[107051] trunk/dports/gnome/libunique/Portfile

[devans at macports.org]

Revision: 107051
          https://trac.macports.org/changeset/107051
Author:   devans at macports.org
Date:     2013-06-16 14:29:11 -0700 (Sun, 16 Jun 2013)
Log Message:
-----------
libunique: add +x11 default variant, dummy +no_x11 remains for legacy compatibility.

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

Modified: trunk/dports/gnome/libunique/Portfile
===================================================================
--- trunk/dports/gnome/libunique/Portfile	2013-06-16 21:28:51 UTC (rev 107050)
+++ trunk/dports/gnome/libunique/Portfile	2013-06-16 21:29:11 UTC (rev 107051)
@@ -5,7 +5,7 @@
 
 name            libunique
 version         1.1.6
-revision        7
+revision        8
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Unique is a library for writing single instance applications.
 long_description \
@@ -31,22 +31,29 @@
 
 depends_lib     port:gtk2 \
                 port:dbus-glib \
-                port:gobject-introspection \
-                port:xorg-libX11
+                port:gobject-introspection
 
 configure.args  --enable-maintainer-flags=no \
-                --x-includes=${prefix}/include \
-                --x-libraries=${prefix}/lib \
-                --enable-introspection
+                --enable-introspection \
+                --without-x
 
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 build.args-append   CC="${configure.cc} ${configure.cc_archflags}"
 
-variant no_x11 description {Disable X11 support} {
-    depends_lib-delete port:xorg-libX11
-    configure.args-delete --x-includes=${prefix}/include \
+# Legacy no_x11 variant to be removed after June 2014.
+variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
+
+variant x11 conflicts no_x11 {
+    depends_lib-append    port:xorg-libX11
+    configure.args-append --x-includes=${prefix}/include \
                           --x-libraries=${prefix}/lib
-    configure.args-append --without-x
+    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/20130616/af97029c/attachment.html>