diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2012-06-14 12:03:43 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2012-06-14 12:03:43 +0000 |
| commit | 1baec243706448d4807ec3700471d7d0a9170d7d (patch) | |
| tree | 76bde4a9ba679aaa5a3c7b69ba9948e7555b9912 /devel | |
| parent | 266aab05ce081f13c7f924db9bcbe18b60a40579 (diff) | |
| download | ports-1baec243706448d4807ec3700471d7d0a9170d7d.tar.gz ports-1baec243706448d4807ec3700471d7d0a9170d7d.zip | |
Notes
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gdcm/Makefile | 16 | ||||
| -rw-r--r-- | devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake | 15 |
2 files changed, 21 insertions, 10 deletions
diff --git a/devel/gdcm/Makefile b/devel/gdcm/Makefile index 22dde9d7f594..17e329789499 100644 --- a/devel/gdcm/Makefile +++ b/devel/gdcm/Makefile @@ -16,8 +16,6 @@ COMMENT= Grassroots DICOM library LIB_DEPENDS= openjpeg.2:${PORTSDIR}/graphics/openjpeg \ expat.6:${PORTSDIR}/textproc/expat2 -BROKEN= does not compile - OPTIONS= VTK "Build the VTK bindings" off USE_BZIP2= yes @@ -26,11 +24,16 @@ USE_OPENSSL= yes USE_LDCONFIG= ${PREFIX}/lib \ ${PREFIX}/lib/gdcm-${GDCM_MAJ} CFLAGS+= -I${LOCALBASE}/include +CMAKE_OUTSOURCE=yes CMAKE_ARGS+= -DGDCM_PDF_DOCUMENTATION:BOOL=NO \ -DGDCM_USE_SYSTEM_OPENSSL:BOOL=YES \ -DGDCM_USE_SYSTEM_EXPAT:BOOL=YES \ -DGDCM_USE_SYSTEM_OPENJPEG:BOOL=YES \ - -DGDCM_USE_SYSTEM_ZLIB:BOOL=YES + -DGDCM_USE_SYSTEM_ZLIB:BOOL=YES \ + -DGDCM_BUILD_APPLICATIONS:BOOL=YES \ + -DGDCM_BUILD_SHARED_LIBS:BOOL=YES \ + -DGDCM_BUILD_EXAMPLES:BOOL=NO \ + -DGDCM_INSTALL_DATA_DIR:STRING=${DATADIR} .include <bsd.port.options.mk> @@ -50,13 +53,6 @@ PLIST_SUB+= GDCM_MAJ="${GDCM_MAJ}" \ GDCM_MIN="${GDCM_MIN}" \ GDCM_SO="${GDCM_SO}" -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_USE_SYSTEM_OPENJPEG:BOOL=YES - .if !defined(NOPORTDOCS) BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ pdflatex:${PORTSDIR}/print/teTeX-base diff --git a/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake new file mode 100644 index 000000000000..524935b79f48 --- /dev/null +++ b/devel/gdcm/files/patch-CMake_FindOpenJPEG.cmake @@ -0,0 +1,15 @@ +--- CMake/FindOpenJPEG.cmake.orig 2012-06-14 12:47:50.000000000 +0200 ++++ CMake/FindOpenJPEG.cmake 2012-06-14 12:47:59.000000000 +0200 +@@ -21,7 +21,6 @@ + # Try first to locate a cmake config file + FIND_PACKAGE(OpenJPEG QUIET NO_MODULE) + +-if( NOT OpenJPEG_DIR ) + SET(OPENJPEG_MAJOR_VERSION 1) # FIXME ? + FIND_PATH(OPENJPEG_INCLUDE_DIR + NAMES openjpeg.h #openjpeg-1.0/openjpeg.h +@@ -50,4 +49,3 @@ + OPENJPEG_LIBRARY + OPENJPEG_INCLUDE_DIR + ) +-endif() |