git: 0bbd21d1998d - main - science/orthanc-postgresql: Update to 9.0

From: Jason W. Bacon <jwb_at_FreeBSD.org>
Date: Mon, 27 Oct 2025 17:12:16 UTC
The branch main has been updated by jwb:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0bbd21d1998d61f05577187b30e86ea982e0a902

commit 0bbd21d1998d61f05577187b30e86ea982e0a902
Author:     Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-10-27 17:10:26 +0000
Commit:     Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2025-10-27 17:10:26 +0000

    science/orthanc-postgresql: Update to 9.0
    
    Take maintainership:
        Maintainer unresponsive for almost two years:
        https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275625
        Also unresponsive to more recent pings
    Changes: https://orthanc.uclouvain.be/hg/orthanc-postgresql/
    
    PR:             275624
    Approved by:    portmgr (blanket, unbreak)
---
 science/orthanc-postgresql/Makefile                | 32 +++++++++++-----------
 science/orthanc-postgresql/distinfo                | 10 +++----
 .../files/patch-PostgreSQL_CMakeLists.txt          | 12 --------
 ....9.3_OrthancFramework_Sources_SystemToolbox.cpp | 11 --------
 ...OrthancServer_Plugins_Engine_PluginsManager.cpp | 11 --------
 ...er_Plugins_Samples_ModalityWorklists_Plugin.cpp | 11 --------
 ..._OrthancServer_Sources_OrthancConfiguration.cpp | 11 --------
 ...urces_Orthanc_Databases_ISqlLookupFormatter.cpp | 10 -------
 8 files changed, 21 insertions(+), 87 deletions(-)

diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile
index 3479520ad2ed..8b89f3124aee 100644
--- a/science/orthanc-postgresql/Makefile
+++ b/science/orthanc-postgresql/Makefile
@@ -1,40 +1,38 @@
 PORTNAME=	orthanc-postgresql
-DISTVERSION=	4.0
-PORTREVISION=	12
+DISTVERSION=	9.0
 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 \
+MASTER_SITES=	https://orthanc.uclouvain.be/downloads/sources/orthanc-postgresql/:pgsql \
+		https://orthanc.uclouvain.be/downloads/sources/orthanc/:orthanc \
+		https://orthanc.uclouvain.be/downloads/third-party-downloads/:thirdparty
+DISTFILES=	OrthancPostgreSQL-${PORTVERSION}.tar.gz:pgsql \
+		Orthanc-${ORTHANC_VER}.tar.gz:orthanc \
 		e2fsprogs-1.44.5.tar.gz:thirdparty
 DIST_SUBDIR=	orthanc
 EXTRACT_ONLY=	OrthancPostgreSQL-${PORTVERSION}.tar.gz
 
-MAINTAINER=	maintainer.freebsd@xpoundit.com
+MAINTAINER=	jwb@FreeBSD.org
 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
 
-BROKEN=		fails to build with boost-1.86+
-
-BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc
+BUILD_DEPENDS=	${LOCALBASE}/include/orthanc/OrthancCDatabasePlugin.h:science/orthanc \
+		googletest>0:devel/googletest
 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
+USES=		cmake localbase pgsql:11+ python:build ssl
+USE_LDCONFIG=	${DATADIR}/plugins
 
 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 \
+CMAKE_ARGS=	-DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-${ORTHANC_VER}/OrthancFramework/Sources \
 		-DORTHANC_FRAMEWORK_SOURCE=path
 CXXFLAGS+=	-I${LOCALBASE}/include -DNDEBUG
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -42,10 +40,12 @@ CFLAGS+=	-DORTHANC_ENABLE_LOGGING_PLUGIN -DNDEBUG
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
+ORTHANC_VER=	1.12.9
+
 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
+		${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-${ORTHANC_VER}.tar.gz ${WRKSRC}/PostgreSQL/ThirdPartyDownloads
+		${TAR} -C ${WRKSRC}/PostgreSQL/ThirdPartyDownloads -xf ${WRKSRC}/PostgreSQL/ThirdPartyDownloads/Orthanc-${ORTHANC_VER}.tar.gz
 
 .include <bsd.port.mk>
diff --git a/science/orthanc-postgresql/distinfo b/science/orthanc-postgresql/distinfo
index a438656c3e1d..c68e74661ed6 100644
--- a/science/orthanc-postgresql/distinfo
+++ b/science/orthanc-postgresql/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1620906912
-SHA256 (orthanc/OrthancPostgreSQL-4.0.tar.gz) = a5049ed8a5d6bb8b6529636cf1d9f631d1b61f6e0bbfdc6accae45aded42bac5
-SIZE (orthanc/OrthancPostgreSQL-4.0.tar.gz) = 318047
-SHA256 (orthanc/Orthanc-1.9.3.tar.gz) = 41cc35a3d15ecb0d7b834e8e28a740cc4ffa1f333c019a764228d60e96608960
-SIZE (orthanc/Orthanc-1.9.3.tar.gz) = 1818313
+TIMESTAMP = 1761533913
+SHA256 (orthanc/OrthancPostgreSQL-9.0.tar.gz) = 92c3fde9c3baad343a4de7090759274a733ac28af06037538dbf70f0ee50cd75
+SIZE (orthanc/OrthancPostgreSQL-9.0.tar.gz) = 790691
+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
diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt b/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt
deleted file mode 100644
index 389ee26f4b28..000000000000
--- a/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- PostgreSQL/CMakeLists.txt.orig	2021-05-17 12:24:06 UTC
-+++ PostgreSQL/CMakeLists.txt
-@@ -23,6 +23,9 @@ set(OPENSSL_STATIC_VERSION "1.1.1" CACHE STRING "Force
- 
- include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginConfiguration.cmake)
- 
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
- 
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-   execute_process(
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
deleted file mode 100644
index b7291c206db2..000000000000
--- a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6211b49b37a1..000000000000
--- a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index cd1e7aed264f..000000000000
--- a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index d41857168ca7..000000000000
--- a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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")
diff --git a/science/orthanc-postgresql/files/patch-Resources_Orthanc_Databases_ISqlLookupFormatter.cpp b/science/orthanc-postgresql/files/patch-Resources_Orthanc_Databases_ISqlLookupFormatter.cpp
deleted file mode 100644
index c1b15d836a28..000000000000
--- a/science/orthanc-postgresql/files/patch-Resources_Orthanc_Databases_ISqlLookupFormatter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- Resources/Orthanc/Databases/ISqlLookupFormatter.cpp.orig	2021-04-22 15:22:26 UTC
-+++ Resources/Orthanc/Databases/ISqlLookupFormatter.cpp
-@@ -49,6 +49,7 @@
- 
- #include "DatabaseConstraint.h"
- 
-+#include <cassert>
- #include <boost/lexical_cast.hpp>
- 
-