[68087] trunk/dports/math/pspp

[snc at macports.org]

Revision: 68087
          http://trac.macports.org/changeset/68087
Author:   snc at macports.org
Date:     2010-05-26 07:20:04 -0700 (Wed, 26 May 2010)
Log Message:
-----------
fix library wrappers with DYLD_FALLBACK

Modified Paths:
--------------
    trunk/dports/math/pspp/Portfile

Added Paths:
-----------
    trunk/dports/math/pspp/files/pspp.in
    trunk/dports/math/pspp/files/psppire.in

Modified: trunk/dports/math/pspp/Portfile
===================================================================
--- trunk/dports/math/pspp/Portfile	2010-05-26 13:48:11 UTC (rev 68086)
+++ trunk/dports/math/pspp/Portfile	2010-05-26 14:20:04 UTC (rev 68087)
@@ -5,7 +5,7 @@
 
 name                    pspp
 version                 0.6.2
-revision                1
+revision                2
 categories              math
 license                 GPLv3+
 maintainers             snc
@@ -44,8 +44,7 @@
 configure.args          --disable-rpath \
                         --without-libpq \
                         --enable-debug \
-                        --without-libncurses \
-                        --libdir=${prefix}/lib
+                        --without-libncurses
 
 patchfiles              patch-config.h.in.diff
 
@@ -88,19 +87,27 @@
 }
 
 post-destroot {
-    if {[variant_isset gui]} {
-        ln -s ${prefix}/lib/libpsppire.dylib \
-            ${destroot}${prefix}/lib/libpsppire.so
-        ln -s ${prefix}/lib/libpsppwidgets.dylib \
-            ${destroot}${prefix}/lib/libpsppwidgets.so
+    xinstall -d ${destroot}${prefix}/libexec/${name}
 
-        #move ${destroot}${prefix}/bin/psppire \
-			#${destroot}${prefix}/libexec/${name}/psppire
+    move ${destroot}${prefix}/bin/pspp ${destroot}${prefix}/libexec/${name}/pspp
 
-        #xinstall -m 755 ${filespath}/psppire.in ${destroot}${prefix}/bin/psppire
-        #reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/psppire
-        #reinplace s|@NAME@|${name}|g ${destroot}${prefix}/bin/psppire
+    xinstall -m 755 ${filespath}/pspp.in ${destroot}${prefix}/bin/pspp
+    reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/pspp
+    reinplace s|@NAME@|${name}|g ${destroot}${prefix}/bin/pspp
 
+    if {![variant_isset no_gui]} {
+        ln -s ${prefix}/lib/pspp/libpsppire.dylib \
+            ${destroot}${prefix}/lib/pspp/libpsppire.so
+        ln -s ${prefix}/lib/pspp/libpsppwidgets.dylib \
+            ${destroot}${prefix}/lib/pspp/libpsppwidgets.so
+
+        move ${destroot}${prefix}/bin/psppire \
+			${destroot}${prefix}/libexec/${name}/psppire
+
+        xinstall -m 755 ${filespath}/psppire.in ${destroot}${prefix}/bin/psppire
+        reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/psppire
+        reinplace s|@NAME@|${name}|g ${destroot}${prefix}/bin/psppire
+
 	    xinstall -d ${destroot}${applications_dir}/PSPP.app/Contents/MacOS
 	    xinstall -m 644 ${filespath}/PSPP.app/Contents/Info.plist \
 		    ${destroot}${applications_dir}/PSPP.app/Contents

Copied: trunk/dports/math/pspp/files/pspp.in (from rev 59344, trunk/dports/math/pspp/files/pspp.in)
===================================================================
--- trunk/dports/math/pspp/files/pspp.in	                        (rev 0)
+++ trunk/dports/math/pspp/files/pspp.in	2010-05-26 14:20:04 UTC (rev 68087)
@@ -0,0 +1,5 @@
+#!/bin/bash
+export OLDPWD=`pwd`
+cd /tmp
+DYLD_FALLBACK_LIBRARY_PATH=@PREFIX@/lib/@NAME@ @PREFIX@/libexec/@NAME@/pspp
+cd $OLDPWD

Copied: trunk/dports/math/pspp/files/psppire.in (from rev 59344, trunk/dports/math/pspp/files/psppire.in)
===================================================================
--- trunk/dports/math/pspp/files/psppire.in	                        (rev 0)
+++ trunk/dports/math/pspp/files/psppire.in	2010-05-26 14:20:04 UTC (rev 68087)
@@ -0,0 +1,5 @@
+#!/bin/bash
+export OLDPWD=`pwd`
+cd /tmp
+DYLD_FALLBACK_LIBRARY_PATH=@PREFIX@/lib/@NAME@ @PREFIX@/libexec/@NAME@/psppire
+cd $OLDPWD
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100526/bd5c5d5f/attachment.html>