Attachment 39537 Details for Bug 62314 – vtk.diff

[patch] vtk.diff

vtk.diff (text/x-diff; charset="us-ascii"), 4.42 KB, created by Mykola Khotyaintsev on 2004-02-05 10:26:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mykola Khotyaintsev

Created: 2004-02-05 10:26:42 UTC

Size: 4.42 KB

patch

obsolete

>diff -ruN old-vtk-port/vtk/Makefile new-vtk-port/vtk/Makefile
>--- old-vtk-port/vtk/Makefile	Wed Feb  4 06:07:34 2004
>+++ new-vtk-port/vtk/Makefile	Thu Feb  5 11:08:51 2004
>@@ -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 @@
> 
> 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 @@
> 		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 @@
> 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 @@
> .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 @@
> post-install: print-pkg-message
> 
> .ifndef(PKGNAMESUFFIX)
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
> .endif
>diff -ruN old-vtk-port/vtk-data/Makefile new-vtk-port/vtk-data/Makefile
>--- old-vtk-port/vtk-data/Makefile	Fri Dec 26 21:03:40 2003
>+++ new-vtk-port/vtk-data/Makefile	Wed Feb  4 18:07:36 2004
>@@ -27,4 +27,4 @@
> 	@${CP} -R ${WRKSRC}/* ${VTKDATAROOT}
> 
> .include "${MASTERDIR}/Makefile"
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN old-vtk-port/vtk-examples/Makefile new-vtk-port/vtk-examples/Makefile
>--- old-vtk-port/vtk-examples/Makefile	Fri Dec 26 21:03:40 2003
>+++ new-vtk-port/vtk-examples/Makefile	Wed Feb  4 18:07:53 2004
>@@ -36,4 +36,4 @@
> 	@${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 -ruN old-vtk-port/vtk-headers/Makefile new-vtk-port/vtk-headers/Makefile
>--- old-vtk-port/vtk-headers/Makefile	Fri Dec 26 21:03:40 2003
>+++ new-vtk-port/vtk-headers/Makefile	Wed Feb  4 18:08:28 2004
>@@ -56,4 +56,4 @@
> 	@${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 -ruN old-vtk-port/vtk-java/Makefile new-vtk-port/vtk-java/Makefile
>--- old-vtk-port/vtk-java/Makefile	Tue Feb  3 20:14:29 2004
>+++ new-vtk-port/vtk-java/Makefile	Wed Feb  4 18:08:46 2004
>@@ -66,4 +66,4 @@
> 	@${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 -ruN old-vtk-port/vtk-python/Makefile new-vtk-port/vtk-python/Makefile
>--- old-vtk-port/vtk-python/Makefile	Fri Dec 26 21:03:41 2003
>+++ new-vtk-port/vtk-python/Makefile	Wed Feb  4 18:09:02 2004
>@@ -58,4 +58,4 @@
> 		${PREFIX}/lib/vtk/python/libvtk${i}.so
> .endfor
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN old-vtk-port/vtk-tcl/Makefile new-vtk-port/vtk-tcl/Makefile
>--- old-vtk-port/vtk-tcl/Makefile	Fri Dec 26 21:03:41 2003
>+++ new-vtk-port/vtk-tcl/Makefile	Wed Feb  4 18:05:55 2004
>@@ -36,4 +36,4 @@
> do-install: install-cnotice install-binaries install-libs
> 	cd ${WRKSRC}/Wrapping/Tcl ; ${MAKE} install
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 62314: 39537