Attachment #157485 for bug #200683

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




# $FreeBSD: head/science/orthanc/Makefile 388534 2015-06-04 14:07:31Z amdmi3 $

PORTNAME=	orthanc
PORTVERSION=	0.9.0
CATEGORIES=	science graphics net
MASTER_SITES=	SF/orthancserver/:main \
		http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	gtest-config:${PORTSDIR}/devel/googletest
LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
		libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \

CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
		-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
		-DUSE_SYSTEM_MONGOOSE=OFF \
		-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF

USES=		cmake:outsource python:build lua:51 dos2unix
DOS2UNIX_FILES=	CMakeLists.txt
CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/jsoncpp
LDFLAGS+=	-L${LOCALBASE}/lib
USE_LDCONFIG=	yes
USE_OPENSSL=	yes
USE_RC_SUBR=	orthanc

post-extract:
	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
	${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads
	# Orthanc hardcodes /usr/local paths for libs and includes.
	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt

# There is no way to disable building of test units without a patch, on other
# hand it brings only one build dependency (devel/googletest) and running it was
# helpful in early bug detection in Debian.
# Some tests require connections to be made to the outside world, this is
# definitely unsupported behaviour and therefor those tests are disabled with
# cmake variable above (-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF).
post-build:
	@cd ${BUILD_WRKSRC} && ./UnitTests

post-install:
	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Resources/Configuration.json
	${CP} ${WRKSRC}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
	${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/libServeFolders.so.0.9.0

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 1001000
IGNORE=	supported only on 10.1 by upstream, not all unit tests are passed
.endif

.if ${OSVERSION} > 1100000
IGNORE=	unit tests are crashing, bug 200544
.endif

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)orthanc/distinfo (-2 / +2 lines)
1	SHA256 (orthanc/Orthanc-0.8.6.tar.gz) = 0668e23dbdf4aa12bf417cf22bfb7b50379797fc6b1132a582789289d1728e69	1	SHA256 (orthanc/Orthanc-0.9.0.tar.gz) = f75f76a2aaa79951c8ece2137046f2572a91e96e31efe9e0ce99b644e4320d0a
2	SIZE (orthanc/Orthanc-0.8.6.tar.gz) = 716036	2	SIZE (orthanc/Orthanc-0.9.0.tar.gz) = 676749
3	SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e	3	SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e
4	SIZE (orthanc/mongoose-3.8.tgz) = 1577314	4	SIZE (orthanc/mongoose-3.8.tgz) = 1577314




--- CMakeLists.txt.orig	2015-02-12 13:47:38 UTC
+++ CMakeLists.txt
@@ -20,6 +20,7 @@ SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allo
 SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
 SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
 SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
+SET(BUILD_UNIT_TESTS ON CACHE BOOL "Build UnitTests binary")
 
 # Advanced parameters to fine-tune linking against system libraries
 SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
@@ -359,22 +360,24 @@ install(
 ## Build the unit tests
 #####################################################################
 
-if (UNIT_TESTS_WITH_HTTP_CONNEXIONS)
-  add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1)
-else()
-  add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=0)
-endif()
-
-add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
-add_executable(UnitTests
-  ${GTEST_SOURCES}
-  ${ORTHANC_UNIT_TESTS_SOURCES}
-  )
-target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
-
-if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
-  target_link_libraries(UnitTests OpenSSL)
+if (BUILD_UNIT_TESTS)
+  if (UNIT_TESTS_WITH_HTTP_CONNEXIONS)
+    add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1)
+  else()
+    add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=0)
+  endif()
+  
+  add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
+  include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
+  add_executable(UnitTests
+    ${GTEST_SOURCES}
+    ${ORTHANC_UNIT_TESTS_SOURCES}
+    )
+  target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
+  
+  if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
+    target_link_libraries(UnitTests OpenSSL)
+  endif()
 endif()
 
 
@@ -443,7 +446,8 @@ if (BUILD_CLIENT_LIBRARY)
         )
     endif()
 
-  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
+          ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     # TODO
     target_link_libraries(OrthancClient pthread)
 

