Changeset 79195

Timestamp:

06/04/11 17:21:33 (4 years ago)

Author:

ryandesign@…

Message:

glib2, glib2-devel: no longer require pkgconfig, because pkgconfig 0.26+ requires glib2; see #29514

Location:

trunk/dports/devel

Files:

• glib2-devel/Portfile (modified) (2 diffs)
• glib2/Portfile (modified) (2 diffs)

trunk/dports/devel/glib2-devel/Portfile

@@ -42 +42 @@
                             patch-gio_gdbusprivate.c.diff
 
-depends_build               port:pkgconfig \
-                            port:dbus
+depends_build               port:dbus
 
 depends_lib                 port:gettext \
@@ -68 +67 @@
 
 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 {

trunk/dports/devel/glib2/Portfile

@@ -41 +41 @@
                             patch-gio_gdbusprivate.c.diff
 
-depends_build               port:pkgconfig \
-                            port:dbus
+depends_build               port:dbus
 
 depends_lib                 port:gettext \
@@ -65 +64 @@
 
 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 {