Attachment #246894 for bug #275621

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

Lines 1-8 Link Here

(-)b/science/orthanc/Makefile (-4 / +8 lines)
		1	# Created by: maintainer.freebsd@xpoundit.com
		2
1	PORTNAME= orthanc	3	PORTNAME= orthanc
2	DISTVERSION= 1.11.0	4	DISTVERSION= 1.12.1
3	PORTREVISION= 11
4	CATEGORIES= science	5	CATEGORIES= science
5	MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/orthanc/	6	MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc/
6	DISTNAME= Orthanc-${PORTVERSION}	7	DISTNAME= Orthanc-${PORTVERSION}
7		8
8	MAINTAINER= maintainer.freebsd@xpoundit.com	9	MAINTAINER= maintainer.freebsd@xpoundit.com
Lines 12-17 WWW= https://www.orthanc-server.com/ Link Here
12	LICENSE= GPLv3	13	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/COPYING	14	LICENSE_FILE= ${WRKSRC}/COPYING
14		15
		16	BUILD_DEPENDS= protoc:devel/protobuf
		17
15	LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \	18	LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \
16	libcivetweb.so:www/civetweb \	19	libcivetweb.so:www/civetweb \
17	libcurl.so:ftp/curl \	20	libcurl.so:ftp/curl \
Lines 20-28 LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ Link Here
20	libicuuc.so:devel/icu \	23	libicuuc.so:devel/icu \
21	libjsoncpp.so:devel/jsoncpp \	24	libjsoncpp.so:devel/jsoncpp \
22	libpng16.so:graphics/png \	25	libpng16.so:graphics/png \
		26	libprotobuf.so:devel/protobuf \
23	libpugixml.so:textproc/pugixml \	27	libpugixml.so:textproc/pugixml \
24	libtiff.so:graphics/tiff \	28	libtiff.so:graphics/tiff \
25	libuuid.so:misc/e2fsprogs-libuuid	29	libuuid.so:misc/e2fsprogs-libuuid \
26		30
27	USES= cmake gnome iconv jpeg lua python:build sqlite ssl	31	USES= cmake gnome iconv jpeg lua python:build sqlite ssl
28	USE_GNOME= libxml2	32	USE_GNOME= libxml2

Lines 1-3 Link Here

(-)b/science/orthanc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1652266484	1	TIMESTAMP = 1701766389
2	SHA256 (Orthanc-1.11.0.tar.gz) = 23949a70562487fd6e79d6f3f13c71a0fc90aa25e492fb3a99575fee0722c5af	2	SHA256 (Orthanc-1.12.1.tar.gz) = 2e8bfe1f56a4cf9a281eb3975549122ee13f2f4057279d88bb0dd09b006e6189
3	SIZE (Orthanc-1.11.0.tar.gz) = 1899829	3	SIZE (Orthanc-1.12.1.tar.gz) = 1991159




--- OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig	2023-12-05 11:17:50 UTC
+++ OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
@@ -64,22 +64,26 @@ 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")
+    if (NOT HAVE_PROTOBUF_LIB)
+      message(FATAL_ERROR "Cannot find the protobuf library")
+    endif()
+
+    unset(CMAKE_REQUIRED_LIBRARIES)
   endif()
-  
-  unset(CMAKE_REQUIRED_LIBRARIES)
 
   link_libraries(protobuf)
 endif()

Return to bug 275621

Added Link Here

(-)b/science/orthanc/files/patch-OrthancFramework_Resources_CMake_ProtobufConfiguration.cmake (+37 lines)
1	--- OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake.orig 2023-12-05 11:17:50 UTC
2	+++ OrthancFramework/Resources/CMake/ProtobufConfiguration.cmake
3	@@ -64,22 +64,26 @@ 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	+ include(CheckCXXSourceCompiles)
17	+ check_cxx_source_compiles(
18	+ "
19	#include <google/protobuf/descriptor.h>
20	int main()
21	{
22	google::protobuf::FieldDescriptor::TypeName(google::protobuf::FieldDescriptor::TYPE_FLOAT);
23	}
24	" HAVE_PROTOBUF_LIB)
25	- if (NOT HAVE_PROTOBUF_LIB)
26	- message(FATAL_ERROR "Cannot find the protobuf library")
27	+ if (NOT HAVE_PROTOBUF_LIB)
28	+ message(FATAL_ERROR "Cannot find the protobuf library")
29	+ endif()
30	+
31	+ unset(CMAKE_REQUIRED_LIBRARIES)
32	endif()
33	-
34	- unset(CMAKE_REQUIRED_LIBRARIES)
35
36	link_libraries(protobuf)
37	endif()