Re: pkg-config-0.26 depends on glib2

[Thomas Klausner <wiz%NetBSD.org@localhost>]

On Thu, Jul 14, 2011 at 04:41:14PM +0200, Thomas Klausner wrote:
> On Thu, Jul 14, 2011 at 09:56:24AM -0400, Greg Troxel wrote:
> > Does upstream have a story?  Or are they all Linux users that install
> > binary packages and thus none of them has ever run into this?
> 
> Good point. I've asked the author and will let you know when he
> answers.

Upstream answered. Basically, he got annoyed by having to maintain his
own copy of glib1 inside pkg-config's tree; his suggestion is to build
glib2 without making use of pkg-config.

Following that, I've come up with the attached patch. "make configure"
still finds pcre with it. Ok to commit?
 Thomas

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/Makefile,v
retrieving revision 1.185
diff -u -r1.185 Makefile
--- Makefile    2 Jun 2011 18:08:46 -0000       1.185
+++ Makefile    4 Aug 2011 21:12:24 -0000
@@ -34,6 +34,9 @@
 
 # need pcre utf8 + unicode-properties
 BUILDLINK_API_DEPENDS.pcre+=   pcre>=8.11
+# to avoid pkg-config dependency, explicitly specify pcre location
+CONFIGURE_ARGS+=       PCRE_CFLAGS=-I${BUILDLINK_PREFIX.pcre}/include
+CONFIGURE_ARGS+=       
PCRE_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib 
-L${BUILDLINK_PREFIX.pcre}/lib -lpcre"
 
 # needs gz_header structure
 BUILDLINK_API_DEPENDS.zlib+=   zlib>=1.2.2.1
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/Makefile.common,v
retrieving revision 1.12
diff -u -r1.12 Makefile.common
--- Makefile.common     9 Jun 2011 11:16:38 -0000       1.12
+++ Makefile.common     4 Aug 2011 21:12:24 -0000
@@ -21,7 +21,7 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            gmake
 USE_LANGUAGES=         c c++ c99
 USE_LIBTOOL=           yes
 TEST_TARGET=           check