*/*: sync with upstream

Taken from: HardenedBSD
2018-12-13 08:12:13 +01:00 · 2018-12-13 08:12:13 +01:00 · 010d58db50
parent 7a831ee75e
commit 010d58db50
120 changed files with 2013 additions and 2452 deletions
--- a/accessibility/accerciser/files/patch-src_lib_accerciser-accerciser.py
+++ b/accessibility/accerciser/files/patch-src_lib_accerciser-accerciser.py
@ -0,0 +1,14 @@
+diff --git src/lib/accerciser/accerciser.py src/lib/accerciser/accerciser.py
+index fa6e5c752c2b921ab5cb324b747c0080e65f5f82..065a7fec78c62cb79acdda6fee7adc1097c586cf 100644
+--- src/lib/accerciser/accerciser.py
+++ src/lib/accerciser/accerciser.py
+@@ -103,7 +103,8 @@ class Main(Tools):
+     '''
+     GLib.timeout_add(200, self._pumpEvents)
+     try:
+-      pyatspi.Registry.start(async=True, gil=False)
+      # async is a reserved keyword in Python 3.7+, so we pass the args as dict
+      pyatspi.Registry.start(**{'async': True, 'gil': False})
+     except KeyboardInterrupt:
+       self._shutDown()
+ 
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	upx
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.94
+DISTVERSION=	3.95
 CATEGORIES=	archivers

 MAINTAINER=	fjoe@FreeBSD.org
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@ -1,5 +1,5 @@
-TIMESTAMP = 1532707968
-SHA256 (upx-upx-v3.94_GH0.tar.gz) = 2ddd9d409620b6946319bfdab6cf9d570c6057a89cd5b0b4707fc5e13cc95929
-SIZE (upx-upx-v3.94_GH0.tar.gz) = 1601225
-SHA256 (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 9e9cea6112bd93fbc71c61d1ff068cc324b2d7bb7789043928b68c5d3cc0672d
-SIZE (upx-upx-lzma-sdk-v3.94_GH0.tar.gz) = 109693
+TIMESTAMP = 1544570151
+SHA256 (upx-upx-v3.95_GH0.tar.gz) = fdb79c8238360115770e9c13bdaeb48da6fb09c813b0a461c5f9faee176d6fb9
+SIZE (upx-upx-v3.95_GH0.tar.gz) = 1663470
+SHA256 (upx-upx-lzma-sdk-v3.95_GH0.tar.gz) = 4932ed7b79cf47aa91fe737c068f74553e17033161c7e7e532e4b967f02f1557
+SIZE (upx-upx-lzma-sdk-v3.95_GH0.tar.gz) = 109697
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@ -2,8 +2,8 @@
 # $FreeBSD$

 PORTNAME=	csound
-DISTVERSION=	6.12.2
-PORTREVISION=	3
+DISTVERSION=	6.12.2-83
+DISTVERSIONSUFFIX=	-gdf2edd269
 CATEGORIES=	audio lang

 MAINTAINER=	yuri@FreeBSD.org
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1542488559
-SHA256 (csound-csound-6.12.2_GH0.tar.gz) = 39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff
-SIZE (csound-csound-6.12.2_GH0.tar.gz) = 26297850
+TIMESTAMP = 1544642888
+SHA256 (csound-csound-6.12.2-83-gdf2edd269_GH0.tar.gz) = e14038c44fd954bea0fcb34af994757ca5f4fe75f99c80a1e8df867d5b9e7eee
+SIZE (csound-csound-6.12.2-83-gdf2edd269_GH0.tar.gz) = 26295519
--- a/audio/csound/files/patch-CMakeLists.txt
+++ b/audio/csound/files/patch-CMakeLists.txt
@ -1,4 +1,4 @@
--- CMakeLists.txt.orig	2018-11-07 14:05:23 UTC
+--- CMakeLists.txt.orig	2018-12-12 19:23:43 UTC
 +++ CMakeLists.txt
@@ -164,8 +164,8 @@ endif()
 
@ -35,7 +35,7 @@
     set(LINUX YES)
 else()
     set(LINUX NO)
-@@ -527,15 +527,17 @@ find_package(FLTK )
+@@ -527,9 +527,11 @@ find_package(FLTK )
 #        LIST_REPLACE(FLTK_LIBRARIES 2 "fltk_images_SHARED")
 #    endif()
 #endif()
@ -43,13 +43,15 @@
 -find_package(Java)
 -find_package(JNI)
 +if (BUILD_FAUST_OPCODES)
-+    find_package(FAUST)
+  find_package(FAUST)
 +endif()
 +#find_package(Java)
 +#find_package(JNI)
 find_package(LIBLO)
 find_package(LUAJIT)
 find_package(MUSICXML)
+@@ -540,7 +542,7 @@ find_package(MUSICXML)
+ 
 find_package(PORTSMF)
 find_package(PythonLibs 2.7)
 -if(NOT STK_LOCAL)
@ -57,7 +59,7 @@
     find_package(STK)
 endif()
 find_package(SWIG)
-@@ -1245,11 +1247,11 @@ if(CURL_FOUND)
+@@ -1251,11 +1253,11 @@ if(USE_CURL AND CURL_FOUND)
 endif()
 
 # Linux does not have a separate libintl, it is part of libc
@ -71,7 +73,7 @@
         list(APPEND libcsound_LIBS ${LIBINTL_LIBRARY})
     endif()
     list(APPEND libcsound_CFLAGS -DGNU_GETTEXT)
-@@ -1269,8 +1271,8 @@ endif()
+@@ -1275,8 +1277,8 @@ endif()
 
 if(LINUX)
     message(STATUS "Building on Linux.")
--- a/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake
+++ b/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake
@ -1,4 +1,4 @@
--- cmake/Modules/FindFAUST.cmake.orig	2018-11-17 16:56:13 UTC
+--- cmake/Modules/FindFAUST.cmake.orig	2018-12-12 19:23:43 UTC
 +++ cmake/Modules/FindFAUST.cmake
@@ -27,7 +27,7 @@ if(FAUST_FOUND)
         # This is a static build of faust, hence
@ -7,5 +7,5 @@
 -        find_program(LLVM_CONFIG llvm-config HINTS /usr/bin /usr/local/bin /usr/local/opt/llvm/bin)
 +        find_program(LLVM_CONFIG llvm-config${FAUST_LLVM_VERSION} HINTS /usr/bin /usr/local/bin /usr/local/opt/llvm/bin)
         if(NOT LLVM_CONFIG)
-             message(FATAL_ERROR "Using a static Faust library requires LLVM tooling to be present in the path")
-         endif()
+             message(WARNING "Using a static Faust library requires LLVM tooling to be present in the path.")
+             UNSET(FAUST_FOUND)
--- a/audio/synthv1-lv2/Makefile
+++ b/audio/synthv1-lv2/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	synthv1
 DISTVERSIONPREFIX=	${PORTNAME}_
-DISTVERSION=	0_9_3
+DISTVERSION=	0_9_4
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2

--- a/audio/synthv1-lv2/distinfo
+++ b/audio/synthv1-lv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1540761275
-SHA256 (rncbc-synthv1-synthv1_0_9_3_GH0.tar.gz) = 70f3e3bb5a6a828f7fb4f4225a16360f9738a3c40ffcaad6c51c4c0321c086ca
-SIZE (rncbc-synthv1-synthv1_0_9_3_GH0.tar.gz) = 209305
+TIMESTAMP = 1544634972
+SHA256 (rncbc-synthv1-synthv1_0_9_4_GH0.tar.gz) = 236eff9062d8920271f18ea2de54793d7489489196fb52ea1f887021cad9af99
+SIZE (rncbc-synthv1-synthv1_0_9_4_GH0.tar.gz) = 209063
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@ -4,9 +4,9 @@
 PORTNAME=	polygraph
 DISTVERSION=	4.13.0
 PORTREVISION=	1
-DISTVERSIONSUFFIX=	-src
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://www.web-polygraph.org/downloads/srcs/
+EXTRACT_SUFX=	-src.tgz

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Benchmarking tool for Web proxies
@ -14,12 +14,7 @@ COMMENT=	Benchmarking tool for Web proxies
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	configure: error: OpenSSL libraries and/or directories were not found in /usr/local
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USES=		gmake ncurses shebangfix tar:tgz
+USES=		gmake ncurses shebangfix
 SHEBANG_FILES=	tools/*.pl
 USE_GCC=	any
 GNU_CONFIGURE=	yes
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@ -16,9 +16,6 @@ LICENSE_NAME=	American Radio Relay League, Inc. All rights reserved.
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	member access into incomplete type 'EVP_PKEY' (aka 'evp_pkey_st')
-
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libexpat.so:textproc/expat2 \
 		liblmdb.so:databases/lmdb
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@ -12,9 +12,6 @@ COMMENT=	Lightweight connection pooler for PostgreSQL

 LICENSE=	BSD2CLAUSE

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	variable has incomplete type 'X509_STORE_CTX' (aka 'struct x509_store_ctx_st')
-
 LIB_DEPENDS=	libevent.so:devel/libevent
 BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:textproc/gsed

--- a/databases/py-python-arango/Makefile
+++ b/databases/py-python-arango/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	python-arango
-DISTVERSION=	4.2.1
+DISTVERSION=	4.3.0
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/databases/py-python-arango/distinfo
+++ b/databases/py-python-arango/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1529257297
-SHA256 (python-arango-4.2.1.tar.gz) = 3f2e98d0fb88ac31af1031ed09cf327609ba0bb110b8d615ef5566fee87e2c38
-SIZE (python-arango-4.2.1.tar.gz) = 53999
+TIMESTAMP = 1544635733
+SHA256 (python-arango-4.3.0.tar.gz) = 9b479ea552194ecfc964021d064ec24518a8008215fb4a22e9268355d1617b63
+SIZE (python-arango-4.3.0.tar.gz) = 55253
--- a/devel/Makefile
+++ b/devel/Makefile
@ -434,7 +434,6 @@
    SUBDIR += dbus-tcl
    SUBDIR += dcd-client
    SUBDIR += dcd-server
-    SUBDIR += dcmtk
    SUBDIR += dconf
    SUBDIR += dconf-editor
    SUBDIR += ddd
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	binutils
 PORTVERSION=	2.30
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases
--- a/devel/dcmtk/Makefile
+++ b/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>
--- a/devel/dcmtk/distinfo
+++ b/devel/dcmtk/distinfo
@ -1,2 +0,0 @@
-SHA256 (dcmtk-3.6.0.tar.gz) = cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a
-SIZE (dcmtk-3.6.0.tar.gz) = 4673121
--- a/devel/dcmtk/files/patch-BuildLibrary
+++ b/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})
--- a/devel/dcmtk/files/patch-clang
+++ b/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 );
--- a/devel/dcmtk/files/patch-cmake-CMakeLists.txt
+++ b/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
- #-----------------------------------------------------------------------------
- 
--- a/devel/dcmtk/files/patch-dcmtls_libsrc_tlslayer.cc
+++ b/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);
-     }
--- a/devel/dcmtk/files/patch-id2
+++ b/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)
--- a/devel/dcmtk/files/patch-ofstd_libsrc_oflist.cc
+++ b/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,
--- a/devel/dcmtk/pkg-descr
+++ b/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
--- a/devel/dcmtk/pkg-plist
+++ b/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
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	maven
-DISTVERSION=	3.5.4
+DISTVERSION=	3.6.0
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@ -15,10 +15,10 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	mvn:devel/maven-wrapper

 USES=		cpe
+USE_JAVA=	yes
+
 CPE_PRODUCT=	maven
 CPE_VENDOR=	apache
-
-USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 NO_BUILD=	yes
 NO_ARCH=	yes
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1530049274
-SHA256 (apache-maven-3.5.4-bin.tar.gz) = ce50b1c91364cb77efe3776f756a6d92b76d9038b0a0782f7d53acf1e997a14d
-SIZE (apache-maven-3.5.4-bin.tar.gz) = 8842660
+TIMESTAMP = 1544639955
+SHA256 (apache-maven-3.6.0-bin.tar.gz) = 6a1b346af36a1f1a491c1c1a141667c5de69b42e6611d3687df26868bc0f4637
+SIZE (apache-maven-3.6.0-bin.tar.gz) = 9063587
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@ -1,4 +1,4 @@
-%%ETCDIR%%-wrapper/instances.d/maven-3.5.4
+%%ETCDIR%%-wrapper/instances.d/maven-3.6.0
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
@ -12,84 +12,59 @@
 %%DATADIR%%/conf/logging/simplelogger.properties
 %%DATADIR%%/conf/settings.xml
 %%DATADIR%%/conf/toolchains.xml
+%%DATADIR%%/lib/animal-sniffer-annotations-1.14.jar
+%%DATADIR%%/lib/animal-sniffer-annotations.license
 %%DATADIR%%/lib/aopalliance-1.0.jar
 %%DATADIR%%/lib/cdi-api-1.0.jar
-%%DATADIR%%/lib/cdi-api.license
+%%DATADIR%%/lib/checker-compat-qual-2.0.0.jar
+%%DATADIR%%/lib/checker-compat-qual.license
 %%DATADIR%%/lib/commons-cli-1.4.jar
-%%DATADIR%%/lib/commons-cli.license
 %%DATADIR%%/lib/commons-io-2.5.jar
-%%DATADIR%%/lib/commons-io.license
-%%DATADIR%%/lib/commons-lang3-3.5.jar
-%%DATADIR%%/lib/commons-lang3.license
+%%DATADIR%%/lib/commons-lang3-3.8.1.jar
+%%DATADIR%%/lib/error_prone_annotations-2.1.3.jar
 %%DATADIR%%/lib/ext/README.txt
-%%DATADIR%%/lib/guava-20.0.jar
-%%DATADIR%%/lib/guice-4.2.0-no_aop.jar
+%%DATADIR%%/lib/guava-25.1-android.jar
+%%DATADIR%%/lib/guice-4.2.1-no_aop.jar
+%%DATADIR%%/lib/j2objc-annotations-1.1.jar
 %%DATADIR%%/lib/jansi-1.17.1.jar
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jcl-over-slf4j.license
 %%DATADIR%%/lib/jsr250-api-1.0.jar
 %%DATADIR%%/lib/jsr250-api.license
-%%DATADIR%%/lib/maven-artifact-3.5.4.jar
-%%DATADIR%%/lib/maven-artifact.license
-%%DATADIR%%/lib/maven-builder-support-3.5.4.jar
-%%DATADIR%%/lib/maven-builder-support.license
-%%DATADIR%%/lib/maven-compat-3.5.4.jar
-%%DATADIR%%/lib/maven-compat.license
-%%DATADIR%%/lib/maven-core-3.5.4.jar
-%%DATADIR%%/lib/maven-core.license
-%%DATADIR%%/lib/maven-embedder-3.5.4.jar
-%%DATADIR%%/lib/maven-embedder.license
-%%DATADIR%%/lib/maven-model-3.5.4.jar
-%%DATADIR%%/lib/maven-model-builder-3.5.4.jar
-%%DATADIR%%/lib/maven-model-builder.license
-%%DATADIR%%/lib/maven-model.license
-%%DATADIR%%/lib/maven-plugin-api-3.5.4.jar
-%%DATADIR%%/lib/maven-plugin-api.license
-%%DATADIR%%/lib/maven-repository-metadata-3.5.4.jar
-%%DATADIR%%/lib/maven-repository-metadata.license
-%%DATADIR%%/lib/maven-resolver-api-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-api.license
-%%DATADIR%%/lib/maven-resolver-connector-basic-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-connector-basic.license
-%%DATADIR%%/lib/maven-resolver-impl-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-impl.license
-%%DATADIR%%/lib/maven-resolver-provider-3.5.4.jar
-%%DATADIR%%/lib/maven-resolver-provider.license
-%%DATADIR%%/lib/maven-resolver-spi-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-spi.license
-%%DATADIR%%/lib/maven-resolver-transport-wagon-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-transport-wagon.license
-%%DATADIR%%/lib/maven-resolver-util-1.1.1.jar
-%%DATADIR%%/lib/maven-resolver-util.license
-%%DATADIR%%/lib/maven-settings-3.5.4.jar
-%%DATADIR%%/lib/maven-settings-builder-3.5.4.jar
-%%DATADIR%%/lib/maven-settings-builder.license
-%%DATADIR%%/lib/maven-settings.license
+%%DATADIR%%/lib/jsr305-3.0.2.jar
+%%DATADIR%%/lib/maven-artifact-3.6.0.jar
+%%DATADIR%%/lib/maven-builder-support-3.6.0.jar
+%%DATADIR%%/lib/maven-compat-3.6.0.jar
+%%DATADIR%%/lib/maven-core-3.6.0.jar
+%%DATADIR%%/lib/maven-embedder-3.6.0.jar
+%%DATADIR%%/lib/maven-model-3.6.0.jar
+%%DATADIR%%/lib/maven-model-builder-3.6.0.jar
+%%DATADIR%%/lib/maven-plugin-api-3.6.0.jar
+%%DATADIR%%/lib/maven-repository-metadata-3.6.0.jar
+%%DATADIR%%/lib/maven-resolver-api-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-connector-basic-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-impl-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-provider-3.6.0.jar
+%%DATADIR%%/lib/maven-resolver-spi-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-transport-wagon-1.3.1.jar
+%%DATADIR%%/lib/maven-resolver-util-1.3.1.jar
+%%DATADIR%%/lib/maven-settings-3.6.0.jar
+%%DATADIR%%/lib/maven-settings-builder-3.6.0.jar
 %%DATADIR%%/lib/maven-shared-utils-3.2.1.jar
-%%DATADIR%%/lib/maven-shared-utils.license
-%%DATADIR%%/lib/maven-slf4j-provider-3.5.4.jar
-%%DATADIR%%/lib/maven-slf4j-provider.license
+%%DATADIR%%/lib/maven-slf4j-provider-3.6.0.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.3.jar
 %%DATADIR%%/lib/org.eclipse.sisu.inject.license
 %%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.3.jar
 %%DATADIR%%/lib/org.eclipse.sisu.plexus.license
 %%DATADIR%%/lib/plexus-cipher-1.7.jar
-%%DATADIR%%/lib/plexus-cipher.license
 %%DATADIR%%/lib/plexus-component-annotations-1.7.1.jar
-%%DATADIR%%/lib/plexus-component-annotations.license
-%%DATADIR%%/lib/plexus-interpolation-1.24.jar
-%%DATADIR%%/lib/plexus-interpolation.license
+%%DATADIR%%/lib/plexus-interpolation-1.25.jar
 %%DATADIR%%/lib/plexus-sec-dispatcher-1.4.jar
-%%DATADIR%%/lib/plexus-sec-dispatcher.license
 %%DATADIR%%/lib/plexus-utils-3.1.0.jar
-%%DATADIR%%/lib/plexus-utils.license
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
 %%DATADIR%%/lib/slf4j-api.license
-%%DATADIR%%/lib/wagon-file-3.1.0.jar
-%%DATADIR%%/lib/wagon-file.license
-%%DATADIR%%/lib/wagon-http-3.1.0-shaded.jar
-%%DATADIR%%/lib/wagon-http.license
-%%DATADIR%%/lib/wagon-provider-api-3.1.0.jar
-%%DATADIR%%/lib/wagon-provider-api.license
-%%DATADIR%%/maven-3.5.4
+%%DATADIR%%/lib/wagon-file-3.2.0.jar
+%%DATADIR%%/lib/wagon-http-3.2.0-shaded.jar
+%%DATADIR%%/lib/wagon-provider-api-3.2.0.jar
+%%DATADIR%%/maven-3.6.0
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@ -12,9 +12,6 @@ COMMENT=	Cross platform C++ library, used by OPAL

 LICENSE=	MPL10

-BROKEN_SSL=	openssl111
-BROKEN_SSL_REASON_openssl111=	use of undeclared identifier 'BIO_s_file_internal'
-
 LIB_DEPENDS=	libexpat.so:textproc/expat2

 CONFLICTS=	pwlib-1.*
@ -48,7 +45,7 @@ DEBUG_DESC=	Install debug library

 .include <bsd.port.options.mk>

-.if ${OSVERSION} > 1200085
+.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl111
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx-openssl111
 .else
 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_ptclib_pssl.cxx
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@ -2,7 +2,8 @@
 # $FreeBSD$

 PORTNAME=	wine
-PORTVERSION=	3.20
+PORTVERSION=	4.0.r1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
@ -64,7 +65,7 @@ PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
 .endif
 .endfor

-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200500 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000))
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000))
 IGNORE=		binaries compiled for FreeBSD 11.2+, 12.0+ and -current only
 DISTFILES=
 .endif
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1543047666
-SHA256 (freebsd:11:x86:64/i386-wine-devel-3.20,1.txz) = a45910b024c8fad338fb942a1dbcc69871e52294e5c980f2e821800db2954180
-SIZE (freebsd:11:x86:64/i386-wine-devel-3.20,1.txz) = 65311304
-SHA256 (freebsd:12:x86:64/i386-wine-devel-3.20,1.txz) = b8ece2e2282a8ef6ecae8122b53c05785b8128eda751a0d48b16c824fd6c7b90
-SIZE (freebsd:12:x86:64/i386-wine-devel-3.20,1.txz) = 65846388
-SHA256 (freebsd:13:x86:64/i386-wine-devel-3.20,1.txz) = df5b25ae2a6370adc4e32290d792c8d55d11e5d755fc02f3b1c7fb630df4a182
-SIZE (freebsd:13:x86:64/i386-wine-devel-3.20,1.txz) = 65878868
+TIMESTAMP = 1544680104
+SHA256 (freebsd:11:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = eb8dc579927b5ef72f395ebbb343e0c4cada8f0a258fbf716e378a6f5aba8d91
+SIZE (freebsd:11:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = 65382376
+SHA256 (freebsd:12:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = 7447f260b442de8258a4ac3b8154e0fbf8e18576e31e105184b7ac3db482cf9d
+SIZE (freebsd:12:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = 65936612
+SHA256 (freebsd:13:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = 3b38d349a7e74109c38ab0c1ce3f33a6ade5545ad2eccca673c127c86cbb3cb1
+SIZE (freebsd:13:x86:64/i386-wine-devel-4.0.r1_1,1.txz) = 65982284
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@ -643,6 +643,7 @@ include/wine/windows/ntddcdrm.h
 include/wine/windows/ntddndis.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
+include/wine/windows/ntddvdeo.h
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
 include/wine/windows/ntlsa.h
@ -713,6 +714,7 @@ include/wine/windows/pstore.h
 include/wine/windows/pstore.idl
 include/wine/windows/qedit.h
 include/wine/windows/qedit.idl
+include/wine/windows/qos2.h
 include/wine/windows/ras.h
 include/wine/windows/rasdlg.h
 include/wine/windows/raserror.h
@ -1456,6 +1458,7 @@ lib32/wine/ext-ms-win-ntuser-draw-l1-1-0.dll.so
 lib32/wine/ext-ms-win-ntuser-gui-l1-3-0.dll.so
 lib32/wine/ext-ms-win-ntuser-keyboard-l1-3-0.dll.so
 lib32/wine/ext-ms-win-ntuser-message-l1-1-1.dll.so
+lib32/wine/ext-ms-win-ntuser-misc-l1-2-0.dll.so
 lib32/wine/ext-ms-win-ntuser-misc-l1-5-1.dll.so
 lib32/wine/ext-ms-win-ntuser-mouse-l1-1-0.dll.so
 lib32/wine/ext-ms-win-ntuser-private-l1-1-1.dll.so
@ -1885,6 +1888,7 @@ lib32/wine/fakedlls/ext-ms-win-ntuser-draw-l1-1-0.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-gui-l1-3-0.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-keyboard-l1-3-0.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-message-l1-1-1.dll
+lib32/wine/fakedlls/ext-ms-win-ntuser-misc-l1-2-0.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-misc-l1-5-1.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-mouse-l1-1-0.dll
 lib32/wine/fakedlls/ext-ms-win-ntuser-private-l1-1-1.dll
@ -2230,6 +2234,7 @@ lib32/wine/fakedlls/traffic.dll
 lib32/wine/fakedlls/twain.dll16
 lib32/wine/fakedlls/twain_32.dll
 lib32/wine/fakedlls/typelib.dll16
+lib32/wine/fakedlls/tzres.dll
 lib32/wine/fakedlls/ucrtbase.dll
 lib32/wine/fakedlls/uiautomationcore.dll
 lib32/wine/fakedlls/uiribbon.dll
@ -2870,6 +2875,7 @@ lib32/wine/traffic.dll.so
 lib32/wine/twain.dll16.so
 lib32/wine/twain_32.dll.so
 lib32/wine/typelib.dll16.so
+lib32/wine/tzres.dll.so
 lib32/wine/ucrtbase.dll.so
 lib32/wine/uiautomationcore.dll.so
 lib32/wine/uiribbon.dll.so
--- a/emulators/i386-wine/Makefile.inc
+++ b/emulators/i386-wine/Makefile.inc
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	wine
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
@ -58,7 +58,7 @@ PLIST_SUB+=	OSREL${osrel}="@comment "
 .endif
 .endfor

-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200500 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000))
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1102000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000))
 IGNORE=		binaries compiled for FreeBSD 11.2+, 12.0+ and -current only
 DISTFILES=
 .endif
--- a/emulators/i386-wine/distinfo
+++ b/emulators/i386-wine/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1543047550
-SHA256 (freebsd:11:x86:64/i386-wine-3.0.3_1,1.txz) = 043d3dee2ba5b5db707c1319d83cdbe914ade38c2b6833576fa763db198083cd
-SIZE (freebsd:11:x86:64/i386-wine-3.0.3_1,1.txz) = 62767876
-SHA256 (freebsd:12:x86:64/i386-wine-3.0.3_1,1.txz) = a22ff691ed71b445df282c84f50585aea2883e333b084893688ea964c09bd367
-SIZE (freebsd:12:x86:64/i386-wine-3.0.3_1,1.txz) = 63302948
-SHA256 (freebsd:13:x86:64/i386-wine-3.0.3_1,1.txz) = 2e93d528108d56d7c431d9271fc0750589263cb8899fdf3ae1ce18826635b099
-SIZE (freebsd:13:x86:64/i386-wine-3.0.3_1,1.txz) = 63310956
+TIMESTAMP = 1544679897
+SHA256 (freebsd:11:x86:64/i386-wine-3.0.4_1,1.txz) = fa07f56635e21e510dbefc8283adf672c5c4edefbb9afa16c096cb0fe86d5986
+SIZE (freebsd:11:x86:64/i386-wine-3.0.4_1,1.txz) = 63947036
+SHA256 (freebsd:12:x86:64/i386-wine-3.0.4_1,1.txz) = 4c1ed8d80b46c8db08a4240eb119535e33b4af6e2070491da0e9a0ec21251263
+SIZE (freebsd:12:x86:64/i386-wine-3.0.4_1,1.txz) = 64474636
+SHA256 (freebsd:13:x86:64/i386-wine-3.0.4_1,1.txz) = ef59c7ad96ece30e781fc61dbe61c5c973f4d46a9bdeb556d5ffef44ce3b12e5
+SIZE (freebsd:13:x86:64/i386-wine-3.0.4_1,1.txz) = 64524548
--- a/emulators/i386-wine/pkg-plist
+++ b/emulators/i386-wine/pkg-plist
@ -834,6 +834,7 @@ include/wine/windows/ver.h
 include/wine/windows/verrsrc.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
+include/wine/windows/virtdisk.h
 include/wine/windows/vmr9.h
 include/wine/windows/vmr9.idl
 include/wine/windows/vmrender.idl
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@ -2,9 +2,8 @@

 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.5-1109
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g1ca02c7d1
+DISTVERSION=	0.0.5-1116
+DISTVERSIONSUFFIX=	-g76f94940c
 CATEGORIES=	emulators

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/emulators/rpcs3/distinfo
+++ b/emulators/rpcs3/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1544464223
-SHA256 (RPCS3-rpcs3-v0.0.5-1109-g1ca02c7d1_GH0.tar.gz) = a6a1a2960d6c9bbf99657d1376a1c0237728b9904ceaa35c731943ceecd58f7c
-SIZE (RPCS3-rpcs3-v0.0.5-1109-g1ca02c7d1_GH0.tar.gz) = 5028354
+TIMESTAMP = 1544557030
+SHA256 (RPCS3-rpcs3-v0.0.5-1116-g76f94940c_GH0.tar.gz) = 423717f2193c020ed717cd01e3787aa20d11111d085bd41fad74ad11cd28acf9
+SIZE (RPCS3-rpcs3-v0.0.5-1116-g76f94940c_GH0.tar.gz) = 5030401
 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5
 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400
 SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce
--- a/games/openspades/Makefile
+++ b/games/openspades/Makefile
@ -18,8 +18,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	convert:graphics/ImageMagick6 # for building icons
 LIB_DEPENDS=	libcurl.so:ftp/curl

-NOT_FOR_ARCHS=		aarch64 powerpc64
-NOT_FOR_ARCHS_REASON=	fails to compile: uses x86 assembly
+BROKEN_aarch64=		fails to compile: uses x86 assembly
+BROKEN_powerpc64=	fails to compile: uses x86 assembly

 USE_GITHUB=	yes
 GH_ACCOUNT=	yvt
--- a/games/voxelands/Makefile
+++ b/games/voxelands/Makefile
@ -13,12 +13,11 @@ COMMENT?=		Fun-Focused voxel world game
 LICENSE=		GPLv3+

 BROKEN=			fails to build
+BROKEN_powerpc64=	fails to link: sibling call optimization does not allow automatic multiple TOCs

 LIB_DEPENDS=		libIrrlicht.so:x11-toolkits/irrlicht \
 			libfreetype.so:print/freetype2

-BROKEN_powerpc64=	fails to link: sibling call optimization does not allow automatic multiple TOCs
-
 USES=			cmake tar:bzip2
 LLD_UNSAFE=		yes

--- a/games/zdoom/Makefile
+++ b/games/zdoom/Makefile
@ -19,8 +19,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libsndfile.so:audio/libsndfile

-NOT_FOR_ARCHS=		powerpc64
-NOT_FOR_ARCHS_REASON=	fails to compile: invokes x86 assembly
+BROKEN_powerpc64=	fails to compile: invokes x86 assembly

 USE_GITHUB=	yes
 GH_ACCOUNT=	rheit
--- a/graphics/ImageMagick6/Makefile
+++ b/graphics/ImageMagick6/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.10-14
-PORTREVISION=	2
+DISTVERSION=	6.9.10-16
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
--- a/graphics/ImageMagick6/distinfo
+++ b/graphics/ImageMagick6/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1541454920
-SHA256 (ImageMagick-6.9.10-14.tar.xz) = d123d4ad4e5bf72c51a6f528a2dbbbd4bf4249f25b36045017c9c634db968e6d
-SIZE (ImageMagick-6.9.10-14.tar.xz) = 8931552
+TIMESTAMP = 1544635602
+SHA256 (ImageMagick-6.9.10-16.tar.xz) = 3dd570fd1b770fbdf30015131ca1ad06606a340b04a348d4276d509493d98bfa
+SIZE (ImageMagick-6.9.10-16.tar.xz) = 8929036
--- a/graphics/ImageMagick6/files/patch-coders_icon.c
+++ b/graphics/ImageMagick6/files/patch-coders_icon.c
@ -1,24 +0,0 @@
-From e08e321e2a763325329e5c4748ef374ec9e3b76a Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sun, 18 Nov 2018 17:40:50 -0500
-Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1386
-
---
- coders/icon.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/coders/icon.c b/coders/icon.c
-index 5f4657f6f..c9b748d77 100644
--- coders/icon.c
-+++ coders/icon.c
-@@ -372,8 +372,8 @@ static Image *ReadICONImage(const ImageInfo *image_info,
-         png[13]=(unsigned char) (icon_info.planes >> 8);
-         png[14]=(unsigned char) icon_info.bits_per_pixel;
-         png[15]=(unsigned char) (icon_info.bits_per_pixel >> 8);
-        count=ReadBlob(image,length,png+16);
-        if (count != (ssize_t) length)
-+        count=ReadBlob(image,length-16,png+16);
-+        if (count != (ssize_t) (length-16))
-           {
-             png=(unsigned char *) RelinquishMagickMemory(png);
-             ThrowReaderException(CorruptImageError,
--- a/graphics/ImageMagick6/files/patch-configure
+++ b/graphics/ImageMagick6/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	2018-11-20 17:30:00.562966000 +0100
-+++ configure	2018-11-20 17:30:07.703770000 +0100
-@@ -36930,7 +36930,7 @@
- MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
- MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
- MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
-+MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
- 
- 
- 
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	ImageMagick
-DISTVERSION=	7.0.8-14
-PORTREVISION=	2
+DISTVERSION=	7.0.8-16
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/legacy/ \
--- a/graphics/ImageMagick7/distinfo
+++ b/graphics/ImageMagick7/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1541880044
-SHA256 (ImageMagick-7.0.8-14.tar.xz) = 70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1
-SIZE (ImageMagick-7.0.8-14.tar.xz) = 8634400
+TIMESTAMP = 1544635868
+SHA256 (ImageMagick-7.0.8-16.tar.xz) = 2d4713956fb11d500681da5b32a3243d5d5823551dfdfeb62ba8e5959244e951
+SIZE (ImageMagick-7.0.8-16.tar.xz) = 8646148
--- a/graphics/ImageMagick7/files/patch-coders_icon.c
+++ b/graphics/ImageMagick7/files/patch-coders_icon.c
@ -1,24 +0,0 @@
-From 08761138f4b3ee4d174ee4297983839c55382349 Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sun, 18 Nov 2018 17:39:53 -0500
-Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1386
-
---
- coders/icon.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/coders/icon.c b/coders/icon.c
-index fa35021cd5..e32c7392f8 100644
--- coders/icon.c
-+++ coders/icon.c
-@@ -367,8 +367,8 @@ static Image *ReadICONImage(const ImageInfo *image_info,
-         png[13]=(unsigned char) (icon_info.planes >> 8);
-         png[14]=(unsigned char) icon_info.bits_per_pixel;
-         png[15]=(unsigned char) (icon_info.bits_per_pixel >> 8);
-        count=ReadBlob(image,length,png+16);
-        if (count != (ssize_t) length)
-+        count=ReadBlob(image,length-16,png+16);
-+        if (count != (ssize_t) (length-16))
-           {
-             png=(unsigned char *) RelinquishMagickMemory(png);
-             ThrowReaderException(CorruptImageError,
--- a/graphics/ImageMagick7/files/patch-config_policy.xml
+++ b/graphics/ImageMagick7/files/patch-config_policy.xml
@ -12,6 +12,6 @@ Upstream doesn't disable these by default.
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
 +  <policy domain="coder" rights="none" pattern="MVG" />
 +  <policy domain="coder" rights="none" pattern="MSL" />
-   <!-- <policy domain="resource" name="area" value="100MP"/> -->
-   <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
-   <!-- <policy domain="resource" name="file" value="768"/> -->
+   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
+   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
--- a/graphics/ImageMagick7/files/patch-configure
+++ b/graphics/ImageMagick7/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	2018-11-20 17:30:38.038076000 +0100
-+++ configure	2018-11-20 17:30:45.393294000 +0100
-@@ -36948,7 +36948,7 @@
- MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
- MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
- MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
-+MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
- 
- 
- 
--- a/graphics/ImageMagick7/pkg-plist
+++ b/graphics/ImageMagick7/pkg-plist
@ -188,6 +188,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/clip.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cmyk.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cmyk.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cube.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cube.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cut.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cut.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/dcm.la
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -121,6 +121,7 @@
    SUBDIR += darktable
    SUBDIR += dataplot
    SUBDIR += dc20pack
+    SUBDIR += dcmtk
    SUBDIR += dcp2icc
    SUBDIR += dcraw
    SUBDIR += dcraw-m
--- a/graphics/aeskulap/Makefile
+++ b/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
--- a/graphics/aeskulap/distinfo
+++ b/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
--- a/graphics/aeskulap/files/patch-configure.in
+++ b/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"
--- a/graphics/aeskulap/files/patch-imagepool_dicomdir.cpp
+++ b/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
--- a/graphics/aeskulap/files/patch-imagepool_dicomdirloader.cpp
+++ b/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;
-                             }
--- a/graphics/aeskulap/files/patch-imagepool_poolassociation.cpp
+++ b/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);
--- a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.cpp
+++ b/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, 
--- a/graphics/aeskulap/files/patch-imagepool_poolfindassociation.h
+++ b/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
--- a/graphics/aeskulap/files/patch-imagepool_poolinstance.h
+++ b/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;
- 
--- a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.cpp
+++ b/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) {
--- a/graphics/aeskulap/files/patch-imagepool_poolmoveassociation.h
+++ b/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
--- a/graphics/aeskulap/files/patch-imagepool_poolnetwork.cpp
+++ b/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 */
- 	}
--- a/graphics/aeskulap/files/patch-imagepool_poolnetwork.h
+++ b/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
--- a/graphics/aeskulap/pkg-plist
+++ b/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
--- a/graphics/dcmtk/Makefile
+++ b/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>
--- a/graphics/dcmtk/distinfo
+++ b/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
--- a/graphics/dcmtk/pkg-descr
+++ b/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
--- a/graphics/dcmtk/pkg-plist
+++ b/graphics/dcmtk/pkg-plist
--- a/lang/gcc9-devel/Makefile
+++ b/lang/gcc9-devel/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcc
-PORTVERSION=	9.0.0.s20181202
-PORTREVISION=	1
+PORTVERSION=	9.0.0.s20181209
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
--- a/lang/gcc9-devel/distinfo
+++ b/lang/gcc9-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1543791048
-SHA256 (gcc-9-20181202.tar.xz) = 02846fd3d047180f4df84d043b367ad5fbdb9891a744000955797eaf5b2ca202
-SIZE (gcc-9-20181202.tar.xz) = 67269888
+TIMESTAMP = 1544431339
+SHA256 (gcc-9-20181209.tar.xz) = a9b0cd8be0f73aece502934558293b36aa8e68da38af8f30625ff6986104d6df
+SIZE (gcc-9-20181209.tar.xz) = 67308780
--- a/lang/gravity/Makefile
+++ b/lang/gravity/Makefile
@ -1,7 +1,8 @@
 # $FreeBSD$

 PORTNAME=	gravity
