Attachment #246896 for bug #275623

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




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


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

CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \
		-DORTHANC_FRAMEWORK_SOURCE=path
CMAKE_OFF=	DBUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
CMAKE_SOURCE_PATH=	${WRKSRC}/MySQL

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

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)b/science/orthanc-mysql/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1629969268	1	TIMESTAMP = 1701854261
2	SHA256 (orthanc/OrthancMySQL-4.3.tar.gz) = 7a22cbb482809bc1f6732e3e582cbbf4449e9205f297453ad4c7b7792956efba	2	SHA256 (orthanc/OrthancMySQL-5.1.tar.gz) = d1298d01dab48ca551daabe6ed2894eaa1e72989adef95c01810b8c18ca39c07
3	SIZE (orthanc/OrthancMySQL-4.3.tar.gz) = 321585	3	SIZE (orthanc/OrthancMySQL-5.1.tar.gz) = 402971
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




--- MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig	2023-12-06 09:05:27 UTC
+++ MySQL/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()

Return to bug 275623

Lines 1-12 Link Here

(-)b/science/orthanc-mysql/Makefile (-9 / +8 lines)
1	PORTNAME= orthanc-mysql	1	PORTNAME= orthanc-mysql
2	DISTVERSION= 4.3	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-mysql/:main \	4	MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc-mysql/: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= OrthancMySQL-${PORTVERSION}.tar.gz:main \	7	DISTFILES= OrthancMySQL-${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= OrthancMySQL-${PORTVERSION}.tar.gz	11	EXTRACT_ONLY= OrthancMySQL-${PORTVERSION}.tar.gz
Lines 32-38 USE_LDCONFIG= yes Link Here
32		31
33	WRKSRC= ${WRKDIR}/OrthancMySQL-${PORTVERSION}	32	WRKSRC= ${WRKDIR}/OrthancMySQL-${PORTVERSION}
34		33
35	CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources \	34	CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Sources \
36	-DORTHANC_FRAMEWORK_SOURCE=path	35	-DORTHANC_FRAMEWORK_SOURCE=path
37	CMAKE_OFF= DBUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID	36	CMAKE_OFF= DBUILD_UNIT_TESTS USE_SYSTEM_ORTHANC_SDK USE_SYSTEM_UUID
38	CMAKE_SOURCE_PATH= ${WRKSRC}/MySQL	37	CMAKE_SOURCE_PATH= ${WRKSRC}/MySQL
Lines 45-51 PLIST_SUB= DISTVERSION=${DISTVERSION} Link Here
45	post-extract:	44	post-extract:
46	${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads	45	${MKDIR} ${WRKSRC}/MySQL/ThirdPartyDownloads
47	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads	46	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
48	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads	47	${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.12.1.tar.gz ${WRKSRC}/MySQL/ThirdPartyDownloads
49	${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz	48	${TAR} -C ${WRKSRC}/MySQL/ThirdPartyDownloads -xf ${WRKSRC}/MySQL/ThirdPartyDownloads/Orthanc-1.12.1.tar.gz
50		49
51	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Added Link Here

(-)b/science/orthanc-mysql/files/patch-Orthanc-1.12.1_OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake (+39 lines)
1	--- MySQL/ThirdPartyDownloads/Orthanc-1.12.1/OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig 2023-12-06 09:05:27 UTC
2	+++ MySQL/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()