Rafael Sadowski <[email protected]> wrote:
> Update all orthanc ports to the latest version. This includes some
> patches from FreeBSD and needs civetweb as a new dependency. Checkout
> ports@
>
> I'm not an orthanc user, it was just a graphics/dcmtk rabbit hole challenge.
> Test, feedback welcome. Please see graphics/dcmtk and www/civetweb on ports@.
>
> OK?
not an orthanc user either, but diff looks fine and it buils :)
i'm trusting that you did some testing; ok op
nitpics:
> Index: postgresql-plugin/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/orthanc/postgresql-plugin/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- postgresql-plugin/Makefile 28 May 2022 06:20:01 -0000 1.10
> +++ postgresql-plugin/Makefile 4 Jul 2022 18:07:19 -0000
> @@ -1,36 +1,49 @@
> COMMENT = PostgreSQL backend for Orthanc
>
> -VERSION = 2.0
> +VERSION = 4.0
> PLUGIN = PostgreSQL
> -REVISION = 2
> +
> +DISTNAME = Orthanc${PLUGIN}-${VERSION}
> +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> +EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
> +
> +DISTFILES += ${FRAMEWORK_DISTFILE:C/$/:1/}
I think you could simplify this to
+DISTFILES += ${FRAMEWORK_DISTFILE}:1
> [...]
> Index: webviewer-plugin/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/orthanc/webviewer-plugin/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- webviewer-plugin/Makefile 28 May 2022 06:20:01 -0000 1.10
> +++ webviewer-plugin/Makefile 4 Jul 2022 18:07:19 -0000
> @@ -1,8 +1,8 @@
> COMMENT = web viewer plugin for Orthanc
>
> -VERSION = 2.3
> +VERSION = 2.8
> +
> PLUGIN = WebViewer
> -REVISION = 3
>
> PLUGIN_3RDPARTY = cornerstone-0.11.0.zip \
> jquery-ui-1.11.3.zip \
> @@ -13,34 +13,45 @@ PLUGIN_3RDPARTY = cornerstone-0.11.0.zip
> DISTNAME = Orthanc${PLUGIN}-${VERSION}
> DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
> -DISTFILES += ${PLUGIN_3RDPARTY:C/$/:1/}
>
> +DISTFILES += ${PLUGIN_3RDPARTY:C/$/:1/}
> MASTER_SITES1 =
> https://www.orthanc-server.com/downloads/third-party/WebViewer/
>
> +DISTFILES += ${FRAMEWORK_DISTFILE:C/$/:2/}
(here tooo if you want)
> +MASTER_SITES2 =
> https://www.orthanc-server.com/downloads/get.php?path=/orthanc/
> +
> WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
> -WANTLIB += boost_date_time-mt boost_filesystem-mt boost_locale-mt
> -WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt gdcmCommon
> -WANTLIB += gdcmDICT gdcmDSED gdcmIOD gdcmMSFF gtest jsoncpp m
> -WANTLIB += sqlite3
> +WANTLIB += boost_date_time-mt boost_filesystem-mt boost_iostreams-mt
> +WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt jsoncpp
> +WANTLIB += m sqlite3 uuid
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -BUILD_DEPENDS = graphics/orthanc/server
> +BUILD_DEPENDS = graphics/orthanc/server \
> + devel/gtest
> +
> RUN_DEPENDS = graphics/orthanc/server
> LIB_DEPENDS = databases/sqlite3 \
> devel/boost \
> - devel/gtest \
> devel/jsoncpp \
> - graphics/gdcm
> + sysutils/e2fsprogs
> +
> +TEST_DEPENDS = devel/gtest
devel/gtest is already in BUILD_DEPENDS.
