Index: science/orthanc/Makefile =================================================================== --- science/orthanc/Makefile (revision 471825) +++ science/orthanc/Makefile (working copy) @@ -1,92 +1,71 @@ -# Created by: mp39590@gmail.com +# Created by: maintainer.freebsd@xpoundit.com # $FreeBSD$ PORTNAME= orthanc -PORTVERSION= 1.3.0 -PORTREVISION= 4 -CATEGORIES= science graphics net www +PORTVERSION= 1.7.2 +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 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 \ +LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ + libcharls.so:graphics/dcmtk \ + libcurl.so:ftp/curl \ + libgtest.so:devel/googletest \ + libicudata.so:devel/icu \ + libjbig.so:graphics/jbigkit \ + libjpeg.so:graphics/jpeg-turbo \ libjsoncpp.so:devel/jsoncpp \ + libnghttp2.so:www/libnghttp2 \ + libpng16.so:graphics/png \ + libpugixml.so:textproc/pugixml \ + libsqlite3.so:databases/sqlite3 \ + libtiff.so:graphics/tiff \ libuuid.so:misc/e2fsprogs-libuuid \ - libboost_filesystem.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 \ - libsqlite3.so:databases/sqlite3 \ - libpng.so:graphics/png \ - libgtest.so:devel/googletest \ - libpugixml.so:textproc/pugixml + libxml2.so:textproc/libxml2 +USES= cmake dos2unix iconv jpeg lua python:build ssl + +WRKSRC= ${WRKDIR}/Orthanc-${PORTVERSION} +CMAKE_SOURCE_PATH= ${WRKSRC}/OrthancServer CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \ -DDCMTK_DIR="${LOCALBASE}" \ -DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \ - -DUSE_SYSTEM_MONGOOSE=OFF \ - -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF - -USES= cmake:outsource dos2unix jpeg lua:51 python:build ssl -CFLAGS+= -I${LOCALBASE}/include + -DUSE_SYSTEM_CIVETWEB=OFF \ + -DUSE_SYSTEM_UUID=OFF \ + -DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF \ + -DBUILD_CONNECTIVITY_CHECKS=OFF +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 - # Orthanc hardcodes /usr/local paths for libs and includes. - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/Resources/CMake/*.cmake + ${MKDIR} ${CMAKE_SOURCE_PATH}/ThirdPartyDownloads + ${MKDIR} ${CMAKE_SOURCE_PATH}/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads + ${CP} ${DISTDIR}/${DIST_SUBDIR}/civetweb-1.12-fixed.tar.gz ${CMAKE_SOURCE_PATH}/ThirdPartyDownloads + ${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${CMAKE_SOURCE_PATH}/ThirdPartyDownloads -# 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 ${MKDIR} ${STAGEDIR}${ETCDIR} - ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Resources/Configuration.json - ${CP} ${WRKSRC}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample - ${STRIP_CMD} ${STAGEDIR}${DATADIR}/plugins/libServeFolders.so.${PORTVERSION} + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${CMAKE_SOURCE_PATH}/Resources/Configuration.json + ${CP} ${CMAKE_SOURCE_PATH}/Resources/Configuration.json ${STAGEDIR}${ETCDIR}/orthanc.json.sample .include Index: science/orthanc/distinfo =================================================================== --- science/orthanc/distinfo (revision 471825) +++ science/orthanc/distinfo (working copy) @@ -1,5 +1,7 @@ -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 = 1596543829 +SHA256 (orthanc/Orthanc-1.7.2.tar.gz) = ea167b4688db7cd8855a1758f289b21d490e7d97afcc405f12d881b22bf17e9b +SIZE (orthanc/Orthanc-1.7.2.tar.gz) = 1644200 +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 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,9 @@ @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 +%%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%%