[146379] users/devans/GNOME-3/stable/dports/devel/glib2

[devans at macports.org]

Revision: 146379
          https://trac.macports.org/changeset/146379
Author:   devans at macports.org
Date:     2016-03-06 11:54:47 -0800 (Sun, 06 Mar 2016)
Log Message:
-----------
GNOME-3/stable: glib2, sync with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/glib2/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/glib2/


Property changes on: users/devans/GNOME-3/stable/dports/devel/glib2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glib2:125620-142849
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619,128305-141254
   + /branches/mld-qt-481/dports/devel/glib2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/glib2:125620-146378
/trunk/dports/devel/glib2-devel:51739-120463
/users/cal/ports/devel/glib2:96570-97031
/users/devans/GNOME-3/unstable/dports/devel/glib2:120511-125619,128305-141254

Modified: users/devans/GNOME-3/stable/dports/devel/glib2/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2016-03-06 19:52:23 UTC (rev 146378)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2016-03-06 19:54:47 UTC (rev 146379)
@@ -3,7 +3,6 @@
 
 PortSystem                  1.0
 PortGroup                   compiler_blacklist_versions 1.0
-PortGroup                   conflicts_build 1.0
 
 # Please keep the glib2 and glib2-devel ports as similar as possible.
 
@@ -75,7 +74,8 @@
 
 configure.args              --enable-static --disable-libelf \
                             --disable-compile-warnings \
-                            --with-pcre=system
+                            --with-pcre=system \
+                            ac_cv_prog_AWK=/usr/bin/awk
 
 configure.perl              /usr/bin/perl
 configure.python            /usr/bin/python
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160306/de7b23a8/attachment.html>