Attachment #174004 for bug #211263

Lines 2-9 Link Here

(-)b/science/orthanc/Makefile (-7 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= orthanc	4	PORTNAME= orthanc
5	PORTVERSION= 1.0.0	5	PORTVERSION= 1.1.0
6	PORTREVISION= 1
7	CATEGORIES= science graphics net www	6	CATEGORIES= science graphics net www
8	MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/orthanc/:main \	7	MASTER_SITES= http://orthanc-server.com/downloads/get.php?path=/orthanc/:main \
9	http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose	8	http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose
Lines 18-26 COMMENT= RESTful DICOM server for healthcare and medical research Link Here
18	LICENSE= GPLv3	17	LICENSE= GPLv3
19	LICENSE_FILE= ${WRKSRC}/COPYING	18	LICENSE_FILE= ${WRKSRC}/COPYING
20		19
21	BROKEN_powerpc64= Does not build
22
23	BUILD_DEPENDS= gtest-config:devel/googletest
24	LIB_DEPENDS= libcurl.so:ftp/curl \	20	LIB_DEPENDS= libcurl.so:ftp/curl \
25	libjsoncpp.so:devel/jsoncpp \	21	libjsoncpp.so:devel/jsoncpp \
26	libuuid.so:misc/e2fsprogs-libuuid \	22	libuuid.so:misc/e2fsprogs-libuuid \
Lines 34-51 LIB_DEPENDS= libcurl.so:ftp/curl \ Link Here
34	libcharls.so:devel/dcmtk \	30	libcharls.so:devel/dcmtk \
35	libdcmjpls.so:devel/dcmtk \	31	libdcmjpls.so:devel/dcmtk \
36	libsqlite3.so:databases/sqlite3 \	32	libsqlite3.so:databases/sqlite3 \
		33	libpng16.so:graphics/png \
		34	libgtest.so:devel/googletest \
37	libpugixml.so:textproc/pugixml	35	libpugixml.so:textproc/pugixml
38		36
		37	BROKEN_powerpc64= Does not build
		38
39	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \	39	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
40	-DDCMTK_DIR="${LOCALBASE}" \	40	-DDCMTK_DIR="${LOCALBASE}" \
41	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \	41	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
42	-DUSE_SYSTEM_MONGOOSE=OFF \	42	-DUSE_SYSTEM_MONGOOSE=OFF \
43	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF	43	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF
44		44
45	USES= cmake:outsource dos2unix lua:51 python:build	45	USES= cmake:outsource dos2unix jpeg lua:51 python:build ssl
		46	CFLAGS+= -I${LOCALBASE}/include
46	DOS2UNIX_FILES= CMakeLists.txt	47	DOS2UNIX_FILES= CMakeLists.txt
47	USE_LDCONFIG= yes	48	USE_LDCONFIG= yes
48	USE_OPENSSL= yes
49	USE_RC_SUBR= orthanc	49	USE_RC_SUBR= orthanc
50	WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION}	50	WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION}
51	USERS= orthanc	51	USERS= orthanc

Lines 1-4 Link Here

(-)b/science/orthanc/distinfo (-2 / +3 lines)
1	SHA256 (orthanc/Orthanc-1.0.0.tar.gz) = 3fc37a0fc91e597cc4004934b14726595b5e97b7e328e03dedb4454096bd1bbb	1	TIMESTAMP = 1469014978
2	SIZE (orthanc/Orthanc-1.0.0.tar.gz) = 1164342	2	SHA256 (orthanc/Orthanc-1.1.0.tar.gz) = e8e7ce79dc327b8d0cd4917a520d867260eb58a34a2eea5e24a56db3540edbd4
		3	SIZE (orthanc/Orthanc-1.1.0.tar.gz) = 1152366
3	SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e	4	SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e
4	SIZE (orthanc/mongoose-3.8.tgz) = 1577314	5	SIZE (orthanc/mongoose-3.8.tgz) = 1577314

Line 0 Link Here

(-)b/science/orthanc/files/patch-OrthancServer_FromDcmtkBridge.cpp (+11 lines)
	1	--- OrthancServer/FromDcmtkBridge.cpp.orig 2016-07-20 11:36:11 UTC
	2	+++ OrthancServer/FromDcmtkBridge.cpp
	3	@@ -197,7 +197,7 @@ namespace Orthanc
	4	LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM);
	5	LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE);
	6
	7	-#elif defined(__linux__) \|\| defined(__FreeBSD_kernel__)
	8	+#elif defined(__linux__) \|\| defined(__FreeBSD__)
	9	std::string path = DCMTK_DICTIONARY_DIR;
	10
	11	const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE);




Fix the build with CMake 3.5.0.

FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
match the directory used for searching for the headers below.
--- Resources/CMake/DcmtkConfiguration.cmake.orig	2015-12-15 16:49:02 UTC
+++ Resources/CMake/DcmtkConfiguration.cmake
@@ -186,10 +186,10 @@ else()
     -DHAVE_CONFIG_H=1
     )
 
-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
+  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
   else()
     message(FATAL_ERROR "Please install libdcmtk*-dev")
   endif()

Lines 15-18 include/orthanc/OrthancCppDatabasePlugin.h Link Here

(-)b/science/orthanc/pkg-plist (+1 lines)
15	%%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%%	15	%%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%%
16	%%DATADIR%%/plugins/libModalityWorklists.so	16	%%DATADIR%%/plugins/libModalityWorklists.so
17	%%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%%	17	%%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%%
		18	bin/OrthancRecoverCompressedFile
18	sbin/Orthanc	19	sbin/Orthanc

Return to bug 211263

Removed Link Here

(-)a/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake (-22 lines)
1	Fix the build with CMake 3.5.0.
2
3	FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
4	this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
5	match the directory used for searching for the headers below.
6	--- Resources/CMake/DcmtkConfiguration.cmake.orig 2015-12-15 16:49:02 UTC
7	+++ Resources/CMake/DcmtkConfiguration.cmake
8	@@ -186,10 +186,10 @@ else()
9	-DHAVE_CONFIG_H=1
10	)
11
12	- if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
13	- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
14	- elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux
15	- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
16	+ if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
17	+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
18	+ elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux
19	+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
20	else()
21	message(FATAL_ERROR "Please install libdcmtk*-dev")
22	endif()