[107294] trunk/dports/gnome/libgnomeui/Portfile

[devans at macports.org]

Revision: 107294
          https://trac.macports.org/changeset/107294
Author:   devans at macports.org
Date:     2013-06-25 07:52:52 -0700 (Tue, 25 Jun 2013)
Log Message:
-----------
libgnomeui: add +x11 default variant, dummy +no_x11 remains for legacy compatibility.

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

Modified: trunk/dports/gnome/libgnomeui/Portfile
===================================================================
--- trunk/dports/gnome/libgnomeui/Portfile	2013-06-25 14:52:35 UTC (rev 107293)
+++ trunk/dports/gnome/libgnomeui/Portfile	2013-06-25 14:52:52 UTC (rev 107294)
@@ -5,7 +5,7 @@
 
 name            libgnomeui
 version         2.24.5
-revision        6
+revision        7
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome
@@ -32,19 +32,26 @@
                 port:libbonoboui \
                 port:libffi \
                 port:libgnome-keyring \
-                port:libpng \
-                port:xorg-libsm
+                port:libpng
 
 configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
-configure.args  --x-includes=${prefix}/include \
-                --x-libraries=${prefix}/lib
+configure.args  --without-x
 
-variant no_x11 {
-    patchfiles-append       patch-configure.diff
-        depends_lib-delete      port:xorg-libsm
-        configure.args-delete   --x-includes=${prefix}/include \
-                                --x-libraries=${prefix}/lib
-        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 {
+    patchfiles-delete       patch-configure.diff
+    depends_lib-append      port:xorg-libsm
+    configure.args-append   --x-includes=${prefix}/include \
+                            --x-libraries=${prefix}/lib
+    configure.args-delete   --without-x
 }
 
+if {[variant_isset no_x11]} {
+    default_variants -x11
+} else {
+    default_variants +x11
+}
+
 livecheck.type  gnome
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130625/bdc392ce/attachment.html>