devel/gdcm: update 2.4.4 -> 2.6.3

- Switch off by default DOCS option for Doxygen docs to DOXYGEN
- Switch DOXYGEN bits to options helpers
- Standardize on the more prevelant ON/OFF CMAKE flags
- Set USE_LDCONFIG=yes as ${PREFIX}/lib is the default
- Add gdcmviewer to DESKTOP_ENTRIES

PR:		203479
Submitted by:	tkato432@yahoo.com (with changes)
Security:	CVE-2015-8396
Security:	CVE-2015-8397
Security:	https://vuxml.FreeBSD.org/freebsd/e00d8b94-c88a-11e5-b5fe-002590263bf5.html
MFH:		2016Q1

8 files changed, 88 insertions, 95 deletions

diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index de2053100ecc..89a553430196 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	gdcm
 PORTVERSION=	${GDCM_MAJOR}.${GDCM_MINOR}.${GDCM_PATCH}
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION}
 
@@ -13,27 +12,36 @@ COMMENT=	Grassroots DICOM library
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 \
-   		libexpat.so:${PORTSDIR}/textproc/expat2
+		libexpat.so:${PORTSDIR}/textproc/expat2
 
-OPTIONS_DEFINE=		DOCS
-OPTIONS_UNSET=		DOCS
+OPTIONS_DEFINE=		DOXYGEN
 OPTIONS_RADIO=		VTK
 OPTIONS_RADIO_VTK=	VTK5 VTK6
+OPTIONS_SUB=		yes
+
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen \
+			docbook-xsl-ns>0:${PORTSDIR}/textproc/docbook-xsl-ns
+DOXYGEN_USES=		ghostscript
+DOXYGEN_USE=		gnome=libxslt:build tex=latex:build
+DOXYGEN_CMAKE_ON=	-DGDCM_DOCUMENTATION:BOOL=ON \
+			-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
+			-DGDCM_INSTALL_MAN_DIR:PATH=man \
+			-DGDCM_INSTALL_DOC_DIR:PATH=${DOCSDIR_REL}
+DOXYGEN_CMAKE_OFF=	-DGDCM_DOCUMENTATION:BOOL=OFF
 
 VTK5_DESC=		Build VTK 5 integration classes
 VTK5_LIB_DEPENDS=	libvtkHybrid.so:${PORTSDIR}/math/vtk5
-VTK5_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=YES \
+VTK5_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK5_VERSION}
-
 VTK6_DESC=		Build VTK 6 integration classes
 VTK6_LIB_DEPENDS=	libvtkCommonCore-${VTK6_VERSION}.so:${PORTSDIR}/math/vtk6
-VTK6_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=YES \
+VTK6_CMAKE_ON=		-DGDCM_USE_VTK:BOOL=ON \
 			-DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION}
 
 # Change this when updating the port
 GDCM_MAJOR=	2
-GDCM_MINOR=	4
-GDCM_PATCH=	4
+GDCM_MINOR=	6
+GDCM_PATCH=	3
 
 # Change this whenever VTK is updated
 VTK5_VERSION=	5.10
@@ -41,21 +49,21 @@ VTK6_VERSION=	6.2
 
 USES=		alias cmake:outsource tar:bzip2
 USE_OPENSSL=	yes
-USE_LDCONFIG=	${PREFIX}/lib
+USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include
-CMAKE_ARGS+=	-DGDCM_PDF_DOCUMENTATION:BOOL=NO \
-   		-DGDCM_USE_SYSTEM_OPENSSL:BOOL=YES \
-		-DGDCM_USE_SYSTEM_EXPAT:BOOL=YES \
-		-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=YES \
-		-DGDCM_USE_SYSTEM_ZLIB:BOOL=YES \
-		-DGDCM_BUILD_APPLICATIONS:BOOL=YES \
-    		-DGDCM_BUILD_SHARED_LIBS:BOOL=YES \
-		-DGDCM_BUILD_EXAMPLES:BOOL=NO \
-		-DGDCM_INSTALL_DATA_DIR:STRING=${DATADIR}
+CMAKE_ARGS=	-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \
+		-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
+		-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=ON \
+		-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \
+		-DGDCM_BUILD_APPLICATIONS:BOOL=ON \
+		-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
+		-DGDCM_BUILD_EXAMPLES:BOOL=OFF \
+		-DGDCM_INSTALL_DATA_DIR:PATH=${DATADIR_REL}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVTK5} || ${PORT_OPTIONS:MVTK6}
+DESKTOP_ENTRIES="Gdcmviewer" "Simple DICOM Viewer" "" "gdcmviewer" "" ""
 PLIST_SUB+=	VTK=""
 .else
 PLIST_SUB+=	VTK="@comment "
