graphics/dcmtk: Update 3.6.0 -> 3.6.4; Move to the 'graphics' category

Port changes:
* Take maintainership
* Move to github
* Remove targets: it installs itself fine

Update graphics/aeskulap: Swutch to a more updated fork; Update patches and dependencies.

MOVED

@@ -10782,3 +10782,4 @@ sysutils/battfink||2018-12-11|Has expired: GNOME 2 application
 sysutils/cog||2018-12-11|Has expired: GNOME 2 application
 sysutils/gcdmaster||2018-12-11|Has expired: GNOME 2 application
 biology/njplot|biology/seaview|2018-12-11|Has expired: Deprecated by upstream; use biology/seaview instead
+devel/dcmtk|graphics/dcmtk|2018-12-12|Move to a proper category

devel/Makefile

@@ -434,7 +434,6 @@
     SUBDIR += dbus-tcl
     SUBDIR += dcd-client
     SUBDIR += dcd-server
-    SUBDIR += dcmtk
     SUBDIR += dconf
     SUBDIR += dconf-editor
     SUBDIR += ddd

devel/dcmtk/Makefile

@@ -1,50 +0,0 @@
-# Created by: gahr
-# $FreeBSD$
-
-PORTNAME=	dcmtk
-DISTVERSION=	3.6.0
-PORTREVISION=	5
-CATEGORIES=	devel
-MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNAME}${PORTVERSION:S/.//g}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Toolkit to work with DICOM objects
-
-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA'
-
-LIB_DEPENDS=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png
-
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USES=		cmake:outsource jpeg ssl
-CMAKE_ARGS+=	-DDCMTK_WITH_DOXYGEN:BOOL=OFF \
-		-DDCMTK_WITH_OPENSSL:BOOL=ON
-
-SHLIBS=		dcmdata dcmdsig dcmimage dcmimgle dcmjpeg dcmnet \
-		dcmpstat dcmqrdb dcmsr dcmtls dcmwlm ijg8 ijg12 \
-		ijg16 i2d ofstd oflog charls dcmjpls
-
-SHLIBVER=	${PORTVERSION:R:R}
-PLIST_SUB=	SHLIBVER=${SHLIBVER}
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	${FIND} ${WRKSRC} -name "*.h.orig" -delete
-
-post-patch-DOCS-off:
-	${FIND} ${WRKSRC} -name CMakeLists.txt | ${XARGS} \
-	    ${REINPLACE_CMD} -e '/INSTALL_DOCDIR/d'
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/doxygen/manpages/man1/*.1 ${STAGEDIR}${PREFIX}/man/man1/
-.for shlib in ${SHLIBS}
-	@${MV} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so.${SHLIBVER}
-	@${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${STAGEDIR}${PREFIX}/lib/lib${shlib}.so
-.endfor
-
-.include <bsd.port.mk>

devel/dcmtk/distinfo

@@ -1,2 +0,0 @@
-SHA256 (dcmtk-3.6.0.tar.gz) = cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a
-SIZE (dcmtk-3.6.0.tar.gz) = 4673121

devel/dcmtk/files/patch-BuildLibrary

@@ -1,238 +0,0 @@
---- CMake/BuildLibrary.cmake.orig	2011-01-12 14:30:46.000000000 +0000
-+++ CMake/BuildLibrary.cmake	2011-01-13 09:30:51.000000000 +0000
-@@ -0,0 +1,8 @@
-+MACRO(BUILD_LIBRARY library_name )
-+    SET(SOURCES ${ARGN})
-+    ADD_LIBRARY(${library_name} STATIC ${SOURCES})
-+    ADD_LIBRARY(${library_name}Shared SHARED ${SOURCES})
-+    SET_TARGET_PROPERTIES(${library_name}Shared PROPERTIES OUTPUT_NAME ${library_name})
-+    INSTALL_TARGETS(${INSTALL_LIBDIR} ${library_name})
-+    INSTALL_TARGETS(${INSTALL_LIBDIR} ${library_name}Shared)
-+ENDMACRO(BUILD_LIBRARY)
---- dcmtls/libsrc/CMakeLists.txt.orig	2010-04-29 16:18:39.000000000 +0000
-+++ dcmtls/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls)
-+# invoke macro to build and declare installation files
-+SET(SOURCES tlslayer tlstrans tlsscu)
-+BUILD_LIBRARY(dcmtls ${SOURCES})
---- dcmdata/libi2d/CMakeLists.txt.orig	2009-07-16 14:25:38.000000000 +0000
-+++ dcmdata/libi2d/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(libi2d i2d i2dplvlp i2djpgs i2dbmps i2dplsc i2dplnsc)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} libi2d)
-+# invoke macro to build and declare installation files
-+SET(SOURCES i2d i2dplvlp i2djpgs i2dbmps i2dplsc i2dplnsc)
-+BUILD_LIBRARY(i2d ${SOURCES})
---- dcmdata/libsrc/CMakeLists.txt.orig	2010-08-27 15:26:01.000000000 +0000
-+++ dcmdata/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmdata cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata)
-+# invoke macro to build and declare installation files
-+SET(SOURCES cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl)
-+BUILD_LIBRARY(dcmdata ${SOURCES})
---- dcmpstat/libsrc/CMakeLists.txt.orig	2005-09-15 08:17:54.000000000 +0000
-+++ dcmpstat/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat)
-+# invoke macro to build and declare installation files
-+SET(SOURCES dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl)
-+BUILD_LIBRARY(dcmpstat ${SOURCES})
---- oflog/libsrc/CMakeLists.txt.orig	2010-12-08 13:19:02.000000000 +0000
-+++ oflog/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,4 +1,4 @@
--# create library from source files
-+# select additional sources basing on platform
- 
- IF(WIN32 AND NOT CYGWIN)
-   SET(OFLOG_PLATFORM_LIBRARIES winsock windebap winconap)
-@@ -6,7 +6,6 @@
-   SET(OFLOG_PLATFORM_LIBRARIES unixsock)
- ENDIF(WIN32 AND NOT CYGWIN)
- 
--ADD_LIBRARY(oflog oflog apndimpl appender config consap factory fileap filter globinit hierarchy hierlock layout logger logimpl logevent loglevel loglog lloguser ndc ntelogap nullap objreg patlay pointer property rootlog sleep socketap sockbuff socket strhelp syncprims syslogap threads timehelp ${OFLOG_PLATFORM_LIBRARIES})
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} oflog)
-+# invoke macro to build and declare installation files
-+SET(SOURCES oflog apndimpl appender config consap factory fileap filter globinit hierarchy hierlock layout logger logimpl logevent loglevel loglog lloguser ndc ntelogap nullap objreg patlay pointer property rootlog sleep socketap sockbuff socket strhelp syncprims syslogap threads timehelp ${OFLOG_PLATFORM_LIBRARIES})
-+BUILD_LIBRARY(oflog ${SOURCES})
---- dcmsign/libsrc/CMakeLists.txt.orig	2005-09-15 08:21:03.000000000 +0000
-+++ dcmsign/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmdsig dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig)
-+# invoke macro to build and declare installation files
-+SET(SOURCES dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes)
-+BUILD_LIBRARY(dcmdsig ${SOURCES})
---- dcmwlm/libsrc/CMakeLists.txt.orig	2005-09-15 08:25:33.000000000 +0000
-+++ dcmwlm/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmwlm wlds wldsfs wlfsim wlmactmg)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmwlm)
-+# invoke macro to build and declare installation files
-+SET(SOURCES wlds wldsfs wlfsim wlmactmg)
-+BUILD_LIBRARY(dcmwlm ${SOURCES})
---- dcmjpls/libcharls/CMakeLists.txt.orig	2010-03-09 12:27:00.000000000 +0000
-+++ dcmjpls/libcharls/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,8 +1,6 @@
- # declare additional include directories
- INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/libcharls ${ofstd_SOURCE_DIR}/include )
- 
--# create library from source files
--ADD_LIBRARY(charls header intrface jpegls)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} charls)
-+# invoke macro to build and declare installation files
-+SET(SOURCES header intrface jpegls)
-+BUILD_LIBRARY(charls ${SOURCES})
---- dcmjpls/libsrc/CMakeLists.txt.orig	2009-10-07 13:18:54.000000000 +0000
-+++ dcmjpls/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,8 +1,6 @@
- # declare additional include directories
- INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
- 
--# create library from source files
--ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpls)
-+# invoke macro to build and declare installation files
-+SET(SOURCES djcparam djdecode djencode djrparam djcodecd djutils djcodece)
-+BUILD_LIBRARY(dcmjpls ${SOURCES})
---- dcmimage/libsrc/CMakeLists.txt.orig	2009-11-25 14:40:25.000000000 +0000
-+++ dcmimage/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,5 @@
--# create library from source files
--ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage)
-+# invoke macro to build and declare installation files
-+SET(SOURCES diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img)
-+BUILD_LIBRARY(dcmimage ${SOURCES})
-+TARGET_LINK_LIBRARIES(dcmimageShared ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
-+TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
---- dcmnet/libsrc/CMakeLists.txt.orig	2009-12-16 17:02:57.000000000 +0000
-+++ dcmnet/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmnet assoc cond dcasccff dcasccfg dccfenmp dccfpcmp dccfprmp dccfrsmp dccftsmp dccfuidh dcmlayer dcmtrans dcompat dimcancl dimcmd dimdump dimecho dimfind dimget dimmove dimse dimstore diutil dul dulconst dulextra dulfsm dulparse dulpres extneg lst dfindscu dcuserid scu scp)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmnet)
-+# invoke macro to build and declare installation files
-+SET(SOURCES assoc cond dcasccff dcasccfg dccfenmp dccfpcmp dccfprmp dccfrsmp dccftsmp dccfuidh dcmlayer dcmtrans dcompat dimcancl dimcmd dimdump dimecho dimfind dimget dimmove dimse dimstore diutil dul dulconst dulextra dulfsm dulparse dulpres extneg lst dfindscu dcuserid scu scp)
-+BUILD_LIBRARY(dcmnet ${SOURCES})
---- dcmimgle/libsrc/CMakeLists.txt.orig	2005-09-15 08:10:03.000000000 +0000
-+++ dcmimgle/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
- # create library from source files
--ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle)
-+SET(SOURCES dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils)
-+BUILD_LIBRARY(dcmimgle ${SOURCES})
---- dcmqrdb/libsrc/CMakeLists.txt.orig	2005-12-16 12:44:35.000000000 +0000
-+++ dcmqrdb/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmqrdb dcmqrcbf dcmqrcbg dcmqrcbm dcmqrcbs dcmqrcnf dcmqrdbi dcmqrdbs dcmqropt dcmqrptb dcmqrsrv dcmqrtis)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmqrdb)
-+# invoke macro to build and declare installation files
-+SET(SOURCES dcmqrcbf dcmqrcbg dcmqrcbm dcmqrcbs dcmqrcnf dcmqrdbi dcmqrdbs dcmqropt dcmqrptb dcmqrsrv dcmqrtis)
-+BUILD_LIBRARY(dcmqrdb ${SOURCES})
---- ofstd/libsrc/CMakeLists.txt.orig	2009-12-21 15:06:18.000000000 +0000
-+++ ofstd/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(ofstd ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime offname oflist ofstd ofstring ofthread oftime)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} ofstd)
-+# invoke macro to build and declare installation files
-+SET(SOURCES ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime offname oflist ofstd ofstring ofthread oftime)
-+BUILD_LIBRARY(ofstd ${SOURCES})
---- dcmsr/libsrc/CMakeLists.txt.orig	2010-11-05 11:06:57.000000000 +0000
-+++ dcmsr/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr)
-+# invoke macro to build and declare installation files
-+SET(SOURCES dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc)
-+BUILD_LIBRARY(dcmsr ${SOURCES})
---- dcmjpeg/libijg16/CMakeLists.txt.orig	2005-09-15 08:12:52.000000000 +0000
-+++ dcmjpeg/libijg16/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(ijg16 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} ijg16)
-+# invoke macro to build and declare installation files
-+SET(SOURCES jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
-+BUILD_LIBRARY(ijg16 ${SOURCES})
---- dcmjpeg/libijg12/CMakeLists.txt.orig	2005-09-15 08:12:17.000000000 +0000
-+++ dcmjpeg/libijg12/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(ijg12 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} ijg12)
-+# invoke macro to build and declare installation files
-+SET(SOURCES jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
-+BUILD_LIBRARY(ijg12 ${SOURCES})
---- dcmjpeg/libijg8/CMakeLists.txt.orig	2005-09-15 08:12:58.000000000 +0000
-+++ dcmjpeg/libijg8/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,5 +1,3 @@
--# create library from source files
--ADD_LIBRARY(ijg8 jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} ijg8)
-+# invoke macro to build and declare installation files
-+SET(SOURCES jaricom jcapimin jcapistd jcarith jccoefct jccolor jcdctmgr jcdiffct jchuff jcinit jclhuff jclossls jclossy jcmainct jcmarker jcmaster jcodec jcomapi jcparam jcphuff jcpred jcprepct jcsample jcscale jcshuff jctrans jdapimin jdapistd jdarith jdatadst jdatasrc jdcoefct jdcolor jddctmgr jddiffct jdhuff jdinput jdlhuff jdlossls jdlossy jdmainct jdmarker jdmaster jdmerge jdphuff jdpostct jdpred jdsample jdscale jdshuff jdtrans jerror jfdctflt jfdctfst jfdctint jidctflt jidctfst jidctint jidctred jmemmgr jmemnobs jquant1 jquant2 jutils)
-+BUILD_LIBRARY(ijg8 ${SOURCES})
---- dcmjpeg/libsrc/CMakeLists.txt.orig	2009-10-07 12:44:33.000000000 +0000
-+++ dcmjpeg/libsrc/CMakeLists.txt	2011-01-12 14:00:57.000000000 +0000
-@@ -1,8 +1,6 @@
- # declare additional include directories
- INCLUDE_DIRECTORIES(${dcmjpeg_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpeg_SOURCE_DIR}/libijg8 ${dcmjpeg_SOURCE_DIR}/libijg12 ${dcmjpeg_SOURCE_DIR}/libijg16 ${ZLIB_INCDIR})
- 
--# create library from source files
--ADD_LIBRARY(dcmjpeg ddpiimpl dipijpeg djcodecd djcodece djcparam djdecbas djdecext djdeclol djdecode djdecpro djdecsps djdecsv1 djdijg12 djdijg8 djdijg16 djeijg12 djeijg8 djeijg16 djencbas djencext djenclol djencode djencpro djencsps djencsv1 djrplol djrploss djutils)
--
--# declare installation files
--INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpeg)
-+# invoke macro to build and declare installation files
-+SET(SOURCES ddpiimpl dipijpeg djcodecd djcodece djcparam djdecbas djdecext djdeclol djdecode djdecpro djdecsps djdecsv1 djdijg12 djdijg8 djdijg16 djeijg12 djeijg8 djeijg16 djencbas djencext djenclol djencode djencpro djencsps djencsv1 djrplol djrploss djutils)
-+BUILD_LIBRARY(dcmjpeg ${SOURCES})

devel/dcmtk/files/patch-clang

@@ -1,300 +0,0 @@
---- dcmimage/include/dcmtk/dcmimage/diargpxt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/diargpxt.h	2012-06-08 20:02:18.531310065 +0400
-@@ -91,7 +91,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {                                             // not very much optimized, but no one really uses ARGB !!
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 value;
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
---- dcmimage/include/dcmtk/dcmimage/dicmypxt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dicmypxt.h	2012-06-08 20:03:41.696298705 +0400
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             // use the number of input pixels derived from the length of the 'PixelData'
-             // attribute), but not more than the size of the intermediate buffer
---- dcmimage/include/dcmtk/dcmimage/dicocpt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dicocpt.h	2012-06-08 20:07:13.211298345 +0400
-@@ -86,7 +86,7 @@
-     inline void copy(const T *pixel[3],
-                      const unsigned long offset)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             for (int j = 0; j < 3; j++)
-                 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
---- dcmimage/include/dcmtk/dcmimage/dicoflt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dicoflt.h	2012-06-08 20:08:27.084301025 +0400
-@@ -98,14 +98,14 @@
-                      const int horz,
-                      const int vert)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             if (horz && vert)
--                flipHorzVert(pixel, this->Data);
-+                this->flipHorzVert(pixel, this->Data);
-             else if (horz)
--                flipHorz(pixel, this->Data);
-+                this->flipHorz(pixel, this->Data);
-             else if (vert)
--                flipVert(pixel, this->Data);
-+                this->flipVert(pixel, this->Data);
-         }
-     }
- };
---- dcmimage/include/dcmtk/dcmimage/dicorot.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dicorot.h	2012-06-08 20:04:43.917297785 +0400
-@@ -98,14 +98,14 @@
-     inline void rotate(const T *pixel[3],
-                        const int degree)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             if (degree == 90)
--                rotateRight(pixel, this->Data);
-+                this->rotateRight(pixel, this->Data);
-             else if (degree == 180)
--                rotateTopDown(pixel, this->Data);
-+                this->rotateTopDown(pixel, this->Data);
-             else  if (degree == 270)
--                rotateLeft(pixel, this->Data);
-+                this->rotateLeft(pixel, this->Data);
-         }
-     }
- };
---- dcmimage/include/dcmtk/dcmimage/dicosct.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dicosct.h	2012-06-08 20:05:53.268297505 +0400
-@@ -107,8 +107,8 @@
-     inline void scale(const T *pixel[3],
-                       const int interpolate)
-     {
--        if (Init(pixel))
--            scaleData(pixel, this->Data, interpolate);
-+        if (this->Init(pixel))
-+            this->scaleData(pixel, this->Data, interpolate);
-     }
- };
- 
---- dcmimage/include/dcmtk/dcmimage/dihsvpxt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dihsvpxt.h	2012-06-08 20:09:41.902298105 +0400
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 *r = this->Data[0];
-             register T2 *g = this->Data[1];
---- dcmimage/include/dcmtk/dcmimage/dipalpxt.h	2010-10-14 17:16:29.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dipalpxt.h	2012-06-08 20:10:20.035298545 +0400
-@@ -92,7 +92,7 @@
-     void convert(const T1 *pixel,
-                  DiLookupTable *palette[3])
-     {                                                                // can be optimized if necessary !
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register const T1 *p = pixel;
-             register T2 value = 0;
---- dcmimage/include/dcmtk/dcmimage/dirgbpxt.h	2010-10-14 17:16:30.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/dirgbpxt.h	2012-06-08 20:11:05.988298185 +0400
-@@ -87,7 +87,7 @@
-                  const unsigned long planeSize,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             // use the number of input pixels derived from the length of the 'PixelData'
-             // attribute), but not more than the size of the intermediate buffer
---- dcmimage/include/dcmtk/dcmimage/diybrpxt.h	2010-10-14 17:16:30.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/diybrpxt.h	2012-06-08 20:11:45.316297345 +0400
-@@ -91,7 +91,7 @@
-                  const int bits,
-                  const OFBool rgb)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
-             // use the number of input pixels derived from the length of the 'PixelData'
---- dcmimage/include/dcmtk/dcmimage/diyf2pxt.h	2010-10-14 17:16:30.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/diyf2pxt.h	2012-06-08 20:12:19.882296744 +0400
-@@ -95,7 +95,7 @@
-                  const int bits,
-                  const OFBool rgb)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
-             register unsigned long i;
---- dcmimage/include/dcmtk/dcmimage/diyp2pxt.h	2010-10-14 17:16:30.000000000 +0400
-+++ dcmimage/include/dcmtk/dcmimage/diyp2pxt.h	2012-06-08 20:13:10.632301225 +0400
-@@ -91,7 +91,7 @@
-     void convert(const T1 *pixel,
-                  const int bits)
-     {
--        if (Init(pixel))
-+        if (this->Init(pixel))
-         {
-             register T2 *r = this->Data[0];
-             register T2 *g = this->Data[1];
---- dcmimgle/include/dcmtk/dcmimgle/diflipt.h	2010-10-14 17:16:26.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/diflipt.h	2012-06-08 19:22:38.840297986 +0400
-@@ -129,7 +129,7 @@
-             else if (vert)
-                 flipVert(src, dest);
-             else
--                copyPixel(src, dest);
-+                this->copyPixel(src, dest);
-         }
-     }
- 
---- dcmimgle/include/dcmtk/dcmimgle/dimoflt.h	2010-10-14 17:16:26.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/dimoflt.h	2012-06-08 19:17:52.632300786 +0400
-@@ -106,11 +106,11 @@
-             if (this->Data != NULL)
-             {
-                 if (horz && vert)
--                    flipHorzVert(&pixel, &this->Data);
-+                    this->flipHorzVert(&pixel, &this->Data);
-                 else if (horz)
--                    flipHorz(&pixel, &this->Data);
-+                    this->flipHorz(&pixel, &this->Data);
-                 else if (vert)
--                    flipVert(&pixel, &this->Data);
-+                    this->flipVert(&pixel, &this->Data);
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h	2010-10-14 17:16:26.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h	2012-06-08 19:19:50.210297466 +0400
-@@ -76,10 +76,10 @@
-             else if ((this->Modality != NULL) && this->Modality->hasRescaling())
-             {
-                 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-             } else {
-                 rescale(pixel);                     // "copy" or reference pixel data
--                determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-+                this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimorot.h	2010-10-14 17:16:26.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/dimorot.h	2012-06-08 19:18:29.177297946 +0400
-@@ -105,11 +105,11 @@
-             if (this->Data != NULL)
-             {
-                 if (degree == 90)
--                    rotateRight(&pixel, &(this->Data));
-+                    this->rotateRight(&pixel, &(this->Data));
-                 else if (degree == 180)
--                    rotateTopDown(&pixel, &(this->Data));
-+                    this->rotateTopDown(&pixel, &(this->Data));
-                 else if (degree == 270)
--                    rotateLeft(&pixel, &(this->Data));
-+                    this->rotateLeft(&pixel, &(this->Data));
-             }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dimosct.h	2010-10-14 17:16:26.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/dimosct.h	2012-06-08 18:55:53.254300667 +0400
-@@ -124,7 +124,7 @@
-             {
-                 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
-                     OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
--                scaleData(&pixel, &this->Data, interpolate, value);
-+                this->scaleData(&pixel, &this->Data, interpolate, value);
-              }
-         }
-     }
---- dcmimgle/include/dcmtk/dcmimgle/dirotat.h	2010-10-14 17:16:27.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/dirotat.h	2012-06-08 19:23:11.011295866 +0400
-@@ -132,7 +132,7 @@
-         else if (degree == 270)
-             rotateLeft(src, dest);
-         else
--            copyPixel(src, dest);
-+            this->copyPixel(src, dest);
-     }
- 
- 
---- dcmimgle/include/dcmtk/dcmimgle/discalet.h	2010-10-14 17:16:27.000000000 +0400
-+++ dcmimgle/include/dcmtk/dcmimgle/discalet.h	2012-06-08 19:17:13.918299826 +0400
-@@ -206,12 +206,12 @@
-                 (Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
-             {                                                                         // no image to be displayed
-                 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
--                fillPixel(dest, value);                                               // ... fill bitmap
-+                this->fillPixel(dest, value);                                               // ... fill bitmap
-             }
-             else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y))  // no scaling
-             {
-                 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
--                    copyPixel(src, dest);                                             // copying
-+                    this->copyPixel(src, dest);                                             // copying
-                 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
-                          (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
-                     clipPixel(src, dest);                                             // clipping
-@@ -567,7 +567,7 @@
-         if ((xtemp == NULL) || (xvalue == NULL))
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
-             for (int j = 0; j < this->Planes; ++j)
-             {
-@@ -905,7 +905,7 @@
-         if (pTemp == NULL)
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
- 
-             /*
-@@ -1029,7 +1029,7 @@
-         if (pTemp == NULL)
-         {
-             DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
--            clearPixel(dest);
-+            this->clearPixel(dest);
-         } else {
- 
-             /*
---- ofstd/include/dcmtk/ofstd/ofoset.h	2010-10-14 17:15:50.000000000 +0400
-+++ ofstd/include/dcmtk/ofstd/ofoset.h	2012-06-08 20:32:10.974296904 +0400
-@@ -146,7 +146,7 @@
-       {
-         // if size equals num, we need more space
-         if( this->size == this->num )
--          Resize( this->size * 2 );
-+          this->Resize( this->size * 2 );
- 
-         // copy item
-         T *newItem = new T( item );
-@@ -189,7 +189,7 @@
-         {
-           // if size equals num, we need more space
-           if( this->size == this->num )
--            Resize( this->size * 2 );
-+            this->Resize( this->size * 2 );
- 
-           // copy item
-           T *newItem = new T( item );

devel/dcmtk/files/patch-cmake-CMakeLists.txt

@@ -1,33 +0,0 @@
---- CMakeLists.txt.orig	2011-01-12 13:26:53.000000000 +0000
-+++ CMakeLists.txt	2011-01-12 13:25:56.000000000 +0000
-@@ -71,14 +71,14 @@
- # Installation sub-directories
- #-----------------------------------------------------------------------------
- 
--SET(INSTALL_BINDIR "/bin")
-+SET(INSTALL_BINDIR "/bin/dcmtk")
- SET(INSTALL_INCDIR "/include")
- SET(INSTALL_LIBDIR "/lib")
- SET(INSTALL_ETCDIR "/etc/dcmtk")
- SET(INSTALL_DATDIR "/share/dcmtk")
- SET(INSTALL_DOCDIR "/share/doc/dcmtk")
- SET(INSTALL_HTMDIR "/share/doc/dcmtk/html")
--SET(INSTALL_MANDIR "/share/man")
-+SET(INSTALL_MANDIR "/man")
- 
- #-----------------------------------------------------------------------------
- # Platform-independent settings
-@@ -234,6 +234,13 @@
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- #-----------------------------------------------------------------------------
-+# Module to build shared and static libraries
-+#-----------------------------------------------------------------------------
-+
-+INCLUDE(CMake/BuildLibrary.cmake)
-+
-+
-+#-----------------------------------------------------------------------------
- # Third party libraries
- #-----------------------------------------------------------------------------
- 

devel/dcmtk/files/patch-dcmtls_libsrc_tlslayer.cc

@@ -1,12 +0,0 @@
---- dcmtls/libsrc/tlslayer.cc.orig	2010-10-14 13:14:46 UTC
-+++ dcmtls/libsrc/tlslayer.cc
-@@ -371,7 +371,9 @@ void DcmTLSTransportLayer::seedPRNG(cons
- #endif
-   if (randFile)
-   {
-+#ifndef LIBRESSL_VERSION_NUMBER
-     if (RAND_egd(randFile) <= 0)
-+#endif
-     {
-       RAND_load_file(randFile ,-1);
-     }

devel/dcmtk/files/patch-id2

@@ -1,23 +0,0 @@
---- dcmdata/apps/CMakeLists.txt.orig	2010-11-25 11:41:57.000000000 +0000
-+++ dcmdata/apps/CMakeLists.txt	2011-01-13 09:31:53.000000000 +0000
-@@ -22,4 +22,4 @@
- 
- TARGET_LINK_LIBRARIES(dcmftest ofstd ${ZLIB_LIBS} ${THREAD_LIBS})
- TARGET_LINK_LIBRARIES(xml2dcm ${TARGET_LINK_LIBRARIES} ${LIBXML_LIBS})
--TARGET_LINK_LIBRARIES(img2dcm ${TARGET_LINK_LIBRARIES} libi2d dcmdata)
-+TARGET_LINK_LIBRARIES(img2dcm ${TARGET_LINK_LIBRARIES} i2d dcmdata)
---- dcmdata/tests/CMakeLists.txt.orig	2010-08-09 17:48:33.000000000 +0000
-+++ dcmdata/tests/CMakeLists.txt	2011-01-13 09:32:33.000000000 +0000
-@@ -11,9 +11,9 @@
-   TARGET_LINK_LIBRARIES(${PROGRAM} dcmdata oflog ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
- ENDFOREACH(PROGRAM)
- 
--TARGET_LINK_LIBRARIES(i2dbmp libi2d dcmdata oflog ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
-+TARGET_LINK_LIBRARIES(i2dbmp i2d dcmdata oflog ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
- 
- # declare installation files
- #FOREACH(PROGRAM i2dbmp tstpath tstchval tstpread tvrdatim)
- #  INSTALL_TARGETS(${INSTALL_BINDIR} ${PROGRAM})
--#ENDFOREACH(PROGRAM)
-\ No newline at end of file
-+#ENDFOREACH(PROGRAM)

devel/dcmtk/files/patch-ofstd_libsrc_oflist.cc

@@ -1,13 +0,0 @@
---- ofstd/libsrc/oflist.cc.orig	2015-05-30 20:13:25 UTC
-+++ ofstd/libsrc/oflist.cc
-@@ -50,8 +50,8 @@ OFListBase::OFListBase()
- OFListBase::~OFListBase()
- {
-     base_clear();
--    if (afterLast)
--        delete afterLast;
-+    delete afterLast;
-+    afterLast = NULL;
- }
- 
- OFListLinkBase * OFListBase::base_insert(OFListLinkBase * pos,

devel/dcmtk/pkg-descr

@@ -1,8 +0,0 @@
-DCMTK is a collection of libraries and applications implementing large parts
-of the DICOM standard. DCMTK includes software for examining, constructing and
-converting DICOM image files, handling offline media, sending and receiving
-images over a network connection, as well as demonstrative image storage and
-worklist servers.  DCMTK comes in complete source code and is written in a
-mixture of ANSI C and C++.
-
-WWW: http://dicom.offis.de/dcmtk.php.en

devel/dcmtk/pkg-plist

@@ -1,667 +0,0 @@
-bin/dcmtk/dcm2pdf
-bin/dcmtk/dcm2pnm
-bin/dcmtk/dcm2xml
-bin/dcmtk/dcmcjpeg
-bin/dcmtk/dcmcjpls
-bin/dcmtk/dcmconv
-bin/dcmtk/dcmcrle
-bin/dcmtk/dcmdjpeg
-bin/dcmtk/dcmdjpls
-bin/dcmtk/dcmdrle
-bin/dcmtk/dcmdspfn
-bin/dcmtk/dcmdump
-bin/dcmtk/dcmftest
-bin/dcmtk/dcmgpdir
-bin/dcmtk/dcmj2pnm
-bin/dcmtk/dcml2pnm
-bin/dcmtk/dcmmkcrv
-bin/dcmtk/dcmmkdir
-bin/dcmtk/dcmmklut
-bin/dcmtk/dcmodify
-bin/dcmtk/dcmp2pgm
-bin/dcmtk/dcmprscp
-bin/dcmtk/dcmprscu
-bin/dcmtk/dcmpschk
-bin/dcmtk/dcmpsmk
-bin/dcmtk/dcmpsprt
-bin/dcmtk/dcmpsrcv
-bin/dcmtk/dcmpssnd
-bin/dcmtk/dcmqridx
-bin/dcmtk/dcmqrscp
-bin/dcmtk/dcmqrti
-bin/dcmtk/dcmquant
-bin/dcmtk/dcmscale
-bin/dcmtk/dcmsign
-bin/dcmtk/dcod2lum
-bin/dcmtk/dconvlum
-bin/dcmtk/dsr2html
-bin/dcmtk/dsr2xml
-bin/dcmtk/dsrdump
-bin/dcmtk/dump2dcm
-bin/dcmtk/echoscu
-bin/dcmtk/findscu
-bin/dcmtk/img2dcm
-bin/dcmtk/movescu
-bin/dcmtk/pdf2dcm
-bin/dcmtk/storescp
-bin/dcmtk/storescu
-bin/dcmtk/termscu
-bin/dcmtk/wlmscpfs
-bin/dcmtk/xml2dcm
-bin/dcmtk/xml2dsr
-etc/dcmtk/logger.cfg
-etc/dcmtk/filelog.cfg
-etc/dcmtk/dcmpstat.cfg
-etc/dcmtk/dcmqrscp.cfg
-etc/dcmtk/printers.cfg
-etc/dcmtk/storescp.cfg
-etc/dcmtk/storescu.cfg
-include/dcmtk/config/osconfig.h
-include/dcmtk/dcmdata/cmdlnarg.h
-include/dcmtk/dcmdata/dcbytstr.h
-include/dcmtk/dcmdata/dcchrstr.h
-include/dcmtk/dcmdata/dccodec.h
-include/dcmtk/dcmdata/dcdatset.h
-include/dcmtk/dcmdata/dcddirif.h
-include/dcmtk/dcmdata/dcdeftag.h
-include/dcmtk/dcmdata/dcdicdir.h
-include/dcmtk/dcmdata/dcdicent.h
-include/dcmtk/dcmdata/dcdict.h
-include/dcmtk/dcmdata/dcdirrec.h
-include/dcmtk/dcmdata/dcelem.h
-include/dcmtk/dcmdata/dcerror.h
-include/dcmtk/dcmdata/dcfcache.h
-include/dcmtk/dcmdata/dcfilefo.h
-include/dcmtk/dcmdata/dchashdi.h
-include/dcmtk/dcmdata/dcistrma.h
-include/dcmtk/dcmdata/dcistrmb.h
-include/dcmtk/dcmdata/dcistrmf.h
-include/dcmtk/dcmdata/dcistrmz.h
-include/dcmtk/dcmdata/dcitem.h
-include/dcmtk/dcmdata/dclist.h
-include/dcmtk/dcmdata/dcmetinf.h
-include/dcmtk/dcmdata/dcobject.h
-include/dcmtk/dcmdata/dcofsetl.h
-include/dcmtk/dcmdata/dcostrma.h
-include/dcmtk/dcmdata/dcostrmb.h
-include/dcmtk/dcmdata/dcostrmf.h
-include/dcmtk/dcmdata/dcostrmz.h
-include/dcmtk/dcmdata/dcovlay.h
-include/dcmtk/dcmdata/dcpath.h
-include/dcmtk/dcmdata/dcpcache.h
-include/dcmtk/dcmdata/dcpixel.h
-include/dcmtk/dcmdata/dcpixseq.h
-include/dcmtk/dcmdata/dcpxitem.h
-include/dcmtk/dcmdata/dcrleccd.h
-include/dcmtk/dcmdata/dcrlecce.h
-include/dcmtk/dcmdata/dcrlecp.h
-include/dcmtk/dcmdata/dcrledec.h
-include/dcmtk/dcmdata/dcrledrg.h
-include/dcmtk/dcmdata/dcrleenc.h
-include/dcmtk/dcmdata/dcrleerg.h
-include/dcmtk/dcmdata/dcrlerp.h
-include/dcmtk/dcmdata/dcsequen.h
-include/dcmtk/dcmdata/dcstack.h
-include/dcmtk/dcmdata/dcswap.h
-include/dcmtk/dcmdata/dctag.h
-include/dcmtk/dcmdata/dctagkey.h
-include/dcmtk/dcmdata/dctk.h
-include/dcmtk/dcmdata/dctypes.h
-include/dcmtk/dcmdata/dcuid.h
-include/dcmtk/dcmdata/dcvm.h
-include/dcmtk/dcmdata/dcvr.h
-include/dcmtk/dcmdata/dcvrae.h
-include/dcmtk/dcmdata/dcvras.h
-include/dcmtk/dcmdata/dcvrat.h
-include/dcmtk/dcmdata/dcvrcs.h
-include/dcmtk/dcmdata/dcvrda.h
-include/dcmtk/dcmdata/dcvrds.h
-include/dcmtk/dcmdata/dcvrdt.h
-include/dcmtk/dcmdata/dcvrfd.h
-include/dcmtk/dcmdata/dcvrfl.h
-include/dcmtk/dcmdata/dcvris.h
-include/dcmtk/dcmdata/dcvrlo.h
-include/dcmtk/dcmdata/dcvrlt.h
-include/dcmtk/dcmdata/dcvrobow.h
-include/dcmtk/dcmdata/dcvrof.h
-include/dcmtk/dcmdata/dcvrpn.h
-include/dcmtk/dcmdata/dcvrpobw.h
-include/dcmtk/dcmdata/dcvrsh.h
-include/dcmtk/dcmdata/dcvrsl.h
-include/dcmtk/dcmdata/dcvrss.h
-include/dcmtk/dcmdata/dcvrst.h
-include/dcmtk/dcmdata/dcvrtm.h
-include/dcmtk/dcmdata/dcvrui.h
-include/dcmtk/dcmdata/dcvrul.h
-include/dcmtk/dcmdata/dcvrulup.h
-include/dcmtk/dcmdata/dcvrus.h
-include/dcmtk/dcmdata/dcvrut.h
-include/dcmtk/dcmdata/dcwcache.h
-include/dcmtk/dcmdata/dcxfer.h
-include/dcmtk/dcmdata/libi2d/i2d.h
-include/dcmtk/dcmdata/libi2d/i2dbmps.h
-include/dcmtk/dcmdata/libi2d/i2dimgs.h
-include/dcmtk/dcmdata/libi2d/i2djpgs.h
-include/dcmtk/dcmdata/libi2d/i2doutpl.h
-include/dcmtk/dcmdata/libi2d/i2dplnsc.h
-include/dcmtk/dcmdata/libi2d/i2dplsc.h
-include/dcmtk/dcmdata/libi2d/i2dplvlp.h
-include/dcmtk/dcmdata/vrscan.h
-include/dcmtk/dcmimage/diargimg.h
-include/dcmtk/dcmimage/diargpxt.h
-include/dcmtk/dcmimage/dicmyimg.h
-include/dcmtk/dcmimage/dicmypxt.h
-include/dcmtk/dcmimage/dicocpt.h
-include/dcmtk/dcmimage/dicoflt.h
-include/dcmtk/dcmimage/dicoimg.h
-include/dcmtk/dcmimage/dicomot.h
-include/dcmtk/dcmimage/dicoopx.h
-include/dcmtk/dcmimage/dicoopxt.h
-include/dcmtk/dcmimage/dicopx.h
-include/dcmtk/dcmimage/dicopxt.h
-include/dcmtk/dcmimage/dicorot.h
-include/dcmtk/dcmimage/dicosct.h
-include/dcmtk/dcmimage/dihsvimg.h
-include/dcmtk/dcmimage/dihsvpxt.h
-include/dcmtk/dcmimage/dilogger.h
-include/dcmtk/dcmimage/dipalimg.h
-include/dcmtk/dcmimage/dipalpxt.h
-include/dcmtk/dcmimage/dipipng.h
-include/dcmtk/dcmimage/dipitiff.h
-include/dcmtk/dcmimage/diqtcmap.h
-include/dcmtk/dcmimage/diqtctab.h
-include/dcmtk/dcmimage/diqtfs.h
-include/dcmtk/dcmimage/diqthash.h
-include/dcmtk/dcmimage/diqthitl.h
-include/dcmtk/dcmimage/diqthitm.h
-include/dcmtk/dcmimage/diqtid.h
-include/dcmtk/dcmimage/diqtpbox.h
-include/dcmtk/dcmimage/diqtpix.h
-include/dcmtk/dcmimage/diqtstab.h
-include/dcmtk/dcmimage/diqttype.h
-include/dcmtk/dcmimage/diquant.h
-include/dcmtk/dcmimage/diregist.h
-include/dcmtk/dcmimage/dirgbimg.h
-include/dcmtk/dcmimage/dirgbpxt.h
-include/dcmtk/dcmimage/diybrimg.h
-include/dcmtk/dcmimage/diybrpxt.h
-include/dcmtk/dcmimage/diyf2img.h
-include/dcmtk/dcmimage/diyf2pxt.h
-include/dcmtk/dcmimage/diyp2img.h
-include/dcmtk/dcmimage/diyp2pxt.h
-include/dcmtk/dcmimgle/dcmimage.h
-include/dcmtk/dcmimgle/dibaslut.h
-include/dcmtk/dcmimgle/diciefn.h
-include/dcmtk/dcmimgle/dicielut.h
-include/dcmtk/dcmimgle/dicrvfit.h
-include/dcmtk/dcmimgle/didislut.h
-include/dcmtk/dcmimgle/didispfn.h
-include/dcmtk/dcmimgle/didocu.h
-include/dcmtk/dcmimgle/diflipt.h
-include/dcmtk/dcmimgle/digsdfn.h
-include/dcmtk/dcmimgle/digsdlut.h
-include/dcmtk/dcmimgle/diimage.h
-include/dcmtk/dcmimgle/diinpx.h
-include/dcmtk/dcmimgle/diinpxt.h
-include/dcmtk/dcmimgle/diluptab.h
-include/dcmtk/dcmimgle/dimo1img.h
-include/dcmtk/dcmimgle/dimo2img.h
-include/dcmtk/dcmimgle/dimocpt.h
-include/dcmtk/dcmimgle/dimoflt.h
-include/dcmtk/dcmimgle/dimoimg.h
-include/dcmtk/dcmimgle/dimoipxt.h
-include/dcmtk/dcmimgle/dimomod.h
-include/dcmtk/dcmimgle/dimoopx.h
-include/dcmtk/dcmimgle/dimoopxt.h
-include/dcmtk/dcmimgle/dimopx.h
-include/dcmtk/dcmimgle/dimopxt.h
-include/dcmtk/dcmimgle/dimorot.h
-include/dcmtk/dcmimgle/dimosct.h
-include/dcmtk/dcmimgle/diobjcou.h
-include/dcmtk/dcmimgle/diovdat.h
-include/dcmtk/dcmimgle/diovlay.h
-include/dcmtk/dcmimgle/diovlimg.h
-include/dcmtk/dcmimgle/diovpln.h
-include/dcmtk/dcmimgle/dipixel.h
-include/dcmtk/dcmimgle/diplugin.h
-include/dcmtk/dcmimgle/dipxrept.h
-include/dcmtk/dcmimgle/diregbas.h
-include/dcmtk/dcmimgle/dirotat.h
-include/dcmtk/dcmimgle/discalet.h
-include/dcmtk/dcmimgle/displint.h
-include/dcmtk/dcmimgle/ditranst.h
-include/dcmtk/dcmimgle/diutils.h
-include/dcmtk/dcmjpeg/ddpiimpl.h
-include/dcmtk/dcmjpeg/dipijpeg.h
-include/dcmtk/dcmjpeg/djcodecd.h
-include/dcmtk/dcmjpeg/djcodece.h
-include/dcmtk/dcmjpeg/djcparam.h
-include/dcmtk/dcmjpeg/djdecabs.h
-include/dcmtk/dcmjpeg/djdecbas.h
-include/dcmtk/dcmjpeg/djdecext.h
-include/dcmtk/dcmjpeg/djdeclol.h
-include/dcmtk/dcmjpeg/djdecode.h
-include/dcmtk/dcmjpeg/djdecpro.h
-include/dcmtk/dcmjpeg/djdecsps.h
-include/dcmtk/dcmjpeg/djdecsv1.h
-include/dcmtk/dcmjpeg/djdijg12.h
-include/dcmtk/dcmjpeg/djdijg16.h
-include/dcmtk/dcmjpeg/djdijg8.h
-include/dcmtk/dcmjpeg/djeijg12.h
-include/dcmtk/dcmjpeg/djeijg16.h
-include/dcmtk/dcmjpeg/djeijg8.h
-include/dcmtk/dcmjpeg/djencabs.h
-include/dcmtk/dcmjpeg/djencbas.h
-include/dcmtk/dcmjpeg/djencext.h
-include/dcmtk/dcmjpeg/djenclol.h
-include/dcmtk/dcmjpeg/djencode.h
-include/dcmtk/dcmjpeg/djencpro.h
-include/dcmtk/dcmjpeg/djencsps.h
-include/dcmtk/dcmjpeg/djencsv1.h
-include/dcmtk/dcmjpeg/djrplol.h
-include/dcmtk/dcmjpeg/djrploss.h
-include/dcmtk/dcmjpeg/djutils.h
-include/dcmtk/dcmjpls/djcodecd.h
-include/dcmtk/dcmjpls/djcodece.h
-include/dcmtk/dcmjpls/djcparam.h
-include/dcmtk/dcmjpls/djdecode.h
-include/dcmtk/dcmjpls/djencode.h
-include/dcmtk/dcmjpls/djlsutil.h
-include/dcmtk/dcmjpls/djrparam.h
-include/dcmtk/dcmnet/assoc.h
-include/dcmtk/dcmnet/cond.h
-include/dcmtk/dcmnet/dcasccff.h
-include/dcmtk/dcmnet/dcasccfg.h
-include/dcmtk/dcmnet/dccfenmp.h
-include/dcmtk/dcmnet/dccfpcmp.h
-include/dcmtk/dcmnet/dccfprmp.h
-include/dcmtk/dcmnet/dccfrsmp.h
-include/dcmtk/dcmnet/dccftsmp.h
-include/dcmtk/dcmnet/dccfuidh.h
-include/dcmtk/dcmnet/dcmlayer.h
-include/dcmtk/dcmnet/dcmsmap.h
-include/dcmtk/dcmnet/dcmtrans.h
-include/dcmtk/dcmnet/dcompat.h
-include/dcmtk/dcmnet/dcuserid.h
-include/dcmtk/dcmnet/dfindscu.h
-include/dcmtk/dcmnet/dicom.h
-include/dcmtk/dcmnet/dimse.h
-include/dcmtk/dcmnet/diutil.h
-include/dcmtk/dcmnet/dul.h
-include/dcmtk/dcmnet/extneg.h
-include/dcmtk/dcmnet/lst.h
-include/dcmtk/dcmnet/scp.h
-include/dcmtk/dcmnet/scu.h
-include/dcmtk/dcmpstat/dcmpstat.h
-include/dcmtk/dcmpstat/dvcache.h
-include/dcmtk/dcmpstat/dviface.h
-include/dcmtk/dcmpstat/dvpsab.h
-include/dcmtk/dcmpstat/dvpsabl.h
-include/dcmtk/dcmpstat/dvpsal.h
-include/dcmtk/dcmpstat/dvpsall.h
-include/dcmtk/dcmpstat/dvpscf.h
-include/dcmtk/dcmpstat/dvpscu.h
-include/dcmtk/dcmpstat/dvpscul.h
-include/dcmtk/dcmpstat/dvpsda.h
-include/dcmtk/dcmpstat/dvpsdal.h
-include/dcmtk/dcmpstat/dvpsdef.h
-include/dcmtk/dcmpstat/dvpsfs.h
-include/dcmtk/dcmpstat/dvpsga.h
-include/dcmtk/dcmpstat/dvpsgal.h
-include/dcmtk/dcmpstat/dvpsgl.h
-include/dcmtk/dcmpstat/dvpsgll.h
-include/dcmtk/dcmpstat/dvpsgr.h
-include/dcmtk/dcmpstat/dvpsgrl.h
-include/dcmtk/dcmpstat/dvpshlp.h
-include/dcmtk/dcmpstat/dvpsib.h
-include/dcmtk/dcmpstat/dvpsibl.h
-include/dcmtk/dcmpstat/dvpsmsg.h
-include/dcmtk/dcmpstat/dvpsov.h
-include/dcmtk/dcmpstat/dvpsovl.h
-include/dcmtk/dcmpstat/dvpspl.h
-include/dcmtk/dcmpstat/dvpspll.h
-include/dcmtk/dcmpstat/dvpspr.h
-include/dcmtk/dcmpstat/dvpsprt.h
-include/dcmtk/dcmpstat/dvpsri.h
-include/dcmtk/dcmpstat/dvpsril.h
-include/dcmtk/dcmpstat/dvpsrs.h
-include/dcmtk/dcmpstat/dvpsrsl.h
-include/dcmtk/dcmpstat/dvpssp.h
-include/dcmtk/dcmpstat/dvpsspl.h
-include/dcmtk/dcmpstat/dvpssv.h
-include/dcmtk/dcmpstat/dvpssvl.h
-include/dcmtk/dcmpstat/dvpstat.h
-include/dcmtk/dcmpstat/dvpstx.h
-include/dcmtk/dcmpstat/dvpstxl.h
-include/dcmtk/dcmpstat/dvpstyp.h
-include/dcmtk/dcmpstat/dvpsvl.h
-include/dcmtk/dcmpstat/dvpsvll.h
-include/dcmtk/dcmpstat/dvpsvw.h
-include/dcmtk/dcmpstat/dvpsvwl.h
-include/dcmtk/dcmpstat/dvsighdl.h
-include/dcmtk/dcmqrdb/dcmqrcbf.h
-include/dcmtk/dcmqrdb/dcmqrcbg.h
-include/dcmtk/dcmqrdb/dcmqrcbm.h
-include/dcmtk/dcmqrdb/dcmqrcbs.h
-include/dcmtk/dcmqrdb/dcmqrcnf.h
-include/dcmtk/dcmqrdb/dcmqrdba.h
-include/dcmtk/dcmqrdb/dcmqrdbi.h
-include/dcmtk/dcmqrdb/dcmqrdbs.h
-include/dcmtk/dcmqrdb/dcmqridx.h
-include/dcmtk/dcmqrdb/dcmqropt.h
-include/dcmtk/dcmqrdb/dcmqrptb.h
-include/dcmtk/dcmqrdb/dcmqrsrv.h
-include/dcmtk/dcmqrdb/dcmqrtis.h
-include/dcmtk/dcmsign/dcsignat.h
-include/dcmtk/dcmsign/sialgo.h
-include/dcmtk/dcmsign/siautopr.h
-include/dcmtk/dcmsign/sibrsapr.h
-include/dcmtk/dcmsign/sicert.h
-include/dcmtk/dcmsign/sicertvf.h
-include/dcmtk/dcmsign/sicreapr.h
-include/dcmtk/dcmsign/sidsa.h
-include/dcmtk/dcmsign/simac.h
-include/dcmtk/dcmsign/simaccon.h
-include/dcmtk/dcmsign/simd5.h
-include/dcmtk/dcmsign/sinullpr.h
-include/dcmtk/dcmsign/siprivat.h
-include/dcmtk/dcmsign/siripemd.h
-include/dcmtk/dcmsign/sirsa.h
-include/dcmtk/dcmsign/sisha1.h
-include/dcmtk/dcmsign/sisprof.h
-include/dcmtk/dcmsign/sitstamp.h
-include/dcmtk/dcmsign/sitypes.h
-include/dcmtk/dcmsr/dsrbascc.h
-include/dcmtk/dcmsr/dsrchecc.h
-include/dcmtk/dcmsr/dsrcitem.h
-include/dcmtk/dcmsr/dsrcodtn.h
-include/dcmtk/dcmsr/dsrcodvl.h
-include/dcmtk/dcmsr/dsrcolcc.h
-include/dcmtk/dcmsr/dsrcomcc.h
-include/dcmtk/dcmsr/dsrcomtn.h
-include/dcmtk/dcmsr/dsrcomvl.h
-include/dcmtk/dcmsr/dsrcontn.h
-include/dcmtk/dcmsr/dsrcsidl.h
-include/dcmtk/dcmsr/dsrdattn.h
-include/dcmtk/dcmsr/dsrdoc.h
-include/dcmtk/dcmsr/dsrdoctn.h
-include/dcmtk/dcmsr/dsrdoctr.h
-include/dcmtk/dcmsr/dsrdtitn.h
-include/dcmtk/dcmsr/dsrenhcc.h
-include/dcmtk/dcmsr/dsrimgfr.h
-include/dcmtk/dcmsr/dsrimgtn.h
-include/dcmtk/dcmsr/dsrimgvl.h
-include/dcmtk/dcmsr/dsrimpcc.h
-include/dcmtk/dcmsr/dsriodcc.h
-include/dcmtk/dcmsr/dsrkeycc.h
-include/dcmtk/dcmsr/dsrmaccc.h
-include/dcmtk/dcmsr/dsrmamcc.h
-include/dcmtk/dcmsr/dsrnumtn.h
-include/dcmtk/dcmsr/dsrnumvl.h
-include/dcmtk/dcmsr/dsrpnmtn.h
-include/dcmtk/dcmsr/dsrprocc.h
-include/dcmtk/dcmsr/dsrreftn.h
-include/dcmtk/dcmsr/dsrsc3gr.h
-include/dcmtk/dcmsr/dsrsc3tn.h
-include/dcmtk/dcmsr/dsrsc3vl.h
-include/dcmtk/dcmsr/dsrscogr.h
-include/dcmtk/dcmsr/dsrscotn.h
-include/dcmtk/dcmsr/dsrscovl.h
-include/dcmtk/dcmsr/dsrsoprf.h
-include/dcmtk/dcmsr/dsrspecc.h
-include/dcmtk/dcmsr/dsrstrvl.h
-include/dcmtk/dcmsr/dsrtcodt.h
-include/dcmtk/dcmsr/dsrtcosp.h
-include/dcmtk/dcmsr/dsrtcotn.h
-include/dcmtk/dcmsr/dsrtcoto.h
-include/dcmtk/dcmsr/dsrtcovl.h
-include/dcmtk/dcmsr/dsrtextn.h
-include/dcmtk/dcmsr/dsrtimtn.h
-include/dcmtk/dcmsr/dsrtlist.h
-include/dcmtk/dcmsr/dsrtncsr.h
-include/dcmtk/dcmsr/dsrtree.h
-include/dcmtk/dcmsr/dsrtypes.h
-include/dcmtk/dcmsr/dsruidtn.h
-include/dcmtk/dcmsr/dsrwavch.h
-include/dcmtk/dcmsr/dsrwavtn.h
-include/dcmtk/dcmsr/dsrwavvl.h
-include/dcmtk/dcmsr/dsrxmlc.h
-include/dcmtk/dcmsr/dsrxmld.h
-include/dcmtk/dcmsr/dsrxrdcc.h
-include/dcmtk/dcmtls/tlslayer.h
-include/dcmtk/dcmtls/tlsscu.h
-include/dcmtk/dcmtls/tlstrans.h
-include/dcmtk/dcmwlm/wlds.h
-include/dcmtk/dcmwlm/wldsfs.h
-include/dcmtk/dcmwlm/wlfsim.h
-include/dcmtk/dcmwlm/wlmactmg.h
-include/dcmtk/dcmwlm/wltypdef.h
-include/dcmtk/oflog/appender.h
-include/dcmtk/oflog/config.h
-include/dcmtk/oflog/config/defines.h
-include/dcmtk/oflog/config/macosx.h
-include/dcmtk/oflog/config/win32.h
-include/dcmtk/oflog/configrt.h
-include/dcmtk/oflog/consap.h
-include/dcmtk/oflog/fileap.h
-include/dcmtk/oflog/fstreams.h
-include/dcmtk/oflog/helpers/apndimpl.h
-include/dcmtk/oflog/helpers/lloguser.h
-include/dcmtk/oflog/helpers/loglog.h
-include/dcmtk/oflog/helpers/pointer.h
-include/dcmtk/oflog/helpers/property.h
-include/dcmtk/oflog/helpers/sleep.h
-include/dcmtk/oflog/helpers/sockbuff.h
-include/dcmtk/oflog/helpers/socket.h
-include/dcmtk/oflog/helpers/strhelp.h
-include/dcmtk/oflog/helpers/syncppth.h
-include/dcmtk/oflog/helpers/syncprims.h
-include/dcmtk/oflog/helpers/syncpwin.h
-include/dcmtk/oflog/helpers/threadcf.h
-include/dcmtk/oflog/helpers/threads.h
-include/dcmtk/oflog/helpers/timehelp.h
-include/dcmtk/oflog/hierarchy.h
-include/dcmtk/oflog/hierlock.h
-include/dcmtk/oflog/layout.h
-include/dcmtk/oflog/logger.h
-include/dcmtk/oflog/loglevel.h
-include/dcmtk/oflog/logmacro.h
-include/dcmtk/oflog/ndc.h
-include/dcmtk/oflog/ntelogap.h
-include/dcmtk/oflog/nullap.h
-include/dcmtk/oflog/oflog.h
-include/dcmtk/oflog/socketap.h
-include/dcmtk/oflog/spi/apndatch.h
-include/dcmtk/oflog/spi/factory.h
-include/dcmtk/oflog/spi/filter.h
-include/dcmtk/oflog/spi/logevent.h
-include/dcmtk/oflog/spi/logfact.h
-include/dcmtk/oflog/spi/logimpl.h
-include/dcmtk/oflog/spi/objreg.h
-include/dcmtk/oflog/spi/rootlog.h
-include/dcmtk/oflog/streams.h
-include/dcmtk/oflog/syslogap.h
-include/dcmtk/oflog/tstring.h
-include/dcmtk/oflog/winconap.h
-include/dcmtk/oflog/windebap.h
-include/dcmtk/ofstd/ofalgo.h
-include/dcmtk/ofstd/ofaptr.h
-include/dcmtk/ofstd/ofbmanip.h
-include/dcmtk/ofstd/ofcast.h
-include/dcmtk/ofstd/ofcmdln.h
-include/dcmtk/ofstd/ofconapp.h
-include/dcmtk/ofstd/ofcond.h
-include/dcmtk/ofstd/ofconfig.h
-include/dcmtk/ofstd/ofconsol.h
-include/dcmtk/ofstd/ofcrc32.h
-include/dcmtk/ofstd/ofdate.h
-include/dcmtk/ofstd/ofdatime.h
-include/dcmtk/ofstd/ofdefine.h
-include/dcmtk/ofstd/offile.h
-include/dcmtk/ofstd/offname.h
-include/dcmtk/ofstd/ofglobal.h
-include/dcmtk/ofstd/oflist.h
-include/dcmtk/ofstd/ofmap.h
-include/dcmtk/ofstd/ofoset.h
-include/dcmtk/ofstd/ofset.h
-include/dcmtk/ofstd/ofsetit.h
-include/dcmtk/ofstd/ofstack.h
-include/dcmtk/ofstd/ofstd.h
-include/dcmtk/ofstd/ofstdinc.h
-include/dcmtk/ofstd/ofstream.h
-include/dcmtk/ofstd/ofstring.h
-include/dcmtk/ofstd/ofthread.h
-include/dcmtk/ofstd/oftime.h
-include/dcmtk/ofstd/oftimer.h
-include/dcmtk/ofstd/oftypes.h
-include/dcmtk/ofstd/ofuoset.h
-include/dcmtk/ofstd/ofvector.h
-lib/libcharls.a
-lib/libcharls.so
-lib/libcharls.so.%%SHLIBVER%%
-lib/libdcmdata.a
-lib/libdcmdata.so
-lib/libdcmdata.so.%%SHLIBVER%%
-lib/libdcmdsig.a
-lib/libdcmdsig.so
-lib/libdcmdsig.so.%%SHLIBVER%%
-lib/libdcmimage.a
-lib/libdcmimage.so
-lib/libdcmimage.so.%%SHLIBVER%%
-lib/libdcmimgle.a
-lib/libdcmimgle.so
-lib/libdcmimgle.so.%%SHLIBVER%%
-lib/libdcmjpeg.a
-lib/libdcmjpeg.so
-lib/libdcmjpeg.so.%%SHLIBVER%%
-lib/libdcmjpls.a
-lib/libdcmjpls.so
-lib/libdcmjpls.so.%%SHLIBVER%%
-lib/libdcmnet.a
-lib/libdcmnet.so
-lib/libdcmnet.so.%%SHLIBVER%%
-lib/libdcmpstat.a
-lib/libdcmpstat.so
-lib/libdcmpstat.so.%%SHLIBVER%%
-lib/libdcmqrdb.a
-lib/libdcmqrdb.so
-lib/libdcmqrdb.so.%%SHLIBVER%%
-lib/libdcmsr.a
-lib/libdcmsr.so
-lib/libdcmsr.so.%%SHLIBVER%%
-lib/libdcmtls.a
-lib/libdcmtls.so
-lib/libdcmtls.so.%%SHLIBVER%%
-lib/libdcmwlm.a
-lib/libdcmwlm.so
-lib/libdcmwlm.so.%%SHLIBVER%%
-lib/libi2d.a
-lib/libi2d.so
-lib/libi2d.so.%%SHLIBVER%%
-lib/libijg12.a
-lib/libijg12.so
-lib/libijg12.so.%%SHLIBVER%%
-lib/libijg16.a
-lib/libijg16.so
-lib/libijg16.so.%%SHLIBVER%%
-lib/libijg8.a
-lib/libijg8.so
-lib/libijg8.so.%%SHLIBVER%%
-lib/liboflog.a
-lib/liboflog.so
-lib/liboflog.so.%%SHLIBVER%%
-lib/libofstd.a
-lib/libofstd.so
-lib/libofstd.so.%%SHLIBVER%%
-man/man1/dcm2pdf.1.gz
-man/man1/dcm2pnm.1.gz
-man/man1/dcm2xml.1.gz
-man/man1/dcmcjpeg.1.gz
-man/man1/dcmcjpls.1.gz
-man/man1/dcmconv.1.gz
-man/man1/dcmcrle.1.gz
-man/man1/dcmdjpeg.1.gz
-man/man1/dcmdjpls.1.gz
-man/man1/dcmdrle.1.gz
-man/man1/dcmdspfn.1.gz
-man/man1/dcmdump.1.gz
-man/man1/dcmftest.1.gz
-man/man1/dcmgpdir.1.gz
-man/man1/dcmj2pnm.1.gz
-man/man1/dcml2pnm.1.gz
-man/man1/dcmmkcrv.1.gz
-man/man1/dcmmkdir.1.gz
-man/man1/dcmmklut.1.gz
-man/man1/dcmodify.1.gz
-man/man1/dcmp2pgm.1.gz
-man/man1/dcmprscp.1.gz
-man/man1/dcmprscu.1.gz
-man/man1/dcmpschk.1.gz
-man/man1/dcmpsmk.1.gz
-man/man1/dcmpsprt.1.gz
-man/man1/dcmpsrcv.1.gz
-man/man1/dcmpssnd.1.gz
-man/man1/dcmqridx.1.gz
-man/man1/dcmqrscp.1.gz
-man/man1/dcmqrti.1.gz
-man/man1/dcmquant.1.gz
-man/man1/dcmscale.1.gz
-man/man1/dcmsign.1.gz
-man/man1/dcod2lum.1.gz
-man/man1/dconvlum.1.gz
-man/man1/dsr2html.1.gz
-man/man1/dsr2xml.1.gz
-man/man1/dsrdump.1.gz
-man/man1/dump2dcm.1.gz
-man/man1/echoscu.1.gz
-man/man1/findscu.1.gz
-man/man1/img2dcm.1.gz
-man/man1/movescu.1.gz
-man/man1/pdf2dcm.1.gz
-man/man1/storescp.1.gz
-man/man1/storescu.1.gz
-man/man1/termscu.1.gz
-man/man1/wlmscpfs.1.gz
-man/man1/xml2dcm.1.gz
-man/man1/xml2dsr.1.gz
-%%DATADIR%%/SC.dump
-%%DATADIR%%/VLP.dump
-%%DATADIR%%/camera.lut
-%%DATADIR%%/dcm2xml.dtd
-%%DATADIR%%/dicom.dic
-%%DATADIR%%/diconde.dic
-%%DATADIR%%/dsr2xml.xsd
-%%DATADIR%%/dumppat.txt
-%%DATADIR%%/monitor.lut
-%%DATADIR%%/philips.lut
-%%DATADIR%%/printer.lut
-%%DATADIR%%/private.dic
-%%DATADIR%%/report.css
-%%DATADIR%%/reportx.css
-%%DATADIR%%/scanner.lut
-%%DATADIR%%/wlistdb/OFFIS/lockfile
-%%DATADIR%%/wlistdb/OFFIS/wklist1.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist10.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist2.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist3.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist4.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist5.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist6.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist7.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist8.dump
-%%DATADIR%%/wlistdb/OFFIS/wklist9.dump
-%%DATADIR%%/wlistdb/README
-%%DATADIR%%/wlistqry/README
-%%DATADIR%%/wlistqry/wlistqry0.dump
-%%DATADIR%%/wlistqry/wlistqry1.dump
-%%DATADIR%%/wlistqry/wlistqry10.dump
-%%DATADIR%%/wlistqry/wlistqry11.dump
-%%DATADIR%%/wlistqry/wlistqry12.dump
-%%DATADIR%%/wlistqry/wlistqry2.dump
-%%DATADIR%%/wlistqry/wlistqry3.dump
-%%DATADIR%%/wlistqry/wlistqry4.dump
-%%DATADIR%%/wlistqry/wlistqry5.dump
-%%DATADIR%%/wlistqry/wlistqry6.dump
-%%DATADIR%%/wlistqry/wlistqry7.dump
-%%DATADIR%%/wlistqry/wlistqry8.dump
-%%DATADIR%%/wlistqry/wlistqry9.dump

graphics/Makefile

@@ -121,6 +121,7 @@
     SUBDIR += darktable
     SUBDIR += dataplot
     SUBDIR += dc20pack
+    SUBDIR += dcmtk
     SUBDIR += dcp2icc
     SUBDIR += dcraw
     SUBDIR += dcraw-m

graphics/aeskulap/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	aeskulap
-PORTVERSION=	0.2.2.20140119
-PORTREVISION=	3
+DISTVERSION=	0.2.2.20180219
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,18 +11,20 @@ COMMENT=	Medical image viewer
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libglademm-2.4.so:devel/libglademm24\
-		libdcmimage.so:devel/dcmtk
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	pipelka
-GH_TAGNAME=	ea0a119
+LIB_DEPENDS=	libdcmimage.so:graphics/dcmtk \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libglademm-2.4.so:devel/libglademm24 \
+		libpng16.so:graphics/png \
+		libtiff.so:graphics/tiff
 
 USES=		compiler:c++11-lang autoreconf desktop-file-utils gettext \
-		gmake libtool localbase pkgconfig
+		gmake gnome jpeg libtool localbase pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	jenslody # was pipelka
+GH_TAGNAME=	8787e95
 USE_CXXSTD=	c++11
-USE_GNOME=	gconfmm26 gtkmm24 intltool
-GCONF_SCHEMAS=	aeskulap.schemas
+USE_GNOME=	gconfmm26 gtkmm24 intltool libglade2
 USE_LDCONFIG=	${PREFIX}/lib/aeskulap
 
 GNU_CONFIGURE=	yes

graphics/aeskulap/distinfo

@@ -1,2 +1,3 @@
-SHA256 (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = a98e07b31cf6d73b0cb2e4788a04f3e9bfdca856da709f01819fba0b58d21e89
-SIZE (pipelka-aeskulap-0.2.2.20140119-ea0a119_GH0.tar.gz) = 4323281
+TIMESTAMP = 1544657589
+SHA256 (jenslody-aeskulap-0.2.2.20180219-8787e95_GH0.tar.gz) = cf6bd1bb92599a92b3e4ce20fa77b606c888d8a0be1bde41470cae257923431a
+SIZE (jenslody-aeskulap-0.2.2.20180219-8787e95_GH0.tar.gz) = 2168735

graphics/aeskulap/files/patch-configure.in

@@ -1,41 +0,0 @@
---- configure.in.orig	2014-01-19 07:38:17 UTC
-+++ configure.in
-@@ -104,17 +104,8 @@ DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -
- 
- else
- 
--DCMJPEG_LIBS="-L../dcmtk/dcmjpeg/libijg8 -L../dcmtk/dcmjpeg/libijg12 -L../dcmtk/dcmjpeg/libijg16 -lijg8 -lijg12 -lijg16"
--AC_SUBST(DCMJPEG_LIBS)
--
--DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(top_srcdir)/dcmtk/config/include -I\$(top_srcdir)/dcmtk/ofstd/include -I\$(top_srcdir)/dcmtk/dcmdata/include -I\$(top_srcdir)/dcmtk/dcmnet/include -I\$(top_srcdir)/dcmtk/dcmimage/include -I\$(top_srcdir)/dcmtk/dcmimgle/include -I\$(top_srcdir)/dcmtk/dcmjpeg/include"
--DCMTK_LIBS="-L../dcmtk/ofstd/libsrc \
---L../dcmtk/dcmdata/libsrc \
---L../dcmtk/dcmnet/libsrc \
---L../dcmtk/dcmjpeg/libsrc \
---L../dcmtk/dcmimage/libsrc \
---L../dcmtk/dcmimgle/libsrc \
--\$(DCMJPEG_LIBS) -ldcmjpeg -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -lofstd -lrt -lpthread"
-+DCMTK_CFLAGS="-DHAVE_CONFIG_H -I\$(prefix)/include"
-+DCMTK_LIBS="-L\$(prefix)/lib -ldcmjpeg -lijg8 -lijg12 -lijg16 -ldcmimage -ldcmimgle -ldcmnet -ldcmdata -loflog -lofstd"
- 
- fi
- 
-@@ -130,8 +121,7 @@ fi
- 
- DCMTK_SUBDIR=""
- if test x"$MINGW32" = xno ; then
--DCMTK_SUBDIR="dcmtk"
--LDFLAGS_AESKULAP_LIBS="-Wl,-rpath,${prefix}/lib/aeskulap -avoid-version"
-+LDFLAGS_AESKULAP_LIBS="-avoid-version"
- else
- LDFLAGS_MINGW32="-mwindows"
- LDFLAGS_AESKULAP_LIBS="-avoid-version -no-undefined"
-@@ -161,7 +151,7 @@ packaging/win32/aeskulap.iss
- ])
- 
- 
--if test x"$MINGW32" = xno ; then
-+if false ; then
- 
- cd $srcdir/dcmtk
- export CFLAGS="$CFLAGS"

graphics/aeskulap/files/patch-imagepool_dicomdir.cpp

@@ -1,89 +0,0 @@
---- imagepool/dicomdir.cpp.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/dicomdir.cpp
-@@ -43,7 +43,7 @@ namespace ImagePool {
-         DcmDicomDir dir(dicomdir.c_str());
-         OFCondition ret;
- 
--        if ( (ret=dir.error()) != ECC_Normal ) {
-+        if ( (ret=dir.error()) != EC_Normal ) {
-             std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
-             return;
-         }
-@@ -151,21 +151,21 @@ namespace ImagePool {
-             DcmDataset study;
-             DcmElement *el;
- 
--            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
--            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == EC_Normal )
-                 study.insert(el);
-             resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
-         }
-@@ -179,7 +179,7 @@ namespace ImagePool {
-         DcmDirectoryRecord *seriesRec;
-         OFCondition ret;
- 
--        if ( dir.error() != ECC_Normal ) {
-+        if ( dir.error() != EC_Normal ) {
-             std::cout << "DICOMDIR Error: " << ret.text() << std::endl;
-             return;
-         }
-@@ -191,7 +191,7 @@ namespace ImagePool {
-                 for ( studyRec=patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
-                     if ( studyRec->getRecordType()==ERT_Study ) {
-                         OFString uid;
--                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
-+                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
-                             if ( studyinstanceuid == uid.c_str() ) {
-                                 open_dicomdir_series_result(dicomdir, patRec, studyRec, resultslot);
-                                 return;
-@@ -221,21 +221,21 @@ namespace ImagePool {
-             DcmDataset series;
-             DcmElement *el;
- 
--            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
--            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
-+            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == EC_Normal )
-                 series.insert(el);
- 
-             // Count Related SOP Instances

graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp

@@ -1,41 +0,0 @@
---- imagepool/dicomdirloader.cpp.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/dicomdirloader.cpp
-@@ -42,7 +42,7 @@ namespace ImagePool {
-             return false;
-         }
- 
--        if ( (ret=dir.error()) != ECC_Normal ) {
-+        if ( (ret=dir.error()) != EC_Normal ) {
-             std::cout << "DicomdirLoader::load Error: " << ret.text() << std::endl;
-             return false;
-         }
-@@ -80,7 +80,7 @@ namespace ImagePool {
-                 for ( studyRec = patRec->nextSub(NULL); studyRec; studyRec = patRec->nextSub(studyRec) ) {
-                     if ( studyRec->getRecordType()==ERT_Study ) {
-                         OFString uid;
--                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==ECC_Normal ) {
-+                        if ( studyRec->findAndGetOFString(DCM_StudyInstanceUID, uid)==EC_Normal ) {
-                             if ( studyinstanceuid == uid.c_str() )
-                                 return studyRec;
-                         }
-@@ -107,9 +107,9 @@ namespace ImagePool {
-         while ( seriesRec ) {
-             OFString modality;
- 
--            if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == ECC_Normal ) {
-+            if ( seriesRec->findAndGetOFString(DCM_Modality, modality) == EC_Normal ) {
-                 OFString seriesinstanceuid;
--                if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != ECC_Normal ) {
-+                if ( seriesRec->findAndGetOFString(DCM_SeriesInstanceUID, seriesinstanceuid) != EC_Normal ) {
-                     seriesRec = studyRec->nextSub(seriesRec);
-                     continue;
-                 }
-@@ -124,7 +124,7 @@ namespace ImagePool {
-                         switch ( sopRec->getRecordType() ) {
-                         case ERT_Image:
-                         case ERT_StoredPrint:
--                            if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=ECC_Normal ) {
-+                            if ( sopRec->findAndGetElement(DCM_ReferencedFileID, el, true)!=EC_Normal ) {
-                                 sopRec = seriesRec->nextSub(sopRec);
-                                 continue;
-                             }

graphics/aeskulap/files/patch-imagepool_poolassociation.cpp

@@ -1,109 +1,11 @@
---- imagepool/poolassociation.cpp.orig	2014-01-19 07:38:17 UTC
+--- imagepool/poolassociation.cpp.orig	2018-12-12 23:25:10 UTC
 +++ imagepool/poolassociation.cpp
-@@ -72,24 +72,24 @@ Association::~Association()
- 		Drop();
- }
+@@ -120,7 +120,7 @@ OFCondition Association::SendObject(DcmD
+ 	T_DIMSE_C_StoreRSP rsp;
  
--CONDITION Association::Drop(CONDITION cond) {
-+OFCondition Association::Drop(OFCondition cond) {
- 	// tear down association
--	if(cond == DIMSE_NORMAL) {
-+	if(cond == EC_Normal) {
- 		/* release association */
- 		cond = ASC_releaseAssociation(assoc);
- 	}
--	else if(cond == DIMSE_PEERREQUESTEDRELEASE) {
-+	else if(cond == DUL_PEERREQUESTEDRELEASE) {
- 		cond = ASC_abortAssociation(assoc);
--		if (SUCCESS(cond)) {
-+		if (cond.good()) {
- 			return cond;
- 		}
- 	}
--	else if(cond == DIMSE_PEERABORTEDASSOCIATION) {
-+	else if(cond == DUL_PEERABORTEDASSOCIATION) {
- 		return cond;
- 	}
- 	else {
- 		cond = ASC_abortAssociation(assoc);
--		if (SUCCESS(cond)) {
-+		if (cond.good()) {
- 			return cond;
- 		}
- 	}
-@@ -99,7 +99,7 @@ CONDITION Association::Drop(CONDITION co
- }
- 
- void Association::Destroy() {
--	CONDITION cond = ASC_destroyAssociation(&assoc);
-+	OFCondition cond = ASC_destroyAssociation(&assoc);
- 
- 	dcmNet = NULL;
- 	assoc = NULL;
-@@ -110,8 +110,8 @@ void Association::Destroy() {
- 
- }
- 
--CONDITION Association::SendObject(DcmDataset *dataset) {
--	CONDITION cond;
-+OFCondition Association::SendObject(DcmDataset *dataset) {
-+	OFCondition cond;
- 	DcmDataset *statusDetail = NULL;
- 
- 	T_DIMSE_C_StoreRQ req;
-@@ -163,7 +163,7 @@ CONDITION Association::SendObject(DcmDat
- 	if(opt_oxferSyn.getXfer() != ori_oxferSyn) {
- 		std::cout << "Converting object to accepted transfer-syntax " << opt_oxferSyn.getXferName() << std::endl;
- 	
--		CONDITION cond;
-+		OFCondition cond;
- 		// create RepresentationParameter
- 		DJ_RPLossless rp_lossless(6, 0);
- 		DJ_RPLossy rp_lossy(m_CompressionQuality);
-@@ -172,10 +172,18 @@ CONDITION Association::SendObject(DcmDat
- 		
- 		const DcmRepresentationParameter *rp = NULL;
- 
-+#if 0
-+		if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess14) {
-+#else
- 		if(opt_oxferSyn.getXfer() == EXS_JPEGProcess14SV1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess14TransferSyntax) {
-+#endif
- 			rp = &rp_lossless;
- 		}
-+#if 0
-+		else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1 || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4) {
-+#else
- 		else if(opt_oxferSyn.getXfer() == EXS_JPEGProcess1TransferSyntax || opt_oxferSyn.getXfer() == EXS_JPEGProcess2_4TransferSyntax) {
-+#endif
- 			rp = &rp_lossy;
- 		}
- 
-@@ -232,15 +240,15 @@ CONDITION Association::SendObject(DcmDat
- 		delete statusDetail;
- 	}
- 
--	if (cond != DIMSE_NORMAL)
-+	if (cond != EC_Normal)
+ 	// check if we SOPClass and SOPInstance in dataset
+-	if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, sopInstance))
++	if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, strlen(sopClass), sopInstance, strlen(sopInstance)))
  	{
- 		return cond;
+ 		return DIMSE_BADDATA;
  	}
- 
--	return (rsp.DimseStatus == STATUS_Success) ? DIMSE_NORMAL : DIMSE_BADDATA;
-+	return (rsp.DimseStatus == STATUS_Success) ? EC_Normal : DIMSE_BADDATA;
- }
- 
--CONDITION Association::SendObject(DcmFileFormat *dcmff)
-+OFCondition Association::SendObject(DcmFileFormat *dcmff)
- {
- 	DcmDataset* dataset = dcmff->getDataset();
- 	return SendObject(dataset);
-@@ -334,7 +342,7 @@ Network* Association::GetNetwork()
- 	return dcmNet;
- }
- 
--CONDITION Association::Connect(Network *network, int lossy)
-+OFCondition Association::Connect(Network *network, int lossy)
- {
- 	dcmNet = network;
- 	return network->ConnectAssociation(this, lossy);

graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp

@@ -1,22 +1,13 @@
---- imagepool/poolfindassociation.cpp.orig	2014-01-19 07:38:17 UTC
+--- imagepool/poolfindassociation.cpp.orig	2018-12-12 23:22:31 UTC
 +++ imagepool/poolfindassociation.cpp
-@@ -40,8 +40,8 @@ FindAssociation::~FindAssociation() {
- 	DeleteResultStack();
- }
- 
--CONDITION FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) {
--	CONDITION cond;
-+OFCondition FindAssociation::findSCU(T_ASC_Association *assoc, DcmDataset *query) {
-+	OFCondition cond;
- 	DIC_US msgId = assoc->nextMsgID++;
- 	T_ASC_PresentationContextID presId;
- 	T_DIMSE_C_FindRQ req;
-@@ -100,7 +100,7 @@ void FindAssociation::findCallback(void*
- 	caller->OnResponseReceived(response);
- }
- 
--CONDITION FindAssociation::SendObject(DcmDataset *dataset) {
-+OFCondition FindAssociation::SendObject(DcmDataset *dataset) {
- 	return findSCU(assoc, dataset);
- }
+@@ -57,7 +57,10 @@ OFCondition FindAssociation::findSCU(T_A
+ 	req.Priority = DIMSE_PRIORITY_LOW;
+ 	strcpy(req.AffectedSOPClassUID, m_abstractSyntax);
  
++        int responseCount = 0;
++
+ 	cond = DIMSE_findUser(assoc, presId, &req, query, 
++			responseCount,
+ 			findCallback, (void*)this, 
+ 			(m_timeout == 0) ? DIMSE_BLOCKING : DIMSE_NONBLOCKING,
+ 			m_timeout, 

graphics/aeskulap/files/patch-imagepool_poolfindassociation.h

@@ -1,20 +0,0 @@
---- imagepool/poolfindassociation.h.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/poolfindassociation.h
-@@ -45,7 +45,7 @@ public:
- 	/**
- 	Send a query object (C-Find) through association
- 	*/
--	CONDITION SendObject(DcmDataset *dataset);
-+	OFCondition SendObject(DcmDataset *dataset);
- 
- 	/**
- 	Get the result stack of the last query
-@@ -88,7 +88,7 @@ private:
- 	/**
- 	C-Find service class user
- 	*/
--	CONDITION findSCU(T_ASC_Association * assoc, DcmDataset * query);
-+	OFCondition findSCU(T_ASC_Association * assoc, DcmDataset * query);
- 
- 	/**
- 	Callback function for C-Find service class user

graphics/aeskulap/files/patch-imagepool_poolinstance.h

@@ -1,47 +0,0 @@
---- imagepool/poolinstance.h.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/poolinstance.h
-@@ -50,9 +50,9 @@ protected:
- 
- 	Instance(const std::string& sopinstanceuid);
- 
--	friend void ImagePool::remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
-+	friend void remove_instance(const Glib::RefPtr<ImagePool::Instance>&);
- 
--	friend class ImagePool::Loader;
-+	friend class Loader;
- 
- public:
- 
-@@ -131,9 +131,9 @@ public:
- 
- 	int instancenumber();
- 
--	const Glib::RefPtr<ImagePool::Series>& series();
-+	const Glib::RefPtr<Series>& series();
- 
--	const Glib::RefPtr<ImagePool::Study>& study();
-+	const Glib::RefPtr<Study>& study();
- 
- 	const std::string& date();
- 
-@@ -176,7 +176,7 @@ public:
- 
- 	bool has_3d_information();
- 
--	static Glib::RefPtr<ImagePool::Instance> create(DcmDataset* dset);
-+	static Glib::RefPtr<Instance> create(DcmDataset* dset);
- 
- 	int studyrelatedinstances();
- 
-@@ -248,9 +248,9 @@ private:
- 
- 	std::string m_modality;
- 
--	Glib::RefPtr<ImagePool::Series> m_series;
-+	Glib::RefPtr<Series> m_series;
- 
--	Glib::RefPtr<ImagePool::Study> m_study;
-+	Glib::RefPtr<Study> m_study;
- 
- 	std::string m_date;
- 

graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp

@@ -1,64 +1,11 @@
---- imagepool/poolmoveassociation.cpp.orig	2014-01-19 07:38:17 UTC
+--- imagepool/poolmoveassociation.cpp.orig	2018-12-12 23:21:04 UTC
 +++ imagepool/poolmoveassociation.cpp
-@@ -68,7 +68,7 @@ void MoveAssociation::Create(const std::
- 	Association::Create(title, peer, port, ouraet, abstractSyntax);
- }
- 
--CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
-+OFCondition MoveAssociation::SendObject(DcmDataset *dataset) {
- 	return moveSCU(dataset);	
- }
- 
-@@ -79,8 +79,8 @@ void MoveAssociation::OnAddPresentationC
- 	ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer));
- }
- 
--CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) {
--	CONDITION cond;
-+OFCondition MoveAssociation::moveSCU(DcmDataset *pdset) {
-+	OFCondition cond;
- 	T_ASC_PresentationContextID presId;
- 	T_DIMSE_C_MoveRQ req;
- 	T_DIMSE_C_MoveRSP rsp;
-@@ -161,8 +161,8 @@ void MoveAssociation::subOpCallback(void
- 	}
- }
- 
--CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
--	CONDITION cond = ASC_NORMAL;
-+OFCondition MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
-+	OFCondition cond = EC_Normal;
- 	const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass };
- 	const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax };
- 
-@@ -222,7 +222,7 @@ CONDITION MoveAssociation::acceptSubAsso
- 	
- }
- 
--CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
-+OFCondition MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
- 	T_DIMSE_Message msg;
- 	T_ASC_PresentationContextID presID;
- 
-@@ -269,8 +269,8 @@ CONDITION MoveAssociation::subOpSCP(T_AS
- 	return cond;
- }
- 
--CONDITION MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
--	CONDITION cond;
-+OFCondition MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
-+	OFCondition cond;
- 	T_DIMSE_C_StoreRQ* req;
- 	DcmDataset *dset = new DcmDataset;
- 
-@@ -328,8 +328,8 @@ void MoveAssociation::storeSCPCallback(v
- 
- }
- 
--CONDITION MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
--	CONDITION cond;
-+OFCondition MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
-+	OFCondition cond;
- 
- 	// the echo succeeded !!
- 	cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
+@@ -310,7 +310,7 @@ void MoveAssociation::storeSCPCallback(v
+ 		*/
+ 		if (rsp->DimseStatus == STATUS_Success) {
+ 			/* which SOP class and SOP instance ? */
+-			if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, sopInstance)) {
++			if (! DU_findSOPClassAndInstanceInDataSet(cbdata->dataset, sopClass, strlen(sopClass), sopInstance, strlen(sopInstance))) {
+ 				rsp->DimseStatus = STATUS_STORE_Error_CannotUnderstand;
+ 			}
+ 			else if (strcmp(sopClass, req->AffectedSOPClassUID) != 0) {

graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h

@@ -1,34 +0,0 @@
---- imagepool/poolmoveassociation.h.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/poolmoveassociation.h
-@@ -39,7 +39,7 @@ public:
- 
- 	void Create(const std::string& title, const std::string& peer, int port, const std::string& ouraet, /*int ourPort,*/ const char *abstractSyntax = UID_MOVEPatientRootQueryRetrieveInformationModel/*, const char *abstractSyntaxMove = UID_MOVEPatientRootQueryRetrieveInformationModel*/);
- 
--	CONDITION SendObject(DcmDataset *dataset);
-+	OFCondition SendObject(DcmDataset *dataset);
- 
- protected:
- 
-@@ -62,17 +62,17 @@ private:
- 		MoveAssociation* pCaller;
- 	} StoreCallbackInfo;
- 
--	CONDITION moveSCU(DcmDataset *pdset);
-+	OFCondition moveSCU(DcmDataset *pdset);
- 	static void moveCallback(void *callbackData, T_DIMSE_C_MoveRQ *request, int responseCount, T_DIMSE_C_MoveRSP *response);
- 
--	CONDITION acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc);
--	CONDITION subOpSCP(T_ASC_Association **subAssoc);
-+	OFCondition acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc);
-+	OFCondition subOpSCP(T_ASC_Association **subAssoc);
- 	static void subOpCallback(void * pCaller, T_ASC_Network *aNet, T_ASC_Association **subAssoc);
- 
--	CONDITION storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
-+	OFCondition storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
- 	static void storeSCPCallback(void *callbackData, T_DIMSE_StoreProgress *progress, T_DIMSE_C_StoreRQ *req, char *imageFileName, DcmDataset **imageDataSet, T_DIMSE_C_StoreRSP *rsp, DcmDataset **statusDetail);
- 
--	CONDITION echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
-+	OFCondition echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID);
- };
- 
- #endif // IMAGEPOOL_MOVEASSOCIATION_H

graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp

@@ -1,101 +0,0 @@
---- imagepool/poolnetwork.cpp.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/poolnetwork.cpp
-@@ -42,8 +42,8 @@ Network::~Network() {
- 	DropNetwork();
- }
- 
--CONDITION Network::ConnectAssociation(Association* assoc, int lossy) {
--	CONDITION cond;
-+OFCondition Network::ConnectAssociation(Association* assoc, int lossy) {
-+	OFCondition cond;
- 
- 	cond = ASC_ConnectAssociation(
- 						assoc,
-@@ -54,7 +54,7 @@ CONDITION Network::ConnectAssociation(As
- 						assoc->m_abstractSyntax,
- 						lossy);
- 
--	if (!SUCCESS(cond)) {
-+	if (!cond.good()) {
- 		assoc->Drop(cond);
- 		return cond;
- 	}
-@@ -65,7 +65,7 @@ CONDITION Network::ConnectAssociation(As
- 	return cond;
- }
- 
--CONDITION Network::InitializeNetwork(int timeout, int port) {
-+OFCondition Network::InitializeNetwork(int timeout, int port) {
- #ifdef _WIN32
- 	WORD wVersionRequested;
- 	WSADATA wsaData;
-@@ -78,9 +78,9 @@ CONDITION Network::InitializeNetwork(int
- 	return ASC_initializeNetwork(NET_ACCEPTORREQUESTOR, port, timeout, &net);
- }
- 
--CONDITION Network::DropNetwork()
-+OFCondition Network::DropNetwork()
- {
--	CONDITION cond = ASC_dropNetwork(&net);
-+	OFCondition cond = ASC_dropNetwork(&net);
- 	net = NULL;
- 
- #ifdef _WIN32
-@@ -90,9 +90,9 @@ CONDITION Network::DropNetwork()
- 	return cond;
- }
- 
--CONDITION Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy)
-+OFCondition Network::ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax, int lossy)
- {
--    CONDITION cond;
-+    OFCondition cond;
-     T_ASC_Parameters *params;
- 	bool bProposeCompression = assoc->GetProposeCompression();
- 
-@@ -100,7 +100,7 @@ CONDITION Network::ASC_ConnectAssociatio
-     DIC_NODENAME localHost;
- 
-     cond = ASC_createAssociationParameters(&params, ASC_DEFAULTMAXPDU);
--    if (!SUCCESS(cond)) 
-+    if (!cond.good()) 
- 	{
- 		return cond;
-     }
-@@ -155,9 +155,9 @@ CONDITION Network::ASC_ConnectAssociatio
- 
-     /* create association */
-     cond = ASC_requestAssociation(net, params, &(assoc->assoc));
--    if (cond != ASC_NORMAL)
-+    if (cond != EC_Normal)
- 	{
--		if (cond == ASC_ASSOCIATIONREJECTED) 
-+		if (cond == DUL_ASSOCIATIONREJECTED) 
- 		{
- 			T_ASC_RejectParameters rej;
- 
-@@ -178,12 +178,12 @@ CONDITION Network::ASC_ConnectAssociatio
- 		return cond;
-     }
- 
--	return ASC_NORMAL;
-+	return EC_Normal;
- }
- 
--CONDITION Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
-+OFCondition Network::addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression, int lossy)
- {
--    CONDITION cond = ASC_NORMAL;
-+    OFCondition cond = EC_Normal;
-     int i;
-     int pid = 1;
- 
-@@ -232,7 +232,7 @@ CONDITION Network::addAllStoragePresenta
- 	}
- 
- 	/* the array of Storage SOP Class UIDs comes from dcuid.h */
--	for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && SUCCESS(cond); i++) {
-+	for (i=0; i<numberOfAllDcmStorageSOPClassUIDs && cond.good(); i++) {
- 		cond = ASC_addPresentationContext(params, pid, dcmAllStorageSOPClassUIDs[i], transferSyntaxes, transferSyntaxes_count);
- 		pid += 2;	/* only odd presentation context id's */
- 	}

graphics/aeskulap/files/patch-imagepool_poolnetwork.h

@@ -1,38 +0,0 @@
---- imagepool/poolnetwork.h.orig	2014-01-19 07:38:17 UTC
-+++ imagepool/poolnetwork.h
-@@ -43,17 +43,17 @@ public:
- 	/**
- 	Initialize the dicom network
- 	*/
--	CONDITION InitializeNetwork(int timeout=20, int port = 0);
-+	OFCondition InitializeNetwork(int timeout=20, int port = 0);
- 
- 	/**
- 	Drop the dicom network
- 	*/
--	CONDITION DropNetwork();
-+	OFCondition DropNetwork();
- 
- 	/**
- 	Connect an association to the specified host
- 	*/
--	CONDITION ConnectAssociation(Association* assoc, int lossy = 0);
-+	OFCondition ConnectAssociation(Association* assoc, int lossy = 0);
- 
- 	/**
- 	Send C-Echo request to dicom node
-@@ -80,12 +80,12 @@ private:
- 	/**
- 	Add all possible presentation contexts to association parameters
- 	*/
--	static CONDITION addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
-+	static OFCondition addAllStoragePresentationContexts(T_ASC_Parameters *params, bool bProposeCompression = true, int lossy = 0);
- 
- 	/**
- 	Connect to a host and try to establish an association
- 	*/
--	CONDITION ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
-+	OFCondition ASC_ConnectAssociation(Association* assoc, const std::string& peerTitle, const std::string& peer, int port, const std::string& ouraet, const char *abstractSyntax = NULL, int lossy = 0);
- 
- 	/**
- 	THE dicom network

graphics/aeskulap/pkg-plist

@@ -24,7 +24,9 @@ lib/aeskulap/libimagepool.so
 %%DATADIR%%/images/stock-tool-eraser-22.png
 %%DATADIR%%/images/stock-tool-measure-22.png
 %%DATADIR%%/images/stock-tool-scale-22.png
+share/appdata/aeskulap.appdata.xml
 share/applications/aeskulap.desktop
+share/glib-2.0/schemas/org.gnu.aeskulap.gschema.xml
 share/icons/hicolor/64x64/apps/aeskulap.png
 share/icons/hicolor/scalable/apps/aeskulap.svg
 share/locale/de/LC_MESSAGES/aeskulap.mo

graphics/dcmtk/Makefile

@@ -0,0 +1,32 @@
+# Created by: gahr
+# $FreeBSD$
+
+PORTNAME=	dcmtk
+DISTVERSIONPREFIX=	${PORTNAME:tu}-
+DISTVERSION=	3.6.4
+CATEGORIES=	graphics devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	DICOM ToolKit, libraries and applications for DICOM/MEDICOM standard
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
+LIB_DEPENDS=	libicuuc.so:devel/icu \
+		libpng16.so:graphics/png \
+		libtiff.so:graphics/tiff
+
+USES=		cmake:outsource gnome jpeg ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME:tu}
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	DCMTK_WITH_DOXYGEN
+
+OPTIONS_DEFINE=	DOCS
+
+PORTDOCS=	*
+
+.include <bsd.port.mk>

graphics/dcmtk/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1544641785
+SHA256 (DCMTK-dcmtk-DCMTK-3.6.4_GH0.tar.gz) = e4b1de804a3fef38fe8cb9edd00262c3cbbd114b305511c14479dd888a9337d2
+SIZE (DCMTK-dcmtk-DCMTK-3.6.4_GH0.tar.gz) = 6199127

graphics/dcmtk/pkg-descr

@@ -0,0 +1,5 @@
+This DICOM ToolKit (DCMTK) package consists of source code, documentation
+and installation instructions for a set of software libraries and
+applications implementing part of the DICOM/MEDICOM Standard.
+
+WWW: https://dcmtk.org