diff --git a/science/orthanc-dicomweb/Makefile b/science/orthanc-dicomweb/Makefile index 4621c2660c8a..cf8110adbcb9 100644 --- a/science/orthanc-dicomweb/Makefile +++ b/science/orthanc-dicomweb/Makefile @@ -1,65 +1,60 @@ PORTNAME= orthanc-dicomweb -DISTVERSION= 1.8 -PORTREVISION= 15 +DISTVERSION= 1.21 CATEGORIES= science -MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/:main \ - https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \ - https://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty \ - https://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/:thirdpartydicomweb -DISTFILES= OrthancDicomWeb-${PORTVERSION}.tar.gz:main -EXTRADISTFILES= Orthanc-1.11.0.tar.gz:framework \ +MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc-dicomweb/:dicomweb \ + https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty \ + https://orthanc.uclouvain.be/downloads/third-party-downloads/dicom-web/:thirdpartyweb \ + https://orthanc.uclouvain.be/downloads/sources/orthanc/:orthanc +DISTFILES= OrthancDicomWeb-${PORTVERSION}.tar.gz:dicomweb +EXTRADISTFILES= Orthanc-${ORTHANC_VER}.tar.gz:orthanc \ e2fsprogs-1.44.5.tar.gz:thirdparty \ - bootstrap-4.3.1.zip:thirdpartydicomweb \ - vuejs-2.6.10.tar.gz:thirdpartydicomweb \ - axios-0.19.0.tar.gz:thirdpartydicomweb \ - Font-Awesome-4.7.0.tar.gz:thirdpartydicomweb \ - bootstrap-vue-2.0.0-rc.24-dist.tar.gz:thirdpartydicomweb \ - babel-polyfill-6.26.0.min.js.gz:thirdpartydicomweb + bootstrap-5.3.3.zip:thirdparty \ + babel-polyfill-6.26.0.min.js.gz:thirdpartyweb \ + vuejs-2.6.10.tar.gz:thirdpartyweb \ + axios-0.19.0.tar.gz:thirdpartyweb \ + Font-Awesome-4.7.0.tar.gz:thirdpartyweb DISTFILES+= ${EXTRADISTFILES} DIST_SUBDIR= orthanc EXTRACT_ONLY= OrthancDicomWeb-${PORTVERSION}.tar.gz -MAINTAINER= maintainer.freebsd@xpoundit.com -COMMENT= Orthanc plugin to bring support of the DICOMweb standard into Orthanc +MAINTAINER= jwb@FreeBSD.org +COMMENT= Orthanc DICOMWeb plugin WWW= https://www.orthanc-server.com/static.php?page=dicomweb LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.86+ - -BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc +BUILD_DEPENDS= orthanc>=${ORTHANC_VER}:science/orthanc \ + googletest>0:devel/googletest LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ - libexpat.so:textproc/expat2 \ - libgdcmCommon.so:devel/gdcm \ - libicudata.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ - libopenjp2.so:graphics/openjpeg \ libpugixml.so:textproc/pugixml -RUN_DEPENDS= Orthanc:science/orthanc +RUN_DEPENDS= orthanc>=${ORTHANC_VER}:science/orthanc USES= cmake localbase python:build -USE_LDCONFIG= yes +# FIXME: Should plugins be moved to lib? +USE_LDCONFIG= ${DATADIR}/plugins -CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources \ +ORTHANC_VER= 1.12.9 +CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-${ORTHANC_VER}/OrthancFramework/Sources \ -DORTHANC_FRAMEWORK_SOURCE=path CMAKE_OFF= USE_SYSTEM_UUID CFLAGS+= -DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG CXXFLAGS+= -DNDEBUG WRKSRC= ${WRKDIR}/OrthancDicomWeb-${PORTVERSION} PLIST_SUB= DISTVERSION=${DISTVERSION} post-extract: ${MKDIR} ${WRKSRC}/ThirdPartyDownloads .for f in ${EXTRADISTFILES:C/:[^:]*//} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${f} ${WRKSRC}/ThirdPartyDownloads .endfor - ${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0.tar.gz + ${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-${ORTHANC_VER}.tar.gz do-test: @cd ${BUILD_WRKSRC} && ./UnitTests .include diff --git a/science/orthanc-dicomweb/distinfo b/science/orthanc-dicomweb/distinfo index 2d9a67378d22..97b550726de8 100644 --- a/science/orthanc-dicomweb/distinfo +++ b/science/orthanc-dicomweb/distinfo @@ -1,19 +1,17 @@ -TIMESTAMP = 1652283828 -SHA256 (orthanc/OrthancDicomWeb-1.8.tar.gz) = e32a02914ceec019f70c56988939d7f7b16d7fce75895cb756d2a91fd2fe4f9c -SIZE (orthanc/OrthancDicomWeb-1.8.tar.gz) = 203789 -SHA256 (orthanc/Orthanc-1.11.0.tar.gz) = 23949a70562487fd6e79d6f3f13c71a0fc90aa25e492fb3a99575fee0722c5af -SIZE (orthanc/Orthanc-1.11.0.tar.gz) = 1899829 +TIMESTAMP = 1761569002 +SHA256 (orthanc/OrthancDicomWeb-1.21.tar.gz) = 30b7b1c7e710b78f378fd1e46e09be3ece33111331acb0227f80bfebf7d1417c +SIZE (orthanc/OrthancDicomWeb-1.21.tar.gz) = 296207 +SHA256 (orthanc/Orthanc-1.12.9.tar.gz) = 7a7cbc5f3663939fbef31ded021b36fcd52420337911ed43491bb663bcb5a4b2 +SIZE (orthanc/Orthanc-1.12.9.tar.gz) = 2165182 SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237 -SHA256 (orthanc/bootstrap-4.3.1.zip) = c7fcae50c070250e4e1ae36a670e5ee8fe9d529eb3f1a03c527f8223ce3f61bc -SIZE (orthanc/bootstrap-4.3.1.zip) = 2705432 +SHA256 (orthanc/bootstrap-5.3.3.zip) = 55d7f1ce795040afb8311df09d29d0d34648400c1eaabb2d0a2ed2216b3db05d +SIZE (orthanc/bootstrap-5.3.3.zip) = 8594807 +SHA256 (orthanc/babel-polyfill-6.26.0.min.js.gz) = 087d3d2d6212afb418f50491858f7f055cb54defb6351d6c5d008f662a2a95c2 +SIZE (orthanc/babel-polyfill-6.26.0.min.js.gz) = 34718 SHA256 (orthanc/vuejs-2.6.10.tar.gz) = e3d900cd9266b5bed9bb6d575fc9ab6787e79e7ad21c01ee1277bff5453121f2 SIZE (orthanc/vuejs-2.6.10.tar.gz) = 1576461 SHA256 (orthanc/axios-0.19.0.tar.gz) = 29577c6085b090b4e4a99392fcdd582fb6bbcb49b2aaf2cc7b7fa3874529b380 SIZE (orthanc/axios-0.19.0.tar.gz) = 125193 SHA256 (orthanc/Font-Awesome-4.7.0.tar.gz) = de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 SIZE (orthanc/Font-Awesome-4.7.0.tar.gz) = 2672776 -SHA256 (orthanc/bootstrap-vue-2.0.0-rc.24-dist.tar.gz) = bc62cc91c2c3c24ddd29321d91be629e72db6129413ab6b8111ce13c2a57775b -SIZE (orthanc/bootstrap-vue-2.0.0-rc.24-dist.tar.gz) = 2448005 -SHA256 (orthanc/babel-polyfill-6.26.0.min.js.gz) = 087d3d2d6212afb418f50491858f7f055cb54defb6351d6c5d008f662a2a95c2 -SIZE (orthanc/babel-polyfill-6.26.0.min.js.gz) = 34718 diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h deleted file mode 100644 index 7e2d22ba1503..000000000000 --- a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/OrthancFramework.h.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/OrthancFramework.h -@@ -70,6 +70,7 @@ - - - #include -+#include - - namespace Orthanc - { diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp deleted file mode 100644 index be3a52257299..000000000000 --- a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp -@@ -728,7 +728,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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp deleted file mode 100644 index 7e84c746faa1..000000000000 --- a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp -@@ -292,7 +292,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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp deleted file mode 100644 index dad50da54856..000000000000 --- a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp -@@ -163,7 +163,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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp deleted file mode 100644 index 9df1a25a54a7..000000000000 --- a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp -@@ -113,7 +113,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")