[79195] trunk/dports/devel

[ryandesign at macports.org]

Revision: 79195
          http://trac.macports.org/changeset/79195
Author:   ryandesign at macports.org
Date:     2011-06-04 17:21:33 -0700 (Sat, 04 Jun 2011)
Log Message:
-----------
glib2, glib2-devel: no longer require pkgconfig, because pkgconfig 0.26+ requires glib2; see #29514

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

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2011-06-04 20:34:43 UTC (rev 79194)
+++ trunk/dports/devel/glib2/Portfile	2011-06-05 00:21:33 UTC (rev 79195)
@@ -40,8 +40,7 @@
                             patch-gio_xdgmime_xdgmime.c.diff \
                             patch-gio_gdbusprivate.c.diff
 
-depends_build               port:pkgconfig \
-                            port:dbus
+depends_build               port:dbus
 
 depends_lib                 port:gettext \
                             port:libiconv \
@@ -64,7 +63,12 @@
 configure.args              --enable-static
 
 configure.perl              ${prefix}/bin/perl
-configure.env-append        PERL_PATH=${configure.perl}
+configure.env-append        PERL_PATH=${configure.perl} \
+                            PKG_CONFIG=false \
+                            ZLIB_CFLAGS="-I${prefix}/lib" \
+                            ZLIB_LIBS="-L${prefix}/lib -lz" \
+                            DBUS1_CFLAGS="-I${prefix}/include/dbus-1.0 -I${prefix}/lib/dbus-1.0/include" \
+                            DBUS1_LIBS="-L${prefix}/lib -ldbus-1 -lpthread"
 
 post-patch {
     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2011-06-04 20:34:43 UTC (rev 79194)
+++ trunk/dports/devel/glib2-devel/Portfile	2011-06-05 00:21:33 UTC (rev 79195)
@@ -41,8 +41,7 @@
                             patch-gio_xdgmime_xdgmime.c.diff \
                             patch-gio_gdbusprivate.c.diff
 
-depends_build               port:pkgconfig \
-                            port:dbus
+depends_build               port:dbus
 
 depends_lib                 port:gettext \
                             port:libiconv \
@@ -67,8 +66,19 @@
 configure.args              --enable-static
 
 configure.perl              ${prefix}/bin/perl
-configure.env-append        PERL_PATH=${configure.perl}
+configure.env-append        PERL_PATH=${configure.perl} \
+                            PKG_CONFIG=false \
+                            ZLIB_CFLAGS="-I${prefix}/lib" \
+                            ZLIB_LIBS="-L${prefix}/lib -lz" \
+                            DBUS1_CFLAGS="-I${prefix}/include/dbus-1.0 -I${prefix}/lib/dbus-1.0/include" \
+                            DBUS1_LIBS="-L${prefix}/lib -ldbus-1 -lpthread"
 
+pre-configure {
+    set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
+    configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
+                            LIBFFI_LIBS="-L${prefix}/lib -lffi"
+}
+
 post-patch {
     reinplace "s|data_dirs = \"/usr|data_dirs = \"${prefix}/share:/usr|g" ${worksrcpath}/glib/gutils.c
     reinplace "s|path = \"/bin|path = \"${prefix}/bin:/bin|g" ${worksrcpath}/glib/gutils.c ${worksrcpath}/glib/gspawn.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110604/17605cda/attachment-0001.html>