Attachment 215799 Details for Bug 242546 – Diff / the latest version of science/ortanc

[patch] Diff / the latest version of science/ortanc

science_orthanc.diff (text/plain), 14.30 KB, created by Thierry Thomas on 2020-06-19 20:59:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2020-06-19 20:59:05 UTC

Size: 14.30 KB

patch

obsolete

>Index: science/orthanc/Makefile
>===================================================================
>--- science/orthanc/Makefile	(revision 471825)
>+++ science/orthanc/Makefile	(working copy)
>@@ -2,85 +2,109 @@
> # $FreeBSD$
> 
> PORTNAME=	orthanc
>-PORTVERSION=	1.3.0
>-PORTREVISION=	4
>-CATEGORIES=	science graphics net www
>+PORTVERSION=	1.6.1
>+PORTREVISION=	0
>+CATEGORIES=	science
> MASTER_SITES=	http://orthanc-server.com/downloads/get.php?path=/orthanc/:main \
>-		http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/:mongoose
>+		http://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty
> DISTFILES=	Orthanc-${PORTVERSION}.tar.gz:main \
>-		mongoose-3.8.tgz:mongoose
>+		civetweb-1.12-fixed.tar.gz:thirdparty \
>+		e2fsprogs-1.44.5.tar.gz:thirdparty \
>+		dicom-web/bootstrap-4.3.1.zip:thirdparty \
>+		dicom-web/vuejs-2.6.10.tar.gz:thirdparty \
>+		dicom-web/axios-0.19.0.tar.gz:thirdparty \
>+		jquery-3.4.1.min.js:thirdparty
> DIST_SUBDIR=	${PORTNAME}
>+EXTRACT_ONLY=	Orthanc-${PORTVERSION}.tar.gz
> 
>-MAINTAINER=	mp39590@gmail.com
>-COMMENT=	RESTful DICOM server for healthcare and medical research
>+MAINTAINER=	maintainer.freebsd@xpoundit.com
>+COMMENT=	Orthanc is a DICOM server for healthcare and medical research
> 
>-# GPLv3 license, with the OpenSSL exception.
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BROKEN=		fails to build with boost 1.66, see bug 224177
>-BROKEN_powerpc64=	fails to configure: CMake: Looking for C++ include pugixml.hpp - not found
>-DEPRECATED=	Broken for more than 3 months
>-EXPIRATION_DATE=	2018-06-06
>-
>-LIB_DEPENDS=	libcurl.so:ftp/curl \
>-		libjsoncpp.so:devel/jsoncpp \
>-		libuuid.so:misc/e2fsprogs-libuuid \
>+LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
>+		libboost_chrono.so:devel/boost-libs \
>+		libboost_date_time.so:devel/boost-libs \
> 		libboost_filesystem.so:devel/boost-libs \
>+		libboost_locale.so:devel/boost-libs \
>+		libboost_regex.so:devel/boost-libs \
>+		libboost_system.so:devel/boost-libs \
> 		libboost_thread.so:devel/boost-libs \
>-		libboost_system.so:devel/boost-libs \
>-		libboost_date_time.so:devel/boost-libs \
>-		libboost_regex.so:devel/boost-libs \
>-		libboost_locale.so:devel/boost-libs \
>-		libdcmdsig.so:devel/dcmtk \
>-		libcharls.so:devel/dcmtk \
>-		libdcmjpls.so:devel/dcmtk \
>+		libcharls.so:graphics/dcmtk \
>+		libcmr.so:graphics/dcmtk \
>+		libcurl.so:ftp/curl \
>+		libdcmdata.so:graphics/dcmtk \
>+		libdcmdsig.so:graphics/dcmtk \
>+		libdcmfg.so:graphics/dcmtk \
>+		libdcmimage.so:graphics/dcmtk \
>+		libdcmimgle.so:graphics/dcmtk \
>+		libdcmiod.so:graphics/dcmtk \
>+		libdcmjpeg.so:graphics/dcmtk \
>+		libdcmjpls.so:graphics/dcmtk \
>+		libdcmnet.so:graphics/dcmtk \
>+		libdcmpmap.so:graphics/dcmtk \
>+		libdcmpstat.so:graphics/dcmtk \
>+		libdcmqrdb.so:graphics/dcmtk \
>+		libdcmrt.so:graphics/dcmtk \
>+		libdcmseg.so:graphics/dcmtk \
>+		libdcmsr.so:graphics/dcmtk \
>+		libdcmtls.so:graphics/dcmtk \
>+		libdcmtract.so:graphics/dcmtk \
>+		libdcmwlm.so:graphics/dcmtk \
>+		libgtest.so:devel/googletest \
>+		libgtest_main.so:devel/googletest \
>+		libi2d.so:graphics/dcmtk \
>+		libicudata.so:devel/icu \
>+		libicui18n.so:devel/icu \
>+		libicuuc.so:devel/icu \
>+		libijg12.so:graphics/dcmtk \
>+		libijg16.so:graphics/dcmtk \
>+		libijg8.so:graphics/dcmtk \
>+		libjbig.so:graphics/jbigkit \
>+		libjpeg.so:graphics/jpeg-turbo \
>+		libjsoncpp.so:devel/jsoncpp \
>+		libnghttp2.so:www/libnghttp2 \
>+		liboflog.so:graphics/dcmtk \
>+		libofstd.so:graphics/dcmtk \
>+		libpng16.so:graphics/png \
>+		libpugixml.so:textproc/pugixml \
> 		libsqlite3.so:databases/sqlite3 \
>-		libpng.so:graphics/png \
>-		libgtest.so:devel/googletest \
>-		libpugixml.so:textproc/pugixml
>+		libtiff.so:graphics/tiff \
>+		libuuid.so:misc/e2fsprogs-libuuid \
>+		libxml2.so:textproc/libxml2
> 
>+USES=		cmake dos2unix jpeg lua:51 python:build ssl
>+
>+WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}
> CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
> 		-DDCMTK_DIR="${LOCALBASE}" \
> 		-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
>-		-DUSE_SYSTEM_MONGOOSE=OFF \
>+		-DUSE_SYSTEM_CIVETWEB=OFF \
>+		-DUSE_SYSTEM_UUID=OFF \
> 		-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF
>-
>-USES=		cmake:outsource dos2unix jpeg lua:51 python:build ssl
>-CFLAGS+=	-I${LOCALBASE}/include
>+CFLAGS+=	-I${LOCALBASE}/include \
>+		-DNDEBUG
>+CXXFLAGS+=	-DNDEBUG
> DOS2UNIX_FILES=	CMakeLists.txt
> USE_LDCONFIG=	yes
> USE_RC_SUBR=	orthanc
>-WRKSRC=		${WRKDIR}/Orthanc-${PORTVERSION}
> USERS=		orthanc
> GROUPS=		orthanc
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> 
>-# This is mongoose sources, downloaded from Orthanc author homepage.  Orthanc
>-# requires mongoose webserver, but after version 3.8, mongoose developers has
>-# changed the license from MIT to GPLv2 only. This action made illegal to
>-# combine new mongoose versions with GPLv3 only Orthanc.
>-# We download sources manually and pass USE_SYSTEM_MONGOOSE=OFF to Orthanc
>-# cmake variables to tell that mongoose is not presented on the host OS and
>-# should be build together with the software instead.
>-# https://www.mail-archive.com/mongoose-users@googlegroups.com/msg00625.html
> post-patch:
> 	${MKDIR} ${WRKSRC}/ThirdPartyDownloads
>-	${CP} ${DISTDIR}/${DIST_SUBDIR}/mongoose-3.8.tgz ${WRKSRC}/ThirdPartyDownloads
>+	${MKDIR} ${WRKSRC}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/civetweb-1.12-fixed.tar.gz ${WRKSRC}/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/dicom-web/bootstrap-4.3.1.zip ${WRKSRC}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/dicom-web/vuejs-2.6.10.tar.gz ${WRKSRC}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/dicom-web/axios-0.19.0.tar.gz ${WRKSRC}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
>+	${CP} ${DISTDIR}/${DIST_SUBDIR}/jquery-3.4.1.min.js ${WRKSRC}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
> 	# Orthanc hardcodes /usr/local paths for libs and includes.
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Resources/CMake/*.cmake
> 
>-# There is no way to disable building of test units without a patch, on other
>-# hand it brings only one build dependency (devel/googletest) and running it was
>-# helpful in early bug detection in Debian.
>-# Some tests require connections to be made to the outside world, this is
>-# definitely unsupported behaviour and therefor those tests are disabled with
>-# cmake variable above (-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF).
>-#
>-# Tests run is temporary disabled: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=215393
>-#post-build:
>-#	@cd ${BUILD_WRKSRC} && ./UnitTests
>-
> post-install:
> 	${MKDIR} ${STAGEDIR}/var/db/orthanc/db/db-v5
> 	${MKDIR} ${STAGEDIR}${DATADIR}/plugins
>Index: science/orthanc/distinfo
>===================================================================
>--- science/orthanc/distinfo	(revision 471825)
>+++ science/orthanc/distinfo	(working copy)
>@@ -1,5 +1,15 @@
>-TIMESTAMP = 1508149082
>-SHA256 (orthanc/Orthanc-1.3.0.tar.gz) = a68b3c3fda8ea5cd065d356b314737634d8088d6ab2380c9ccfa433cc8fe61de
>-SIZE (orthanc/Orthanc-1.3.0.tar.gz) = 1231636
>-SHA256 (orthanc/mongoose-3.8.tgz) = 6afc2c377614a01a24b78560a62d1316b29372afe08eae3715b56c877be71c6e
>-SIZE (orthanc/mongoose-3.8.tgz) = 1577314
>+TIMESTAMP = 1588925141
>+SHA256 (orthanc/Orthanc-1.6.1.tar.gz) = 86f6e1a79bc93f082fd5243dd4daaf5a2ea05fcdf515cf35f100829c5fe5c4df
>+SIZE (orthanc/Orthanc-1.6.1.tar.gz) = 1633929
>+SHA256 (orthanc/civetweb-1.12-fixed.tar.gz) = 0e81fc252166302a33abd68e98936fb24d9b008b5816fe50edd6b12256768e41
>+SIZE (orthanc/civetweb-1.12-fixed.tar.gz) = 3035855
>+SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc
>+SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237
>+SHA256 (orthanc/dicom-web/bootstrap-4.3.1.zip) = c7fcae50c070250e4e1ae36a670e5ee8fe9d529eb3f1a03c527f8223ce3f61bc
>+SIZE (orthanc/dicom-web/bootstrap-4.3.1.zip) = 2705432
>+SHA256 (orthanc/dicom-web/vuejs-2.6.10.tar.gz) = e3d900cd9266b5bed9bb6d575fc9ab6787e79e7ad21c01ee1277bff5453121f2
>+SIZE (orthanc/dicom-web/vuejs-2.6.10.tar.gz) = 1576461
>+SHA256 (orthanc/dicom-web/axios-0.19.0.tar.gz) = 29577c6085b090b4e4a99392fcdd582fb6bbcb49b2aaf2cc7b7fa3874529b380
>+SIZE (orthanc/dicom-web/axios-0.19.0.tar.gz) = 125193
>+SHA256 (orthanc/jquery-3.4.1.min.js) = 0925e8ad7bd971391a8b1e98be8e87a6971919eb5b60c196485941c3c1df089a
>+SIZE (orthanc/jquery-3.4.1.min.js) = 88145
>Index: science/orthanc/files/orthanc.in
>===================================================================
>Index: science/orthanc/files/patch-CMakeLists.txt
>===================================================================
>--- science/orthanc/files/patch-CMakeLists.txt	(nonexistent)
>+++ science/orthanc/files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,13 @@
>+--- CMakeLists.txt.orig	2020-04-01 15:55:47 UTC
>++++ CMakeLists.txt
>+@@ -519,8 +519,8 @@ if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS)
>+     list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
>+     list(GET CMAKE_FIND_LIBRARY_SUFFIXES 0 Suffix)
>+     install(FILES
>+-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}
>+-      ${CMAKE_CURRENT_BINARY_DIR}/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
>++      ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}
>++      ${CMAKE_CURRENT_BINARY_DIR}/ConnectivityChecks-build/${Prefix}ConnectivityChecks${Suffix}.${ORTHANC_VERSION}
>+       DESTINATION "share/orthanc/plugins")
>+   endif()
>+ endif()
>
>Property changes on: science/orthanc/files/patch-CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: science/orthanc/files/patch-Resources_Configuration.json
>===================================================================
>--- science/orthanc/files/patch-Resources_Configuration.json	(revision 471825)
>+++ science/orthanc/files/patch-Resources_Configuration.json	(working copy)
>@@ -1,4 +1,4 @@
>---- Resources/Configuration.json.orig	2017-07-19 11:10:48 UTC
>+--- Resources/Configuration.json.orig	2020-03-18 12:12:46 UTC
> +++ Resources/Configuration.json
> @@ -10,12 +10,12 @@
>    // Path to the directory that holds the heavyweight files (i.e. the
>@@ -13,9 +13,9 @@
> -  "IndexDirectory" : "OrthancStorage",
> +  "IndexDirectory" : "/var/db/orthanc/db-v5",
>  
>-   // Enable the transparent compression of the DICOM instances
>-   "StorageCompression" : false,
>-@@ -41,6 +41,7 @@
>+   // Path to the directory where Orthanc stores its large temporary
>+   // files. The content of this folder can be safely deleted if
>+@@ -53,6 +53,7 @@
>    // find shared libraries. Backslashes must be either escaped by
>    // doubling them, or replaced by forward slashes "/".
>    "Plugins" : [
>@@ -22,4 +22,4 @@
> +    "%%PREFIX%%/share/orthanc/plugins/"
>    ],
>  
>- 
>+   // Maximum number of processing jobs that are simultaneously running
>Index: science/orthanc/pkg-descr
>===================================================================
>--- science/orthanc/pkg-descr	(revision 471825)
>+++ science/orthanc/pkg-descr	(working copy)
>@@ -1,20 +1,23 @@
>-Orthanc aims at providing a simple, yet powerful standalone DICOM
>-server. It is designed to improve the DICOM flows in hospitals and to
>-support research about the automated analysis of medical images.
>+Orthanc aims at providing a simple, yet powerful standalone DICOM server. It
>+is designed to improve the DICOM flows in hospitals and to support research
>+about the automated analysis of medical images. Orthanc lets its users focus
>+on the content of the DICOM files, hiding the complexity of the DICOM format
>+and of the DICOM protocol.
> 
>-Orthanc can turn any computer running Windows, Linux, FreeBSD or OS X
>-into a DICOM store (in other words, a mini-PACS system). Its
>-architecture is lightweight and standalone, meaning that no complex
>-database administration is required, nor the installation of third-party
>-dependencies.
>+Orthanc can turn any computer running Windows, Linux, FreeBSD or OS X into a
>+DICOM store (in other words, a mini-PACS system). Its architecture is
>+lightweight and standalone, meaning that no complex database administration
>+is required, nor the installation of third-party dependencies.
> 
>-What makes Orthanc unique is the fact that it provides a RESTful API.
>-Thanks to this major feature, it is possible to drive Orthanc from any
>-computer language. The DICOM tags of the stored medical images can be
>-downloaded in the JSON file format. Furthermore, standard PNG images can
>-be generated on-the-fly from the DICOM instances by Orthanc.
>+What makes Orthanc unique is the fact that it provides a RESTful API. Thanks
>+to this major feature, it is possible to drive Orthanc from any computer
>+language. The DICOM tags of the stored medical images can be downloaded in
>+the JSON file format. Furthermore, standard PNG images can be generated
>+on-the-fly from the DICOM instances by Orthanc.
> 
>-Orthanc lets its users focus on the content of the DICOM files, hiding
>-the complexity of the DICOM format and of the DICOM protocol.
>+Orthanc also features a plugin mechanism to add new modules that extends the
>+core capabilities of its REST API. A Web viewer, a PostgreSQL database
>+back-end, a MySQL database back-end, and a reference implementation of
>+DICOMweb are currently freely available as plugins.
> 
>-WWW: http://www.orthanc-server.com/
>+WWW: https://www.orthanc-server.com/
>Index: science/orthanc/pkg-plist
>===================================================================
>--- science/orthanc/pkg-plist	(revision 471825)
>+++ science/orthanc/pkg-plist	(working copy)
>@@ -10,10 +10,12 @@
> @mode
> include/orthanc/OrthancCDatabasePlugin.h
> include/orthanc/OrthancCPlugin.h
>-include/orthanc/OrthancCppDatabasePlugin.h
>-%%DATADIR%%/plugins/libServeFolders.so
>-%%DATADIR%%/plugins/libServeFolders.so.%%PORTVERSION%%
>-%%DATADIR%%/plugins/libModalityWorklists.so
>-%%DATADIR%%/plugins/libModalityWorklists.so.%%PORTVERSION%%
> bin/OrthancRecoverCompressedFile
> sbin/Orthanc
>+etc/rc.d/orthanc
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ConnectivityChecks.so
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ConnectivityChecks.so.%%PORTVERSION%%
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ModalityWorklists.so
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ModalityWorklists.so.%%PORTVERSION%%
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so
>+%%DATADIR%%/plugins/%%LUA_LIBDIR%%ServeFolders.so.%%PORTVERSION%%

Flags:

maintainer.freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 242546: 209831 | 214830 | 215799 | 215907 | 217005 | 217069 | 217125 | 217126 | 217732 | 225062 | 225335 | 225590 | 225634