Ticket #18886: Portfile2.diff

Portfile

@@ -40 +40 @@
 
 configure   { system "cd ${worksrcpath} && ${configure.env} cmake ${configure.args} ${worksrcpath}" }
 configure.args  \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
-        -DVTK_USE_RPATH:BOOL=ON \
-        -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
-        -DCMAKE_INSTALL_RPATH:STRING=${prefix}/lib/vtk-5.2 \
-        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/vtk-5.2 \
-        -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
-        -DCMAKE_LIBRARY_PATH:PATH=${prefix}/lib \
-        -DCMAKE_INCLUDE_PATH:PATH=${prefix}/include \
-        -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 \
-        -DTK_INCLUDE_PATH=${prefix}/include \
-        -DTK_LIBRARY=${prefix}/lib/libtk.dylib \
-        -DVTK_USE_CARBON:BOOL=OFF \
-        -DVTK_USE_COCOA:BOOL=ON \
-        -DVTK_DATA_ROOT:PATH=${prefix}/share/VTKData \
-        -DVTK_USE_GL2PS:BOOL=ON \
-        -DVTK_WRAP_PYTHON:BOOL=OFF
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DVTK_USE_RPATH:BOOL=ON \
+    -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
+    -DCMAKE_INSTALL_RPATH:STRING=${prefix}/lib/vtk-5.2 \
+    -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/vtk-5.2 \
+    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
+    -DCMAKE_LIBRARY_PATH:PATH=${prefix}/lib \
+    -DCMAKE_INCLUDE_PATH:PATH=${prefix}/include \
+    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+    -DVTK_INSTALL_PREFIX:PATH=${prefix} \
+    -DVTK_USE_HYBRID:BOOL=ON \
+    -DVTK_USE_CARBON:BOOL=OFF \
+    -DVTK_USE_COCOA:BOOL=ON \
+    -DVTK_DATA_ROOT:PATH=${prefix}/share/VTKData \
+    -DVTK_USE_GL2PS:BOOL=ON \
+    -DVTK_WRAP_TCL:BOOL=OFF \
+    -DVTK_WRAP_PYTHON:BOOL=OFF
 
 configure.env   \
-        LDFLAGS="-L${prefix}/lib" \
-        CPPFLAGS="-I${prefix}/include"
+    LDFLAGS="-L${prefix}/lib" \
+    CPPFLAGS="-I${prefix}/include" 
 
 post-configure {
     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}/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
+    
+    if {[variant_isset tcl]} {
+        reinplace "s|c++|c++ -L${prefix}/lib |" \
+            ${worksrcpath}/Wrapping/Tcl/CMakeFiles/vtk.dir/link.txt
+    }
 }
 
 build.env-append DYLD_LIBRARY_PATH=${worksrcpath}/bin
@@ -88 +88 @@
 
 variant x11 description {use X11} {
     depends_build-append    port:xorg-libs
-    configure.args-delete   -DVTK_USE_COCOA:BOOL=ON
+    configure.args-delete   \
+        -DVTK_USE_COCOA:BOOL=ON \
+        -DCMAKE_LIBRARY_PATH:PATH=${prefix}/lib \
+        -DCMAKE_INCLUDE_PATH:PATH=${prefix}/include
     configure.args-append   \
         -DVTK_USE_COCOA:BOOL=OFF \
         -DVTK_USE_X:BOOL=ON \
+        -DCMAKE_LIBRARY_PATH:PATH=${x11prefix}/lib \
+        -DCMAKE_INCLUDE_PATH:PATH=${x11prefix}/include \
         -DOPENGL_gl_LIBRARY:FILEPATH=${x11prefix}/lib/libGL.dylib \
         -DOPENGL_glu_LIBRARY:FILEPATH=${x11prefix}/lib/libGLU.dylib
 }
 
+variant tcl description {builds tcl wrappers} {
+    depends_build-append    port:tk
+    configure.args-delete   \
+        -DVTK_WRAP_TCL:BOOL=OFF
+    configure.args-append   \
+        -DVTK_WRAP_TCL:BOOL=ON \
+        -DTCL_INCLUDE_PATH=${prefix}/include \
+        -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
+        -DTK_INCLUDE_PATH=${prefix}/include \
+        -DTK_LIBRARY=${prefix}/lib/libtk.dylib
+}
+
 variant python description {builds python wrappers} {
     depends_build-append    port:python25
     configure.args-delete   \