- Update to 2.0.18

  Release notes: http://sf.net/apps/mediawiki/gdcm/index.php?title=GDCM_Release_2.0.18

3 files changed, 308 insertions, 328 deletions

diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index cac318f8430a..783e6947e54f 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+=	VTK="@comment "
 .endif
 
 GDCM_MAJ=	2.0
-GDCM_MIN=	17
+GDCM_MIN=	18
 
 PLIST_SUB+=	GDCM_MAJ="${GDCM_MAJ}" \
 		GDCM_MIN="${GDCM_MIN}"
@@ -49,6 +49,7 @@ CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=YES \
 MAN1=		gdcm2vtk.1 gdcmconv.1 gdcmanon.1 gdcmgendir.1 \
 		gdcmdump.1 gdcmimg.1 gdcminfo.1 gdcmpdf.1 \
 		gdcmraw.1 gdcmscanner.1 gdcmtar.1 gdcmviewer.1
+MAN3=		libopenjpeg.3
 PORTDOCS=	*
 post-install:
 	${MKDIR} ${DOCSDIR}
@@ -65,5 +66,8 @@ MANUAL_PACKAGE_BUILD=	hangs on pointyhat
 
 post-patch:
 	${REINPLACE_CMD} -e 's| NAMELINK_SKIP||; s| NAMELINK_ONLY||' ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|share/man|man|g; /DESTINATION/s|$${OPENJPEG_INSTALL_DOC_DIR}|${DOCSDIR}|g' \
+	   ${WRKSRC}/Utilities/gdcmopenjpeg-v1/CMakeLists.txt \
+	   ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/devel/gdcm/distinfo b/devel/gdcm/distinfo
index aafe2ec59c31..1be15cf1721e 100644
--- a/devel/gdcm/distinfo
+++ b/devel/gdcm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdcm-2.0.17.tar.bz2) = 9fccf0139797fd21609afce026ba1587014232582d89d7a36885e146d290dcd8
-SIZE (gdcm-2.0.17.tar.bz2) = 2440295
+SHA256 (gdcm-2.0.18.tar.bz2) = 693b8d2d65577717ef89e0816ea26c0f524c24a0fb30aa0fc482dc20997b168b
+SIZE (gdcm-2.0.18.tar.bz2) = 4040781
diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist
index 324bfd05e80b..573fb3d8f502 100644
--- a/devel/gdcm/pkg-plist
+++ b/devel/gdcm/pkg-plist
@@ -1,317 +1,295 @@
-bin/gdcmdump
-bin/gdcmraw
-bin/gdcmscanner
+bin/gdcm2pnm
+bin/gdcm2vtk
 bin/gdcmanon
+bin/gdcmconv
+bin/gdcmdump
 bin/gdcmgendir
 bin/gdcmimg
-bin/gdcmconv
-bin/gdcmtar
 bin/gdcminfo
