From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 21:41:24 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 498F56722B8; Sat, 7 Aug 2021 21:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GhwlS1gbyz4lfD; Sat, 7 Aug 2021 21:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2168C6F7; Sat, 7 Aug 2021 21:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 177LfOtd048254; Sat, 7 Aug 2021 21:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177LfOk3048253; Sat, 7 Aug 2021 21:41:24 GMT (envelope-from git) Date: Sat, 7 Aug 2021 21:41:24 GMT Message-Id: <202108072141.177LfOk3048253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guangyuan Yang Subject: git: b660b9f92328 - main - science/orthanc-postgresql: Revive port MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ygy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b660b9f923286590d1bfb59406f3c263f8f9620d Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 21:41:24 -0000 The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b660b9f923286590d1bfb59406f3c263f8f9620d commit b660b9f923286590d1bfb59406f3c263f8f9620d Author: Frank Scholl AuthorDate: 2021-08-07 21:40:42 +0000 Commit: Guangyuan Yang CommitDate: 2021-08-07 21:40:42 +0000 science/orthanc-postgresql: Revive port Orthanc plugin to use PostgreSQL for indexing or storage. PR: 242548 --- MOVED | 1 - science/Makefile | 1 + science/orthanc-postgresql/Makefile | 49 ++++++++++++++++++++++ science/orthanc-postgresql/distinfo | 7 ++++ .../files/patch-PostgreSQL_CMakeLists.txt | 12 ++++++ science/orthanc-postgresql/pkg-descr | 4 ++ science/orthanc-postgresql/pkg-plist | 4 ++ 7 files changed, 77 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index 8c8b74fe0dba..943293805bbe 100644 --- a/MOVED +++ b/MOVED @@ -10153,7 +10153,6 @@ audio/gkrellmss2||2018-06-07|Has expired: Broken for more than 6 months audio/abcmidi||2018-06-07|Has expired: Broken for more than 6 months benchmarks/netpipe||2018-06-07|Has expired: Broken for more than 6 months science/orthanc-dicomweb||2018-06-07|Removed, depends on expired science/orthanc -science/orthanc-postgresql||2018-06-07|Removed, depends on expired science/orthanc graphics/libkface||2018-06-09|Has expired: No longer maintained upstream math/scilab-toolbox-sivp||2018-06-09|Has expired: Cannot build with newer opencv math/clipper|graphics/polyclipping|2018-06-11|Duplicate port diff --git a/science/Makefile b/science/Makefile index a1eeff45bed3..9fed81d7b2ba 100644 --- a/science/Makefile +++ b/science/Makefile @@ -178,6 +178,7 @@ SUBDIR += opsin SUBDIR += orthanc SUBDIR += orthanc-mysql + SUBDIR += orthanc-postgresql SUBDIR += orthanc-webviewer SUBDIR += p5-Algorithm-SVMLight SUBDIR += p5-Chemistry-3DBuilder diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile new file mode 100644 index 000000000000..7357612b072c --- /dev/null +++ b/science/orthanc-postgresql/Makefile @@ -0,0 +1,49 @@ +# Created by: maintainer.freebsd@xpoundit.com + +PORTNAME= orthanc-postgresql +DISTVERSION= 4.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 \ + 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 + +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/distinfo b/science/orthanc-postgresql/distinfo new file mode 100644 index 000000000000..a438656c3e1d --- /dev/null +++ b/science/orthanc-postgresql/distinfo @@ -0,0 +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 +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 new file mode 100644 index 000000000000..389ee26f4b28 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_CMakeLists.txt @@ -0,0 +1,12 @@ +--- 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/pkg-descr b/science/orthanc-postgresql/pkg-descr new file mode 100644 index 000000000000..d9a11d5e7aa9 --- /dev/null +++ b/science/orthanc-postgresql/pkg-descr @@ -0,0 +1,4 @@ +Orthanc-postgresql is an Orthanc plugin that replaces the default +SQLite engine of Orthanc with a PostgreSQL back-end. + +WWW: https://www.orthanc-server.com/static.php?page=postgresql diff --git a/science/orthanc-postgresql/pkg-plist b/science/orthanc-postgresql/pkg-plist new file mode 100644 index 000000000000..9fa5571804db --- /dev/null +++ b/science/orthanc-postgresql/pkg-plist @@ -0,0 +1,4 @@ +share/orthanc/plugins/libOrthancPostgreSQLIndex.so +share/orthanc/plugins/libOrthancPostgreSQLIndex.so.%%DISTVERSION%% +share/orthanc/plugins/libOrthancPostgreSQLStorage.so +share/orthanc/plugins/libOrthancPostgreSQLStorage.so.%%DISTVERSION%%