Attachment #228702 for bug #259145




# Created by: maintainer.freebsd@xpoundit.com

PORTNAME=	orthanc
DISTVERSION=	1.9.7
CATEGORIES=	science
MASTER_SITES=	https://www.orthanc-server.com/downloads/get.php?path=/orthanc/
DISTNAME=	Orthanc-${PORTVERSION}


WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}

CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer
CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
CMAKE_ON=	USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \
		USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \
		USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \
		USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \
		USE_SYSTEM_UUID USE_SYSTEM_ZLIB
CMAKE_OFF=	BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
CMAKE_SOURCE_PATH=	${WRKSRC}/OrthancServer

CFLAGS+=	-DNDEBUG
CXXFLAGS+=	-DNDEBUG


USERS=		orthanc
GROUPS=		orthanc

PLIST_SUB+=	DISTVERSION=${DISTVERSION}

post-install:
	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5

Lines 1-3 Link Here

(-)b/science/orthanc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620899601	1	TIMESTAMP = 1634131378
2	SHA256 (Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960	2	SHA256 (Orthanc-1.9.7.tar.gz) = dd662add29808a15e4f1b24582021d5ea84146eefb2b6437da018c7db2168e51
3	SIZE (Orthanc-1.9.3.tar.gz) = 1818313	3	SIZE (Orthanc-1.9.7.tar.gz) = 1856489




--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig	2021-08-30 20:14:33 UTC
+++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake
@@ -109,32 +109,38 @@ else()
 
   cmake_reset_check_state()
   set(CMAKE_REQUIRED_LIBRARIES dl pthread)

+      message(FATAL_ERROR "Unable to use mg_start from civetweb library")
+    endif()
+
+    CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_disable_connection_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
+    if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
+      add_definitions(
+        -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1

+        )
+      message("Performance: Your system-wide distribution of civetweb is configured for best performance")
+    else()
+      message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_connection_keep_alive() function, and WebDAV will only be available for read-only access")
+      add_definitions(
+        -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0
+        -DCIVETWEB_HAS_WEBDAV_WRITING=0

Lines 13-18 include/orthanc/OrthancCDatabasePlugin.h Link Here

(-)b/science/orthanc/pkg-plist (-2 / +2 lines)
13	include/orthanc/OrthancCPlugin.h	13	include/orthanc/OrthancCPlugin.h
14	sbin/Orthanc	14	sbin/Orthanc
15	%%DATADIR%%/plugins/libModalityWorklists.so	15	%%DATADIR%%/plugins/libModalityWorklists.so
16	%%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%%	16	%%DATADIR%%/plugins/libModalityWorklists.so.%%DISTVERSION%%
17	%%DATADIR%%/plugins/libServeFolders.so	17	%%DATADIR%%/plugins/libServeFolders.so
18	%%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%%	18	%%DATADIR%%/plugins/libServeFolders.so.%%DISTVERSION%%

Return to bug 259145

Lines 1-7 Link Here

(-)b/science/orthanc/Makefile (-3 / +5 lines)
1	# Created by: maintainer.freebsd@xpoundit.com	1	# Created by: maintainer.freebsd@xpoundit.com
2		2
3	PORTNAME= orthanc	3	PORTNAME= orthanc
4	DISTVERSION= 1.9.3	4	DISTVERSION= 1.9.7
5	CATEGORIES= science	5	CATEGORIES= science
6	MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/orthanc/	6	MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/orthanc/
7	DISTNAME= Orthanc-${PORTVERSION}	7	DISTNAME= Orthanc-${PORTVERSION}
Lines 30-42 USE_LDCONFIG= yes Link Here
30		30
31	WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION}	31	WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION}
32		32
33	CMAKE_SOURCE_PATH= ${WRKSRC}/OrthancServer
34	CMAKE_OFF= BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS	33	CMAKE_OFF= BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
35	CMAKE_ON= USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \	34	CMAKE_ON= USE_SYSTEM_BOOST USE_SYSTEM_CIVETWEB USE_SYSTEM_DCMTK \
36	USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \	35	USE_SYSTEM_GOOGLE_TEST USE_SYSTEM_JSONCPP USE_SYSTEM_LIBICONV \
37	USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \	36	USE_SYSTEM_LIBJPEG USE_SYSTEM_LIBPNG USE_SYSTEM_LUA \
38	USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \	37	USE_SYSTEM_OPENSSL USE_SYSTEM_PUGIXML USE_SYSTEM_SQLITE \
39	USE_SYSTEM_UUID USE_SYSTEM_ZLIB	38	USE_SYSTEM_UUID USE_SYSTEM_ZLIB
		39	CMAKE_OFF= BUILD_CONNECTIVITY_CHECKS UNIT_TESTS_WITH_HTTP_CONNEXIONS
		40	CMAKE_SOURCE_PATH= ${WRKSRC}/OrthancServer
		41
40	CFLAGS+= -DNDEBUG	42	CFLAGS+= -DNDEBUG
41	CXXFLAGS+= -DNDEBUG	43	CXXFLAGS+= -DNDEBUG
42		44
Lines 45-51 USE_RC_SUBR= orthanc Link Here
45	USERS= orthanc	47	USERS= orthanc
46	GROUPS= orthanc	48	GROUPS= orthanc
47		49
48	PLIST_SUB+= PORTVERSION=${PORTVERSION}	50	PLIST_SUB+= DISTVERSION=${DISTVERSION}
49		51
50	post-install:	52	post-install:
51	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5	53	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5

Lines 1-6 Link Here

(-)b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration.cmake (-4 / +4 lines)
1	--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig 2021-05-12 13:54:35 UTC	1	--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig 2021-08-30 20:14:33 UTC
2	+++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake	2	+++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake
3	@@ -98,32 +98,38 @@ else()	3	@@ -109,32 +109,38 @@ else()
4		4
5	cmake_reset_check_state()	5	cmake_reset_check_state()
6	set(CMAKE_REQUIRED_LIBRARIES dl pthread)	6	set(CMAKE_REQUIRED_LIBRARIES dl pthread)
Lines 34-40 Link Here
34	+ message(FATAL_ERROR "Unable to use mg_start from civetweb library")	34	+ message(FATAL_ERROR "Unable to use mg_start from civetweb library")
35	+ endif()	35	+ endif()
36	+	36	+
37	+ CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_disable_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE)	37	+ CHECK_LIBRARY_EXISTS(${CIVETWEB_LIB} mg_disable_connection_keep_alive "" CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
38	+ if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE)	38	+ if (CIVETWEB_HAS_DISABLE_KEEP_ALIVE)
39	+ add_definitions(	39	+ add_definitions(
40	+ -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1	40	+ -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=1
Lines 42-48 Link Here
42	+ )	42	+ )
43	+ message("Performance: Your system-wide distribution of civetweb is configured for best performance")	43	+ message("Performance: Your system-wide distribution of civetweb is configured for best performance")
44	+ else()	44	+ else()
45	+ message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_keep_alive() function, and WebDAV will only be available for read-only access")	45	+ message(WARNING "Performance: Your system-wide distribution of civetweb does not feature the mg_disable_connection_keep_alive() function, and WebDAV will only be available for read-only access")
46	+ add_definitions(	46	+ add_definitions(
47	+ -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0	47	+ -DCIVETWEB_HAS_DISABLE_KEEP_ALIVE=0
48	+ -DCIVETWEB_HAS_WEBDAV_WRITING=0	48	+ -DCIVETWEB_HAS_WEBDAV_WRITING=0