-%%VTK%%bin/gdcm2vtk
-%%VTK%%bin/gdcmviewer
-include/gdcm-2.0/gdcmASN1.h
-include/gdcm-2.0/gdcmAnonymizeEvent.h
-include/gdcm-2.0/gdcmAnonymizer.h
-include/gdcm-2.0/gdcmApplicationEntity.h
-include/gdcm-2.0/gdcmAttribute.h
-include/gdcm-2.0/gdcmAudioCodec.h
-include/gdcm-2.0/gdcmBase64.h
-include/gdcm-2.0/gdcmBasicOffsetTable.h
-include/gdcm-2.0/gdcmBitmap.h
-include/gdcm-2.0/gdcmByteBuffer.h
-include/gdcm-2.0/gdcmByteSwap.h
-include/gdcm-2.0/gdcmByteSwap.txx
-include/gdcm-2.0/gdcmByteSwapFilter.h
-include/gdcm-2.0/gdcmByteValue.h
-include/gdcm-2.0/gdcmCP246ExplicitDataElement.h
-include/gdcm-2.0/gdcmCP246ExplicitDataElement.txx
-include/gdcm-2.0/gdcmCSAElement.h
-include/gdcm-2.0/gdcmCSAHeader.h
-include/gdcm-2.0/gdcmCSAHeader.txx
-include/gdcm-2.0/gdcmCSAHeaderDict.h
-include/gdcm-2.0/gdcmCSAHeaderDictEntry.h
-include/gdcm-2.0/gdcmCodeString.h
-include/gdcm-2.0/gdcmCodec.h
-include/gdcm-2.0/gdcmCoder.h
-include/gdcm-2.0/gdcmCommand.h
-include/gdcm-2.0/gdcmConfigure.h
-include/gdcm-2.0/gdcmConstCharWrapper.h
-include/gdcm-2.0/gdcmCryptographicMessageSyntax.h
-include/gdcm-2.0/gdcmCurve.h
-include/gdcm-2.0/gdcmDICOMDIR.h
-include/gdcm-2.0/gdcmDICOMDIRGenerator.h
-include/gdcm-2.0/gdcmDataElement.h
-include/gdcm-2.0/gdcmDataSet.h
-include/gdcm-2.0/gdcmDataSet.txx
-include/gdcm-2.0/gdcmDataSetHelper.h
-include/gdcm-2.0/gdcmDecoder.h
-include/gdcm-2.0/gdcmDefinedTerms.h
-include/gdcm-2.0/gdcmDeflateStream.h
-include/gdcm-2.0/gdcmDefs.h
-include/gdcm-2.0/gdcmDeltaEncodingCodec.h
-include/gdcm-2.0/gdcmDict.h
-include/gdcm-2.0/gdcmDictConverter.h
-include/gdcm-2.0/gdcmDictEntry.h
-include/gdcm-2.0/gdcmDictPrinter.h
-include/gdcm-2.0/gdcmDicts.h
-include/gdcm-2.0/gdcmDirectionCosines.h
-include/gdcm-2.0/gdcmDirectory.h
-include/gdcm-2.0/gdcmDummyValueGenerator.h
-include/gdcm-2.0/gdcmDumper.h
-include/gdcm-2.0/gdcmElement.h
-include/gdcm-2.0/gdcmEncapsulatedDocument.h
-include/gdcm-2.0/gdcmEnumeratedValues.h
-include/gdcm-2.0/gdcmEvent.h
-include/gdcm-2.0/gdcmException.h
-include/gdcm-2.0/gdcmExplicitDataElement.h
-include/gdcm-2.0/gdcmExplicitDataElement.txx
-include/gdcm-2.0/gdcmExplicitImplicitDataElement.h
-include/gdcm-2.0/gdcmExplicitImplicitDataElement.txx
-include/gdcm-2.0/gdcmFiducials.h
-include/gdcm-2.0/gdcmFile.h
-include/gdcm-2.0/gdcmFileDerivation.h
-include/gdcm-2.0/gdcmFileExplicitFilter.h
-include/gdcm-2.0/gdcmFileMetaInformation.h
-include/gdcm-2.0/gdcmFileSet.h
-include/gdcm-2.0/gdcmFilename.h
-include/gdcm-2.0/gdcmFilenameGenerator.h
-include/gdcm-2.0/gdcmFragment.h
-include/gdcm-2.0/gdcmFragment.txx
-include/gdcm-2.0/gdcmGlobal.h
-include/gdcm-2.0/gdcmGroupDict.h
-include/gdcm-2.0/gdcmIOD.h
-include/gdcm-2.0/gdcmIODEntry.h
-include/gdcm-2.0/gdcmIODs.h
-include/gdcm-2.0/gdcmIPPSorter.h
-include/gdcm-2.0/gdcmIconImage.h
-include/gdcm-2.0/gdcmImage.h
-include/gdcm-2.0/gdcmImageApplyLookupTable.h
-include/gdcm-2.0/gdcmImageChangePhotometricInterpretation.h
-include/gdcm-2.0/gdcmImageChangePlanarConfiguration.h
-include/gdcm-2.0/gdcmImageChangeTransferSyntax.h
-include/gdcm-2.0/gdcmImageCodec.h
-include/gdcm-2.0/gdcmImageConverter.h
-include/gdcm-2.0/gdcmImageFragmentSplitter.h
-include/gdcm-2.0/gdcmImageHelper.h
-include/gdcm-2.0/gdcmImageReader.h
-include/gdcm-2.0/gdcmImageToImageFilter.h
-include/gdcm-2.0/gdcmImageWriter.h
-include/gdcm-2.0/gdcmImplicitDataElement.h
-include/gdcm-2.0/gdcmImplicitDataElement.txx
-include/gdcm-2.0/gdcmItem.h
-include/gdcm-2.0/gdcmItem.txx
-include/gdcm-2.0/gdcmJPEG12Codec.h
-include/gdcm-2.0/gdcmJPEG16Codec.h
-include/gdcm-2.0/gdcmJPEG2000Codec.h
-include/gdcm-2.0/gdcmJPEG8Codec.h
-include/gdcm-2.0/gdcmJPEGCodec.h
-include/gdcm-2.0/gdcmJPEGLSCodec.h
-include/gdcm-2.0/gdcmKAKADUCodec.h
-include/gdcm-2.0/gdcmLO.h
-include/gdcm-2.0/gdcmLegacyMacro.h
-include/gdcm-2.0/gdcmLookupTable.h
-include/gdcm-2.0/gdcmMD5.h
-include/gdcm-2.0/gdcmMacro.h
-include/gdcm-2.0/gdcmMacroEntry.h
-include/gdcm-2.0/gdcmMacros.h
-include/gdcm-2.0/gdcmMediaStorage.h
-include/gdcm-2.0/gdcmModule.h
-include/gdcm-2.0/gdcmModuleEntry.h
-include/gdcm-2.0/gdcmModules.h
-include/gdcm-2.0/gdcmNestedModuleEntries.h
-include/gdcm-2.0/gdcmObject.h
-include/gdcm-2.0/gdcmOrientation.h
-include/gdcm-2.0/gdcmOverlay.h
-include/gdcm-2.0/gdcmPDBElement.h
-include/gdcm-2.0/gdcmPDBHeader.h
-include/gdcm-2.0/gdcmPDFCodec.h
-include/gdcm-2.0/gdcmPNMCodec.h
-include/gdcm-2.0/gdcmPVRGCodec.h
-include/gdcm-2.0/gdcmParseException.h
-include/gdcm-2.0/gdcmParser.h
-include/gdcm-2.0/gdcmPatient.h
-include/gdcm-2.0/gdcmPersonName.h
-include/gdcm-2.0/gdcmPhotometricInterpretation.h
-include/gdcm-2.0/gdcmPixelFormat.h
-include/gdcm-2.0/gdcmPixmap.h
-include/gdcm-2.0/gdcmPixmapReader.h
-include/gdcm-2.0/gdcmPixmapToPixmapFilter.h
-include/gdcm-2.0/gdcmPixmapWriter.h
-include/gdcm-2.0/gdcmPreamble.h
-include/gdcm-2.0/gdcmPrinter.h
-include/gdcm-2.0/gdcmPrivateTag.h
-include/gdcm-2.0/gdcmProgressEvent.h
-include/gdcm-2.0/gdcmRAWCodec.h
-include/gdcm-2.0/gdcmRLECodec.h
-include/gdcm-2.0/gdcmReader.h
-include/gdcm-2.0/gdcmRescaler.h
-include/gdcm-2.0/gdcmSHA1.h
-include/gdcm-2.0/gdcmSOPClassUIDToIOD.h
-include/gdcm-2.0/gdcmScanner.h
-include/gdcm-2.0/gdcmSegmentedPaletteColorLookupTable.h
-include/gdcm-2.0/gdcmSequenceOfFragments.h
-include/gdcm-2.0/gdcmSequenceOfFragments.txx
-include/gdcm-2.0/gdcmSequenceOfItems.h
-include/gdcm-2.0/gdcmSequenceOfItems.txx
-include/gdcm-2.0/gdcmSerieHelper.h
-include/gdcm-2.0/gdcmSeries.h
-include/gdcm-2.0/gdcmSimpleSubjectWatcher.h
-include/gdcm-2.0/gdcmSmartPointer.h
-include/gdcm-2.0/gdcmSorter.h
-include/gdcm-2.0/gdcmSpacing.h
-include/gdcm-2.0/gdcmSpectroscopy.h
-include/gdcm-2.0/gdcmSplitMosaicFilter.h
-include/gdcm-2.0/gdcmStaticAssert.h
-include/gdcm-2.0/gdcmString.h
-include/gdcm-2.0/gdcmStringFilter.h
-include/gdcm-2.0/gdcmStudy.h
-include/gdcm-2.0/gdcmSubject.h
-include/gdcm-2.0/gdcmSwapCode.h
-include/gdcm-2.0/gdcmSwapper.h
-include/gdcm-2.0/gdcmSwapper.txx
-include/gdcm-2.0/gdcmSystem.h
-include/gdcm-2.0/gdcmTable.h
-include/gdcm-2.0/gdcmTableEntry.h
-include/gdcm-2.0/gdcmTableReader.h
-include/gdcm-2.0/gdcmTag.h
-include/gdcm-2.0/gdcmTagPath.h
-include/gdcm-2.0/gdcmTagToType.h
-include/gdcm-2.0/gdcmTagToVR.h
-include/gdcm-2.0/gdcmTerminal.h
-include/gdcm-2.0/gdcmTestDriver.h
-include/gdcm-2.0/gdcmTesting.h
-include/gdcm-2.0/gdcmTrace.h
-include/gdcm-2.0/gdcmTransferSyntax.h
-include/gdcm-2.0/gdcmType.h
-include/gdcm-2.0/gdcmTypes.h
-include/gdcm-2.0/gdcmUIDGenerator.h
-include/gdcm-2.0/gdcmUIDs.h
-include/gdcm-2.0/gdcmUNExplicitDataElement.h
-include/gdcm-2.0/gdcmUNExplicitDataElement.txx
-include/gdcm-2.0/gdcmUNExplicitImplicitDataElement.h
-include/gdcm-2.0/gdcmUNExplicitImplicitDataElement.txx
-include/gdcm-2.0/gdcmUnpacker12Bits.h
-include/gdcm-2.0/gdcmUsage.h
-include/gdcm-2.0/gdcmVL.h
-include/gdcm-2.0/gdcmVM.h
-include/gdcm-2.0/gdcmVR.h
-include/gdcm-2.0/gdcmVR16ExplicitDataElement.h
-include/gdcm-2.0/gdcmVR16ExplicitDataElement.txx
-include/gdcm-2.0/gdcmValidate.h
-include/gdcm-2.0/gdcmValue.h
-include/gdcm-2.0/gdcmValue.txx
-include/gdcm-2.0/gdcmValueIO.h
-include/gdcm-2.0/gdcmValueIO.txx
-include/gdcm-2.0/gdcmVersion.h
-include/gdcm-2.0/gdcmWaveform.h
-include/gdcm-2.0/gdcmWin32.h
-include/gdcm-2.0/gdcmWriter.h
-include/gdcm-2.0/gdcmXMLDictReader.h
-include/gdcm-2.0/gdcmXMLPrivateDictReader.h
-include/gdcm-2.0/gdcm_j2k.h
-include/gdcm-2.0/gdcm_jp2.h
-include/gdcm-2.0/gdcmcharls/colortransform.h
-include/gdcm-2.0/gdcmcharls/config.h
-include/gdcm-2.0/gdcmcharls/context.h
-include/gdcm-2.0/gdcmcharls/contextrunmode.h
-include/gdcm-2.0/gdcmcharls/decoderstrategy.h
-include/gdcm-2.0/gdcmcharls/defaulttraits.h
-include/gdcm-2.0/gdcmcharls/encoderstrategy.h
-include/gdcm-2.0/gdcmcharls/header.h
-include/gdcm-2.0/gdcmcharls/interface.h
-include/gdcm-2.0/gdcmcharls/lookuptable.h
-include/gdcm-2.0/gdcmcharls/losslesstraits.h
-include/gdcm-2.0/gdcmcharls/processline.h
-include/gdcm-2.0/gdcmcharls/scan.h
-include/gdcm-2.0/gdcmcharls/stdafx.h
-include/gdcm-2.0/gdcmcharls/streams.h
-include/gdcm-2.0/gdcmcharls/util.h
-include/gdcm-2.0/gdcmjpeg/12/jconfig.h
-include/gdcm-2.0/gdcmjpeg/12/jerror.h
-include/gdcm-2.0/gdcmjpeg/12/jinclude.h
-include/gdcm-2.0/gdcmjpeg/12/jmorecfg.h
-include/gdcm-2.0/gdcmjpeg/12/jpegcmake.h
-include/gdcm-2.0/gdcmjpeg/12/jpeglib.h
-include/gdcm-2.0/gdcmjpeg/12/mangle_jpeg12bits.h
-include/gdcm-2.0/gdcmjpeg/16/jconfig.h
-include/gdcm-2.0/gdcmjpeg/16/jerror.h
-include/gdcm-2.0/gdcmjpeg/16/jinclude.h
-include/gdcm-2.0/gdcmjpeg/16/jmorecfg.h
-include/gdcm-2.0/gdcmjpeg/16/jpegcmake.h
-include/gdcm-2.0/gdcmjpeg/16/jpeglib.h
-include/gdcm-2.0/gdcmjpeg/16/mangle_jpeg16bits.h
-include/gdcm-2.0/gdcmjpeg/8/jconfig.h
-include/gdcm-2.0/gdcmjpeg/8/jerror.h
-include/gdcm-2.0/gdcmjpeg/8/jinclude.h
-include/gdcm-2.0/gdcmjpeg/8/jmorecfg.h
-include/gdcm-2.0/gdcmjpeg/8/jpegcmake.h
-include/gdcm-2.0/gdcmjpeg/8/jpeglib.h
-include/gdcm-2.0/gdcmjpeg/8/mangle_jpeg8bits.h
-include/gdcm-2.0/gdcmjpeg/jchuff.h
-include/gdcm-2.0/gdcmjpeg/jconfig.h
-include/gdcm-2.0/gdcmjpeg/jdct.h
-include/gdcm-2.0/gdcmjpeg/jdhuff.h
-include/gdcm-2.0/gdcmjpeg/jerror.h
-include/gdcm-2.0/gdcmjpeg/jinclude.h
-include/gdcm-2.0/gdcmjpeg/jlossls.h
-include/gdcm-2.0/gdcmjpeg/jlossy.h
-include/gdcm-2.0/gdcmjpeg/jmemsys.h
-include/gdcm-2.0/gdcmjpeg/jmorecfg.h
-include/gdcm-2.0/gdcmjpeg/jpegint.h
-include/gdcm-2.0/gdcmjpeg/jpeglib.h
-include/gdcm-2.0/gdcmjpeg/jversion.h
-include/gdcm-2.0/gdcmopenjpeg/bio.h
-include/gdcm-2.0/gdcmopenjpeg/cio.h
-include/gdcm-2.0/gdcmopenjpeg/dwt.h
-include/gdcm-2.0/gdcmopenjpeg/event.h
-include/gdcm-2.0/gdcmopenjpeg/fix.h
-include/gdcm-2.0/gdcmopenjpeg/function_list.h
-include/gdcm-2.0/gdcmopenjpeg/image.h
-include/gdcm-2.0/gdcmopenjpeg/int.h
-include/gdcm-2.0/gdcmopenjpeg/invert.h
-include/gdcm-2.0/gdcmopenjpeg/j2k.h
-include/gdcm-2.0/gdcmopenjpeg/j2k_lib.h
-include/gdcm-2.0/gdcmopenjpeg/jp2.h
-include/gdcm-2.0/gdcmopenjpeg/jpt.h
-include/gdcm-2.0/gdcmopenjpeg/mct.h
-include/gdcm-2.0/gdcmopenjpeg/mqc.h
-include/gdcm-2.0/gdcmopenjpeg/openjpeg.h
-include/gdcm-2.0/gdcmopenjpeg/openjpeg_mangle.h
-include/gdcm-2.0/gdcmopenjpeg/opj_configure.h
-include/gdcm-2.0/gdcmopenjpeg/opj_includes.h
-include/gdcm-2.0/gdcmopenjpeg/opj_malloc.h
-include/gdcm-2.0/gdcmopenjpeg/pi.h
-include/gdcm-2.0/gdcmopenjpeg/profile.h
-include/gdcm-2.0/gdcmopenjpeg/raw.h
-include/gdcm-2.0/gdcmopenjpeg/t1.h
-include/gdcm-2.0/gdcmopenjpeg/t1_luts.h
-include/gdcm-2.0/gdcmopenjpeg/t2.h
-include/gdcm-2.0/gdcmopenjpeg/tcd.h
-include/gdcm-2.0/gdcmopenjpeg/tgt.h
-include/gdcm-2.0/zipstreamimpl.h
-%%VTK%%include/gdcm-2.0/vtkGDCMImageReader.h
-%%VTK%%include/gdcm-2.0/vtkGDCMImageWriter.h
-%%VTK%%include/gdcm-2.0/vtkGDCMMedicalImageProperties.h
-%%VTK%%include/gdcm-2.0/vtkGDCMPolyDataReader.h
-%%VTK%%include/gdcm-2.0/vtkGDCMPolyDataWriter.h
-%%VTK%%include/gdcm-2.0/vtkGDCMTesting.h
-%%VTK%%include/gdcm-2.0/vtkGDCMThreadedImageReader.h
-%%VTK%%include/gdcm-2.0/vtkGDCMThreadedImageReader2.h
-%%VTK%%include/gdcm-2.0/vtkImageColorViewer.h
-%%VTK%%include/gdcm-2.0/vtkImageMapToColors16.h
-%%VTK%%include/gdcm-2.0/vtkImageMapToWindowLevelColors2.h
-%%VTK%%include/gdcm-2.0/vtkImagePlanarComponentsToComponents.h
-%%VTK%%include/gdcm-2.0/vtkImageRGBToYBR.h
-%%VTK%%include/gdcm-2.0/vtkImageYBRToRGB.h
-%%VTK%%include/gdcm-2.0/vtkLookupTable16.h
-lib/gdcm-2.0/GDCMConfig.cmake
-lib/gdcm-2.0/GDCMConfigVersion.cmake
-lib/gdcm-2.0/GDCMTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/gdcm-2.0/GDCMTargets.cmake
-lib/gdcm-2.0/UseGDCM.cmake
-lib/gdcmopenjpeg-2.0/GDCMTargets.cmake
-lib/gdcmopenjpeg-2.0/GDCMTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/gdcmopenjpeg-2.0/OpenJPEGConfig.cmake
+bin/gdcmraw
+bin/gdcmscanner
+bin/gdcmtar
+bin/gdcmviewer
+include/gdcm-%%GDCM_MAJ%%/gdcmASN1.h
+include/gdcm-%%GDCM_MAJ%%/gdcmAnonymizeEvent.h
+include/gdcm-%%GDCM_MAJ%%/gdcmAnonymizer.h
+include/gdcm-%%GDCM_MAJ%%/gdcmApplicationEntity.h
+include/gdcm-%%GDCM_MAJ%%/gdcmAttribute.h
+include/gdcm-%%GDCM_MAJ%%/gdcmAudioCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmBase64.h
+include/gdcm-%%GDCM_MAJ%%/gdcmBasicOffsetTable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmBitmap.h
+include/gdcm-%%GDCM_MAJ%%/gdcmByteBuffer.h
+include/gdcm-%%GDCM_MAJ%%/gdcmByteSwap.h
+include/gdcm-%%GDCM_MAJ%%/gdcmByteSwap.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmByteSwapFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmByteValue.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCP246ExplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCP246ExplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmCSAElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCSAHeader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCSAHeader.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmCSAHeaderDict.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCSAHeaderDictEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCodeString.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCoder.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCommand.h
+include/gdcm-%%GDCM_MAJ%%/gdcmConfigure.h
+include/gdcm-%%GDCM_MAJ%%/gdcmConstCharWrapper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCryptographicMessageSyntax.h
+include/gdcm-%%GDCM_MAJ%%/gdcmCurve.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDICOMDIR.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDICOMDIRGenerator.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDataSet.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDataSet.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmDataSetHelper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDecoder.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDefinedTerms.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDeflateStream.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDefs.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDeltaEncodingCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDict.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDictConverter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDictEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDictPrinter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDicts.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDirectionCosines.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDirectory.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDummyValueGenerator.h
+include/gdcm-%%GDCM_MAJ%%/gdcmDumper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmEncapsulatedDocument.h
+include/gdcm-%%GDCM_MAJ%%/gdcmEnumeratedValues.h
+include/gdcm-%%GDCM_MAJ%%/gdcmEvent.h
+include/gdcm-%%GDCM_MAJ%%/gdcmException.h
+include/gdcm-%%GDCM_MAJ%%/gdcmExplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmExplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmExplicitImplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmExplicitImplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmFiducials.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFile.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFileDerivation.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFileExplicitFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFileMetaInformation.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFileSet.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFilename.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFilenameGenerator.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFragment.h
+include/gdcm-%%GDCM_MAJ%%/gdcmFragment.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmGlobal.h
+include/gdcm-%%GDCM_MAJ%%/gdcmGroupDict.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIOD.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIODEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIODs.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIPPSorter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIconImage.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIconImageFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmIconImageGenerator.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImage.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageApplyLookupTable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageChangePhotometricInterpretation.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageChangePlanarConfiguration.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageChangeTransferSyntax.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageConverter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageFragmentSplitter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageHelper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageToImageFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImageWriter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmImplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmItem.h
+include/gdcm-%%GDCM_MAJ%%/gdcmItem.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEG12Codec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEG16Codec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEG2000Codec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEG8Codec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEGCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmJPEGLSCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmKAKADUCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmLO.h
+include/gdcm-%%GDCM_MAJ%%/gdcmLegacyMacro.h
+include/gdcm-%%GDCM_MAJ%%/gdcmLookupTable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmMD5.h
+include/gdcm-%%GDCM_MAJ%%/gdcmMacro.h
+include/gdcm-%%GDCM_MAJ%%/gdcmMacroEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmMacros.h
+include/gdcm-%%GDCM_MAJ%%/gdcmMediaStorage.h
+include/gdcm-%%GDCM_MAJ%%/gdcmModule.h
+include/gdcm-%%GDCM_MAJ%%/gdcmModuleEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmModules.h
+include/gdcm-%%GDCM_MAJ%%/gdcmNestedModuleEntries.h
+include/gdcm-%%GDCM_MAJ%%/gdcmObject.h
+include/gdcm-%%GDCM_MAJ%%/gdcmOrientation.h
+include/gdcm-%%GDCM_MAJ%%/gdcmOverlay.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPDBElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPDBHeader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPDFCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPNMCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPVRGCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmParseException.h
+include/gdcm-%%GDCM_MAJ%%/gdcmParser.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPatient.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPersonName.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPhotometricInterpretation.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPixelFormat.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPixmap.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPixmapReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPixmapToPixmapFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPixmapWriter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPreamble.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPrinter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPrivateTag.h
+include/gdcm-%%GDCM_MAJ%%/gdcmProgressEvent.h
+include/gdcm-%%GDCM_MAJ%%/gdcmRAWCodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmRLECodec.h
+include/gdcm-%%GDCM_MAJ%%/gdcmReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmRescaler.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSHA1.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSOPClassUIDToIOD.h
+include/gdcm-%%GDCM_MAJ%%/gdcmScanner.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSegmentedPaletteColorLookupTable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSequenceOfFragments.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSequenceOfFragments.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmSequenceOfItems.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSequenceOfItems.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmSerieHelper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSeries.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSimpleSubjectWatcher.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSmartPointer.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSorter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSpacing.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSpectroscopy.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSplitMosaicFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmStaticAssert.h
+include/gdcm-%%GDCM_MAJ%%/gdcmString.h
+include/gdcm-%%GDCM_MAJ%%/gdcmStringFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmStudy.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSubject.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSwapCode.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSwapper.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSwapper.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmSystem.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTableEntry.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTableReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTag.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTagPath.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTagToType.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTagToVR.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTerminal.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTestDriver.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTesting.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTrace.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTransferSyntax.h
+include/gdcm-%%GDCM_MAJ%%/gdcmType.h
+include/gdcm-%%GDCM_MAJ%%/gdcmTypes.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUIDGenerator.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUIDs.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUNExplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUNExplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmUNExplicitImplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUNExplicitImplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmUnpacker12Bits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmUsage.h
+include/gdcm-%%GDCM_MAJ%%/gdcmVL.h
+include/gdcm-%%GDCM_MAJ%%/gdcmVM.h
+include/gdcm-%%GDCM_MAJ%%/gdcmVR.h
+include/gdcm-%%GDCM_MAJ%%/gdcmVR16ExplicitDataElement.h
+include/gdcm-%%GDCM_MAJ%%/gdcmVR16ExplicitDataElement.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmValidate.h
+include/gdcm-%%GDCM_MAJ%%/gdcmValue.h
+include/gdcm-%%GDCM_MAJ%%/gdcmValue.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmValueIO.h
+include/gdcm-%%GDCM_MAJ%%/gdcmValueIO.txx
+include/gdcm-%%GDCM_MAJ%%/gdcmVersion.h
+include/gdcm-%%GDCM_MAJ%%/gdcmWaveform.h
+include/gdcm-%%GDCM_MAJ%%/gdcmWin32.h
+include/gdcm-%%GDCM_MAJ%%/gdcmWriter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmXMLDictReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmXMLPrivateDictReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcm_j2k.h
+include/gdcm-%%GDCM_MAJ%%/gdcm_jp2.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/colortransform.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/config.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/context.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/contextrunmode.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/decoderstrategy.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/defaulttraits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/encoderstrategy.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/header.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/interface.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/lookuptable.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/losslesstraits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/processline.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/scan.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/stdafx.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/streams.h
+include/gdcm-%%GDCM_MAJ%%/gdcmcharls/util.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jconfig.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jerror.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jinclude.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jmorecfg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jpegcmake.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/jpeglib.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12/mangle_jpeg12bits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jconfig.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jerror.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jinclude.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jmorecfg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jpegcmake.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/jpeglib.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16/mangle_jpeg16bits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jconfig.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jerror.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jinclude.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jmorecfg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jpegcmake.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/jpeglib.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8/mangle_jpeg8bits.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jchuff.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jconfig.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jdct.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jdhuff.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jerror.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jinclude.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jlossls.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jlossy.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jmemsys.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jmorecfg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jpegint.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jpeglib.h
+include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/jversion.h
+include/gdcm-%%GDCM_MAJ%%/gdcmopenjpeg/gdcmopenjpeg-1.4/openjpeg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmopenjpeg/openjpeg.h
+include/gdcm-%%GDCM_MAJ%%/gdcmopenjpeg/openjpeg_mangle.h
+include/gdcm-%%GDCM_MAJ%%/zipstreamimpl.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMImageReader.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMImageWriter.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMMedicalImageProperties.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMPolyDataReader.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMPolyDataWriter.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMTesting.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMThreadedImageReader.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkGDCMThreadedImageReader2.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImageColorViewer.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImageMapToColors16.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImageMapToWindowLevelColors2.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImagePlanarComponentsToComponents.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImageRGBToYBR.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkImageYBRToRGB.h
+%%VTK%%include/gdcm-%%GDCM_MAJ%%/vtkLookupTable16.h
+lib/gdcm-%%GDCM_MAJ%%/GDCMConfig.cmake
+lib/gdcm-%%GDCM_MAJ%%/GDCMConfigVersion.cmake
+lib/gdcm-%%GDCM_MAJ%%/GDCMTargets-release.cmake
+lib/gdcm-%%GDCM_MAJ%%/GDCMTargets.cmake
+lib/gdcm-%%GDCM_MAJ%%/UseGDCM.cmake
+lib/gdcmopenjpeg-1.4/GDCMTargets-release.cmake
+lib/gdcmopenjpeg-1.4/GDCMTargets.cmake
+lib/gdcmopenjpeg-1.4/OpenJPEGConfig.cmake
 lib/libgdcmCommon.so
 lib/libgdcmCommon.so.%%GDCM_MAJ%%
 lib/libgdcmCommon.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
