8 files changed, 507 insertions, 74 deletions

diff --git a/devel/dcmtk/Makefile b/devel/dcmtk/Makefile
index 490f31f91c11..bf40de68def7 100644
--- a/devel/dcmtk/Makefile
+++ b/devel/dcmtk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dcmtk
-PORTVERSION=	3.5.4
+DISTVERSION=	3.6.0
 CATEGORIES=	devel
 MASTER_SITES=	ftp://dicom.offis.de/pub/dicom/offis/software/${PORTNAME}/${PORTNAME}${PORTVERSION:S/.//g}/
 
@@ -17,27 +17,15 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
     		png.6:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
-
-CFLAGS=		-D__BSD_VISIBLE -fPIC
-CPPFLAGS=	${CFLAGS}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-libpnginc=${LOCALBASE}/include \
-		--with-libtiffinc=${LOCALBASE}/include \
-		--with-libxmlinc=${LOCALBASE}/include \
-		--bindir=${PREFIX}/bin/${PORTNAME} \
-		--sysconfdir=${PREFIX}/etc/${PORTNAME} \
-		--datadir=${DATADIR}
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" AR="${CXX}" \
-		ARFLAGS="-shared -o" LIBEXT="so" RANLIB=":"
-
-INSTALL_TARGET=	install install-lib
+USE_CMAKE=	yes
+CMAKE_OUTSOURCE=yes
 
 SHLIBS=		dcmdata dcmdsig dcmimage dcmimgle dcmjpeg dcmnet \
-		dcmpstat dcmqrdb dcmsr dcmtls dcmwlm ijg12 ijg16 \
-		ijg8 ofstd
+		dcmpstat dcmqrdb dcmsr dcmtls dcmwlm ijg8 ijg12 \
+		ijg16 i2d ofstd oflog charls dcmjpls
+
 SHLIBVER=	${PORTVERSION:R:R}
 PLIST_SUB=	SHLIBVER=${SHLIBVER}
 
@@ -47,6 +35,5 @@ post-install:
 	@${LN} -sf ${PREFIX}/lib/lib${shlib}.so.${SHLIBVER} ${PREFIX}/lib/lib${shlib}.so
 .endfor
 
-.include "Makefile.man"
+#.include "Makefile.man"
 .include <bsd.port.mk>
-
diff --git a/devel/dcmtk/Makefile.man b/devel/dcmtk/Makefile.man
index f7b8dc91a3cf..80995aad54ee 100644
--- a/devel/dcmtk/Makefile.man
+++ b/devel/dcmtk/Makefile.man
@@ -5,4 +5,5 @@ MAN1=	dcm2pnm.1 dcmcrle.1 dcmdump.1 dcmmkcrv.1 dcmp2pgm.1 dcmpsmk.1 \
 	dcmcjpeg.1 dcmdrle.1 dcmgpdir.1 dcmmklut.1 dcmprscu.1 dcmpsrcv.1 \
 	dcmqrti.1 dcod2lum.1 dsrdump.1 movescu.1 termscu.1 dcmconv.1 \
 	dcmdspfn.1 dcmj2pnm.1 dcmodify.1 dcmpschk.1 dcmpssnd.1 dcmquant.1 \