-DISTVERSION=	0.5.9
+DISTVERSION=	0.6.0-2
+DISTVERSIONSUFFIX=	-g9d02289
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-lang

@ -19,7 +20,4 @@ LDFLAGS+=	-lm

 PLIST_FILES=	bin/${PORTNAME}

-do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-
 .include <bsd.port.mk>
--- a/lang/gravity/distinfo
+++ b/lang/gravity/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1544393098
-SHA256 (marcobambini-gravity-0.5.9_GH0.tar.gz) = 1dd0bda48dbd21b1852135b94af455d999b0cd0c9b5e444e9cfab65c438e364a
-SIZE (marcobambini-gravity-0.5.9_GH0.tar.gz) = 855702
+TIMESTAMP = 1544634727
+SHA256 (marcobambini-gravity-0.6.0-2-g9d02289_GH0.tar.gz) = 3ef4d96ff840455fd076ee049388e2b736f5d4488c434ab2f3ed097407fe5275
+SIZE (marcobambini-gravity-0.6.0-2-g9d02289_GH0.tar.gz) = 858320
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@ -1,11 +1,11 @@
 # $FreeBSD$

 PORTNAME=	meta1
-PORTVERSION=	1.1.0a.10.0
+PORTVERSION=	1.1.0a.11.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.MeTA1.org/download/.alpha/tlsa2/
+MASTER_SITES=	http://www.MeTA1.org/download/.alpha/mstack/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
-DISTNAME=	${PORTNAME}-1.1.Alpha10.0
+DISTNAME=	${PORTNAME}-1.1.Alpha11.0

 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Secure and efficient mail gateway
