[108533] trunk/dports/math/pspp/Portfile

[snc at macports.org]

Revision: 108533
          https://trac.macports.org/changeset/108533
Author:   snc at macports.org
Date:     2013-07-25 14:57:29 -0700 (Thu, 25 Jul 2013)
Log Message:
-----------
pspp:
 * remove graph variant
 * checked actually linking dependencies for x11/quartz/gui
 * weaken doc variant to a working state
 * clean up perl mess
 * apply -fno-inline-functions to all llvm-gcc-4.2

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

Modified: trunk/dports/math/pspp/Portfile
===================================================================
--- trunk/dports/math/pspp/Portfile	2013-07-25 21:38:05 UTC (rev 108532)
+++ trunk/dports/math/pspp/Portfile	2013-07-25 21:57:29 UTC (rev 108533)
@@ -6,6 +6,7 @@
 
 name                    pspp
 version                 0.8.0
+revision                1
 categories              math
 license                 GPL-3+
 maintainers             snc
@@ -24,30 +25,29 @@
 checksums           rmd160  56ec2f87494d2e74dfbb36fa0d07ba1971c91260 \
                     sha256  d8574aed32b4c951f650b90e847901f6609c27a4cc295bfd23939385fe58f3dd
 
-#depends_build           path:bin/perl:perl5 \
-#                        port:pkgconfig
-#configure.perl          ${prefix}/bin/perl
-
-depends_lib-append  port:gsl \
-                    port:libffi \
+depends_lib-append  port:cairo \
+                    port:fontconfig \
+                    port:freetype \
+                    port:gsl \
                     port:libiconv \
-                    port:libpng \
-                    port:libtool \
                     port:libxml2 \
+                    port:ncurses \
+                    port:pango \
                     port:readline \
-                    port:zlib \
+                    port:zlib
 
 distname            ${name}-${version}a
 worksrcdir          ${name}-${version}
 
-configure.perl      ${prefix}/bin/perl
 configure.args      --disable-rpath \
                     --without-libpq \
+                    --without-gui \
                     --with-packager=snc \
                     --with-packager-version=${version} \
                     --with-packager-bug-reports=${maintainers}
 
-if {${configure.compiler} == "llvm-gcc-4.2"} {
+set nif_compilers {macports-llvm-gcc-4.2 llvm-gcc-4.2}
+if {[lsearch -exact ${nif_compilers} ${configure.compiler}] > -1} {
     configure.cflags-append -fno-inline-functions
 }
 
@@ -56,15 +56,12 @@
 test.run                yes
 test.target             check
 
-default_variants +graph +gui
-
 variant help requires gui description {Provide in-application help via yelp} {
     depends_run-append  port:yelp
 }
 
 variant doc description {Build documentation} {
-    depends_lib-append   port:texinfo
-    build.target-append  pdf html
+    build.target-append  html
 }
 
 variant postgres description {Enables reading of postgresql databases} {
@@ -74,24 +71,35 @@
     configure.env-append    PG_CONFIG=${prefix}/lib/postgresql92/bin/pg_config
 }
 
-variant graph description {Enable graphing features} {
-    depends_lib-append      port:plotutils
-    configure.args-delete   --without-libplot
-}
-
 variant gui description {Build PSPPIRE, the graphical interface} {
-    depends_lib-append      port:pkgconfig \
+    depends_lib-append      port:atk \
+                            port:gdk-pixbuf2 \
+                            port:glib2 \
                             port:gtk2 \
-                            port:gtksourceview2 \
-                            port:libglade2
+                            port:gtksourceview2
+
     configure.args-delete   --without-gui
 }
 
-variant quartz conflicts x11 {}
-variant x11 conflicts quartz {}
+variant quartz requires gui conflicts x11 {}
+variant x11 requires gui conflicts quartz {
+    depends_lib-append  port:xorg-libX11 \
+                        port:xorg-libXau \
+                        port:xorg-libXcomposite \
+                        port:xorg-libXcursor \
+                        port:xorg-libXdamage \
+                        port:xorg-libXdmcp \
+                        port:xorg-libXext \
+                        port:xorg-libXfixes \
+                        port:xorg-libXi \
+                        port:xorg-libXinerama \
+                        port:xorg-libXrandr \
+                        port:xorg-libxcb \
+                        port:xrender
+}
 if {![variant_isset x11] && ![variant_isset quartz]} {
     if {${os.major} < 11} {
-        default_variants -quartz
+        default_variants +x11
     } else {
         default_variants +quartz
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130725/ebd4ae34/attachment.html>