[126685] users/devans/GNOME-3/stable/dports/gnome/libgnomekbd

[devans at macports.org]

Revision: 126685
          https://trac.macports.org/changeset/126685
Author:   devans at macports.org
Date:     2014-10-13 11:04:03 -0700 (Mon, 13 Oct 2014)
Log Message:
-----------
GNOME-3/stable: libgnomekbd, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/libgnomekbd:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libgnomekbd:108265-117389
/users/rmstonecipher/gnome/libgnomekbd:102363-103172
   + /branches/mld-qt-481/dports/gnome/libgnomekbd:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/libgnomekbd:108265-126631
/users/rmstonecipher/gnome/libgnomekbd:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile	2014-10-13 17:54:58 UTC (rev 126684)
+++ users/devans/GNOME-3/stable/dports/gnome/libgnomekbd/Portfile	2014-10-13 18:04:03 UTC (rev 126685)
@@ -46,18 +46,13 @@
                     --disable-schemas-compile \
                     --disable-silent-rules
 
-# Legacy no_x11 variant to be removed after June 2014.
-variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
-
-variant x11 conflicts no_x11 {
+variant x11 {
     configure.args-append   --x-includes=${prefix}/include \
                             --x-libraries=${prefix}/lib
     configure.args-delete   --without-x
 }
 
-if {![variant_isset no_x11]} {
-    default_variants +x11
-}
+default_variants    +x11
 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141013/54fbdc48/attachment-0001.html>