-	dconvlum.1 dump2dcm.1 pdf2dcm.1 wlmscpfs.1 
+	dconvlum.1 dump2dcm.1 pdf2dcm.1 wlmscpfs.1 dcm2pdf.1 dcmcjpls.1 \
+	dcmdjpls.1 dcml2pnm.1 img2dcm.1
diff --git a/devel/dcmtk/distinfo b/devel/dcmtk/distinfo
index 2dc1f709b906..01a419c35221 100644
--- a/devel/dcmtk/distinfo
+++ b/devel/dcmtk/distinfo
@@ -1,3 +1,2 @@
-MD5 (dcmtk-3.5.4.tar.gz) = 0afd971cdf976a5b336722ef2f68e6d7
-SHA256 (dcmtk-3.5.4.tar.gz) = 7b8575ba609516d76b681c0de8c1328cf23e57deb2c7085a6aa37d4292354d76
-SIZE (dcmtk-3.5.4.tar.gz) = 3756374
+SHA256 (dcmtk-3.6.0.tar.gz) = cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a
+SIZE (dcmtk-3.6.0.tar.gz) = 4673121
diff --git a/devel/dcmtk/files/patch-BuildLibrary b/devel/dcmtk/files/patch-BuildLibrary
new file mode 100644
index 000000000000..1ee19ce937fc
--- /dev/null
+++ b/devel/dcmtk/files/patch-BuildLibrary
@@ -0,0 +1,240 @@
+--- 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,6 @@
+-# 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)
++# 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})
+ 
+-# declare installation files
+-INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat)
++TARGET_LINK_LIBRARIES(dcmpstatShared dcmsr)
++TARGET_LINK_LIBRARIES(dcmpstat dcmsr)
+--- 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})
diff --git a/devel/dcmtk/files/patch-cmake-CMakeLists.txt b/devel/dcmtk/files/patch-cmake-CMakeLists.txt
new file mode 100644
index 000000000000..1e1a1e2279de
--- /dev/null
+++ b/devel/dcmtk/files/patch-cmake-CMakeLists.txt
@@ -0,0 +1,33 @@
+--- 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
+ #-----------------------------------------------------------------------------
+ 
diff --git a/devel/dcmtk/files/patch-config_configure b/devel/dcmtk/files/patch-config_configure
deleted file mode 100644
index 6b436ee1c9ae..000000000000
--- a/devel/dcmtk/files/patch-config_configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/configure.orig	2010-07-28 07:44:25.000000000 +0000
-+++ config/configure	2010-07-28 07:47:33.000000000 +0000
-@@ -15824,9 +15824,9 @@
- 	  CXXFLAGS="-D_POSIX_C_SOURCE=199506L $CXXFLAGS"
- 	  CFLAGS="-D_POSIX_C_SOURCE=199506L $CFLAGS"
- 	  ;;
--        *-*-freebsd5*)
--	  ;;
--        *-*-freebsd6*)
-+        *-*-freebsd*)
-+	  CXXFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CXXFLAGS"
-+	  CFLAGS="-D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L $CFLAGS"
- 	  ;;
-         *-*-netbsdelf2*)
- 	  ;;
diff --git a/devel/dcmtk/files/patch-id2 b/devel/dcmtk/files/patch-id2
new file mode 100644
index 000000000000..bdecd0cc43ca
--- /dev/null
+++ b/devel/dcmtk/files/patch-id2
@@ -0,0 +1,23 @@
+--- 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)
diff --git a/devel/dcmtk/pkg-plist b/devel/dcmtk/pkg-plist
index f515c0c344ae..06a96342e3a6 100644
--- a/devel/dcmtk/pkg-plist
+++ b/devel/dcmtk/pkg-plist
@@ -1,15 +1,19 @@
+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
@@ -36,6 +40,7 @@ bin/dcmtk/dsrdump
 bin/dcmtk/dump2dcm
 bin/dcmtk/echoscu
 bin/dcmtk/findscu
+bin/dcmtk/img2dcm
 bin/dcmtk/movescu
 bin/dcmtk/pdf2dcm
 bin/dcmtk/storescp
@@ -44,12 +49,13 @@ 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/cfunix.h
 include/dcmtk/config/osconfig.h
 include/dcmtk/dcmdata/cmdlnarg.h
 include/dcmtk/dcmdata/dcbytstr.h
@@ -57,8 +63,6 @@ include/dcmtk/dcmdata/dcchrstr.h
 include/dcmtk/dcmdata/dccodec.h
 include/dcmtk/dcmdata/dcdatset.h
 include/dcmtk/dcmdata/dcddirif.h
-include/dcmtk/dcmdata/dcdebug.h
-include/dcmtk/dcmdata/dcdefine.h
 include/dcmtk/dcmdata/dcdeftag.h
 include/dcmtk/dcmdata/dcdicdir.h
 include/dcmtk/dcmdata/dcdicent.h
@@ -66,6 +70,7 @@ 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
@@ -82,6 +87,7 @@ 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
@@ -130,7 +136,17 @@ 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
@@ -147,6 +163,7 @@ 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
@@ -244,6 +261,13 @@ 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
@@ -258,12 +282,16 @@ 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
@@ -348,6 +376,7 @@ 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
@@ -362,18 +391,24 @@ 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
@@ -394,13 +429,63 @@ 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
@@ -411,10 +496,12 @@ 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/oflogfil.h
+include/dcmtk/ofstd/ofmap.h
 include/dcmtk/ofstd/ofoset.h
 include/dcmtk/ofstd/ofset.h
 include/dcmtk/ofstd/ofsetit.h
@@ -428,58 +515,136 @@ include/dcmtk/ofstd/oftime.h
 include/dcmtk/ofstd/oftimer.h
 include/dcmtk/ofstd/oftypes.h
 include/dcmtk/ofstd/ofuoset.h
-lib/dcm2xml.dtd
-lib/dicom.dic
-lib/dsr2xml.xsd
-lib/libdcmdata.so.%%SHLIBVER%%
+include/dcmtk/ofstd/ofvector.h
+lib/libcharls.a
+lib/libcharls.so
+lib/libcharls.so.%%SHLIBVER%%
+lib/libdcmdata.a
 lib/libdcmdata.so
-lib/libdcmdsig.so.%%SHLIBVER%%
+lib/libdcmdata.so.%%SHLIBVER%%
+lib/libdcmdsig.a
 lib/libdcmdsig.so
-lib/libdcmimage.so.%%SHLIBVER%%
+lib/libdcmdsig.so.%%SHLIBVER%%
+lib/libdcmimage.a
 lib/libdcmimage.so
-lib/libdcmimgle.so.%%SHLIBVER%%
+lib/libdcmimage.so.%%SHLIBVER%%
+lib/libdcmimgle.a
 lib/libdcmimgle.so
-lib/libdcmjpeg.so.%%SHLIBVER%%
+lib/libdcmimgle.so.%%SHLIBVER%%
+lib/libdcmjpeg.a
 lib/libdcmjpeg.so