Lines 1-11 Link Here

(-)orthanc/files/patch-Core_Compression_HierarchicalZipWriter.cpp (-11 lines)
1	--- Core/Compression/HierarchicalZipWriter.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Core/Compression/HierarchicalZipWriter.cpp
3	@@ -53,7 +53,7 @@ namespace Orthanc
4	if (c == '^')
5	c = ' ';
6
7	- if (c < 128 &&
8	+ if (c <= 127 &&
9	c >= 0)
10	{
11	if (isspace(c))

Lines 1-11 Link Here

(-)orthanc/files/patch-Core_ImageFormats_ImageProcessing.cpp (-11 lines)
1	--- Core/ImageFormats/ImageProcessing.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Core/ImageFormats/ImageProcessing.cpp
3	@@ -209,7 +209,7 @@ namespace Orthanc
4	void MultiplyConstantInternal(ImageAccessor& image,
5	float factor)
6	{
7	- if (abs(factor - 1.0f) <= std::numeric_limits<float>::epsilon())
8	+ if (std::abs(factor - 1.0f) <= std::numeric_limits<float>::epsilon())
9	{
10	return;
11	}




--- Core/MultiThreading/Mutex.cpp.orig	2015-02-12 13:47:38 UTC
+++ Core/MultiThreading/Mutex.cpp
@@ -37,7 +37,7 @@
 
 #if defined(_WIN32)
 #include <windows.h>
-#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
+#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__)
 #include <pthread.h>
 #else
 #error Support your platform here
@@ -75,7 +75,7 @@ namespace Orthanc
   }
 
 
-#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
+#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__)
 
   struct Mutex::PImpl
   {

Lines 1-11 Link Here

(-)orthanc/files/patch-Core_MultiThreading_ThreadedCommandProcessor.cpp (-11 lines)
1	--- Core/MultiThreading/ThreadedCommandProcessor.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Core/MultiThreading/ThreadedCommandProcessor.cpp
3	@@ -175,7 +175,7 @@ namespace Orthanc
4	{
5	boost::mutex::scoped_lock lock(mutex_);
6
7	- while (!remainingCommands_ == 0)
8	+ while (remainingCommands_ != 0)
9	{
10	processedCommand_.wait(lock);
11	}




--- Core/Toolbox.cpp.orig	2015-02-12 13:47:38 UTC
+++ Core/Toolbox.cpp
@@ -59,7 +59,7 @@
 #include <limits.h>      /* PATH_MAX */
 #endif
 
-#if defined(__linux) || defined(__FreeBSD_kernel__)
+#if defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
 #include <limits.h>      /* PATH_MAX */
 #include <signal.h>
 #include <unistd.h>
@@ -116,7 +116,7 @@ namespace Orthanc
   {
 #if defined(_WIN32)
     ::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000)));
-#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
     usleep(microSeconds);
 #else
 #error Support your platform here
@@ -503,7 +503,7 @@ namespace Orthanc
     return std::string(&buffer[0]);
   }
 
-#elif defined(__linux) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
   static std::string GetPathToExecutableInternal()
   {
     std::vector<char> buffer(PATH_MAX + 1);
@@ -633,7 +633,7 @@ namespace Orthanc
     result.reserve(source.size() + 1);
     for (size_t i = 0; i < source.size(); i++)
     {
-      if (source[i] < 128 && source[i] >= 0 && !iscntrl(source[i]))
+      if (source[i] <= 127 && source[i] >= 0 && !iscntrl(source[i]))
       {
         result.push_back(source[i]);
       }

Lines 1-11 Link Here

(-)orthanc/files/patch-OrthancServer_Internals_StoreScp.cpp (-11 lines)
1	--- OrthancServer/Internals/StoreScp.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ OrthancServer/Internals/StoreScp.cpp
3	@@ -182,7 +182,7 @@ namespace Orthanc
4
5	// check the image to make sure it is consistent, i.e. that its sopClass and sopInstance correspond
6	// to those mentioned in the request. If not, set the status in the response message variable.
7	- if ((rsp->DimseStatus == STATUS_Success))
8	+ if (rsp->DimseStatus == STATUS_Success)
9	{
10	// which SOP class and SOP instance ?
11	if (!DU_findSOPClassAndInstanceInDataSet(imageDataSet, sopClass, sopInstance, /opt_correctUIDPadding*/ OFFalse))

Lines 1-11 Link Here

(-)orthanc/files/patch-Plugins_Engine_PluginsManager.cpp (-11 lines)
1	--- Plugins/Engine/PluginsManager.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Plugins/Engine/PluginsManager.cpp
3	@@ -42,7 +42,7 @@
4
5	#ifdef WIN32
6	#define PLUGIN_EXTENSION ".dll"
7	-#elif defined(__linux) \|\| defined(__FreeBSD_kernel__)
8	+#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
9	#define PLUGIN_EXTENSION ".so"
10	#elif defined(__APPLE__) && defined(__MACH__)
11	#define PLUGIN_EXTENSION ".dylib"




--- Plugins/Engine/SharedLibrary.cpp.orig	2015-02-12 13:47:38 UTC
+++ Plugins/Engine/SharedLibrary.cpp
@@ -36,7 +36,7 @@
 
 #if defined(_WIN32)
 #include <windows.h>
-#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
 #include <dlfcn.h>
 #else
 #error Support your platform here
@@ -58,7 +58,7 @@ namespace Orthanc
       throw OrthancException(ErrorCode_SharedLibrary);
     }
 
-#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
     handle_ = ::dlopen(path.c_str(), RTLD_NOW);
     if (handle_ == NULL) 
     {
@@ -84,7 +84,7 @@ namespace Orthanc
     {
 #if defined(_WIN32)
       ::FreeLibrary((HMODULE)handle_);
-#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
       ::dlclose(handle_);
 #else
 #error Support your platform here
@@ -102,7 +102,7 @@ namespace Orthanc
 
 #if defined(_WIN32)
     return ::GetProcAddress((HMODULE)handle_, name.c_str());
-#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__)
+#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
     return ::dlsym(handle_, name.c_str());
 #else
 #error Support your platform here




--- Resources/CMake/AutoGeneratedCode.cmake.orig	2015-02-12 13:47:38 UTC
+++ Resources/CMake/AutoGeneratedCode.cmake
@@ -3,6 +3,7 @@ set(AUTOGENERATED_SOURCES)
 
 file(MAKE_DIRECTORY ${AUTOGENERATED_DIR})
 include_directories(${AUTOGENERATED_DIR})
+include(FindPythonInterp)
 
 macro(EmbedResources)
   # Convert a semicolon separated list to a whitespace separated string
@@ -26,7 +27,7 @@ macro(EmbedResources)
     "${TARGET_BASE}.h"
     "${TARGET_BASE}.cpp"
     COMMAND 
-    python
+    ${PYTHON_EXECUTABLE}
     "${CMAKE_CURRENT_SOURCE_DIR}/Resources/EmbedResources.py"
     "${AUTOGENERATED_DIR}/EmbeddedResources"
     ${SCRIPT_ARGUMENTS}

Lines 1-10 Link Here

(-)orthanc/files/patch-Resources_CMake_BoostConfiguration.cmake (-10 lines)
1	--- Resources/CMake/BoostConfiguration.cmake.orig 2015-02-12 13:47:38 UTC
2	+++ Resources/CMake/BoostConfiguration.cmake
3	@@ -56,6 +56,7 @@ if (BOOST_STATIC)
4
5	if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
6	${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
7	+ ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR
8	${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD")
9	list(APPEND BOOST_SOURCES
10	${BOOST_SOURCES_DIR}/libs/thread/src/pthread/once.cpp




--- Resources/CMake/Compiler.cmake.orig	2015-02-12 13:47:38 UTC
+++ Resources/CMake/Compiler.cmake
@@ -4,7 +4,8 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration")  
   # --std=c99 makes libcurl not to compile
   # -pedantic gives a lot of warnings on OpenSSL 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wno-variadic-macros")
+  # with -pedantic we failing to build headers from boost, which have comma at the end of enum's
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -Wno-variadic-macros")
 
   if (CMAKE_CROSSCOMPILING)
     # http://stackoverflow.com/a/3543845/881731
@@ -79,6 +80,8 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "D
     )
   link_libraries(iconv)
 
+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+  link_libraries(uuid pthread)
 endif()
 
 




--- Resources/CMake/SQLiteConfiguration.cmake.orig	2015-02-12 13:47:38 UTC
+++ Resources/CMake/SQLiteConfiguration.cmake
@@ -28,8 +28,11 @@ else()
     message(FATAL_ERROR "Please install the libsqlite3-dev package")
   endif()
 
+  find_path(SQLITE_INCLUDE_DIR sqlite3.h)
+  message("SQLite include dir: ${SQLITE_INCLUDE_DIR}")
+
   # Autodetection of the version of SQLite
-  file(STRINGS "/usr/include/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")    
+  file(STRINGS "${SQLITE_INCLUDE_DIR}/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")
   string(REGEX REPLACE "#define SQLITE_VERSION_NUMBER(.*)$" "\\1" SQLITE_VERSION_NUMBER ${SQLITE_VERSION_NUMBER1})
 
   message("Detected version of SQLite: ${SQLITE_VERSION_NUMBER}")

Lines 5-12 Link Here

(-)orthanc/pkg-plist (-3 / +2 lines)
5	@sample(orthanc,orthanc,600) %%ETCDIR%%/orthanc.json.sample	5	@sample(orthanc,orthanc,600) %%ETCDIR%%/orthanc.json.sample
6	include/orthanc/OrthancCDatabasePlugin.h	6	include/orthanc/OrthancCDatabasePlugin.h
7	include/orthanc/OrthancCPlugin.h	7	include/orthanc/OrthancCPlugin.h
8	include/orthanc/OrthancCppClient.h
9	include/orthanc/OrthancCppDatabasePlugin.h	8	include/orthanc/OrthancCppDatabasePlugin.h
10	lib/libOrthancClient.so	9	%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so
11	lib/libOrthancClient.so.0.8	10	%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so.0.9.0
12	sbin/Orthanc	11	sbin/Orthanc

Return to bug 200683

Lines 2-8 Link Here

(-)orthanc/Makefile (-7 / +28 lines)
2	# $FreeBSD: head/science/orthanc/Makefile 388534 2015-06-04 14:07:31Z amdmi3 $	2	# $FreeBSD: head/science/orthanc/Makefile 388534 2015-06-04 14:07:31Z amdmi3 $
3		3
4	PORTNAME= orthanc	4	PORTNAME= orthanc
5	PORTVERSION= 0.8.6	5	PORTVERSION= 0.9.0
6	CATEGORIES= science graphics net	6	CATEGORIES= science graphics net
7	MASTER_SITES= SF/orthancserver/:main \	7	MASTER_SITES= SF/orthancserver/:main \
8	http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose	8	http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose
Lines 16-21 Link Here
16	LICENSE= GPLv3	16	LICENSE= GPLv3
17	LICENSE_FILE= ${WRKSRC}/COPYING	17	LICENSE_FILE= ${WRKSRC}/COPYING
18		18
		19	BUILD_DEPENDS= gtest-config:${PORTSDIR}/devel/googletest
19	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \	20	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
20	libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \	21	libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \
21	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \	22	libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
Lines 28-39 Link Here
28	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \	29	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
29	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \	30	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
30	-DUSE_SYSTEM_MONGOOSE=OFF \	31	-DUSE_SYSTEM_MONGOOSE=OFF \
31	-DBUILD_UNIT_TESTS=OFF	32	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF
32		33
33	USES= cmake:outsource python:build lua:51 dos2unix	34	USES= cmake:outsource python:build lua:51 dos2unix
34	DOS2UNIX_FILES= CMakeLists.txt	35	DOS2UNIX_FILES= CMakeLists.txt
35	CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/jsoncpp
36	LDFLAGS+= -L${LOCALBASE}/lib
37	USE_LDCONFIG= yes	36	USE_LDCONFIG= yes
38	USE_OPENSSL= yes	37	USE_OPENSSL= yes
39	USE_RC_SUBR= orthanc	38	USE_RC_SUBR= orthanc
Lines 52-63 Link Here
52	post-extract:	51	post-extract:
53	${MKDIR} ${WRKSRC}/ThirdPartyDownloads	52	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
54	${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads	53	${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads
		54	# Orthanc hardcodes /usr/local paths for libs and includes.
		55	${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' ${WRKSRC}/CMakeLists.txt
		56
		57	# There is no way to disable building of test units without a patch, on other
		58	# hand it brings only one build dependency (devel/googletest) and running it was
		59	# helpful in early bug detection in Debian.
		60	# Some tests require connections to be made to the outside world, this is
		61	# definitely unsupported behaviour and therefor those tests are disabled with
		62	# cmake variable above (-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF).
		63	post-build:
		64	@cd ${BUILD_WRKSRC} && ./UnitTests
55		65
56	post-install:	66	post-install:
57	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5	67	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
58	${MKDIR} ${STAGEDIR}${DATADIR}/plugins	68	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
59	${MKDIR} ${STAGEDIR}${ETCDIR}	69	${MKDIR} ${STAGEDIR}${ETCDIR}
60	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' \	70	${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/Resources/Configuration.json
61	${WRKSRC}/Resources/Configuration.json > ${STAGEDIR}${ETCDIR}/orthanc.json.sample	71	${CP} ${WRKSRC}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample
		72	${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/libServeFolders.so.0.9.0
		73
		74	.include <bsd.port.pre.mk>
		75
		76	.if ${OSVERSION} < 1001000
		77	IGNORE= supported only on 10.1 by upstream, not all unit tests are passed
		78	.endif
		79
		80	.if ${OSVERSION} > 1100000
		81	IGNORE= unit tests are crashing, bug 200544
		82	.endif
62		83
63	.include <bsd.port.mk>	84	.include <bsd.port.post.mk>

Lines 1-61 Link Here

(-)orthanc/files/patch-CMakeLists.txt (-61 lines)
1	--- CMakeLists.txt.orig 2015-02-12 13:47:38 UTC
2	+++ CMakeLists.txt
3	@@ -20,6 +20,7 @@ SET(ALLOW_DOWNLOADS OFF CACHE BOOL "Allo
4	SET(UNIT_TESTS_WITH_HTTP_CONNEXIONS ON CACHE BOOL "Allow unit tests to make HTTP requests")
5	SET(ENABLE_JPEG ON CACHE BOOL "Enable JPEG decompression")
6	SET(ENABLE_JPEG_LOSSLESS ON CACHE BOOL "Enable JPEG-LS (Lossless) decompression")
7	+SET(BUILD_UNIT_TESTS ON CACHE BOOL "Build UnitTests binary")
8
9	# Advanced parameters to fine-tune linking against system libraries
10	SET(USE_SYSTEM_JSONCPP ON CACHE BOOL "Use the system version of JsonCpp")
11	@@ -359,22 +360,24 @@ install(
12	## Build the unit tests
13	#####################################################################
14
15	-if (UNIT_TESTS_WITH_HTTP_CONNEXIONS)
16	- add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1)
17	-else()
18	- add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=0)
19	-endif()
20	-
21	-add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
22	-include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
23	-add_executable(UnitTests
24	- ${GTEST_SOURCES}
25	- ${ORTHANC_UNIT_TESTS_SOURCES}
26	- )
27	-target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
28	-
29	-if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
30	- target_link_libraries(UnitTests OpenSSL)
31	+if (BUILD_UNIT_TESTS)
32	+ if (UNIT_TESTS_WITH_HTTP_CONNEXIONS)
33	+ add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=1)
34	+ else()
35	+ add_definitions(-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=0)
36	+ endif()
37	+
38	+ add_definitions(-DORTHANC_BUILD_UNIT_TESTS=1)
39	+ include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake)
40	+ add_executable(UnitTests
41	+ ${GTEST_SOURCES}
42	+ ${ORTHANC_UNIT_TESTS_SOURCES}
43	+ )
44	+ target_link_libraries(UnitTests ServerLibrary CoreLibrary ${STATIC_LUA} ${STATIC_GOOGLE_LOG})
45	+
46	+ if (${OPENSSL_SOURCES_LENGTH} GREATER 0)
47	+ target_link_libraries(UnitTests OpenSSL)
48	+ endif()
49	endif()
50
51
52	@@ -443,7 +446,8 @@ if (BUILD_CLIENT_LIBRARY)
53	)
54	endif()
55
56	- elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
57	+ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR
58	+ ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
59	# TODO
60	target_link_libraries(OrthancClient pthread)
61

Lines 1-20 Link Here

(-)orthanc/files/patch-Core_MultiThreading_Mutex.cpp (-20 lines)
1	--- Core/MultiThreading/Mutex.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Core/MultiThreading/Mutex.cpp
3	@@ -37,7 +37,7 @@
4
5	#if defined(_WIN32)
6	#include <windows.h>
7	-#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__APPLE__)
8	+#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
9	#include <pthread.h>
10	#else
11	#error Support your platform here
12	@@ -75,7 +75,7 @@ namespace Orthanc
13	}
14
15
16	-#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__APPLE__)
17	+#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__)
18
19	struct Mutex::PImpl
20	{

Lines 1-38 Link Here

(-)orthanc/files/patch-Core_Toolbox.cpp (-38 lines)
1	--- Core/Toolbox.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Core/Toolbox.cpp
3	@@ -59,7 +59,7 @@
4	#include <limits.h> /* PATH_MAX */
5	#endif
6
7	-#if defined(__linux) \|\| defined(__FreeBSD_kernel__)
8	+#if defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
9	#include <limits.h> /* PATH_MAX */
10	#include <signal.h>
11	#include <unistd.h>
12	@@ -116,7 +116,7 @@ namespace Orthanc
13	{
14	#if defined(_WIN32)
15	::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000)));
16	-#elif defined(__linux) \|\| defined(__APPLE__) \|\| defined(__FreeBSD_kernel__)
17	+#elif defined(__linux) \|\| defined(__APPLE__) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
18	usleep(microSeconds);
19	#else
20	#error Support your platform here
21	@@ -503,7 +503,7 @@ namespace Orthanc
22	return std::string(&buffer[0]);
23	}
24
25	-#elif defined(__linux) \|\| defined(__FreeBSD_kernel__)
26	+#elif defined(__linux) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
27	static std::string GetPathToExecutableInternal()
28	{
29	std::vector<char> buffer(PATH_MAX + 1);
30	@@ -633,7 +633,7 @@ namespace Orthanc
31	result.reserve(source.size() + 1);
32	for (size_t i = 0; i < source.size(); i++)
33	{
34	- if (source[i] < 128 && source[i] >= 0 && !iscntrl(source[i]))
35	+ if (source[i] <= 127 && source[i] >= 0 && !iscntrl(source[i]))
36	{
37	result.push_back(source[i]);
38	}

Lines 1-38 Link Here

(-)orthanc/files/patch-Plugins_Engine_SharedLibrary.cpp (-38 lines)
1	--- Plugins/Engine/SharedLibrary.cpp.orig 2015-02-12 13:47:38 UTC
2	+++ Plugins/Engine/SharedLibrary.cpp
3	@@ -36,7 +36,7 @@
4
5	#if defined(_WIN32)
6	#include <windows.h>
7	-#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__)
8	+#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
9	#include <dlfcn.h>
10	#else
11	#error Support your platform here
12	@@ -58,7 +58,7 @@ namespace Orthanc
13	throw OrthancException(ErrorCode_SharedLibrary);
14	}
15
16	-#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__)
17	+#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
18	handle_ = ::dlopen(path.c_str(), RTLD_NOW);
19	if (handle_ == NULL)
20	{
21	@@ -84,7 +84,7 @@ namespace Orthanc
22	{
23	#if defined(_WIN32)
24	::FreeLibrary((HMODULE)handle_);
25	-#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__)
26	+#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
27	::dlclose(handle_);
28	#else
29	#error Support your platform here
30	@@ -102,7 +102,7 @@ namespace Orthanc
31
32	#if defined(_WIN32)
33	return ::GetProcAddress((HMODULE)handle_, name.c_str());
34	-#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__)
35	+#elif defined(__linux) \|\| (defined(__APPLE__) && defined(__MACH__)) \|\| defined(__FreeBSD_kernel__) \|\| defined(__FreeBSD__)
36	return ::dlsym(handle_, name.c_str());
37	#else
38	#error Support your platform here

Lines 1-19 Link Here

(-)orthanc/files/patch-Resources_CMake_AutoGeneratedCode.cmake (-19 lines)
1	--- Resources/CMake/AutoGeneratedCode.cmake.orig 2015-02-12 13:47:38 UTC
2	+++ Resources/CMake/AutoGeneratedCode.cmake
3	@@ -3,6 +3,7 @@ set(AUTOGENERATED_SOURCES)
4
5	file(MAKE_DIRECTORY ${AUTOGENERATED_DIR})
6	include_directories(${AUTOGENERATED_DIR})
7	+include(FindPythonInterp)
8
9	macro(EmbedResources)
10	# Convert a semicolon separated list to a whitespace separated string
11	@@ -26,7 +27,7 @@ macro(EmbedResources)
12	"${TARGET_BASE}.h"
13	"${TARGET_BASE}.cpp"
14	COMMAND
15	- python
16	+ ${PYTHON_EXECUTABLE}
17	"${CMAKE_CURRENT_SOURCE_DIR}/Resources/EmbedResources.py"
18	"${AUTOGENERATED_DIR}/EmbeddedResources"
19	${SCRIPT_ARGUMENTS}

Lines 1-21 Link Here

(-)orthanc/files/patch-Resources_CMake_Compiler.cmake (-21 lines)
1	--- Resources/CMake/Compiler.cmake.orig 2015-02-12 13:47:38 UTC
2	+++ Resources/CMake/Compiler.cmake
3	@@ -4,7 +4,8 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
4	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-long-long -Wno-implicit-function-declaration")
5	# --std=c99 makes libcurl not to compile
6	# -pedantic gives a lot of warnings on OpenSSL
7	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wno-variadic-macros")
8	+ # with -pedantic we failing to build headers from boost, which have comma at the end of enum's
9	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -Wno-variadic-macros")
10
11	if (CMAKE_CROSSCOMPILING)
12	# http://stackoverflow.com/a/3543845/881731
13	@@ -79,6 +80,8 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "D
14	)
15	link_libraries(iconv)
16
17	+elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
18	+ link_libraries(uuid pthread)
19	endif()
20
21

Lines 1-15 Link Here

(-)orthanc/files/patch-Resources_CMake_SQLiteConfiguration.cmake (-15 lines)
1	--- Resources/CMake/SQLiteConfiguration.cmake.orig 2015-02-12 13:47:38 UTC
2	+++ Resources/CMake/SQLiteConfiguration.cmake
3	@@ -28,8 +28,11 @@ else()
4	message(FATAL_ERROR "Please install the libsqlite3-dev package")
5	endif()
6
7	+ find_path(SQLITE_INCLUDE_DIR sqlite3.h)
8	+ message("SQLite include dir: ${SQLITE_INCLUDE_DIR}")
9	+
10	# Autodetection of the version of SQLite
11	- file(STRINGS "/usr/include/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")
12	+ file(STRINGS "${SQLITE_INCLUDE_DIR}/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")
13	string(REGEX REPLACE "#define SQLITE_VERSION_NUMBER(.*)$" "\\1" SQLITE_VERSION_NUMBER ${SQLITE_VERSION_NUMBER1})
14
15	message("Detected version of SQLite: ${SQLITE_VERSION_NUMBER}")