--- a/mail/meta1/distinfo
+++ b/mail/meta1/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1525034416
-SHA256 (meta1-1.1.Alpha10.0.tar.gz) = 7bd0b0f5c26c283dad5114a26bc0968cf803b342a3b597a4c5cf6af25d62db28
-SIZE (meta1-1.1.Alpha10.0.tar.gz) = 5198596
+TIMESTAMP = 1544441234
+SHA256 (meta1-1.1.Alpha11.0.tar.gz) = fefc59c2e35707c09e5c9797b5e2d6c534aa06d8be9b71e1c3f8d7be5ed3ae2c
+SIZE (meta1-1.1.Alpha11.0.tar.gz) = 5221055
--- a/math/py-osqp/Makefile
+++ b/math/py-osqp/Makefile
@ -1,8 +1,8 @@
 # $FreeBSD$

 PORTNAME=	osqp
-DISTVERSION=	0.4.1
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.5.0
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -22,7 +22,7 @@ USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	oxfordcontrol
 GH_PROJECT=	${PORTNAME}-python
-GH_TUPLE=	oxfordcontrol:${PORTNAME}:a5af44d:s/${PORTNAME}_sources \
+GH_TUPLE=	oxfordcontrol:${PORTNAME}:v${DISTVERSION}:s/${PORTNAME}_sources \
 		oxfordcontrol:qdldl:7ab0fca:q/${PORTNAME}_sources/lin_sys/direct/qdldl/qdldl_sources
 USE_PYTHON=	distutils autoplist

