[68695] trunk/dports/math/pspp-devel
snc at macports.org
snc at macports.org
Thu Jun 10 08:34:30 PDT 2010
Revision: 68695
http://trac.macports.org/changeset/68695
Author: snc at macports.org
Date: 2010-06-10 08:34:25 -0700 (Thu, 10 Jun 2010)
Log Message:
-----------
fix revision/version scheme, update to latest build, make GUI app work
Modified Paths:
--------------
trunk/dports/math/pspp-devel/Portfile
Added Paths:
-----------
trunk/dports/math/pspp-devel/files/PSPP.app/Contents/MacOS/psppire
Removed Paths:
-------------
trunk/dports/math/pspp-devel/files/patch-perl-module-Makefile.PL.diff
trunk/dports/math/pspp-devel/files/patch-test-formats-inexactify.c.diff
Modified: trunk/dports/math/pspp-devel/Portfile
===================================================================
--- trunk/dports/math/pspp-devel/Portfile 2010-06-10 13:19:13 UTC (rev 68694)
+++ trunk/dports/math/pspp-devel/Portfile 2010-06-10 15:34:25 UTC (rev 68695)
@@ -4,9 +4,11 @@
PortSystem 1.0
name pspp-devel
-version 0.7.5
-revision g2d1795
-set buildnum 20100609040502
+set base_vers 0.7.5
+set base_rev 20100610040508
+set buildnum ga3b36e
+version ${base_vers}-${revision}
+revision 1
categories math
license GPLv3+
maintainers snc
@@ -21,11 +23,11 @@
homepage http://www.gnu.org/software/pspp/
platforms darwin
-master_sites http://pspp.benpfaff.org/~blp/pspp-master/${buildnum}
-distname pspp-${version}-${revision}
-checksums md5 203f26b04c9e205bd0beba775b8664a7 \
- sha1 590dd88be59272b9d2451586e629e5db7930633a \
- rmd160 ae01992dbaf01895de719c1b7443934957589e3b
+master_sites http://pspp.benpfaff.org/~blp/pspp-master/${base_rev}
+distname pspp-${base_vers}-${buildnum}
+checksums md5 36286f094d84ab023ceefa33a324383f \
+ sha1 ce416e0a64fd540102431c18df30636af931ee25 \
+ rmd160 a9563f0c07e4cd1f55482a65d55de7cfd90ccc2a
depends_build port:pkgconfig
depends_lib port:gsl \
@@ -39,22 +41,18 @@
port:libglade2 \
port:libtool
-patchfiles patch-perl-module-Makefile.PL.diff \
- patch-test-formats-inexactify.c.diff
-
configure.env-append CPPFLAGS=-I${prefix}/include
configure.perl ${prefix}/bin/perl
configure.args --disable-rpath \
--without-libpq \
--enable-debug \
--without-libncurses \
- #--without-perl-module \
--with-packager=snc \
- --with-packager-version=${version}.${revision} \
+ --with-packager-version=${base_vers}-${buildnum} \
--with-packager-bug-reports=${maintainers}
test.run yes
-test.target check
+test.target tests_check
variant help conflicts no_gui description {Provide in-application help via yelp} {
depends_run-append port:yelp
@@ -95,25 +93,19 @@
}
post-destroot {
- 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
-
+ if {![variant_isset no_gui]} {
xinstall -d ${destroot}${applications_dir}/PSPP.app/Contents/MacOS
+ xinstall -m 755 ${filespath}/PSPP.app/Contents/MacOS/psppire \
+ ${destroot}${applications_dir}/PSPP.app/Contents/MacOS
xinstall -m 644 ${filespath}/PSPP.app/Contents/Info.plist \
${destroot}${applications_dir}/PSPP.app/Contents
- reinplace s|@VERSION@|${version}|g \
+ reinplace s|@VERSION@|${base_vers}|g \
${destroot}${applications_dir}/PSPP.app/Contents/Info.plist
+ reinplace s|@PREFIX@|${prefix}|g \
+ ${destroot}${applications_dir}/PSPP.app/Contents/MacOS/psppire
reinplace s|@NAME@|${name}|g \
${destroot}${applications_dir}/PSPP.app/Contents/Info.plist
- copy ${destroot}${prefix}/bin/psppire \
- ${destroot}${applications_dir}/PSPP.app/Contents/MacOS
- reinplace "s|psppire|psppire \\&|g" \
- ${destroot}${applications_dir}/PSPP.app/Contents/MacOS/psppire
xinstall -m 644 ${filespath}/PSPP.app/Contents/PkgInfo \
${destroot}${applications_dir}/PSPP.app/Contents
+ }
}
Copied: trunk/dports/math/pspp-devel/files/PSPP.app/Contents/MacOS/psppire (from rev 68490, trunk/dports/math/pspp/files/psppire.in)
===================================================================
--- trunk/dports/math/pspp-devel/files/PSPP.app/Contents/MacOS/psppire (rev 0)
+++ trunk/dports/math/pspp-devel/files/PSPP.app/Contents/MacOS/psppire 2010-06-10 15:34:25 UTC (rev 68695)
@@ -0,0 +1,2 @@
+#!/bin/bash
+ at PREFIX@/bin/psppire &
Deleted: trunk/dports/math/pspp-devel/files/patch-perl-module-Makefile.PL.diff
===================================================================
--- trunk/dports/math/pspp-devel/files/patch-perl-module-Makefile.PL.diff 2010-06-10 13:19:13 UTC (rev 68694)
+++ trunk/dports/math/pspp-devel/files/patch-perl-module-Makefile.PL.diff 2010-06-10 15:34:25 UTC (rev 68695)
@@ -1,11 +0,0 @@
---- perl-module/Makefile.PL.orig 2010-06-09 13:05:19.000000000 -0400
-+++ perl-module/Makefile.PL 2010-06-09 13:05:30.000000000 -0400
-@@ -22,7 +22,7 @@
- (ABSTRACT_FROM => 'lib/PSPP.pm', # retrieve abstract from module
- AUTHOR => 'John Darrington <john at darrington.wattle.id.au>') : ()),
- INC => "-I $Locations{SourceDir} -I $Locations{SourceDir}/src -I $Locations{SourceDir}/gl -I $Locations{BuildDir}/gl -I $Locations{BuildDir}",
-- MYEXTLIB => "$Locations{BuildDir}/src/.libs/libpspp-core.\$(DLEXT)",
-+ MYEXTLIB => "$Locations{BuildDir}/src/.libs/libpspp-core.\$(SO)",
- MAN3PODS => {"lib/PSPP.pm", "\$(INST_MAN3DIR)/PSPP.3pm",
- "Examples.pod", "\$(INST_MAN3DIR)/PSPP::Examples.3pm"}
- );
Deleted: trunk/dports/math/pspp-devel/files/patch-test-formats-inexactify.c.diff
===================================================================
--- trunk/dports/math/pspp-devel/files/patch-test-formats-inexactify.c.diff 2010-06-10 13:19:13 UTC (rev 68694)
+++ trunk/dports/math/pspp-devel/files/patch-test-formats-inexactify.c.diff 2010-06-10 15:34:25 UTC (rev 68695)
@@ -1,10 +0,0 @@
---- tests/formats/inexactify.c.orig 2010-06-09 13:23:44.000000000 -0400
-+++ tests/formats/inexactify.c 2010-06-09 13:23:56.000000000 -0400
-@@ -14,6 +14,7 @@
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-+#include <config.h>
- #include <ctype.h>
- #include <stdbool.h>
- #include <stdio.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100610/bde6e54c/attachment.html>
More information about the macports-changes
mailing list