-lib/libdcmnet.so.%%SHLIBVER%%
+lib/libdcmjpeg.so.%%SHLIBVER%%
+lib/libdcmjpls.a
+lib/libdcmjpls.so
+lib/libdcmjpls.so.%%SHLIBVER%%
+lib/libdcmnet.a
 lib/libdcmnet.so
-lib/libdcmpstat.so.%%SHLIBVER%%
+lib/libdcmnet.so.%%SHLIBVER%%
+lib/libdcmpstat.a
 lib/libdcmpstat.so
-lib/libdcmqrdb.so.%%SHLIBVER%%
+lib/libdcmpstat.so.%%SHLIBVER%%
+lib/libdcmqrdb.a
 lib/libdcmqrdb.so
-lib/libdcmsr.so.%%SHLIBVER%%
+lib/libdcmqrdb.so.%%SHLIBVER%%
+lib/libdcmsr.a
 lib/libdcmsr.so
-lib/libdcmtls.so.%%SHLIBVER%%
+lib/libdcmsr.so.%%SHLIBVER%%
+lib/libdcmtls.a
 lib/libdcmtls.so
-lib/libdcmwlm.so.%%SHLIBVER%%
+lib/libdcmtls.so.%%SHLIBVER%%
+lib/libdcmwlm.a
 lib/libdcmwlm.so
-lib/libijg12.so.%%SHLIBVER%%
+lib/libdcmwlm.so.%%SHLIBVER%%
+lib/libi2d.a
+lib/libi2d.so
+lib/libi2d.so.%%SHLIBVER%%
+lib/libijg12.a
 lib/libijg12.so
-lib/libijg16.so.%%SHLIBVER%%
+lib/libijg12.so.%%SHLIBVER%%
+lib/libijg16.a
 lib/libijg16.so
-lib/libijg8.so.%%SHLIBVER%%
+lib/libijg16.so.%%SHLIBVER%%
+lib/libijg8.a
 lib/libijg8.so
-lib/libofstd.so.%%SHLIBVER%%
+lib/libijg8.so.%%SHLIBVER%%
+lib/liboflog.a
+lib/liboflog.so
+lib/liboflog.so.%%SHLIBVER%%
+lib/libofstd.a
 lib/libofstd.so
+lib/libofstd.so.%%SHLIBVER%%
+%%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%%/COPYRIGHT
-%%DATADIR%%/FAQ
-%%DATADIR%%/HISTORY
-%%DATADIR%%/asconfig.txt
-%%DATADIR%%/ciphers.txt
-%%DATADIR%%/datadict.txt
-%%DATADIR%%/dcmqrcnf.txt
-%%DATADIR%%/dcmqrset.txt
-%%DATADIR%%/randseed.txt
-%%DATADIR%%/testing.txt
-%%DATADIR%%/wwwapp.txt
+%%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
+%%DOCSDIR%%/config.txt
+%%DOCSDIR%%/envvars.txt
+%%DOCSDIR%%/modules.txt
+%%DOCSDIR%%/dirstruc.txt
+%%DOCSDIR%%/macros.txt
+%%DOCSDIR%%/datadict.txt
+%%DOCSDIR%%/ciphers.txt
+%%DOCSDIR%%/randseed.txt
+%%DOCSDIR%%/asconfig.txt
+%%DOCSDIR%%/testing.txt
+%%DOCSDIR%%/dcmqrcnf.txt
+%%DOCSDIR%%/dcmqrset.txt
+%%DOCSDIR%%/wwwapp.txt
+%%DOCSDIR%%/ANNOUNCE.360
+%%DOCSDIR%%/CHANGES.360
+%%DOCSDIR%%/COPYRIGHT
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/HISTORY
+%%DOCSDIR%%/VERSION
+@dirrm %%DATADIR%%/wlistdb/OFFIS
+@dirrm %%DATADIR%%/wlistqry
+@dirrm %%DATADIR%%/wlistdb
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
+@dirrm etc/dcmtk
+@dirrm bin/dcmtk
 @dirrm include/dcmtk/ofstd
+@dirrm include/dcmtk/oflog/spi
+@dirrm include/dcmtk/oflog/helpers
+@dirrm include/dcmtk/oflog/config
+@dirrm include/dcmtk/oflog
 @dirrm include/dcmtk/dcmwlm
 @dirrm include/dcmtk/dcmtls
 @dirrm include/dcmtk/dcmsr
@@ -487,11 +652,11 @@ lib/libofstd.so
 @dirrm include/dcmtk/dcmqrdb
 @dirrm include/dcmtk/dcmpstat
 @dirrm include/dcmtk/dcmnet
+@dirrm include/dcmtk/dcmjpls
 @dirrm include/dcmtk/dcmjpeg
 @dirrm include/dcmtk/dcmimgle
 @dirrm include/dcmtk/dcmimage
+@dirrm include/dcmtk/dcmdata/libi2d
 @dirrm include/dcmtk/dcmdata
 @dirrm include/dcmtk/config
 @dirrm include/dcmtk
-@dirrm etc/dcmtk
-@dirrm bin/dcmtk