--- a/math/py-osqp/distinfo
+++ b/math/py-osqp/distinfo
@ -1,7 +1,7 @@
-TIMESTAMP = 1542576185
-SHA256 (oxfordcontrol-osqp-python-0.4.1_GH0.tar.gz) = 76ac8dad5d994d6e22d84ab5ff030e88a1b327144527118c4e7ae0bc03a9fcd6
-SIZE (oxfordcontrol-osqp-python-0.4.1_GH0.tar.gz) = 54994
-SHA256 (oxfordcontrol-osqp-a5af44d_GH0.tar.gz) = 663641bb4fd1ed32855f7b922b750c844a85d4987bdc054076c3ab19388970b7
-SIZE (oxfordcontrol-osqp-a5af44d_GH0.tar.gz) = 927493
+TIMESTAMP = 1544636383
+SHA256 (oxfordcontrol-osqp-python-v0.5.0_GH0.tar.gz) = 6061c34745a152c143c4d0875aeaa01042e7e383f41ffbdffbe06a55f5a7caeb
+SIZE (oxfordcontrol-osqp-python-v0.5.0_GH0.tar.gz) = 55123
+SHA256 (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = e0932d1f7bc56dbe526bee4a81331c1694d94c570f8ac6a6cb413f38904e0f64
+SIZE (oxfordcontrol-osqp-v0.5.0_GH0.tar.gz) = 928438
 SHA256 (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 9d02ed1a10ad2e8df4de3eb70469be4f9b896a8f93a9323065af625b08cd3645
 SIZE (oxfordcontrol-qdldl-7ab0fca_GH0.tar.gz) = 22930
--- a/math/py-spot/Makefile
+++ b/math/py-spot/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	spot
-DISTVERSION=	2.6.3
-PORTREVISION=	1
+DISTVERSION=	2.7
 CATEGORIES=	math
 MASTER_SITES=	http://www.lrde.epita.fr/dload/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/math/py-spot/distinfo
+++ b/math/py-spot/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1539924612
-SHA256 (spot-2.6.3.tar.gz) = 2b24dd7f841cbb4cba04c5be106bb2b3140c453ca216cdf444314c2ee4208432
-SIZE (spot-2.6.3.tar.gz) = 7053469
+TIMESTAMP = 1544636871
+SHA256 (spot-2.7.tar.gz) = 3ea000ac443c780f09574ec059c8931436783227c6afb43b24c863e85a22b5ef
+SIZE (spot-2.7.tar.gz) = 7141679
--- a/math/spot/Makefile
+++ b/math/spot/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	spot
-DISTVERSION=	2.6.3
-PORTREVISION=	1
+DISTVERSION=	2.7
 CATEGORIES=	math
 MASTER_SITES=	http://www.lrde.epita.fr/dload/${PORTNAME}/

--- a/math/spot/distinfo
+++ b/math/spot/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1539899442
-SHA256 (spot-2.6.3.tar.gz) = 2b24dd7f841cbb4cba04c5be106bb2b3140c453ca216cdf444314c2ee4208432
-SIZE (spot-2.6.3.tar.gz) = 7053469
+TIMESTAMP = 1544636463
+SHA256 (spot-2.7.tar.gz) = 3ea000ac443c780f09574ec059c8931436783227c6afb43b24c863e85a22b5ef
+SIZE (spot-2.7.tar.gz) = 7141679
--- a/math/spot/pkg-plist
+++ b/math/spot/pkg-plist
@ -118,6 +118,7 @@ include/spot/twaalgos/dtwasat.hh
 include/spot/twaalgos/dualize.hh
 include/spot/twaalgos/emptiness.hh
 include/spot/twaalgos/emptiness_stats.hh
+include/spot/twaalgos/genem.hh
 include/spot/twaalgos/gfguarantee.hh
 include/spot/twaalgos/gtec/ce.hh
 include/spot/twaalgos/gtec/gtec.hh
@ -162,6 +163,7 @@ include/spot/twaalgos/stutter.hh
 include/spot/twaalgos/sum.hh
 include/spot/twaalgos/tau03.hh
 include/spot/twaalgos/tau03opt.hh
+include/spot/twaalgos/toparity.hh
 include/spot/twaalgos/totgba.hh
 include/spot/twaalgos/toweak.hh
 include/spot/twaalgos/translate.hh
--- a/misc/libpri/Makefile
+++ b/misc/libpri/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libpri
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	misc
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/libpri/releases/

--- a/misc/libpri/distinfo
+++ b/misc/libpri/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1475599827
-SHA256 (libpri-1.5.0.tar.gz) = ee224bc4aa65c54546bd09675c3f0b71817ce9e277332bce86989d8dcd556a24
-SIZE (libpri-1.5.0.tar.gz) = 340683
+TIMESTAMP = 1544570232
+SHA256 (libpri-1.6.0.tar.gz) = 7225ea7ec334a115f9dc08e71f55589c38cb4e00b13964cd2f08cc4e6123e3f6
+SIZE (libpri-1.6.0.tar.gz) = 340578
--- a/misc/libpri/files/patch-Makefile
+++ b/misc/libpri/files/patch-Makefile
@ -1,5 +1,5 @@
--- Makefile.orig	2012-09-26 22:46:23.000000000 +0700
-+++ Makefile	2012-11-03 17:39:22.000000000 +0700
+--- Makefile.orig	2017-01-27 23:25:12.000000000 +0700
+++ Makefile	2018-12-12 06:20:14.634544000 +0700
@@ -24,7 +24,7 @@
 # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
 #ALERTING=-DALERTING_NO_PROGRESS
@ -18,10 +18,10 @@
 
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
-@@ -67,10 +67,10 @@
- DYNAMIC_OBJS= \
+@@ -68,10 +68,10 @@
 	$(STATIC_OBJS)
 CFLAGS ?= -g
+ CFLAGS += $(CPPFLAGS)
 -CFLAGS += -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS += -Wall -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS += -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
@ -32,7 +32,7 @@
 libdir?=$(INSTALL_BASE)/lib
 ifneq ($(findstring Darwin,$(OSARCH)),)
   SOFLAGS=$(LDFLAGS) -dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
 ifeq (${OSARCH},FreeBSD)
 LDCONFIG_FLAGS=-m
 CFLAGS += -I../zaptel -I../zapata
@ -41,7 +41,7 @@
 endif
 endif
 ifeq (${OSARCH},SunOS)
-@@ -148,12 +148,12 @@
+@@ -149,12 +149,12 @@
 	mkdir -p $(INSTALL_PREFIX)$(libdir)
 	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
 ifneq (${OSARCH},SunOS)
@ -58,7 +58,7 @@
 else
 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
 	install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
 	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
 
 %.lo: %.c
@ -67,7 +67,7 @@
 
 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
-@@ -197,7 +197,7 @@
+@@ -198,7 +198,7 @@
 
 $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 	$(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@ -2,9 +2,8 @@

 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.0-1023
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-g71266afd6
+DISTVERSION=	1.0.0-1030
+DISTVERSIONSUFFIX=	-g7ac3eb1bb
 CATEGORIES=	multimedia

 MAINTAINER=	jbeich@FreeBSD.org
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1544485554
-SHA256 (jbeich-aom-v1.0.0-1023-g71266afd6_GH0.tar.gz) = eb9845a7f78b25389ecb0a2e2d3799867e681727bfaca04c8001836b4aa49dba
-SIZE (jbeich-aom-v1.0.0-1023-g71266afd6_GH0.tar.gz) = 3079964
+TIMESTAMP = 1544658068
+SHA256 (jbeich-aom-v1.0.0-1030-g7ac3eb1bb_GH0.tar.gz) = 174886abc41a676808dd5d1f9a79f222a50ef631392a80c490f38f130d0bb9c1
+SIZE (jbeich-aom-v1.0.0-1030-g7ac3eb1bb_GH0.tar.gz) = 3079714
--- a/net/asterisk15/Makefile
+++ b/net/asterisk15/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	asterisk
-PORTVERSION=	15.6.2
-PORTREVISION=	1
+PORTVERSION=	15.7.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@ -27,7 +26,7 @@ ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc sparc64

 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}

-USES=		bison cpe gmake iconv libedit localbase \
+USES=		bison cpe gmake gnome iconv libedit localbase \
 		shebangfix sqlite ssl ncurses
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
--- a/net/asterisk15/distinfo
+++ b/net/asterisk15/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1542217735
-SHA256 (asterisk-15.6.2.tar.gz) = 4de2751a84e27a0f2750ec76269673e5d182c53c887f605206fe07e21c5390da
-SIZE (asterisk-15.6.2.tar.gz) = 27693393
+TIMESTAMP = 1544602480
+SHA256 (asterisk-15.7.0.tar.gz) = dbd33860b82fc36883eaa110f707f8c06345cbf2c1433d1c59247d4ae038fad9
+SIZE (asterisk-15.7.0.tar.gz) = 27605582
 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@ -1,8 +1,7 @@
 # $FreeBSD$

 PORTNAME=	asterisk
-PORTVERSION=	16.0.1
-PORTREVISION=	1
+PORTVERSION=	16.1.0
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@ -24,7 +23,7 @@ ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc sparc64

 EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}

-USES=		bison cpe gmake iconv libedit localbase \
+USES=		bison cpe gmake gnome iconv libedit localbase \
 		shebangfix sqlite ssl ncurses
 USE_CSTD=	gnu89
 USE_GNOME=	libxml2
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1542217787
-SHA256 (asterisk-16.0.1.tar.gz) = dec416e8fa830ef242dbd25139d94c2e6e64bf95af7ea5c9eb2a006746650d99
-SIZE (asterisk-16.0.1.tar.gz) = 27553005
+TIMESTAMP = 1544602608
+SHA256 (asterisk-16.1.0.tar.gz) = d19e25ccc822e7f7825de96b7b9cf26d85cb3888edf61d8d12a724240758dedf
+SIZE (asterisk-16.1.0.tar.gz) = 27528156
 SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
 SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
 SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@ -1,4 +1,4 @@
--- Makefile.orig	2018-08-08 16:02:31 UTC
+--- Makefile.orig	2018-12-04 00:03:56 UTC
 +++ Makefile
@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
 OVERWRITE=y
@ -77,7 +77,7 @@
@@ -764,23 +768,10 @@ upgrade: bininstall
 #  (2) the extension to strip off
 define INSTALL_CONFIGS
- 	@for x in configs/$(1)/*$(2); do \
+ 	@for x in $(1)/*$(2); do \
 -		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
 -		if [ -f "$${dst}" ]; then \
 -			if [ "$(OVERWRITE)" = "y" ]; then \
@ -93,7 +93,7 @@
 -		fi ; \
 		echo "Installing file $$x"; \
 -		$(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
+		 $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
 	done ; \
 -	if [ "$(OVERWRITE)" = "y" ]; then \
 +	if true; then \
@ -111,7 +111,7 @@
 		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
 	fi
 endef
-@@ -810,7 +801,7 @@ adsi:
+@@ -818,7 +809,7 @@ adsi:
 		else \
 			echo "Installing $$x" ; \
 		fi ; \
--- a/net/asterisk16/files/patch-contrib_Makefile
+++ b/net/asterisk16/files/patch-contrib_Makefile
@ -1,15 +1,23 @@
--- contrib/Makefile.orig	2017-04-12 21:47:53 UTC
+--- contrib/Makefile.orig	2018-12-04 00:03:56 UTC
 +++ contrib/Makefile
-@@ -24,10 +24,10 @@ install:
+@@ -24,14 +24,14 @@ install:
 	$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
 	$(INSTALL) -m 755 scripts/ast_loggrabber "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
 	$(INSTALL) -m 755 scripts/ast_coredumper "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
 -	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+-	$(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+-	$(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
 +#	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+#	$(INSTALL) -m 755 scripts/refstats.py "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+#	$(INSTALL) -m 755 scripts/reflocks.py "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
 
 uninstall:
 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
 -	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+-	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+-	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
 +#	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+#	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refstats.py"
+#	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/reflocks.py"
--- a/net/kamailio/Makefile
+++ b/net/kamailio/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	kamailio
-PORTVERSION=	5.1.6
+PORTVERSION=	5.2.0

 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/
--- a/net/kamailio/distinfo
+++ b/net/kamailio/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1540935356
-SHA256 (kamailio-5.1.6_src.tar.gz) = 99880df20dd836e4d9ec03fe863f7a5fc77bb29e3d56f59ea92b8b986deb5186
-SIZE (kamailio-5.1.6_src.tar.gz) = 12072159
+TIMESTAMP = 1544566071
+SHA256 (kamailio-5.2.0_src.tar.gz) = 74862a7503906b8d154cc9252c9dcec20a58638d451d1c17a4eab05fe35d1cdd
+SIZE (kamailio-5.2.0_src.tar.gz) = 12234968
--- a/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh
+++ b/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh
@ -1,9 +0,0 @@
--- src/modules/tls/sip-router_cert.sh.orig	2018-03-01 16:24:10 UTC
-+++ src/modules/tls/sip-router_cert.sh
-@@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
- else
- 	echo "Private key stored in '$DIR/$KEY_FILENAME'."
- 	echo "Certificate stored in '$DIR/$CERT_FILENAME'."
-+	rm ~/.rnd
- 	exit 0;
- fi
--- a/net/kamailio/files/patch-src_modules_tls_tls__bio.c
+++ b/net/kamailio/files/patch-src_modules_tls_tls__bio.c
@ -0,0 +1,20 @@
+--- src/modules/tls/tls_bio.c.orig	2018-11-28 11:08:42.000000000 +0100
+++ src/modules/tls/tls_bio.c	2018-12-12 18:28:16.580475000 +0100
+@@ -63,7 +63,7 @@
+ static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2);
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
+ static BIO_METHOD tls_mbuf_method = {
+ 	BIO_TYPE_TLS_MBUF,	/* type */
+ 	"sr_tls_mbuf",		/* name */
+@@ -109,7 +109,7 @@
+ /** returns a custom tls_mbuf BIO. */
+ BIO_METHOD* tls_BIO_mbuf(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
+ 	return &tls_mbuf_method;
+ #else
+ 	if(tls_mbuf_method != NULL) {
--- a/net/kamailio/pkg-plist
+++ b/net/kamailio/pkg-plist
@ -47,6 +47,7 @@ lib/kamailio/modules/benchmark.so
 lib/kamailio/modules/blst.so
 lib/kamailio/modules/call_control.so
 lib/kamailio/modules/call_obj.so
+lib/kamailio/modules/carrierroute.so
 %%MYSQL%%lib/kamailio/modules/cfg_db.so
 lib/kamailio/modules/cfg_rpc.so
 lib/kamailio/modules/cfgt.so
@ -120,6 +121,7 @@ lib/kamailio/modules/sdpops.so
 lib/kamailio/modules/seas.so
 %%MYSQL%%lib/kamailio/modules/sipcapture.so
 lib/kamailio/modules/sipdump.so
+lib/kamailio/modules/sipjson.so
 lib/kamailio/modules/sipt.so
 %%MYSQL%%lib/kamailio/modules/siptrace.so
 lib/kamailio/modules/siputils.so
--- a/net/libsrtp/Makefile
+++ b/net/libsrtp/Makefile
@ -13,8 +13,6 @@ COMMENT=	Secure RTP (SRTP) Reference Implementation
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-BROKEN_SSL=	openssl111
-
 PORTSCOUT=	limit:^1\.

 USE_GITHUB=	yes
--- a/Show More
+++ b/Show More