Revision: 108487 https://trac.macports.org/changeset/108487 Author: snc@macports.org Date: 2013-07-24 05:58:31 -0700 (Wed, 24 Jul 2013) Log Message: ----------- pspp: update to 0.8.0 Modified Paths: -------------- trunk/dports/math/pspp/Portfile trunk/dports/math/pspp/files/patch-config.h.in.diff Added Paths: ----------- trunk/dports/math/pspp/files/logo.png Removed Paths: ------------- trunk/dports/math/pspp/files/PSPP.app/ trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff 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 2013-07-24 12:02:32 UTC (rev 108486) +++ trunk/dports/math/pspp/Portfile 2013-07-24 12:58:31 UTC (rev 108487) @@ -2,10 +2,10 @@ # $Id$ PortSystem 1.0 +PortGroup app 1.0 name pspp -version 0.6.2 -revision 2 +version 0.8.0 categories math license GPL-3+ maintainers snc @@ -21,110 +21,103 @@ platforms darwin master_sites gnu -checksums rmd160 97667eb32b23a1bc7d18b7022649bd973ff01424 \ - sha256 ec9639a3dcd3663b8007e600ab1a56291214334a9bba2e8d8c5a314509826385 +checksums rmd160 56ec2f87494d2e74dfbb36fa0d07ba1971c91260 \ + sha256 d8574aed32b4c951f650b90e847901f6609c27a4cc295bfd23939385fe58f3dd -use_parallel_build yes +#depends_build path:bin/perl:perl5 \ +# port:pkgconfig +#configure.perl ${prefix}/bin/perl -depends_build path:bin/perl:perl5 \ - port:pkgconfig -configure.perl ${prefix}/bin/perl +depends_lib-append port:gsl \ + port:libffi \ + port:libiconv \ + port:libpng \ + port:libtool \ + port:libxml2 \ + port:readline \ + port:zlib \ -depends_lib port:gsl \ - port:libiconv \ - port:zlib \ - port:libxml2 \ - port:readline \ - port:plotutils \ - port:pkgconfig \ - port:gtk2 \ - port:libglade2 - +distname ${name}-${version}a +worksrcdir ${name}-${version} -configure.args --disable-rpath \ - --without-libpq \ - --enable-debug \ - --without-libncurses +configure.perl ${prefix}/bin/perl +configure.args --disable-rpath \ + --without-libpq \ + --with-packager=snc \ + --with-packager-version=${version} \ + --with-packager-bug-reports=${maintainers} -patchfiles patch-config.h.in.diff \ - patch-lib-gtksheet-gtkitmemory.c.diff +if {${configure.compiler} == "llvm-gcc-4.2"} { + configure.cflags-append -fno-inline-functions +} +patchfiles patch-config.h.in.diff + test.run yes test.target check -test.env-append DYLD_FALLBACK_LIBRARY_PATH=${worksrcpath}/src -variant help conflicts no_gui description {Provide in-application help via yelp} { +default_variants +graph +gui + +variant help requires gui description {Provide in-application help via yelp} { depends_run-append port:yelp } -variant ncurses description {Enable terminal resizing} { - depends_lib-append port:ncursesw - configure.args-delete --without-libncurses -} - variant doc description {Build documentation} { depends_lib-append port:texinfo build.target-append pdf html - post-destroot { - xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name} - foreach fl [glob -nocomplain -directory ${worksrcpath}/doc *.pdf *.html] { - copy ${fl} ${destroot}${prefix}/share/doc/${name} - } - } } variant postgres description {Enables reading of postgresql databases} { - depends_lib-append port:postgresql83 + depends_lib-append port:postgresql92 configure.args-delete --without-libpq - configure.ldflags-append -L${prefix}/lib/postgresql83 + configure.ldflags-append -L${prefix}/lib/postgresql92 + configure.env-append PG_CONFIG=${prefix}/lib/postgresql92/bin/pg_config } -variant no_graph description {Disable graphing features} { - depends_lib-delete port:plotutils - configure.args-append --without-libplot +variant graph description {Enable graphing features} { + depends_lib-append port:plotutils + configure.args-delete --without-libplot } -variant no_gui conflicts help description {Disable PSPPIRE, the graphical interface} { - depends_lib-delete port:pkgconfig \ +variant gui description {Build PSPPIRE, the graphical interface} { + depends_lib-append port:pkgconfig \ port:gtk2 \ + port:gtksourceview2 \ port:libglade2 - configure.args-append --without-gui + configure.args-delete --without-gui } +variant quartz conflicts x11 {} +variant x11 conflicts quartz {} +if {![variant_isset x11] && ![variant_isset quartz]} { + if {${os.major} < 11} { + default_variants -quartz + } else { + default_variants +quartz + } +} + post-destroot { - xinstall -d ${destroot}${prefix}/libexec/${name} + if {[variant_isset doc]} { + xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name} + foreach fl [glob -nocomplain -directory ${worksrcpath}/doc *.pdf *.html] { + copy ${fl} ${destroot}${prefix}/share/doc/${name} + } + } +} - move ${destroot}${prefix}/bin/pspp ${destroot}${prefix}/libexec/${name}/pspp +post-activate { + system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor" - 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 +post-deactivate { + system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor" +} - 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 - reinplace s|@VERSION@|${version}|g \ - ${destroot}${applications_dir}/PSPP.app/Contents/Info.plist - 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 - } +if {![variant_isset gui]} { + app.create no } +app.name PSPP +app.executable psppire +app.icon ${filespath}/logo.png Copied: trunk/dports/math/pspp/files/logo.png (from rev 108183, trunk/dports/math/pspp-devel/files/logo.png) =================================================================== (Binary files differ) Modified: trunk/dports/math/pspp/files/patch-config.h.in.diff =================================================================== --- trunk/dports/math/pspp/files/patch-config.h.in.diff 2013-07-24 12:02:32 UTC (rev 108486) +++ trunk/dports/math/pspp/files/patch-config.h.in.diff 2013-07-24 12:58:31 UTC (rev 108487) @@ -1,6 +1,6 @@ ---- config.h.in.orig 2008-10-02 14:22:07.000000000 -0400 -+++ config.h.in 2008-10-02 14:21:54.000000000 -0400 -@@ -388,7 +388,7 @@ +--- config.h.in.orig 2013-07-23 01:10:46.000000000 -0400 ++++ config.h.in 2013-07-23 09:20:05.000000000 -0400 +@@ -705,7 +705,7 @@ /* Define to 1 if the compiler supports one of the keywords 'inline', '__inline__', '__inline' and effectively inlines functions marked as such. */ Deleted: trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff =================================================================== --- trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff 2013-07-24 12:02:32 UTC (rev 108486) +++ trunk/dports/math/pspp/files/patch-lib-gtksheet-gtkitmemory.c.diff 2013-07-24 12:58:31 UTC (rev 108487) @@ -1,56 +0,0 @@ ---- lib/gtksheet/gtkitementry.c.orig 2010-11-27 21:44:01.000000000 -0500 -+++ lib/gtksheet/gtkitementry.c 2010-11-27 21:44:43.000000000 -0500 -@@ -145,7 +145,7 @@ - static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, - gboolean include_preedit); - static void gtk_entry_queue_draw (GtkEntry *entry); --static void gtk_entry_reset_im_context (GtkEntry *entry); -+static void pspp_gtk_entry_reset_im_context (GtkEntry *entry); - static void gtk_entry_recompute (GtkEntry *entry); - static void gtk_entry_get_cursor_locations (GtkEntry *entry, - CursorType type, -@@ -694,7 +694,7 @@ - if (position != entry->current_pos || - position != entry->selection_bound) - { -- gtk_entry_reset_im_context (entry); -+ pspp_gtk_entry_reset_im_context (entry); - gtk_entry_set_positions (entry, position, position); - } - } -@@ -895,7 +895,7 @@ - { - gint new_pos = entry->current_pos; - -- gtk_entry_reset_im_context (entry); -+ pspp_gtk_entry_reset_im_context (entry); - - if (entry->current_pos != entry->selection_bound && !extend_selection) - { -@@ -989,7 +989,7 @@ - - if (entry->editable) - { -- gtk_entry_reset_im_context (entry); -+ pspp_gtk_entry_reset_im_context (entry); - - gtk_editable_insert_text (editable, str, -1, &pos); - gtk_editable_set_position (editable, pos); -@@ -1005,7 +1005,7 @@ - gint start_pos = entry->current_pos; - gint end_pos = entry->current_pos; - -- gtk_entry_reset_im_context (entry); -+ pspp_gtk_entry_reset_im_context (entry); - - if (!entry->editable) - return; -@@ -1777,7 +1777,7 @@ - } - - static void --gtk_entry_reset_im_context (GtkEntry *entry) -+pspp_gtk_entry_reset_im_context (GtkEntry *entry) - { - if (entry->need_im_reset) - { Deleted: trunk/dports/math/pspp/files/pspp.in =================================================================== --- trunk/dports/math/pspp/files/pspp.in 2013-07-24 12:02:32 UTC (rev 108486) +++ trunk/dports/math/pspp/files/pspp.in 2013-07-24 12:58:31 UTC (rev 108487) @@ -1,5 +0,0 @@ -#!/bin/bash -export OLDPWD=`pwd` -cd /tmp -DYLD_FALLBACK_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 2013-07-24 12:02:32 UTC (rev 108486) +++ trunk/dports/math/pspp/files/psppire.in 2013-07-24 12:58:31 UTC (rev 108487) @@ -1,5 +0,0 @@ -#!/bin/bash -export OLDPWD=`pwd` -cd /tmp -DYLD_FALLBACK_LIBRARY_PATH=@PREFIX@/lib/@NAME@ @PREFIX@/libexec/@NAME@/psppire -cd $OLDPWD