5 files changed, 32 insertions, 20 deletions

diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 17e329789499..e2c424f2a61f 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -1,12 +1,8 @@
-# New ports collection Makefile for:	gdcm
-# Date created:				24 February 2010
-# Whom:					gahr
-#
+# Created by: Pietro Cerutti <gahr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gdcm
 PORTVERSION=	${GDCM_MAJ}.${GDCM_MIN}
-PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION}
 
@@ -16,7 +12,8 @@ COMMENT=	Grassroots DICOM library
 LIB_DEPENDS=	openjpeg.2:${PORTSDIR}/graphics/openjpeg \
    		expat.6:${PORTSDIR}/textproc/expat2
 
-OPTIONS=	VTK "Build the VTK bindings" off
+OPTIONS_DEFINE=	VTK
+VTK_DESC=	Build with VTK bindings
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
@@ -37,7 +34,7 @@ CMAKE_ARGS+=	-DGDCM_PDF_DOCUMENTATION:BOOL=NO \
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_VTK)
+.if ${PORT_OPTIONS:MVTK}
 LIB_DEPENDS+=	vtkHybrid.5:${PORTSDIR}/math/vtk5
 CMAKE_ARGS+=	-DGDCM_USE_VTK:BOOL=YES
 PLIST_SUB+=	VTK=""
@@ -47,7 +44,7 @@ PLIST_SUB+=	VTK="@comment "
 
 GDCM_SO=	2
 GDCM_MAJ=	2.2
-GDCM_MIN=	0
+GDCM_MIN=	1
 
 PLIST_SUB+=	GDCM_MAJ="${GDCM_MAJ}" \
 		GDCM_MIN="${GDCM_MIN}" \
@@ -55,17 +52,16 @@ PLIST_SUB+=	GDCM_MAJ="${GDCM_MAJ}" \
 
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
+    		pdfopt:${PORTSDIR}/print/ghostscript9 \
    		pdflatex:${PORTSDIR}/print/teTeX-base
 CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=YES \
-		-DGDCM_INSTALL_MAN_DIR:STRING=${MAN1PREFIX}/man
+		-DGDCM_INSTALL_MAN_DIR:STRING=${MAN1PREFIX}/man \
+		-DGDCM_INSTALL_DOC_DIR:STRING=${DOCSDIR}
 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 \
 		gdcm2pnm.1 gdcmdiff.1 gdcmscu.1
 PORTDOCS=	*
-post-install:
-	${MKDIR} ${DOCSDIR}
-	cd ${INSTALL_WRKSRC}/Utilities/doxygen/html && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .else
 CMAKE_ARGS+=	-DGDCM_DOCUMENTATION:BOOL=NO
 .endif
diff --git a/devel/gdcm/distinfo b/devel/gdcm/distinfo
index e7fe2b92bb07..d773f7dc0d5c 100644
--- a/devel/gdcm/distinfo
+++ b/devel/gdcm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdcm-2.2.0.tar.bz2) = 2e095e5236047d6792ee05c489aa16ac8190783cb2eba9c14cdb4d81be2ddc1f
-SIZE (gdcm-2.2.0.tar.bz2) = 4242891
+SHA256 (gdcm-2.2.1.tar.bz2) = 1a6e40b6652c658cccbaaf50c21bd9312efa99c73e612931f215d7f6bd8926ed
+SIZE (gdcm-2.2.1.tar.bz2) = 4234346
diff --git a/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt b/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt
new file mode 100644
index 000000000000..452b7b92d234
--- /dev/null
+++ b/devel/gdcm/files/patch-Source-InformationObjectDefinition_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- 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 583548d5a1ff..180313141957 100644
--- a/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt
+++ b/devel/gdcm/files/patch-Utilities-gdcmjpeg_CMakeLists.txt
@@ -1,10 +1,10 @@
---- Utilities/gdcmjpeg/CMakeLists.txt.orig	2012-01-02 13:53:03.000000000 +0100
-+++ Utilities/gdcmjpeg/CMakeLists.txt	2012-01-02 13:53:23.000000000 +0100
-@@ -19,7 +19,7 @@
- 
+--- 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}
    VERSION "${GDCM_VERSION}"
--  SOVERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
+-  SOVERSION "${JPEG_API_VERSION}"
 +  SOVERSION "${GDCM_MAJOR_VERSION}"
  )
  
diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist
index 90142cd6a869..4f2d705efabb 100644
--- a/devel/gdcm/pkg-plist
+++ b/devel/gdcm/pkg-plist
@@ -36,6 +36,7 @@ include/gdcm-%%GDCM_MAJ%%/gdcmBaseRootQuery.h
 include/gdcm-%%GDCM_MAJ%%/gdcmBasicOffsetTable.h
 include/gdcm-%%GDCM_MAJ%%/gdcmBitmap.h
 include/gdcm-%%GDCM_MAJ%%/gdcmBitmapToBitmapFilter.h
+include/gdcm-%%GDCM_MAJ%%/gdcmBoxRegion.h
 include/gdcm-%%GDCM_MAJ%%/gdcmByteBuffer.h
 include/gdcm-%%GDCM_MAJ%%/gdcmByteSwap.h
 include/gdcm-%%GDCM_MAJ%%/gdcmByteSwap.txx
@@ -127,6 +128,7 @@ 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%%/gdcmImageRegionReader.h
 include/gdcm-%%GDCM_MAJ%%/gdcmImageToImageFilter.h
 include/gdcm-%%GDCM_MAJ%%/gdcmImageWriter.h
 include/gdcm-%%GDCM_MAJ%%/gdcmImplementationClassUIDSub.h
@@ -169,6 +171,7 @@ include/gdcm-%%GDCM_MAJ%%/gdcmPDBHeader.h
 include/gdcm-%%GDCM_MAJ%%/gdcmPDFCodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmPDUFactory.h
 include/gdcm-%%GDCM_MAJ%%/gdcmPDataTFPDU.h
+include/gdcm-%%GDCM_MAJ%%/gdcmPGXCodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmPNMCodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmPVRGCodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmParseException.h
@@ -199,8 +202,11 @@ include/gdcm-%%GDCM_MAJ%%/gdcmQueryStudy.h
 include/gdcm-%%GDCM_MAJ%%/gdcmRAWCodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmRLECodec.h
 include/gdcm-%%GDCM_MAJ%%/gdcmReader.h
+include/gdcm-%%GDCM_MAJ%%/gdcmRegion.h
 include/gdcm-%%GDCM_MAJ%%/gdcmRescaler.h
+include/gdcm-%%GDCM_MAJ%%/gdcmRoleSelectionSub.h
 include/gdcm-%%GDCM_MAJ%%/gdcmSHA1.h
+include/gdcm-%%GDCM_MAJ%%/gdcmSOPClassExtendedNegociationSub.h
 include/gdcm-%%GDCM_MAJ%%/gdcmSOPClassUIDToIOD.h
 include/gdcm-%%GDCM_MAJ%%/gdcmScanner.h
 include/gdcm-%%GDCM_MAJ%%/gdcmSegment.h
@@ -374,8 +380,8 @@ lib/libsocketxx.so.1.2
 lib/libsocketxx.so
 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%%/GDCMTargets-release.cmake
 lib/gdcm-%%GDCM_MAJ%%/UseGDCM.cmake
 lib/libgdcmCommon.so
 lib/libgdcmCommon.so.%%GDCM_SO%%