Attachment #246897 for bug #275624

View | Details | Raw Unified | Return to bug 275624
Collapse All | Expand All




PORTNAME=	orthanc-postgresql
DISTVERSION=	5.1
PORTREVISION=	6
CATEGORIES=	science
MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc-postgresql/:main \
		https://orthanc.uclouvain.be/downloads/sources/orthanc/:framework \
		https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty
DISTFILES=	OrthancPostgreSQL-${PORTVERSION}.tar.gz:main \
		Orthanc-1.12.1.tar.gz:framework \
		e2fsprogs-1.44.5.tar.gz:thirdparty
DIST_SUBDIR=	orthanc
EXTRACT_ONLY=	OrthancPostgreSQL-${PORTVERSION}.tar.gz


CMAKE_SOURCE_PATH=	${WRKSRC}/PostgreSQL
CMAKE_OFF=	BUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \
		-DORTHANC_FRAMEWORK_SOURCE=path
CXXFLAGS+=	-I${LOCALBASE}/include -DNDEBUG
LDFLAGS+=	-L${LOCALBASE}/lib

PLIST_SUB=	DISTVERSION=${DISTVERSION}

post-extract:
		${MV} ${WRKDIR}/OrthancPostgresql-${PORTVERSION} ${WRKSRC}
		${MKDIR} ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
		${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.12.1.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
		${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1.tar.gz

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/science/orthanc-postgresql/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1620906912	1	TIMESTAMP = 1701795693
2	SHA256 (orthanc/OrthancPostgreSQL-4.0.tar.gz) = a5049ed8a5d6bb8b6529636cf1d9f631d1b61f6e0bbfdc6accae45aded42bac5	2	SHA256 (orthanc/OrthancPostgreSQL-5.1.tar.gz) = c5f97c7ca145f9748720a18ebcf829c552cfcac9ad52b6d704fc125a8fc24764
3	SIZE (orthanc/OrthancPostgreSQL-4.0.tar.gz) = 318047	3	SIZE (orthanc/OrthancPostgreSQL-5.1.tar.gz) = 404767
4	SHA256 (orthanc/Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960	4	SHA256 (orthanc/Orthanc-1.12.1.tar.gz) = 2e8bfe1f56a4cf9a281eb3975549122ee13f2f4057279d88bb0dd09b006e6189
5	SIZE (orthanc/Orthanc-1.9.3.tar.gz) = 1818313	5	SIZE (orthanc/Orthanc-1.12.1.tar.gz) = 1991159
6	SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc	6	SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc
7	SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237	7	SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237




--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig	2023-12-06 09:05:27 UTC
+++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
@@ -64,22 +64,27 @@ else()
     message(FATAL_ERROR "Please install the libprotobuf-dev package")
   endif()
 
-  set(CMAKE_REQUIRED_LIBRARIES "protobuf")
+  if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+    find_package(Protobuf REQUIRED)
+  else()
+    set(CMAKE_REQUIRED_LIBRARIES "protobuf")
 
-  include(CheckCXXSourceCompiles) 
-  check_cxx_source_compiles(
-    "
+
+    include(CheckCXXSourceCompiles) 
+    check_cxx_source_compiles(
+      "
 #include <google/protobuf/descriptor.h>
 int main()
 {
   google::protobuf::FieldDescriptor::TypeName(google::protobuf::FieldDescriptor::TYPE_FLOAT);
 }
-"  HAVE_PROTOBUF_LIB)
-  if (NOT HAVE_PROTOBUF_LIB)
-    message(FATAL_ERROR "Cannot find the protobuf library")
-  endif()
+  "  HAVE_PROTOBUF_LIB)
+    if (NOT HAVE_PROTOBUF_LIB)
+      message(FATAL_ERROR "Cannot find the protobuf library")
+    endif()
   
-  unset(CMAKE_REQUIRED_LIBRARIES)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+  endif()
 
   link_libraries(protobuf)
 endif()

Lines 1-6 Link Here

(-)b/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt (-2 / +2 lines)
1	--- PostgreSQL/CMakeLists.txt.orig 2021-05-17 12:24:06 UTC	1	--- PostgreSQL/CMakeLists.txt.orig 2023-06-27 13:34:05 UTC
2	+++ PostgreSQL/CMakeLists.txt	2	+++ PostgreSQL/CMakeLists.txt
3	@@ -23,6 +23,9 @@ set(OPENSSL_STATIC_VERSION "1.1.1" CACHE STRING "Force	3	@@ -43,6 +43,9 @@ set(OPENSSL_STATIC_VERSION "3.0" CACHE STRING "Force t
4		4
5	include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginConfiguration.cmake)	5	include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginConfiguration.cmake)
6		6

Return to bug 275624

Lines 1-12 Link Here

(-)b/science/orthanc-postgresql/Makefile (-9 / +9 lines)
1	PORTNAME= orthanc-postgresql	1	PORTNAME= orthanc-postgresql
2	DISTVERSION= 4.0	2	DISTVERSION= 5.1
3	PORTREVISION= 6
4	CATEGORIES= science	3	CATEGORIES= science
5	MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-postgresql/:main \	4	MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc-postgresql/:main \
6	https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \	5	https://orthanc.uclouvain.be/downloads/sources/orthanc/:framework \
7	https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty	6	https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty
8	DISTFILES= OrthancPostgreSQL-${PORTVERSION}.tar.gz:main \	7	DISTFILES= OrthancPostgreSQL-${PORTVERSION}.tar.gz:main \
9	Orthanc-1.9.3.tar.gz:framework \	8	Orthanc-1.12.1.tar.gz:framework \
10	e2fsprogs-1.44.5.tar.gz:thirdparty	9	e2fsprogs-1.44.5.tar.gz:thirdparty
11	DIST_SUBDIR= orthanc	10	DIST_SUBDIR= orthanc
12	EXTRACT_ONLY= OrthancPostgreSQL-${PORTVERSION}.tar.gz	11	EXTRACT_ONLY= OrthancPostgreSQL-${PORTVERSION}.tar.gz
Lines 32-38 WRKSRC= ${WRKDIR}/OrthancPostgreSQL-${PORTVERSION} Link Here
32		31
33	CMAKE_SOURCE_PATH= ${WRKSRC}/PostgreSQL	32	CMAKE_SOURCE_PATH= ${WRKSRC}/PostgreSQL
34	CMAKE_OFF= BUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID	33	CMAKE_OFF= BUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
35	CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources \	34	CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \
36	-DORTHANC_FRAMEWORK_SOURCE=path	35	-DORTHANC_FRAMEWORK_SOURCE=path
37	CXXFLAGS+= -I${LOCALBASE}/include -DNDEBUG	36	CXXFLAGS+= -I${LOCALBASE}/include -DNDEBUG
38	LDFLAGS+= -L${LOCALBASE}/lib	37	LDFLAGS+= -L${LOCALBASE}/lib
Lines 41-49 CFLAGS+= -DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG Link Here
41	PLIST_SUB= DISTVERSION=${DISTVERSION}	40	PLIST_SUB= DISTVERSION=${DISTVERSION}
42		41
43	post-extract:	42	post-extract:
		43	${MV} ${WRKDIR}/OrthancPostgresql-${PORTVERSION} ${WRKSRC}
44	${MKDIR} ${WRKSRC}/PostgreSQL/ThirdPartyDownloads	44	${MKDIR} ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
45	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads	45	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
46	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads	46	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.12.1.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
47	${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz	47	${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1.tar.gz
48		48
49	.include <bsd.port.mk>	49	.include <bsd.port.mk>

Added Link Here

(-)b/science/orthanc-postgresql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake (+39 lines)
1	--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig 2023-12-06 09:05:27 UTC
2	+++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
3	@@ -64,22 +64,27 @@ else()
4	message(FATAL_ERROR "Please install the libprotobuf-dev package")
5	endif()
6
7	- set(CMAKE_REQUIRED_LIBRARIES "protobuf")
8	+ if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
9	+ find_package(Protobuf REQUIRED)
10	+ else()
11	+ set(CMAKE_REQUIRED_LIBRARIES "protobuf")
12
13	- include(CheckCXXSourceCompiles)
14	- check_cxx_source_compiles(
15	- "
16	+
17	+ include(CheckCXXSourceCompiles)
18	+ check_cxx_source_compiles(
19	+ "
20	#include <google/protobuf/descriptor.h>
21	int main()
22	{
23	google::protobuf::FieldDescriptor::TypeName(google::protobuf::FieldDescriptor::TYPE_FLOAT);
24	}
25	-" HAVE_PROTOBUF_LIB)
26	- if (NOT HAVE_PROTOBUF_LIB)
27	- message(FATAL_ERROR "Cannot find the protobuf library")
28	- endif()
29	+ " HAVE_PROTOBUF_LIB)
30	+ if (NOT HAVE_PROTOBUF_LIB)
31	+ message(FATAL_ERROR "Cannot find the protobuf library")
32	+ endif()
33
34	- unset(CMAKE_REQUIRED_LIBRARIES)
35	+ unset(CMAKE_REQUIRED_LIBRARIES)
36	+ endif()
37
38	link_libraries(protobuf)
39	endif()