@@ -332,7 +310,7 @@ lib/libgdcmcharls.so.%%GDCM_MAJ%%
 lib/libgdcmcharls.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
 lib/libgdcmexpat.so
 lib/libgdcmexpat.so.%%GDCM_MAJ%%
-lib/libgdcmexpat.so.2.0.0
+lib/libgdcmexpat.so.%%GDCM_MAJ%%.0
 lib/libgdcmjpeg12.so
 lib/libgdcmjpeg12.so.%%GDCM_MAJ%%
 lib/libgdcmjpeg12.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
@@ -343,8 +321,8 @@ lib/libgdcmjpeg8.so
 lib/libgdcmjpeg8.so.%%GDCM_MAJ%%
 lib/libgdcmjpeg8.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
 lib/libgdcmopenjpeg.so
-lib/libgdcmopenjpeg.so.%%GDCM_MAJ%%
-lib/libgdcmopenjpeg.so.%%GDCM_MAJ%%.0
+lib/libgdcmopenjpeg.so.1.4
+lib/libgdcmopenjpeg.so.1.4.0
 lib/libgdcmuuid.so
 lib/libgdcmuuid.so.%%GDCM_MAJ%%
 lib/libgdcmuuid.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
@@ -360,16 +338,14 @@ lib/libgdcmzlib.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
 %%DATADIR%%/XML/Part4.xml
 %%DATADIR%%/XML/Part6.xml
 %%DATADIR%%/XML/Part7.xml
-%%DATADIR%%/XML/UIDs.xml
 %%DATADIR%%/XML/cp699.xml
-@dirrm include/gdcm-2.0/gdcmopenjpeg
-@dirrm include/gdcm-2.0/gdcmjpeg/8
-@dirrm include/gdcm-2.0/gdcmjpeg/16
-@dirrm include/gdcm-2.0/gdcmjpeg/12
-@dirrm include/gdcm-2.0/gdcmjpeg
-@dirrm include/gdcm-2.0/gdcmcharls
-@dirrm include/gdcm-2.0
-@dirrm lib/gdcm-2.0
-@dirrm lib/gdcmopenjpeg-2.0
-@dirrm %%DATADIR%%/XML
-@dirrm %%DATADIR%%
+%%DATADIR%%/XML/UIDs.xml
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmopenjpeg/gdcmopenjpeg-1.4
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmopenjpeg
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/8
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/16
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmjpeg/12
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmjpeg
+@dirrm include/gdcm-%%GDCM_MAJ%%/gdcmcharls
+@dirrm include/gdcm-%%GDCM_MAJ%%
+@dirrm lib/gdcmopenjpeg-1.4