Changeset 82480

Timestamp:

08/14/11 06:31:07 (4 years ago)

Author:

snc@…

Message:

pspp-devel:

• update to ge30f5e
• convert +no_* variants

File:

• trunk/dports/math/pspp-devel/Portfile (modified) (4 diffs)

trunk/dports/math/pspp-devel/Portfile

@@ -5 +5 @@
 
 name                pspp-devel
-set buildstamp      20110810030501
-set buildhash       g9ec990
+set buildstamp      20110814030502
+set buildhash       ge30f5e
 version             0.7.8
-revision            5
+revision            6
 # depends_test port:p5-text-diff
+# 2011-08-14: no_* variants obsoleted
 categories          math
 license             GPL-3+
@@ -38 +39 @@
                     port:libtool
 
-checksums           rmd160  878e4bd94e551be5e4c6d78257cacd5e8c8fdb87 \
-                    sha256  f71398b96d4c4d4862e945e8c78a077fac48a36ba10757cddd2355b7c0bc9c5b
+checksums           rmd160  1dd8f31bd491c83f858b60781cf7b2a23f52b74c \
+                    sha256  f9532a35554a1dcd8a0612f3fb8d24d0c0c2c9b3017db958da4774a0d5d118c8
 
 #configure.optflags  -O0
@@ -57 +58 @@
 test.target         check
 
-variant help conflicts no_gui description {Provide in-application help via yelp} {
+if {[variant_isset no_gui]} {
+    if {[variant_isset no_graph]} {
+        default_variants -gui -graph
+    } else {
+        default_variants -gui +graph
+    }
+} else {
+    if {[variant_isset no_graph]} {
+        default_variants +gui -graph
+    } else {
+        default_variants +gui +graph
+    }
+}
+
+variant help requires gui conflicts no_gui description {Provide in-application help via yelp} {
     depends_run-append  port:yelp
 }
@@ -78 +93 @@
 
 variant postgres description {Enables reading of postgresql databases} {
-    depends_lib-append  port:postgresql83
+    depends_lib-append  port:postgresql90
     configure.args-delete   --without-libpq
-    configure.ldflags-append -L${prefix}/lib/postgresql83
+    configure.ldflags-append -L${prefix}/lib/postgresql90
 }
 
-variant no_graph description {Disable graphing features} {
-    depends_lib-delete      port:plotutils
-    configure.args-append   --without-libplot
+variant no_graph conflicts graph description {Obsolete} { }
+
+variant graph conflicts no_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 no_gui conflicts gui description {Obsolete} { }
+
+variant gui conflicts no_gui description {Build PSPPIRE, the graphical interface} {
+    depends_lib-append      port:pkgconfig \
                             port:gtk2 \
                             port:libglade2
-    configure.args-append   --without-gui
+    configure.args-delete   --without-gui
 }
 
 post-destroot {
-    if {![variant_isset no_gui]} {
+    if {[variant_isset gui]} {
             xinstall -d ${destroot}${applications_dir}/PSPP.app/Contents/MacOS
         xinstall -m 755 ${filespath}/PSPP.app/Contents/MacOS/psppire \