diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2012-01-18 08:32:13 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2012-01-18 08:32:13 +0000 |
| commit | 8ec88c6141a75cea15eafe0f24f761a991017488 (patch) | |
| tree | f14b63e091ac443d53f6149b867bcc9bdae237b1 /devel | |
| parent | 3a1c1eb01100db94022f479855eff5df069e3483 (diff) | |
| download | ports-8ec88c6141a75cea15eafe0f24f761a991017488.tar.gz ports-8ec88c6141a75cea15eafe0f24f761a991017488.zip | |
- Use system expat2, zlib and openjpeg
- Bump PORTREVISION
Notes
Notes:
svn path=/head/; revision=289403
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gdcm/Makefile | 11 | ||||
| -rw-r--r-- | devel/gdcm/files/patch-Utilities-gdcmexpat_CMakeLists.txt | 13 | ||||
| -rw-r--r-- | devel/gdcm/pkg-plist | 6 |
3 files changed, 8 insertions, 22 deletions
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile index 8d641bff38a3..cfdd5d9c07c2 100644 --- a/devel/gdcm/Makefile +++ b/devel/gdcm/Makefile @@ -6,14 +6,15 @@ PORTNAME= gdcm PORTVERSION= ${GDCM_MAJ}.${GDCM_MIN} -PORTREVISION= 2 +PORTREVISION= 3 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 +LIB_DEPENDS= openjpeg.2:${PORTSDIR}/graphics/openjpeg \ + expat.6:${PORTSDIR}/textproc/expat2 OPTIONS= VTK "Build the VTK bindings" off @@ -22,8 +23,12 @@ USE_CMAKE= yes USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib \ ${PREFIX}/lib/gdcm-${GDCM_MAJ} +CFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS+= -DGDCM_PDF_DOCUMENTATION:BOOL=NO \ - -DGDCM_USE_SYSTEM_OPENSSL:BOOL=YES + -DGDCM_USE_SYSTEM_OPENSSL:BOOL=YES \ + -DGDCM_USE_SYSTEM_EXPAT:BOOL=YES \ + -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=YES \ + -DGDCM_USE_SYSTEM_ZLIB:BOOL=YES .include <bsd.port.options.mk> diff --git a/devel/gdcm/files/patch-Utilities-gdcmexpat_CMakeLists.txt b/devel/gdcm/files/patch-Utilities-gdcmexpat_CMakeLists.txt deleted file mode 100644 index 896d7f1e61e8..000000000000 --- a/devel/gdcm/files/patch-Utilities-gdcmexpat_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- Utilities/gdcmexpat/CMakeLists.txt.orig 2012-01-02 14:02:27.000000000 +0100 -+++ Utilities/gdcmexpat/CMakeLists.txt 2012-01-02 14:02:43.000000000 +0100 -@@ -15,8 +15,8 @@ - "${EXPAT_MAJOR_VERSION}.${EXPAT_MINOR_VERSION}.${EXPAT_BUILD_VERSION}") - - SET(EXPAT_LIBRARY_PROPERTIES ${EXPAT_LIBRARY_PROPERTIES} -- VERSION "${EXPAT_VERSION}" -- SOVERSION "${EXPAT_MAJOR_VERSION}.${EXPAT_MINOR_VERSION}" -+ VERSION "${GDCM_VERSION}" -+ SOVERSION "${GDCM_MAJOR_VERSION}" - ) - - # Do full dependency headers. diff --git a/devel/gdcm/pkg-plist b/devel/gdcm/pkg-plist index bf2ff8fd1714..90142cd6a869 100644 --- a/devel/gdcm/pkg-plist +++ b/devel/gdcm/pkg-plist @@ -398,9 +398,6 @@ lib/libgdcmMSFF.so.%%GDCM_MAJ%%.%%GDCM_MIN%% lib/libgdcmcharls.so lib/libgdcmcharls.so.%%GDCM_SO%% lib/libgdcmcharls.so.%%GDCM_MAJ%%.%%GDCM_MIN%% -lib/libgdcmexpat.so -lib/libgdcmexpat.so.%%GDCM_SO%% -lib/libgdcmexpat.so.%%GDCM_MAJ%%.0 lib/libgdcmjpeg12.so lib/libgdcmjpeg12.so.%%GDCM_SO%% lib/libgdcmjpeg12.so.%%GDCM_MAJ%%.%%GDCM_MIN%% @@ -413,9 +410,6 @@ lib/libgdcmjpeg8.so.%%GDCM_MAJ%%.%%GDCM_MIN%% lib/libgdcmuuid.so lib/libgdcmuuid.so.%%GDCM_SO%% lib/libgdcmuuid.so.%%GDCM_MAJ%%.%%GDCM_MIN%% -lib/libgdcmzlib.so -lib/libgdcmzlib.so.%%GDCM_SO%% -lib/libgdcmzlib.so.%%GDCM_MAJ%%.%%GDCM_MIN%% %%VTK%%lib/libvtkgdcm.so %%VTK%%lib/libvtkgdcm.so.%%GDCM_SO%% %%VTK%%lib/libvtkgdcm.so.%%GDCM_MAJ%%.%%GDCM_MIN%% |