@@ -65,21 +73,12 @@ PLIST_SUB+=	GDCM_MAJOR="${GDCM_MAJOR}" \
 		GDCM_MINOR="${GDCM_MINOR}" \
 		GDCM_PATCH="${GDCM_PATCH}"
 
-.if ${PORT_OPTIONS:MDOCS}
-USE_TEX=	latex:build
-USES+=		ghostscript
-BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
-CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=YES \
-		-DGDCM_INSTALL_MAN_DIR:STRING=man \
-		-DGDCM_INSTALL_DOC_DIR:STRING=${DOCSDIR}
-PORTDOCS=	*
-.else
-CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=NO
-.endif
+pre-build-DOXYGEN-on:
+	(cd ${WRKSRC}/Utilities/doxygen \
+		&& ${LOCALBASE}/bin/doxygen -u doxyfile.in)
 
-post-build:
-.if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/Utilities/doxygen && ${LOCALBASE}/bin/doxygen -u doxyfile.in
-.endif
+post-install-DOXYGEN-on:
+	@(${FIND} ${STAGEDIR}${DOCSDIR} -type f | ${SED} -e \
+		"s|^${STAGEDIR}${PREFIX}/||" >> ${TMPPLIST})
 
 .include <bsd.port.mk>
diff --git a/devel/gdcm/distinfo b/devel/gdcm/distinfo
index 9004ee86073b..08880ef24439 100644
--- a/devel/gdcm/distinfo
+++ b/devel/gdcm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdcm-2.4.4.tar.bz2) = c5cd2f43a16180f5a9ecd5211bf214971b0620e9d9e027c2e11a89c4ce7d5b1f
-SIZE (gdcm-2.4.4.tar.bz2) = 4397720
+SHA256 (gdcm-2.6.3.tar.bz2) = 7882e880b8b60efc66a492ae3c1c161799340ad62a90d690823b76eb400c0a8f
+SIZE (gdcm-2.6.3.tar.bz2) = 3680016
diff --git a/devel/gdcm/files/patch-CMakeLists.txt b/devel/gdcm/files/patch-CMakeLists.txt
index cf0640890926..46e14950a63a 100644
--- a/devel/gdcm/files/patch-CMakeLists.txt
+++ b/devel/gdcm/files/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig	2012-01-02 12:11:48.000000000 +0100
-+++ CMakeLists.txt	2012-01-02 12:13:50.000000000 +0100
-@@ -45,7 +45,7 @@
-   "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}")
- SET(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES}
+--- CMakeLists.txt.orig	2015-08-22 14:09:50 UTC
++++ CMakeLists.txt
+@@ -53,7 +53,7 @@ if(NOT DEFINED GDCM_API_VERSION)
+ endif()
+ set(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES}
    VERSION "${GDCM_VERSION}"
 -  SOVERSION "${GDCM_API_VERSION}"
 +  SOVERSION "${GDCM_MAJOR_VERSION}"
  )
- #SET(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES}
+ #set(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES}
  #  VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
diff --git a/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake
index 3980d4c04277..ba3fa4d11a68 100644
--- a/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake
+++ b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake
@@ -1,5 +1,5 @@
---- CMake/FindOpenJPEG.cmake.orig	2014-04-03 09:33:49.000000000 +0200
-+++ CMake/FindOpenJPEG.cmake	2014-06-10 09:34:13.000000000 +0200
+--- CMake/FindOpenJPEG.cmake.orig	2015-08-22 14:09:50 UTC
++++ CMake/FindOpenJPEG.cmake
 @@ -18,7 +18,15 @@
  # (To distribute this file outside of CMake, substitute the full
  #  License text for the above reference.)
@@ -17,7 +17,7 @@
  find_package(OpenJPEG QUIET NO_MODULE)
  
  if( NOT OpenJPEG_DIR )
-@@ -51,3 +59,4 @@
+@@ -51,3 +59,4 @@ mark_as_advanced(
    OPENJPEG_INCLUDE_DIR
    )
  endif()
