Date: Fri, 11 Apr 2014 08:45:24 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350905 - head/devel/gdcm Message-ID: <201404110845.s3B8jOtt031092@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Apr 11 08:45:24 2014 New Revision: 350905 URL: http://svnweb.freebsd.org/changeset/ports/350905 QAT: https://qat.redports.org/buildarchive/r350905/ Log: - Update to 2.4.2 - Support both VTK5 and VTK6 Modified: head/devel/gdcm/Makefile head/devel/gdcm/distinfo head/devel/gdcm/pkg-plist Modified: head/devel/gdcm/Makefile ============================================================================== --- head/devel/gdcm/Makefile Fri Apr 11 08:25:47 2014 (r350904) +++ head/devel/gdcm/Makefile Fri Apr 11 08:45:24 2014 (r350905) @@ -12,12 +12,23 @@ COMMENT= Grassroots DICOM library LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg \ libexpat.so:${PORTSDIR}/textproc/expat2 -OPTIONS_DEFINE= VTK DOCS +OPTIONS_DEFINE= DOCS OPTIONS_UNSET= DOCS -VTK_DESC= Build with VTK bindings +OPTIONS_RADIO= VTK +OPTIONS_RADIO_VTK= VTK5 VTK6 +VTK5_DESC= Build VTK 5 integration classes +VTK6_DESC= Build VTK 6 integration classes -USE_BZIP2= yes -USES= cmake:outsource +# Change this when updating the port +GDCM_MAJOR= 2 +GDCM_MINOR= 4 +GDCM_PATCH= 2 + +# Change this whenever VTK is updated +VTK5_VERSION= 5.10 +VTK6_VERSION= 6.1 + +USES= cmake:outsource tar:bzip2 USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib CFLAGS+= -I${LOCALBASE}/include @@ -33,18 +44,24 @@ CMAKE_ARGS+= -DGDCM_PDF_DOCUMENTATION:BO .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MVTK} -LIB_DEPENDS+= libvtkHybrid.so.5:${PORTSDIR}/math/vtk5 -CMAKE_ARGS+= -DGDCM_USE_VTK:BOOL=YES +.if ${PORT_OPTIONS:MVTK5} +LIB_DEPENDS+= libvtkHybrid.so:${PORTSDIR}/math/vtk5 +CMAKE_ARGS+= -DGDCM_USE_VTK:BOOL=YES \ + -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK5_VERSION} +.endif + +.if ${PORT_OPTIONS:MVTK6} +LIB_DEPENDS+= libvtkCommonCore-${VTK6_VERSION}.so:${PORTSDIR}/math/vtk6 +CMAKE_ARGS+= -DGDCM_USE_VTK:BOOL=YES \ + -DVTK_DIR:PATH=${LOCALBASE}/lib/vtk-${VTK6_VERSION} +.endif + +.if ${PORT_OPTIONS:MVTK5} || ${PORT_OPTIONS:MVTK6} PLIST_SUB+= VTK="" .else -PLIST_SUB+= VTK="@comment " +PLIST_SUB+= VTK="@comment " .endif -GDCM_MAJOR= 2 -GDCM_MINOR= 4 -GDCM_PATCH= 1 - PLIST_SUB+= GDCM_MAJOR="${GDCM_MAJOR}" \ GDCM_MINOR="${GDCM_MINOR}" \ GDCM_PATCH="${GDCM_PATCH}" Modified: head/devel/gdcm/distinfo ============================================================================== --- head/devel/gdcm/distinfo Fri Apr 11 08:25:47 2014 (r350904) +++ head/devel/gdcm/distinfo Fri Apr 11 08:45:24 2014 (r350905) @@ -1,2 +1,2 @@ -SHA256 (gdcm-2.4.1.tar.bz2) = 57da8d4dc9d9d149e5d857453e9471598ae39414bbac74b31129c2b7cdb6cb0f -SIZE (gdcm-2.4.1.tar.bz2) = 4376426 +SHA256 (gdcm-2.4.2.tar.bz2) = fe2f8b1a206912d4fc83ed5de4e5eedaa08e2f32b295b13407c8b27c1bef5d11 +SIZE (gdcm-2.4.2.tar.bz2) = 4401949 Modified: head/devel/gdcm/pkg-plist ============================================================================== --- head/devel/gdcm/pkg-plist Fri Apr 11 08:25:47 2014 (r350904) +++ head/devel/gdcm/pkg-plist Fri Apr 11 08:45:24 2014 (r350905) @@ -394,6 +394,7 @@ include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/socketxx/sockunix.h include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/zipstreamimpl.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkGDCMImageReader.h +%%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkGDCMImageReader2.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkGDCMImageWriter.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkGDCMMedicalImageProperties.h %%VTK%%include/gdcm-%%GDCM_MAJOR%%.%%GDCM_MINOR%%/vtkGDCMPolyDataReader.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404110845.s3B8jOtt031092>