[53187] users/dweber/graphics

[dweber at macports.org]

Revision: 53187
          http://trac.macports.org/changeset/53187
Author:   dweber at macports.org
Date:     2009-06-30 16:45:08 -0700 (Tue, 30 Jun 2009)
Log Message:
-----------
first attempt to address concerns for Tiger platform raised in http://trac.macports.org/ticket/20002

Modified Paths:
--------------
    users/dweber/graphics/vtk-devel/Portfile

Added Paths:
-----------
    users/dweber/graphics/vtk-devel/

Modified: users/dweber/graphics/vtk-devel/Portfile
===================================================================
--- trunk/dports/graphics/vtk-devel/Portfile	2009-06-30 22:56:14 UTC (rev 53183)
+++ users/dweber/graphics/vtk-devel/Portfile	2009-06-30 23:45:08 UTC (rev 53187)
@@ -5,7 +5,7 @@
 
 name            vtk-devel
 version         5.4.0
-revision        3
+revision        4
 set branch      [join [lrange [split ${version} .] 0 1] .]
 
 categories      graphics math science devel
@@ -51,6 +51,8 @@
 build.type      gnu
 build.dir       ${workpath}/${distname}-build
 
+use_parallel_build  no
+
 # Using this dummy stage to inspect MacPorts variables (using 'port -d fetch vtk-devel')
 #fetch { system "echo ${configure.args} " }
 
@@ -111,6 +113,10 @@
 # 8 for 10.4 Tiger, or
 # 9 for 10.5 Leopard.
 
+# Nothing done here, but the darwin_8 platform needs to be initialized
+# for use inside the post-destroot phase of the data variant
+platform darwin 8 {}
+
 # When building VTK with Cocoa, in OSX >= 10.5.x, Cocoa supports two memory
 # models: reference counting and garbage collection. This compiler flag lets
 # it work with both.
@@ -154,7 +160,16 @@
         -DVTK_DATA_ROOT:PATH=${vtkDataPath}
     post-destroot {
         xinstall -d -o root -g admin -m 0755 ${destroot}/${vtkDataPath}
-        system "tar --strip-components 1 -C ${destroot}/${vtkDataPath} -zxvf ${distpath}/${vtkDataFile}"
+        # tar-1.14 uses --strip-path, tar-1.14.90+ uses --strip-components
+        set tarArg "--strip-components"
+        set tarVersion [lrange [split [exec tar --version]] 3 3]
+        set tarMaj [lrange [split $tarVersion .] 0 0]
+        set tarMin [lrange [split $tarVersion .] 1 1]
+        set tarRev [lrange [split $tarVersion .] 2 2]
+        if (expr $tarMaj == 1 && $tarMin == 14 && $tarRev < 90) {
+            set tarArg "--strip-path"
+        }
+        system "tar $tarArg 1 -C ${destroot}/${vtkDataPath} -zxvf ${distpath}/${vtkDataFile}"
     }
 }
 
@@ -166,9 +181,8 @@
                             sha1 1a8f8ff20b18bc7ac707846a8ba056b04c827392 \
                             rmd160 c657f9ce0850eca1bb0a0d7537f0bcf631132f30
     post-destroot {
-        set vtkDocPathLink ${prefix}/share/doc/${distname}
         xinstall -d -o root -g admin -m 0755 ${destroot}/${vtkDocPath}
-        xinstall -d -o root -g admin -m 0755 ${destroot}/${vtkDocPathLink}
+        xinstall -d -o root -g admin -m 0755 ${destroot}/${prefix}/share/doc
         # Add the doxygen documentation
         system "tar -C ${destroot}/${vtkDocPath} -zxf ${distpath}/${vtkDocFile}"
         # Add basic documentation
@@ -178,14 +192,12 @@
         # Create a symlink to the $prefix path (not the destroot path); use the
         # system to do this because the $prefix path doesn't exist yet and the
         # tcl ln command fails, whereas this system command will allow it.
-        system "ln -Fhs ${vtkDocPath} ${destroot}/${vtkDocPathLink}"
+        system "ln -s ${vtkDocPath} ${destroot}/${prefix}/share/doc/${distname}"
     }
     # A doxygen dependency would add a lot of complexity to vtk, so
     # just use a download instead of building the docs. Otherwise:
-    #depends_build-append \
-        port:doxygen
-    #configure.args-append \
-        -DBUILD_DOCUMENTATION:BOOL=ON
+    #depends_build-append   port:doxygen
+    #configure.args-append  -DBUILD_DOCUMENTATION:BOOL=ON
 }
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090630/cc441e9e/attachment.html>