[141451] trunk/dports/devel/glib2/Portfile

[ryandesign at macports.org]

Revision: 141451
          https://trac.macports.org/changeset/141451
Author:   ryandesign at macports.org
Date:     2015-10-18 21:09:45 -0700 (Sun, 18 Oct 2015)
Log Message:
-----------
glib2: use MacPorts pcre instead of internal copy (#49327)

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2015-10-19 03:24:23 UTC (rev 141450)
+++ trunk/dports/devel/glib2/Portfile	2015-10-19 04:09:45 UTC (rev 141451)
@@ -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/cb22d94c/attachment.html>