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

[devans at macports.org]

Revision: 141455
          https://trac.macports.org/changeset/141455
Author:   devans at macports.org
Date:     2015-10-18 23:12:21 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
GNOME-3/stable: glib2, merge maintainer update from 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-141295
/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-141454
/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	2015-10-19 05:03:26 UTC (rev 141454)
+++ users/devans/GNOME-3/stable/dports/devel/glib2/Portfile	2015-10-19 06:12:21 UTC (rev 141455)
@@ -11,6 +11,7 @@
 conflicts                   glib2-devel
 set my_name                 glib
 version                     2.46.1
+revision                    1
 set branch                  [join [lrange [split ${version} .] 0 1] .]
 categories                  devel
 maintainers                 ryandesign openmaintainer
@@ -53,9 +54,10 @@
 depends_build               bin:xmllint:libxml2
 
 depends_lib                 port:gettext \
+                            port:libffi \
                             port:libiconv \
-                            port:zlib \
-                            port:libffi
+                            port:pcre \
+                            port:zlib
 
 # GLib-CRITICAL **: attempting to free a locked GVariant instance.  This should never happen.
 compiler.blacklist-append   {clang < 318}
@@ -70,11 +72,14 @@
 configure.cflags-append     -fstrict-aliasing
 
 configure.args              --enable-static --disable-libelf \
-                            --disable-compile-warnings
+                            --disable-compile-warnings \
+                            --with-pcre=system
 
 configure.perl              /usr/bin/perl
 configure.python            /usr/bin/python
-configure.env-append        PERL_PATH=${configure.perl} \
+configure.env-append        PCRE_CFLAGS="-I${prefix}/include" \
+                            PCRE_LIBS="-L${prefix}/lib -lpcre" \
+                            PERL_PATH=${configure.perl} \
                             PKG_CONFIG=false \
                             ZLIB_CFLAGS="-I${prefix}/include" \
                             ZLIB_LIBS="-L${prefix}/lib -lz"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/58fd9b63/attachment.html>