[pkgsrc/trunk]: pkgsrc/devel/glib2 Get rid of pkg-config build dependency.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5486fabc6bb7
branches:  trunk
changeset: 591099:5486fabc6bb7
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 04 23:52:04 2011 +0000

description:
Get rid of pkg-config build dependency.

diffstat:

 devel/glib2/Makefile        |  5 ++++-
 devel/glib2/Makefile.common |  4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 1606db78e2fc -r 5486fabc6bb7 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Thu Aug 04 23:43:57 2011 +0000
+++ b/devel/glib2/Makefile      Thu Aug 04 23:52:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.185 2011/06/02 18:08:46 reed Exp $
+# $NetBSD: Makefile,v 1.186 2011/08/04 23:52:04 wiz Exp $
 
 .include "Makefile.common"
 
@@ -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
diff -r 1606db78e2fc -r 5486fabc6bb7 devel/glib2/Makefile.common
--- a/devel/glib2/Makefile.common       Thu Aug 04 23:43:57 2011 +0000
+++ b/devel/glib2/Makefile.common       Thu Aug 04 23:52:04 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2011/06/09 11:16:38 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2011/08/04 23:52:04 wiz Exp $
 #
 # used by devel/glib2/Makefile
 # used by sysutils/gio-fam/Makefile
@@ -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