[50228] trunk/dports/graphics/vtk-devel/Portfile

[dweber at macports.org]

Revision: 50228
          http://trac.macports.org/changeset/50228
Author:   dweber at macports.org
Date:     2009-04-27 16:47:37 -0700 (Mon, 27 Apr 2009)
Log Message:
-----------
changed variant conflict syntax; removed obsolete hacks from post-destroot

Modified Paths:
--------------
    trunk/dports/graphics/vtk-devel/Portfile

Modified: trunk/dports/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile	2009-04-27 23:46:20 UTC (rev 50227)
+++ trunk/dports/graphics/vtk-devel/Portfile	2009-04-27 23:47:37 UTC (rev 50228)
@@ -234,10 +234,6 @@
 }
 
 
-# ---------------------------------------------------------
-# There is a problem with RPATH config for the shared libs.
-# Until this is fixed, it will not be a default variant.
-
 variant shared description {Build shared libraries [default]} {
     configure.args-delete \
         -DBUILD_SHARED_LIBS:BOOL=OFF
@@ -252,37 +248,23 @@
 # CMAKE_EXE_LINKER_FLAGS:STRING=
 
 #  -DVTK_INSTALL_LIB_DIR:STRING=${prefix}/lib/vtk-5.2
-#  -DVTK_USE_RPATH=ON \
-#  -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF \
 
-# -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
-# Cannot use this RPATH setting because the build tree is
-# used to bootstrap the build process, eg:
-#
-#[  4%] Generating vtkGLSLShaderLibrary.h
-#dyld: Library not loaded: "/opt/local/lib/vtk-5.2"/libvtksys.5.2.dylib
-#  Referenced from: /opt/local/var/macports/build/_Users_dweber_ports_graphics_vtk5/work/VTK/Utilities/MaterialLibrary/../../bin/ProcessShader
-#  Reason: image not found
 
-# Might need variants for carbon vs. cocoa.  When doing a shared library
-# build, must use carbon, not cocoa.
-
-
-variant carbon conflicts {cocoa x11} description {Build with Carbon} {
+variant carbon conflicts cocoa x11 description {Build with Carbon} {
     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 \
+        -DVTK_USE_CARBON:BOOL=ON
 }
 
 
-variant cocoa conflicts {carbon x11} description {Build with Cocoa [Default]} {
+variant cocoa conflicts carbon x11 description {Build with Cocoa [default]} {
 }
 
 
-variant x11 conflicts {cocoa carbon} description {Build with X11} {
+variant x11 conflicts cocoa carbon description {Build with X11} {
     #depends_build-append    \
         port:xorg-libs \
         port:xorg-proto
@@ -304,7 +286,7 @@
 # This mesaOpenGL variant may not require the x11 variant, but the
 # assumption here is that it's more likely to work with it than without it.
 
-variant mesaOpenGL requires {x11} description {Use mesa OpenGL} {
+variant mesaOpenGL requires x11 description {Use mesa OpenGL} {
     depends_build-append \
         port:mesa
     configure.args-append \
@@ -355,11 +337,6 @@
 set vtkDocPath  ${destroot}${prefix}/share/doc/${distname}
 set vtkDataPath ${destroot}${prefix}/share/${distname}-data
 
-# Define variables used by install_name_tool for
-# the shared libary installation RPATH
-set libdestStr ${destroot}${prefix}/bin/libvtk
-set libinstStr ${prefix}/lib/${distname}/libvtk
-
 post-destroot {
 
     # Provide data files
@@ -399,32 +376,6 @@
         }
     }
     
-    #if {[variant_isset shared]} {
-        # Must set RPATH on all .dylib for shared variant; the RPATH settings
-        # in the build are hi-jacked by the DESTDIR set by macports during
-        # 'make install'.  Add some system code here to correct the RPATH
-        # settings for shared libs?  Perhaps add the system code to the shared
-        # variant only.
-        
-        # Use install_name_tool to change the
-        # RPATH settings for each .dylib file.
-
-        # This doesn't work!
-        #system "cd ${destroot}${prefix}/bin; install_name_tool -change $libdestStr $libinstStr $*{version}.dylib"
-        # See
-        # http://qin.laya.com/tech_coding_help/dylib_linking.html
-
-        #for f in `otool -L libvtkRendering.5.2.0.dylib`; do
-        #    echo $f | grep $libdestStr; 
-        #done
-    
-        # otool -L ${dylib} | grep ${libdestStr} | sed s/.dylib.*/.dylib/
-
-        # http://guide.macports.org/chunked/reference.phases.html
-        # During the destroot phase, macports issues:
-        # make install DESTDIR=${destroot}
-        # in ${worksrcpath}.
-    #}
 }
 
 # This may be useful to uninstall the port:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090427/28ed6de6/attachment-0001.html>