Mon Jun 22 18:51:02 2015 UTC ()
Substitute hardcoded path to the C++ wrapper, fixing CHECK_WRKREF builds.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/graphics/vtk/Makefile.vtkdist
cvs diff -r1.9 -r1.10 pkgsrc/graphics/vtk/Attic/Makefile.vtkdist (expand / switch to unified diff)

--- pkgsrc/graphics/vtk/Attic/Makefile.vtkdist 2007/05/18 07:50:11 1.9
+++ pkgsrc/graphics/vtk/Attic/Makefile.vtkdist 2015/06/22 18:51:02 1.10
@@ -1,32 +1,37 @@ @@ -1,32 +1,37 @@
1# $NetBSD: Makefile.vtkdist,v 1.9 2007/05/18 07:50:11 obache Exp $ 1# $NetBSD: Makefile.vtkdist,v 1.10 2015/06/22 18:51:02 jperkin Exp $
2 2
3.include "../../graphics/vtk/Makefile.common" 3.include "../../graphics/vtk/Makefile.common"
4 4
5# they change minor releases w/o changing distfile names 5# they change minor releases w/o changing distfile names
6VTKDIST_VERSION= 4.2.6 6VTKDIST_VERSION= 4.2.6
7DISTNAME= VTK-4.2-LatestRelease 7DISTNAME= VTK-4.2-LatestRelease
8DIST_SUBDIR= VTK-4.2.6 8DIST_SUBDIR= VTK-4.2.6
9WRKSRC= ${WRKDIR}/VTK 9WRKSRC= ${WRKDIR}/VTK
10 10
11DISTINFO_FILE= ${.CURDIR}/../vtk/distinfo 11DISTINFO_FILE= ${.CURDIR}/../vtk/distinfo
12PATCHDIR= ${.CURDIR}/../vtk/patches 12PATCHDIR= ${.CURDIR}/../vtk/patches
13 13
14VTK_LIBDIR= ${PREFIX}/lib/vtk 14VTK_LIBDIR= ${PREFIX}/lib/vtk
15 15
16VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX:Q} \ 16VTK_CMAKE_OPT+= -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX:Q} \
17 -DCMAKE_INSTALL_RPATH:STRING=${PREFIX:Q}/lib:${X11BASE:Q}/lib${LIBABISUFFIX:Q}:${VTK_LIBDIR:Q} \ 17 -DCMAKE_INSTALL_RPATH:STRING=${PREFIX:Q}/lib:${X11BASE:Q}/lib${LIBABISUFFIX:Q}:${VTK_LIBDIR:Q} \
18 -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \ 18 -DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \
19 -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \ 19 -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
20 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \ 20 -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
21 -DVTK_USE_HYBRID:BOOL=ON 21 -DVTK_USE_HYBRID:BOOL=ON
22 22
 23SUBST_CLASSES+= fixwrap
 24SUBST_STAGE.fixwrap= post-build
 25SUBST_FILES.fixwrap= vtkConfigure.h
 26SUBST_SED.fixwrap= -e "s,${WRAPPER_BINDIR}/c++,${CXXPATH},g"
 27
23do-configure: 28do-configure:
24 cd ${WRKSRC} && cmake . ${VTK_CMAKE_OPT} 29 cd ${WRKSRC} && cmake . ${VTK_CMAKE_OPT}
25 30
26.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
27 32
28.if ${MACHINE_ARCH} != "mips" || ${MACHINE_ARCH} != "vax" 33.if ${MACHINE_ARCH} != "mips" || ${MACHINE_ARCH} != "vax"
29VTK_CMAKE_OPT+= -DBUILD_SHARED_LIBS:BOOL=ON 34VTK_CMAKE_OPT+= -DBUILD_SHARED_LIBS:BOOL=ON
30.endif 35.endif
31 36
32.include "../../devel/cmake/buildlink3.mk" 37.include "../../devel/cmake/buildlink3.mk"