aboutsummaryrefslogtreecommitdiffstats
path: root/devel/gdcm
diff options
context:
space:
mode:
authorgahr <gahr@FreeBSD.org>2011-07-01 17:56:53 +0800
committergahr <gahr@FreeBSD.org>2011-07-01 17:56:53 +0800
commit89a8c3c629c7d458ad5fd0667693c360d88fb34e (patch)
tree365b9e389322626a2d19e570170a1bc462cdf9c5 /devel/gdcm
parent01c3e28182ed74ce04f2202b3d583ed849d53aa4 (diff)
downloadfreebsd-ports-gnome-89a8c3c629c7d458ad5fd0667693c360d88fb34e.tar.gz
freebsd-ports-gnome-89a8c3c629c7d458ad5fd0667693c360d88fb34e.tar.zst
freebsd-ports-gnome-89a8c3c629c7d458ad5fd0667693c360d88fb34e.zip
- add dependency on graphics/openjpeg
- bump portrevision
Diffstat (limited to 'devel/gdcm')
-rw-r--r--devel/gdcm/Makefile11
-rw-r--r--devel/gdcm/pkg-plist12
2 files changed, 6 insertions, 17 deletions
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile
index 783e6947e54f..d670185b5df5 100644
--- a/devel/gdcm/Makefile
+++ b/devel/gdcm/Makefile
@@ -6,12 +6,15 @@
PORTNAME= gdcm
PORTVERSION= ${GDCM_MAJ}.${GDCM_MIN}
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/gdcm/gdcm%202.x/GDCM%20${PORTVERSION}
MAINTAINER= gahr@FreeBSD.org
COMMENT= Grassroots DICOM library
+LIB_DEPENDS= openjpeg.2:${PORTSDIR}/graphics/openjpeg
+
OPTIONS= VTK "Build the VTK bindings" off
USE_BZIP2= yes
@@ -39,7 +42,8 @@ CMAKE_OUTSOURCE=yes
CMAKE_ARGS+= -DGDCM_BUILD_APPLICATIONS:BOOL=YES \
-DGDCM_BUILD_SHARED_LIBS:BOOL=YES \
-DGDCM_BUILD_EXAMPLES:BOOL=NO \
- -DGDCM_INSTALL_DATA_DIR:STRING=${DATADIR}
+ -DGDCM_INSTALL_DATA_DIR:STRING=${DATADIR} \
+ -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=YES
.if !defined(NOPORTDOCS)
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
@@ -49,7 +53,6 @@ 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}
@@ -66,8 +69,6 @@ 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
+ ${REINPLACE_CMD} -e 's|share/man|man|g;' ${WRKSRC}/CMakeLists.txt
.include <bsd.port.post.mk>
diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist
index 573fb3d8f502..89c4a74bdc6b 100644
--- a/devel/gdcm/pkg-plist
+++ b/devel/gdcm/pkg-plist
@@ -263,9 +263,6 @@ 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
@@ -287,9 +284,6 @@ 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%%
@@ -320,9 +314,6 @@ lib/libgdcmjpeg16.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
lib/libgdcmjpeg8.so
lib/libgdcmjpeg8.so.%%GDCM_MAJ%%
lib/libgdcmjpeg8.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
-lib/libgdcmopenjpeg.so
-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%%
@@ -340,12 +331,9 @@ lib/libgdcmzlib.so.%%GDCM_MAJ%%.%%GDCM_MIN%%
%%DATADIR%%/XML/Part7.xml
%%DATADIR%%/XML/cp699.xml
%%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