ports/73607: math/vtk: C++ ambiguity compile error

[TAOKA Fumiyoshi]

On Sat, 6 Nov 2004 16:16:10 GMT
<pav at FreeBSD.org> wrote:

> Synopsis: math/vtk: C++ ambiguity compile error
> 
> State-Changed-From-To: open->closed
> State-Changed-By: pav
> State-Changed-When: Sat Nov 6 16:16:03 GMT 2004
> State-Changed-Why: 
> Committed, thanks!
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=73607

math/vtk is a master port for math/vtk-* ports.
As changing from do-patch to post-patch in vtk/Makefile
affects them.

--- math/vtk-data/Makefile.orig	Sat Nov  6 16:27:17 2004
+++ math/vtk-data/Makefile	Sun Nov  7 12:33:45 2004
@@ -18,6 +18,8 @@
 
 do-configure:
 
+do-patch:
+
 do-build:
 
 do-install:
--- math/vtk-examples/Makefile.orig	Sat Nov  6 16:29:58 2004
+++ math/vtk-examples/Makefile	Sun Nov  7 12:50:52 2004
@@ -17,6 +17,8 @@
 
 .include "${MASTERDIR}/Makefile"
 
+do-patch:
+
 do-build:
 
 do-install: install-cnotice
--- math/vtk-headers/Makefile.orig	Sun Nov  7 12:54:05 2004
+++ math/vtk-headers/Makefile	Sun Nov  7 12:55:10 2004
@@ -13,7 +13,7 @@
 
 .include "${MASTERDIR}/Makefile"
 
-do-patch:
+post-patch:
 #	@${REINPLACE_CMD} -E 's|^.*LOAD_CMAKE_EXTENSIONS|#|g' \
 #		${VTKSRCDIR}/VTKConfig.cmake.in ${VTKSRCDIR}/UseVTK.cmake.in
 	@${REINPLACE_CMD} -E 's|lib/vtk\)|lib\)|g ; s|lib/vtk/doxygen|share/vtk/doxygen| ; s|lib/vtk/testing/HeaderTesting.py|share/examples/vtk/Testing/Common/HeaderTesting.py| ; s|lib/vtk/testing|share/examples/vtk/Testing/Common/Tcl|g' \
--- math/vtk-java/Makefile.orig	Sun Nov  7 12:31:15 2004
+++ math/vtk-java/Makefile	Sun Nov  7 12:31:23 2004
@@ -42,7 +42,7 @@
 	@${ECHO_MSG} "----------------------------------------------------------------"
 .endif
 
-do-patch: patch-common
+post-patch: patch-common
 
 do-install: install-cnotice install-binaries install-libs
 	@${ECHO_MSG} "Installing ${DESTJARFILE} to ${JAVAJARDIR} ..."
--- math/vtk-python/Makefile.orig	Sat Nov  6 15:33:36 2004
+++ math/vtk-python/Makefile	Sun Nov  7 12:25:53 2004
@@ -40,7 +40,7 @@
 
 .include "${MASTERDIR}/Makefile"
 
-do-patch: patch-common
+post-patch: patch-common
 
 do-install: install-cnotice install-binaries install-libs
 	@${ECHO_MSG} "Installing vtk site package to ${PREFIX}/lib/vtk/python ..."
--- math/vtk-tcl/Makefile.orig	Sat Nov  6 16:31:41 2004
+++ math/vtk-tcl/Makefile	Sat Nov  6 16:31:55 2004
@@ -31,7 +31,7 @@
 
 .include "${MASTERDIR}/Makefile"
 
-do-patch: patch-common
+post-patch: patch-common
 
 do-install: install-cnotice install-binaries install-libs
 	cd ${WRKSRC}/Wrapping/Tcl ; ${MAKE} install

-- 
TAOKA Fumiyoshi