diff --git a/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx b/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx
deleted file mode 100644
index eccf73102831..000000000000
--- a/devel/gdcm/files/patch-Source-DataDictionary_gdcmGlobal.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- Source/DataDictionary/gdcmGlobal.cxx.orig	2011-07-07 09:11:27.000000000 +0200
-+++ Source/DataDictionary/gdcmGlobal.cxx	2011-07-07 09:11:56.000000000 +0200
-@@ -45,7 +45,7 @@
-   void LoadDefaultPaths()
-     {
-     assert( RessourcePaths.empty() );
--    const char filename2[] = GDCM_CMAKE_INSTALL_PREFIX "/" GDCM_INSTALL_DATA_DIR "/XML/";
-+    const char filename2[] = GDCM_INSTALL_DATA_DIR "/XML/";
-     RessourcePaths.push_back( filename2 );
-     const char *curprocfn = System::GetCurrentProcessFileName();
-     if( curprocfn )
diff --git a/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt b/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt
deleted file mode 100644
index 452b7b92d234..000000000000
--- a/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- Source/InformationObjectDefinition/CMakeLists.txt.orig	2012-09-21 12:05:25.000000000 +0200
-+++ Source/InformationObjectDefinition/CMakeLists.txt	2012-09-21 12:05:39.000000000 +0200
-@@ -37,6 +37,7 @@
-   "${GDCM_SOURCE_DIR}/Source/DataStructureAndEncodingDefinition"
-   "${GDCM_SOURCE_DIR}/Source/DataDictionary"
-   "${GDCM_SOURCE_DIR}/Utilities"
-+  "${EXPAT_INCLUDE_DIR}"
-   )
- 
- ADD_LIBRARY(gdcmIOD ${IOD_SRCS})
diff --git a/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt b/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt
index 180313141957..239580ecc968 100644
--- a/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt
+++ b/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt
@@ -1,8 +1,8 @@
---- Utilities/gdcmjpeg/CMakeLists.txt.orig	2012-09-19 15:48:46.000000000 +0200
-+++ Utilities/gdcmjpeg/CMakeLists.txt	2012-09-19 15:49:31.000000000 +0200
-@@ -23,7 +23,7 @@
- ENDIF(NOT DEFINED JPEG_API_VERSION)
- SET(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES}
+--- Utilities/gdcmjpeg/CMakeLists.txt.orig	2015-08-22 14:09:50 UTC
++++ Utilities/gdcmjpeg/CMakeLists.txt
+@@ -24,7 +24,7 @@ if(NOT DEFINED JPEG_API_VERSION)
+ endif()
+ set(JPEG_LIBRARY_PROPERTIES ${JPEG_LIBRARY_PROPERTIES}
    VERSION "${GDCM_VERSION}"
 -  SOVERSION "${JPEG_API_VERSION}"
 +  SOVERSION "${GDCM_MAJOR_VERSION}"
diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist
index 543199586485..7dc1cdf6e13e 100644
--- a/devel/gdcm/pkg-plist
+++ b/devel/gdcm/pkg-plist
@@ -1,3 +1,5 @@
+%%VTK%%bin/gdcm2pnm
+%%VTK%%bin/gdcm2vtk
 bin/gdcmanon
 bin/gdcmconv
 bin/gdcmdiff
@@ -10,27 +12,25 @@ bin/gdcmraw
 bin/gdcmscanner
 bin/gdcmscu
 bin/gdcmtar
-bin/gdcmxml
-%%PORTDOCS%%man/man1/gdcm2pnm.1.gz
-%%PORTDOCS%%man/man1/gdcm2vtk.1.gz
-%%PORTDOCS%%man/man1/gdcmanon.1.gz
-%%PORTDOCS%%man/man1/gdcmconv.1.gz
-%%PORTDOCS%%man/man1/gdcmdiff.1.gz
-%%PORTDOCS%%man/man1/gdcmdump.1.gz
-%%PORTDOCS%%man/man1/gdcmgendir.1.gz
-%%PORTDOCS%%man/man1/gdcmimg.1.gz
-%%PORTDOCS%%man/man1/gdcminfo.1.gz
-%%PORTDOCS%%man/man1/gdcmpap3.1.gz
-%%PORTDOCS%%man/man1/gdcmpdf.1.gz
-%%PORTDOCS%%man/man1/gdcmraw.1.gz
-%%PORTDOCS%%man/man1/gdcmscanner.1.gz
-%%PORTDOCS%%man/man1/gdcmscu.1.gz
-%%PORTDOCS%%man/man1/gdcmtar.1.gz
-%%PORTDOCS%%man/man1/gdcmviewer.1.gz
-%%PORTDOCS%%man/man1/gdcmxml.1.gz
 %%VTK%%bin/gdcmviewer
-%%VTK%%bin/gdcm2pnm
-%%VTK%%bin/gdcm2vtk
+bin/gdcmxml
+%%DOXYGEN%%man/man1/gdcm2pnm.1.gz
+%%DOXYGEN%%man/man1/gdcm2vtk.1.gz
+%%DOXYGEN%%man/man1/gdcmanon.1.gz
+%%DOXYGEN%%man/man1/gdcmconv.1.gz
+%%DOXYGEN%%man/man1/gdcmdiff.1.gz
+%%DOXYGEN%%man/man1/gdcmdump.1.gz
+%%DOXYGEN%%man/man1/gdcmgendir.1.gz
+%%DOXYGEN%%man/man1/gdcmimg.1.gz
+%%DOXYGEN%%man/man1/gdcminfo.1.gz
+%%DOXYGEN%%man/man1/gdcmpap3.1.gz
+%%DOXYGEN%%man/man1/gdcmpdf.1.gz
+%%DOXYGEN%%man/man1/gdcmraw.1.gz
+%%DOXYGEN%%man/man1/gdcmscanner.1.gz
+%%DOXYGEN%%man/man1/gdcmscu.1.gz
+%%DOXYGEN%%man/man1/gdcmtar.1.gz
+%%DOXYGEN%%man/man1/gdcmviewer.1.gz
+%%DOXYGEN%%man/man1/gdcmxml.1.gz
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAbortPDU.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateACPDU.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAAssociateRJPDU.h
@@ -49,7 +49,9 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAttribute.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmAudioCodec.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBase64.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseCompositeMessage.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseNormalizedMessage.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBasePDU.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseQuery.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBaseRootQuery.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBasicOffsetTable.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmBitmap.h
@@ -122,6 +124,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFiducials.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFile.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileAnonymizer.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileChangeTransferSyntax.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileDecompressLookupTable.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileDerivation.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileExplicitFilter.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmFileMetaInformation.h
@@ -181,14 +184,24 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMacros.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMaximumLengthSub.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMediaStorage.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMeshPrimitive.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModalityPerformedProcedureStepCreateQuery.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModalityPerformedProcedureStepSetQuery.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModule.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModuleEntry.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmModules.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMovePatientRootQuery.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmMoveStudyRootQuery.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNActionMessages.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNCreateMessages.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNDeleteMessages.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNEventReportMessages.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNGetMessages.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNSetMessages.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNestedModuleEntries.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNetworkEvents.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNetworkStateID.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNormalizedMessageFactory.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmNormalizedNetworkFunctions.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmObject.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmOpenSSLCryptoFactory.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmOpenSSLCryptographicMessageSyntax.h
@@ -261,6 +274,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmSplitMosaicFilter.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStaticAssert.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStreamImageReader.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStreamImageWriter.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStrictScanner.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmString.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStringFilter.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmStudy.h
@@ -323,6 +337,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmValue.txx
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmValueIO.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmValueIO.txx
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmVersion.h
+include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWLMFindQuery.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWaveform.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWin32.h
 include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/gdcmWriter.h
@@ -410,13 +425,10 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/zipstreamimpl.h
 %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkImageYBRToRGB.h
 %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkLookupTable16.h
 %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkRTStructSetProperties.h
-lib/libsocketxx.so.1.2.0
-lib/libsocketxx.so.1.2
-lib/libsocketxx.so
 lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMConfig.cmake
 lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMConfigVersion.cmake
 lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets.cmake
-lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/GDCMTargets-release.cmake
 lib/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/UseGDCM.cmake
 lib/libgdcmCommon.so
 lib/libgdcmCommon.so.%%GDCM_MAJOR%%
@@ -451,6 +463,9 @@ lib/libgdcmjpeg8.so.%%GDCM_MAJOR%%.%%GDCM_MINOR%%.%%GDCM_PATCH%%
 lib/libgdcmuuid.so
 lib/libgdcmuuid.so.%%GDCM_MAJOR%%
 lib/libgdcmuuid.so.%%GDCM_MAJOR%%.%%GDCM_MINOR%%.%%GDCM_PATCH%%
+lib/libsocketxx.so
+lib/libsocketxx.so.1.2
+lib/libsocketxx.so.1.2.0
 %%VTK%%lib/libvtkgdcm.so
 %%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%%
 %%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJOR%%.%%GDCM_MINOR%%.%%GDCM_PATCH%%