diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile index aa60b313a934..5300ea9fef48 100644 --- a/science/orthanc-postgresql/Makefile +++ b/science/orthanc-postgresql/Makefile @@ -1,49 +1,49 @@ PORTNAME= orthanc-postgresql DISTVERSION= 4.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= science MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-postgresql/:main \ https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \ https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty DISTFILES= OrthancPostgreSQL-${PORTVERSION}.tar.gz:main \ Orthanc-1.9.3.tar.gz:framework \ e2fsprogs-1.44.5.tar.gz:thirdparty DIST_SUBDIR= orthanc EXTRACT_ONLY= OrthancPostgreSQL-${PORTVERSION}.tar.gz MAINTAINER= maintainer.freebsd@xpoundit.com COMMENT= Orthanc plugin to use PostgreSQL for indexing or storage WWW= https://www.orthanc-server.com/static.php?page=postgresql LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libgdcmCommon.so:devel/gdcm \ libjsoncpp.so:devel/jsoncpp \ libpugixml.so:textproc/pugixml RUN_DEPENDS= Orthanc:science/orthanc USES= cmake compiler:c11 localbase pgsql:11+ python:build ssl USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/OrthancPostgreSQL-${PORTVERSION} 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.9.3/OrthancFramework/Sources \ -DORTHANC_FRAMEWORK_SOURCE=path CXXFLAGS+= -I${LOCALBASE}/include -DNDEBUG LDFLAGS+= -L${LOCALBASE}/lib CFLAGS+= -DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG PLIST_SUB= DISTVERSION=${DISTVERSION} post-extract: ${MKDIR} ${WRKSRC}/PostgreSQL/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.9.3.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads ${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3.tar.gz .include diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp new file mode 100644 index 000000000000..b7291c206db2 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp +@@ -727,7 +727,7 @@ namespace Orthanc + + MimeType SystemToolbox::AutodetectMimeType(const std::string& path) + { +- std::string extension = boost::filesystem::extension(path); ++ std::string extension = boost::filesystem::path(path).extension().string(); + Toolbox::ToLowerCase(extension); + + // http://en.wikipedia.org/wiki/Mime_types diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp new file mode 100644 index 000000000000..6211b49b37a1 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp +@@ -303,7 +303,7 @@ namespace Orthanc + } + else + { +- std::string extension = boost::filesystem::extension(it->path()); ++ std::string extension = it->path().extension().string(); + Toolbox::ToLowerCase(extension); + + if (extension == PLUGIN_EXTENSION) diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp new file mode 100644 index 000000000000..cd1e7aed264f --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp +@@ -162,7 +162,7 @@ OrthancPluginErrorCode Callback(OrthancPluginWorklistA + if (type == fs::regular_file || + type == fs::reparse_file) // cf. BitBucket issue #11 + { +- std::string extension = fs::extension(it->path()); ++ std::string extension = it->path().extension().string(); + std::transform(extension.begin(), extension.end(), extension.begin(), tolower); // Convert to lowercase + + if (extension == ".wl") diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp new file mode 100644 index 000000000000..d41857168ca7 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp +@@ -123,7 +123,7 @@ namespace Orthanc + { + if (!is_directory(it->status())) + { +- std::string extension = boost::filesystem::extension(it->path()); ++ std::string extension = it->path().extension().string(); + Toolbox::ToLowerCase(extension); + + if (extension == ".json")