diff options
-rw-r--r-- | math/vtk-data/Makefile | 2 | ||||
-rw-r--r-- | math/vtk-examples/Makefile | 2 | ||||
-rw-r--r-- | math/vtk-headers/Makefile | 2 | ||||
-rw-r--r-- | math/vtk-java/Makefile | 2 | ||||
-rw-r--r-- | math/vtk-python/Makefile | 2 | ||||
-rw-r--r-- | math/vtk-tcl/Makefile | 2 | ||||
-rw-r--r-- | math/vtk/Makefile | 18 | ||||
-rw-r--r-- | math/vtk43-headers/Makefile | 2 | ||||
-rw-r--r-- | math/vtk43/Makefile | 18 | ||||
-rw-r--r-- | math/vtk5/Makefile | 18 |
10 files changed, 43 insertions, 25 deletions
diff --git a/math/vtk-data/Makefile b/math/vtk-data/Makefile index d3b0123fee4f..122c805d38c6 100644 --- a/math/vtk-data/Makefile +++ b/math/vtk-data/Makefile @@ -27,4 +27,4 @@ do-install: @${CP} -R ${WRKSRC}/* ${VTKDATAROOT} .include "${MASTERDIR}/Makefile" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk-examples/Makefile b/math/vtk-examples/Makefile index 1d7f500e2d0e..346033442086 100644 --- a/math/vtk-examples/Makefile +++ b/math/vtk-examples/Makefile @@ -36,4 +36,4 @@ do-install: install-cnotice @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${EXAMPLESDIR}/BUILD-HOWTO @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' > ${DOCSDIR}/README.examples -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk-headers/Makefile b/math/vtk-headers/Makefile index b73fef34139d..d3e72f3db7a7 100644 --- a/math/vtk-headers/Makefile +++ b/math/vtk-headers/Makefile @@ -56,4 +56,4 @@ do-install: install-cnotice @${ECHO_MSG} "Installing Doxygen to ${PREFIX}/share/vtk/doxygen :" @cd ${WRKSRC}/Utilities/Doxygen ; ${MAKE} install -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk-java/Makefile b/math/vtk-java/Makefile index 79d1f55ba72a..31eeebfe3256 100644 --- a/math/vtk-java/Makefile +++ b/math/vtk-java/Makefile @@ -66,4 +66,4 @@ do-install: install-cnotice install-binaries install-libs @${ECHO_MSG} "" >> ${TESTINGDIR}/Java/README @${ECHO_MSG} "Be shure to use java 1.3 or greater." >> ${TESTINGDIR}/Java/README -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk-python/Makefile b/math/vtk-python/Makefile index 9d1aeb5b6263..4fcce9864a15 100644 --- a/math/vtk-python/Makefile +++ b/math/vtk-python/Makefile @@ -58,4 +58,4 @@ do-install: install-cnotice install-binaries install-libs ${PREFIX}/lib/vtk/python/libvtk${i}.so .endfor -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk-tcl/Makefile b/math/vtk-tcl/Makefile index 1d9ee063cc28..9ee8be5af3d4 100644 --- a/math/vtk-tcl/Makefile +++ b/math/vtk-tcl/Makefile @@ -36,4 +36,4 @@ do-patch: patch-common do-install: install-cnotice install-binaries install-libs cd ${WRKSRC}/Wrapping/Tcl ; ${MAKE} install -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 6dca17bfa720..118ff644ca1b 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -15,7 +15,7 @@ PORTNAME= vtk PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz @@ -39,6 +39,8 @@ VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patente PLIST_SUB+= LIBVER=${LIBVER} PKGNAME=${PKGNAME} +.include <bsd.port.pre.mk> + .if defined(WRAP) || !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-headers" WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build @@ -51,8 +53,8 @@ LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 \ tiff.4:${PORTSDIR}/graphics/tiff .if defined(WITH_TESTING) && (!defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-java") -RUN_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data -BUILD_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +RUN_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data .endif ONLY_FOR_ARCHS= i386 # was not tested on other ARCHS @@ -61,7 +63,7 @@ USE_GL= yes INSTALLS_SHLIB= yes # if optimization flag -O2 or -O3 is present - use g++33 -# There is a problems compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 +# There is a problem compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 # with -02 -march=pentium3 .if defined(CXXFLAGS) TTT= "${CXXFLAGS}" # this quotes are VERY important! @@ -71,13 +73,17 @@ USE_GCC= 3.3 .endif .endif +.if ${OSVERSION} < 500016 +ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} +.endif + CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ @@ -227,5 +233,5 @@ print-pkg-message: post-install: print-pkg-message .ifndef(PKGNAMESUFFIX) -.include <bsd.port.mk> +.include <bsd.port.post.mk> .endif diff --git a/math/vtk43-headers/Makefile b/math/vtk43-headers/Makefile index b73fef34139d..d3e72f3db7a7 100644 --- a/math/vtk43-headers/Makefile +++ b/math/vtk43-headers/Makefile @@ -56,4 +56,4 @@ do-install: install-cnotice @${ECHO_MSG} "Installing Doxygen to ${PREFIX}/share/vtk/doxygen :" @cd ${WRKSRC}/Utilities/Doxygen ; ${MAKE} install -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile index 6dca17bfa720..118ff644ca1b 100644 --- a/math/vtk43/Makefile +++ b/math/vtk43/Makefile @@ -15,7 +15,7 @@ PORTNAME= vtk PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz @@ -39,6 +39,8 @@ VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patente PLIST_SUB+= LIBVER=${LIBVER} PKGNAME=${PKGNAME} +.include <bsd.port.pre.mk> + .if defined(WRAP) || !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-headers" WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build @@ -51,8 +53,8 @@ LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 \ tiff.4:${PORTSDIR}/graphics/tiff .if defined(WITH_TESTING) && (!defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-java") -RUN_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data -BUILD_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +RUN_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data .endif ONLY_FOR_ARCHS= i386 # was not tested on other ARCHS @@ -61,7 +63,7 @@ USE_GL= yes INSTALLS_SHLIB= yes # if optimization flag -O2 or -O3 is present - use g++33 -# There is a problems compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 +# There is a problem compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 # with -02 -march=pentium3 .if defined(CXXFLAGS) TTT= "${CXXFLAGS}" # this quotes are VERY important! @@ -71,13 +73,17 @@ USE_GCC= 3.3 .endif .endif +.if ${OSVERSION} < 500016 +ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} +.endif + CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ @@ -227,5 +233,5 @@ print-pkg-message: post-install: print-pkg-message .ifndef(PKGNAMESUFFIX) -.include <bsd.port.mk> +.include <bsd.port.post.mk> .endif diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 6dca17bfa720..118ff644ca1b 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -15,7 +15,7 @@ PORTNAME= vtk PORTVERSION= 4.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ DISTFILES?= VTK-${PORTVERSION}-cvs${CVSDATE}.tar.gz @@ -39,6 +39,8 @@ VTK_KITS= Common Filtering Graphics Hybrid IO Imaging Rendering Parallel Patente PLIST_SUB+= LIBVER=${LIBVER} PKGNAME=${PKGNAME} +.include <bsd.port.pre.mk> + .if defined(WRAP) || !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-headers" WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build @@ -51,8 +53,8 @@ LIB_DEPENDS+= expat.4:${PORTSDIR}/textproc/expat2 \ tiff.4:${PORTSDIR}/graphics/tiff .if defined(WITH_TESTING) && (!defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-java") -RUN_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data -BUILD_DEPENDS= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +RUN_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data +BUILD_DEPENDS+= ${VTKDATAROOT}/VTKData.readme:${PORTSDIR}/math/vtk-data .endif ONLY_FOR_ARCHS= i386 # was not tested on other ARCHS @@ -61,7 +63,7 @@ USE_GL= yes INSTALLS_SHLIB= yes # if optimization flag -O2 or -O3 is present - use g++33 -# There is a problems compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 +# There is a problem compiling Imaging/vtkImageEuclideanDistance.o by gcc 3.2.2 # with -02 -march=pentium3 .if defined(CXXFLAGS) TTT= "${CXXFLAGS}" # this quotes are VERY important! @@ -71,13 +73,17 @@ USE_GCC= 3.3 .endif .endif +.if ${OSVERSION} < 500016 +ADDITIONAL_EXE_LINKER_FLAGS= ${PTHREAD_LIBS} +.endif + CMAKE?= ${LOCALBASE}/bin/cmake CXXFLAGS+= -Wno-deprecated CMAKE_DEFS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS}" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="${LINKERFLAGS} ${ADDITIONAL_EXE_LINKER_FLAGS}" \ -DCMAKE_THREAD_LIBS:STRING="${PTHREAD_LIBS}"\ -DCMAKE_USE_PTHREADS:BOOL=ON \ -DCMAKE_C_COMPILER:STRING='${CC}' \ @@ -227,5 +233,5 @@ print-pkg-message: post-install: print-pkg-message .ifndef(PKGNAMESUFFIX) -.include <bsd.port.mk> +.include <bsd.port.post.mk> .endif |