View | Details | Raw Unified | Return to bug 242546 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 242546