[68004] trunk/dports/math/pspp

[snc at macports.org]

Revision: 68004
          http://trac.macports.org/changeset/68004
Author:   snc at macports.org
Date:     2010-05-24 09:53:55 -0700 (Mon, 24 May 2010)
Log Message:
-----------
put libpspp in expected location

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

Removed 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-24 10:47:58 UTC (rev 68003)
+++ trunk/dports/math/pspp/Portfile	2010-05-24 16:53:55 UTC (rev 68004)
@@ -5,6 +5,7 @@
 
 name                    pspp
 version                 0.6.2
+revision                1
 categories              math
 license                 GPLv3+
 maintainers             snc
@@ -43,7 +44,8 @@
 configure.args          --disable-rpath \
                         --without-libpq \
                         --enable-debug \
-                        --without-libncurses
+                        --without-libncurses \
+                        --libdir=${prefix}/lib
 
 patchfiles              patch-config.h.in.diff
 
@@ -86,26 +88,18 @@
 }
 
 post-destroot {
-    xinstall -d ${destroot}${prefix}/libexec/${name}
-
-    move ${destroot}${prefix}/bin/pspp ${destroot}${prefix}/libexec/${name}/pspp
-
-    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 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
+        ln -s ${prefix}/lib/libpsppire.dylib \
+            ${destroot}${prefix}/lib/libpsppire.so
+        ln -s ${prefix}/lib/libpsppwidgets.dylib \
+            ${destroot}${prefix}/lib/libpsppwidgets.so
 
-        move ${destroot}${prefix}/bin/psppire \
-			${destroot}${prefix}/libexec/${name}/psppire
+        #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 -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 \

Deleted: trunk/dports/math/pspp/files/pspp.in
===================================================================
--- trunk/dports/math/pspp/files/pspp.in	2010-05-24 10:47:58 UTC (rev 68003)
+++ trunk/dports/math/pspp/files/pspp.in	2010-05-24 16:53:55 UTC (rev 68004)
@@ -1,5 +0,0 @@
-#!/bin/bash
-export OLDPWD=`pwd`
-cd /tmp
-LD_LIBRARY_PATH=@PREFIX@/lib/@NAME@ @PREFIX@/libexec/@NAME@/pspp
-cd $OLDPWD

Deleted: trunk/dports/math/pspp/files/psppire.in
===================================================================
--- trunk/dports/math/pspp/files/psppire.in	2010-05-24 10:47:58 UTC (rev 68003)
+++ trunk/dports/math/pspp/files/psppire.in	2010-05-24 16:53:55 UTC (rev 68004)
@@ -1,5 +0,0 @@
-#!/bin/bash
-export OLDPWD=`pwd`
-cd /tmp
-LD_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/20100524/8926f6ee/attachment.html>