[49649] trunk/dports/graphics/vtk5/Portfile

[macsforever2000 at macports.org]

Revision: 49649
          http://trac.macports.org/changeset/49649
Author:   macsforever2000 at macports.org
Date:     2009-04-14 08:48:51 -0700 (Tue, 14 Apr 2009)
Log Message:
-----------
Fix for +tcltk +x11 +python variants. (#19111)

Modified Paths:
--------------
    trunk/dports/graphics/vtk5/Portfile

Modified: trunk/dports/graphics/vtk5/Portfile
===================================================================
--- trunk/dports/graphics/vtk5/Portfile	2009-04-14 15:11:57 UTC (rev 49648)
+++ trunk/dports/graphics/vtk5/Portfile	2009-04-14 15:48:51 UTC (rev 49649)
@@ -51,9 +51,8 @@
         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
         -DVTK_INSTALL_PREFIX:PATH=${prefix} \
         -DVTK_USE_HYBRID:BOOL=ON \
-        -DVTK_WRAP_TCL:BOOL=ON \
-        -DTCL_INCLUDE_PATH=${prefix}/include \
-        -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
+        -DVTK_USE_TK:BOOL=OFF \
+        -DVTK_WRAP_TCL:BOOL=OFF \
         -DTK_INCLUDE_PATH=${prefix}/include \
         -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
         -DVTK_USE_CARBON:BOOL=OFF \
@@ -70,8 +69,12 @@
     reinplace "s|c++|c++ -L${prefix}/lib |" \
     ${worksrcpath}/Infovis/Testing/Cxx/CMakeFiles/InfovisCxxTests.dir/link.txt \
     ${worksrcpath}/IO/Testing/Cxx/CMakeFiles/IOCxxTests.dir/link.txt \
-    ${worksrcpath}/Views/Testing/Cxx/CMakeFiles/ViewsCxxTests.dir/link.txt \
-    ${worksrcpath}/Wrapping/Tcl/CMakeFiles/vtk.dir/link.txt
+    ${worksrcpath}/Views/Testing/Cxx/CMakeFiles/ViewsCxxTests.dir/link.txt
+
+    if {[variant_isset tcltk]} {
+      reinplace "s|c++|c++ -L${prefix}/lib |" \
+      ${worksrcpath}/Wrapping/Tcl/CMakeFiles/vtk.dir/link.txt
+    }
 }
 
 build.env-append DYLD_LIBRARY_PATH=${worksrcpath}/bin
@@ -84,9 +87,9 @@
     configure.env-append    MACOSX_DEPLOYMENT_TARGET=10.5
 }
 
-default_variants +x11 +python
+default_variants +x11 +tcltk +python
 
-variant x11 description {use X11} {
+variant x11 conflicts carbon description {use X11} {
     depends_build-append    port:xorg-libs
     configure.args-delete   -DVTK_USE_COCOA:BOOL=ON
     configure.args-append   \
@@ -96,6 +99,26 @@
         -DOPENGL_glu_LIBRARY:FILEPATH=${x11prefix}/lib/libGLU.dylib
 }
 
+variant tcltk conflicts carbon description {build with Tcl wrappers and Tk support} {
+    configure.args-delete \
+        -DVTK_USE_TK:BOOL=OFF \
+        -DVTK_WRAP_TCL:BOOL=OFF
+    configure.args-append \
+        -DVTK_USE_TK:BOOL=ON \
+        -DVTK_WRAP_TCL:BOOL=ON \
+        -DTCL_INCLUDE_PATH=${prefix}/include \
+        -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib
+}
+
+variant carbon conflicts x11 tcltk description {Use Carbon.  Allows embedding VTK within qt4-mac (and py25-pyqt4 when used with Python)} {
+    configure.args-delete \
+        -DVTK_USE_COCOA:BOOL=ON \
+        -DVTK_USE_CARBON:BOOL=OFF
+    configure.args-append \
+        -DVTK_USE_COCOA:BOOL=OFF \
+        -DVTK_USE_CARBON:BOOL=ON
+}
+
 variant python description {builds python wrappers} {
     depends_build-append    port:python25
     configure.args-delete   \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090414/03345ce8/attachment.html>