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

[snc at macports.org]

Revision: 108559
          https://trac.macports.org/changeset/108559
Author:   snc at macports.org
Date:     2013-07-26 07:19:52 -0700 (Fri, 26 Jul 2013)
Log Message:
-----------
pspp:
 * enforce x11/quartz as mutually exclusive
 * no-inline-functions should be an optflag
 * not sure the patch still necessary

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

Modified: trunk/dports/math/pspp/Portfile
===================================================================
--- trunk/dports/math/pspp/Portfile	2013-07-26 13:54:53 UTC (rev 108558)
+++ trunk/dports/math/pspp/Portfile	2013-07-26 14:19:52 UTC (rev 108559)
@@ -3,6 +3,7 @@
 
 PortSystem              1.0
 PortGroup               app 1.0
+PortGroup               active_variants 1.1
 
 name                    pspp
 version                 0.8.0
@@ -39,7 +40,7 @@
 distname            ${name}-${version}a
 worksrcdir          ${name}-${version}
 
-configure.args      --disable-rpath \
+configure.args-append   --disable-rpath \
                     --without-libpq \
                     --without-gui \
                     --with-packager=snc \
@@ -48,10 +49,10 @@
 
 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
+    configure.optflags-append -fno-inline-functions
 }
 
-patchfiles              patch-config.h.in.diff
+#patchfiles              patch-config.h.in.diff
 
 test.run                yes
 test.target             check
@@ -81,8 +82,19 @@
     configure.args-delete   --without-gui
 }
 
-variant quartz requires gui conflicts x11 {}
+variant quartz requires gui conflicts x11 {
+    require_active_variants cairo quartz x11
+    require_active_variants gtk2 quartz x11
+    require_active_variants pango quartz x11
+    require_active_variants gtksourceview2 quartz x11
+    require_active_variants libglade2 quartz
+}
 variant x11 requires gui conflicts quartz {
+    require_active_variants cairo x11 quartz
+    require_active_variants gtk2 x11 quartz
+    require_active_variants pango x11 quartz
+    require_active_variants gtksourceview2 x11 quartz
+    require_active_variants libglade2 {} x11
     depends_lib-append  port:xorg-libX11 \
                         port:xorg-libXau \
                         port:xorg-libXcomposite \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130726/3d3e78e8/attachment.html>