[145364] users/devans/GNOME-3/stable/dports/gnome/yelp

[devans at macports.org]

Revision: 145364
          https://trac.macports.org/changeset/145364
Author:   devans at macports.org
Date:     2016-02-02 15:32:37 -0800 (Tue, 02 Feb 2016)
Log Message:
-----------
GNOME-3/stable: yelp, merge changes from trunk, add +quartz variant for testing, increment revision.

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

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


Property changes on: users/devans/GNOME-3/stable/dports/gnome/yelp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp:108265-144701
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723,133231-134389,136853-141710
/users/rmstonecipher/gnome/yelp:102363-103172
   + /branches/mld-qt-481/dports/gnome/yelp:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/yelp:108265-145363
/users/devans/GNOME-3/unstable/dports/gnome/yelp:114069-118154,121400-125723,133231-134389,136853-141710
/users/rmstonecipher/gnome/yelp:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile	2016-02-02 23:29:36 UTC (rev 145363)
+++ users/devans/GNOME-3/stable/dports/gnome/yelp/Portfile	2016-02-02 23:32:37 UTC (rev 145364)
@@ -2,10 +2,12 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                yelp
 license             GPL-2
 version             3.18.1
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Help browser for GNOME.
 long_description    Yelp is the default help browser for the \
@@ -26,7 +28,6 @@
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:itstool \
-                    port:gnome-common \
                     port:autoconf \
                     port:automake \
                     port:libtool \
@@ -54,13 +55,19 @@
 
 configure.cmd       ./autogen.sh
 
-configure.args      --x-includes=${prefix}/include \
-                    --x-libraries=${prefix}/lib \
-                    --enable-compile-warnings=minimum \
+configure.args      --enable-compile-warnings=minimum \
                     --disable-schemas-compile \
                     --disable-silent-rules \
                     --enable-debug
 
+variant quartz {}
+
+if {[variant_isset quartz]} {
+    require_active_variants gtk3 quartz
+} else {
+    require_active_variants gtk3 x11
+}
+
 post-activate {
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
     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/20160202/2057d808/attachment-0001.html>