[107083] trunk/dports/gnome/libgnomekbd/Portfile

[devans at macports.org]

Revision: 107083
          https://trac.macports.org/changeset/107083
Author:   devans at macports.org
Date:     2013-06-17 16:23:01 -0700 (Mon, 17 Jun 2013)
Log Message:
-----------
libgnomekbd: add +x11 default variant, dummy +no_x11 remains for legacy compatibility.

Modified Paths:
--------------
    trunk/dports/gnome/libgnomekbd/Portfile

Modified: trunk/dports/gnome/libgnomekbd/Portfile
===================================================================
--- trunk/dports/gnome/libgnomekbd/Portfile	2013-06-17 23:21:26 UTC (rev 107082)
+++ trunk/dports/gnome/libgnomekbd/Portfile	2013-06-17 23:23:01 UTC (rev 107083)
@@ -5,7 +5,7 @@
 
 name                libgnomekbd
 version             2.32.0
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Libgnomekbd is something new.
 long_description    Libgnomekbd is something new.
@@ -24,6 +24,7 @@
 
 depends_build       port:intltool \
                     port:pkgconfig
+
 depends_lib         port:gtk2 \
                     port:gconf \
                     port:libxklavier
@@ -34,17 +35,24 @@
     reinplace "s|test capplet|capplet|" ${worksrcpath}/Makefile.in
 }
 
-use_autoreconf  yes
-autoreconf.args -fvi
-configure.args --disable-schemas-install
+use_autoreconf      yes
+autoreconf.args     -fvi
+configure.args      --without-x \
+                    --disable-schemas-install
 
-variant no_x11 description {Disable X11 support} {
-        configure.args-append --without-x
+# Legacy no_x11 variant to be removed after June 2014.
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+variant x11 conflicts no_x11 {
+        configure.args-append   --x-includes=${prefix}/include \
+                                --x-libraries=${prefix}/lib
+        configure.args-delete   --without-x
 }
 
-if {![variant_isset no_x11]} {
-        configure.args-append --x-includes=${prefix}/include \
-                              --x-libraries=${prefix}/lib
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130617/f0968265/attachment.html>