Revision
94889
Author
dports@macports.org
Date
2012-07-01 21:00:42 -0700 (Sun, 01 Jul 2012)

Log Message

gnucash-devel: merge r94888 from gnucash port:
replace +without_hbci and +without_ofx variants with +ofx and
+hbci default variants

Modified Paths

Property Changed

Diff

Modified: trunk/dports/gnome/gnucash-devel/Portfile (94888 => 94889)


--- trunk/dports/gnome/gnucash-devel/Portfile	2012-07-02 03:48:50 UTC (rev 94888)
+++ trunk/dports/gnome/gnucash-devel/Portfile	2012-07-02 04:00:42 UTC (rev 94889)
@@ -68,8 +68,8 @@
 
 configure.args    --disable-glibtest \
                   --disable-dependency-tracking \
-                  --enable-aqbanking \
-                  --enable-ofx \
+                  --disable-aqbanking \
+                  --disable-ofx \
                   --disable-dbi \
                   --with-html-engine=webkit
 
@@ -79,18 +79,27 @@
     depends_lib-append    port:libgtkhtml3
 }
 
-variant without_hbci description {Disables AqBanking/HBCI support} {
-    depends_lib-delete  port:aqbanking
-    configure.args-delete   --enable-aqbanking
-    configure.args-append   --disable-aqbanking
+variant hbci description {AqBanking/HBCI support} {
+    depends_lib-append  port:aqbanking
+    configure.args-delete   --disable-aqbanking
+    configure.args-append   --enable-aqbanking
 }
 
-variant without_ofx description {Disables ofx support} {
-    depends_lib-delete  port:libofx
-    configure.args-delete   --enable-ofx
-    configure.args-append   --disable-ofx
+variant ofx description {OFX support} {
+    depends_lib-append  port:libofx
+    configure.args-delete   --disable-ofx
+    configure.args-append   --enable-ofx
 }
 
+variant without_hbci conflicts hbci description {Legacy compatibility variant} {}
+variant without_ofx conflicts ofx description {Legacy compatibility variant} {}
+if {![variant_isset without_hbci]} {
+    default_variants +hbci
+}
+if {![variant_isset without_ofx]} {
+    default_variants +ofx
+}
+
 variant dbi description {Adds dbi backend support} {
     depends_lib-append  port:libdbi \
                         port:libdbi-drivers 
Property changes on: trunk/dports/gnome/gnucash-devel/Portfile
___________________________________________________________________

Modified: svn:mergeinfo

+ /trunk/dports/gnome/gnucash/Portfile:75076,76649,77149,77299,77346,78188,79161,80328,80330,84977,86481,87597,88798,88800,89699,94888