Update to 0.27:

pkg-config 0.27
===

 - Drop usage of popt for equivalent API in glib2.
 - Add back an internal snapshot of glib2 to break circular dependency.
   This can be used by passing --with-internal-glib to configure. On
   Windows it may still be required to use an installed glib.
 - Fix --exists to check for Requires and Requires.private. This ensures
   that all necessary packages are installed prior to using --cflags,
   --libs, etc.
 - Various fixes for MinGW which should allow it to be used unpatched on
   that system.
 - New autoconf macros PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR to help
   determine the .pc file install directory.
 - Fix handling of --exact/atleast/max-version vs. =/>=/<=.
 - Fix errors in man page source.
 - Ensure testing only searches in the check directory.
 - Bump glib requirement to 2.16 to avoid deprecated
   g_win32_get_package_installation_subdirectory().
 - Autotools refresh and update. The required versions now are
   autoconf-2.62, automake-1.11 and libtool-2.2.
 - Use g_alloca from glib instead of figuring out alloca ourselves.
 - Remove search for setresuid & setreuid only needed for internal popt.
 - Bugs fixed: 833, 2458, 5214, 5326, 5703, 6074, 8653, 9135, 9143,
   9584, 10652, 11464, 14396, 17053, 23922, 28776, 29011, 29801, 31699,
   31700, 32622, 34382, 37266, 39646, 41081, 43149, 44843, 45599, 45742,
   48743

pkg-config 0.26
===

 - Build system fixes
 - More tests
 - pkg.m4 fixups which makes autoconf 2.66 happier.
 - Drop support for legacy -config scripts.  Those should already be
   gone and cause problems in cross-compilation environments.
 - Drop embedded glib
 - Fix up pkg.m4 to handle the case of --exists working and --cflags
   or --libs failing.
 - Various documentation updates
 - Allow $() through without escaping it.
 - Add --with-system-include-path instead of hard-coding
   /usr/include.

8 files changed, 31 insertions, 700 deletions

diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index f08273d39ab..b585b04d50a 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2010/09/28 04:52:41 dsainty Exp $
+# $NetBSD: Makefile,v 1.19 2012/08/12 16:28:06 wiz Exp $
 
-DISTNAME=	pkg-config-0.25
-PKGREVISION=	1
+DISTNAME=	pkg-config-0.27
 CATEGORIES=	devel
 MASTER_SITES=	http://pkgconfig.freedesktop.org/releases/
 
@@ -15,30 +14,21 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-threads
+CONFIGURE_ARGS+=	--with-internal-glib
+# needed since it can't use pkg-config to find glib2...
+#CONFIGURE_ARGS+=	GLIB_CFLAGS="-I${BUILDLINK_PREFIX.glib2}/include/glib/glib-2.0 -I${BUILDLINK_PREFIX.glib2}/lib/glib-2.0/include"
+#CONFIGURE_ARGS+=	GLIB_LIBS="${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.glib2}/lib -L${BUILDLINK_PREFIX.glib2}/lib -lglib-2.0 -lintl"
 
 # old name of the package
 CONFLICTS=		pkgconfig-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "FreeBSD"
-.  if ${OS_VERSION:R} < 5
-# configure checks but does not fail on warning
-CONFIGURE_ENV+=		glib_cv_va_copy=no
-.  endif
-.endif
-
 .if ${OPSYS} == "IRIX"
 # configure bails out in subdir after re-parsing the cache
 CONFIGURE_ARGS+=	--cache-file=/dev/null
 .endif
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	glib_cv_sane_realloc=yes glib_cv_uscore=no
-CONFIGURE_ARGS+=	glib_cv_rtldglobal_broken=no
-.endif
-
 PKGCONFIG_EXTRA_PATHS=	# empty
 
 .if ${LOCALBASE} != ${X11BASE}
@@ -59,4 +49,5 @@ BUILDLINK_PASSTHRU_DIRS= /private-dep /public-dep /requires-test
 TEST_TARGET=		check
 
 .include "../../mk/dlopen.buildlink3.mk"
+#.include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 91c7fb8e882..162a56d070e 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.18 2010/12/10 07:45:56 hauke Exp $
+$NetBSD: distinfo,v 1.19 2012/08/12 16:28:06 wiz Exp $
 
-SHA1 (pkg-config-0.25.tar.gz) = 8922aeb4edeff7ed554cc1969cbb4ad5a4e6b26e
-RMD160 (pkg-config-0.25.tar.gz) = 835509d01f68c45823ee89c718776eb66f61316b
-Size (pkg-config-0.25.tar.gz) = 988899 bytes
-SHA1 (patch-ac) = 567c7c7dba33253263de81818178d7cebcce8645
-SHA1 (patch-ad) = a9c162409c2bbb4e016855ddc691e03d7a3197cb
-SHA1 (patch-ah) = 915474d8d93a0f2f17cd352b16bb135379a8c844
-SHA1 (patch-ca) = ab435d31c97a487baab8d82638b9d36ec520cf58
-SHA1 (patch-cb) = 23412858615649c8d8305ce4e6571f06e17073fd
+SHA1 (pkg-config-0.27.tar.gz) = ca2ffd312b37064f0afeb352185485ef9205cab9
+RMD160 (pkg-config-0.27.tar.gz) = c47ec7442bf536af657fda2f8a63fc87206c33da
+Size (pkg-config-0.27.tar.gz) = 1912566 bytes
+SHA1 (patch-configure) = 6d936a40351077cf905aaf9ab9561fc813e03899
+SHA1 (patch-glib_m4macros_Makefile.in) = 3babb2784e6a737287015ba9b9f5e940b03ccfc0
diff --git a/devel/pkg-config/patches/patch-ad b/devel/pkg-config/patches/patch-ad
deleted file mode 100644
index a97d7767797..00000000000
--- a/devel/pkg-config/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2010/09/23 07:07:47 adam Exp $
-
-See patch-ac.
-
---- configure.in.orig	2010-05-28 15:55:09.000000000 +0000
-+++ configure.in
-@@ -50,7 +50,7 @@ echo use_indirect_deps=$use_indirect_dep
- AC_MSG_CHECKING([whether to list both direct and indirect dependencies])
- case $use_indirect_deps in
-   auto)
--    deplibs_check_method=`(./libtool --config; echo eval echo '\"$deplibs_check_method\"') | sh`
-+    deplibs_check_method=`(./libtool --config; echo '\"$deplibs_check_method\"') | sh`
-     if test "X$deplibs_check_method" = Xnone; then
-     echo "foo: $deplibs_check_method" >&AS_MESSAGE_LOG_FD
-       use_indirect_deps=yes
diff --git a/devel/pkg-config/patches/patch-ah b/devel/pkg-config/patches/patch-ah
deleted file mode 100644
index 0c27f67538e..00000000000
--- a/devel/pkg-config/patches/patch-ah
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2010/12/10 07:45:56 hauke Exp $
-
---- parse.c.orig	2010-05-27 20:21:36.000000000 +0000
-+++ parse.c
-@@ -880,8 +880,10 @@ parse_cflags (Package *pkg, const char *
-             pkg->other_cflags = g_slist_prepend (pkg->other_cflags,
-                                                  g_strdup (arg));
- 	  if (strcmp("-idirafter", arg) == 0) {
-+	      char *n;
-+		  
-               tmp = trim_string(argv[++i]);
--	      char *n = strdup_escape_shell(tmp);
-+	      n = strdup_escape_shell(tmp);
- 	      pkg->other_cflags = g_slist_prepend(pkg->other_cflags, n);
- 	      g_free(tmp);
- 	  }
-@@ -1460,102 +1462,8 @@ get_compat_package (const char *name)
-     }
-   else
-     {
--      /* Check for the module in gnome-config */
--      char *output;
--      char *p;
--      char *command;
--
--      debug_spew ("Calling gnome-config\n");
--      
--      /* Annoyingly, --modversion doesn't return a failure
--       * code if the lib is unknown, so we have to use --libs
--       * for that.
--       */
--      
--      command = g_strdup_printf ("gnome-config --libs %s",
--                                 name);
--      
--      if (!try_command (command))
--        {
--          g_free (command);
--          g_free (pkg);
--          return NULL;
--        }
--      else
--        g_free (command);
--      
--      command = g_strdup_printf ("gnome-config --modversion %s",
--                                 name);
--      
--      output = backticks (command);
--      g_free (command);
--      if (output == NULL)
--        {
--          g_free (pkg);
--          return NULL;
--        }
--      
--      /* Unknown modules give "Unknown library `foo'" from gnome-config
--       * (but on stderr so this is useless, nevermind)
--       */
--      if (strstr (output, "Unknown") || *output == '\0')
--        {
--          g_free (output);
--          g_free (pkg);
--          return NULL;
--        }
--
--      /* gnome-config --modversion gnomeui outputs e.g. "gnome-libs-1.2.4"
--       * or libglade-0.12
--       */
--      p = output;
--
--      while (*p && isspace ((guchar)*p))
--        ++p;
--
--      if (*p == '\0')
--        {
--          /* empty output */
--          g_free (output);
--          g_free (pkg);
--          return NULL;
--        }
--
--      /* only heuristic; find a number or . */
--      while (*p && ! (isdigit ((guchar)*p) || *p == '.'))
--        ++p;      
--
--      pkg->version = g_strdup (p);
--
--      g_free (output);
--      
--      /* Strip newline */
--      p = pkg->version;
--      while (*p)
--        {
--          if (*p == '\n')
--            *p = '\0';
--
--          ++p;
--        }
--      
--      pkg->name = g_strdup (name);
--      pkg->key = g_strdup (name);
--      pkg->description = g_strdup ("No description");
--
--      command = g_strdup_printf ("gnome-config --libs %s", name);
--      output = backticks (command);
--      g_free (command);
--      parse_libs (pkg, output, "gnome-config");
--      g_free (output);
--
--      command = g_strdup_printf ("gnome-config --cflags %s", name);
--      output = backticks (command);
--      g_free (command);
--      parse_cflags (pkg, output, "gnome-config");
--      g_free (output);
--
--      return pkg;
-+      g_free (pkg);
-+      return NULL;
-     }
- #endif
- }
diff --git a/devel/pkg-config/patches/patch-ca b/devel/pkg-config/patches/patch-ca
deleted file mode 100644
index 5bf62a900d5..00000000000
--- a/devel/pkg-config/patches/patch-ca
+++ /dev/null
@@ -1,343 +0,0 @@
-$NetBSD: patch-ca,v 1.4 2010/09/23 07:07:47 adam Exp $
-
---- glib-1.2.10/configure.orig	2010-09-23 06:52:13.000000000 +0000
-+++ glib-1.2.10/configure
-@@ -12186,61 +12186,6 @@ if test "x$GCC" = "xyes"; then
-   fi
- fi
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags to get ANSI library prototypes" >&5
--$as_echo_n "checking for extra flags to get ANSI library prototypes... " >&6; }
--glib_save_LIBS=$LIBS
--LIBS="$LIBS -lm"
--if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <math.h>
--             int main (void) { return (log(1) != log(1.)); }
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
--$as_echo "none needed" >&6; }
--else
--  glib_save_CFLAGS=$CFLAGS
--     CFLAGS="$CFLAGS -std1"
--     if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <math.h>
--                 int main (void) { return (log(1) != log(1.)); }
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: -std1" >&5
--$as_echo "-std1" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
--$as_echo "" >&6; }
--         CFLAGS=$glib_save_CFLAGS
--         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&5
--$as_echo "$as_me: WARNING: No ANSI prototypes found in library. (-std1 didn't work.)" >&2;}
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--LIBS=$glib_save_LIBS
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra flags for POSIX compliance" >&5
- $as_echo_n "checking for extra flags for POSIX compliance... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12726,30 +12671,18 @@ if test "${glib_cv_has__inline+set}" = s
-   $as_echo_n "(cached) " >&6
- else
- 
--        if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	__inline int foo () { return 0; }
- 	int main () { return foo (); }
- 
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   glib_cv_has__inline=yes
--
--else
--  glib_cv_has__inline=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+	glib_cv_has__inline=no
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -12765,30 +12698,18 @@ if test "${glib_cv_has__inline__+set}" =
-   $as_echo_n "(cached) " >&6
- else
- 
--        if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	__inline__ int foo () { return 0; }
- 	int main () { return foo (); }
- 
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   glib_cv_has__inline__=yes
--
--else
--  glib_cv_has__inline__=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+	glib_cv_has__inline__=no
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -12804,30 +12725,18 @@ if test "${glib_cv_hasinline+set}" = set
-   $as_echo_n "(cached) " >&6
- else
- 
--        if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	inline int foo () { return 0; }
- 	int main () { return foo (); }
- 
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  glib_cv_hasinline=yes
--
--else
--  glib_cv_hasinline=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  glib_cv_has_inline=yes
-+	glib_cv_has_inline=no
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -13541,13 +13450,7 @@ if test "${glib_cv_va_copy+set}" = set; 
-   $as_echo_n "(cached) " >&6
- else
- 
--	if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	#include <stdarg.h>
-@@ -13559,22 +13462,21 @@ else
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   glib_cv_va_copy=yes
--
- else
-   glib_cv_va_copy=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -13586,13 +13488,7 @@ if test "${glib_cv___va_copy+set}" = set
-   $as_echo_n "(cached) " >&6
- else
- 
--	if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	#include <stdarg.h>
-@@ -13604,22 +13500,21 @@ else
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--  glib_cv___va_copy=yes
- 
--else
--  glib_cv___va_copy=no
-+int
-+main ()
-+{
- 
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  glib_cv_va___copy=yes
-+else
-+  glib_cv_va___copy=no
- fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -13631,13 +13526,7 @@ if test "${glib_cv_va_val_copy+set}" = s
-   $as_echo_n "(cached) " >&6
- else
- 
--	if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- 	#include <stdarg.h>
-@@ -13649,22 +13538,21 @@ else
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
- _ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
-+if ac_fn_c_try_compile "$LINENO"; then :
-   glib_cv_va_val_copy=yes
--
- else
-   glib_cv_va_val_copy=no
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- fi
- 
-@@ -14910,6 +14798,15 @@ _ACEOF
- 
- 
- 
-+if test "$cross_compiling" = yes; then
-+	{ echo "#define GLIB_SYSDEF_POLLIN =1"
-+	echo "#define GLIB_SYSDEF_POLLPRI =2"
-+	echo "#define GLIB_SYSDEF_POLLOUT =4"
-+	echo "#define GLIB_SYSDEF_POLLERR =8"
-+	echo "#define GLIB_SYSDEF_POLLHUP =16"
-+	echo "#define GLIB_SYSDEF_POLLNVAL =32"
-+	} > glibconfig-sysdefs.h
-+else
- glib_sysdefso="glibconfig-sysdefs.h"
- glib_sysdef_msg=`echo POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32 | sed 's/:[^ 	]*//g'`
- if test "x`(echo '\n') 2>/dev/null`" != 'x\n'; then
-@@ -14974,7 +14871,7 @@ fi
- 
- rm -f confrun.c
- 
--
-+fi
- 
- 
- ac_config_commands="$ac_config_commands default-1"
diff --git a/devel/pkg-config/patches/patch-cb b/devel/pkg-config/patches/patch-cb
deleted file mode 100644
index 6797d13f8f1..00000000000
--- a/devel/pkg-config/patches/patch-cb
+++ /dev/null
@@ -1,193 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2008/03/04 09:22:27 wiz Exp $
-
---- glib-1.2.10/configure.in.orig	2008-01-16 22:52:24.000000000 +0000
-+++ glib-1.2.10/configure.in
-@@ -178,26 +178,6 @@ if test "x$GCC" = "xyes"; then
- fi
- changequote([,])dnl
- 
--dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R)
--AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
--glib_save_LIBS=$LIBS
--LIBS="$LIBS -lm"
--AC_TRY_RUN([#include <math.h>
--             int main (void) { return (log(1) != log(1.)); }],
--     AC_MSG_RESULT(none needed),
--     glib_save_CFLAGS=$CFLAGS
--     CFLAGS="$CFLAGS -std1"
--     AC_TRY_RUN([#include <math.h>
--                 int main (void) { return (log(1) != log(1.)); }],
--         AC_MSG_RESULT(-std1),
--         AC_MSG_RESULT()
--         CFLAGS=$glib_save_CFLAGS
--         AC_MSG_WARN(
--                [No ANSI prototypes found in library. (-std1 didn't work.)])
--     )
--)
--LIBS=$glib_save_LIBS
--
- dnl NeXTStep cc seems to need this
- AC_MSG_CHECKING([for extra flags for POSIX compliance])
- AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
-@@ -234,14 +214,13 @@ dnl truely know which ones of `inline', 
- dnl actually supported.
- AC_MSG_CHECKING(for __inline)
- AC_CACHE_VAL(glib_cv_has__inline,[
--        AC_TRY_RUN([
-+        AC_COMPILE_IFELSE(
-+	[AC_LANG_SOURCE([
- 	__inline int foo () { return 0; }
- 	int main () { return foo (); }
--       	],
--	glib_cv_has__inline=yes
--        ,
--	glib_cv_has__inline=no
--        ,)
-+       	])],
-+	[glib_cv_has__inline=yes]
-+	[glib_cv_has__inline=no])
- ])
- AC_MSG_RESULT($glib_cv_has__inline)
- case x$glib_cv_has__inline in
-@@ -249,14 +228,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE)
- esac
- AC_MSG_CHECKING(for __inline__)
- AC_CACHE_VAL(glib_cv_has__inline__,[
--        AC_TRY_RUN([
-+        AC_COMPILE_IFELSE(
-+	[AC_LANG_SOURCE([
- 	__inline__ int foo () { return 0; }
- 	int main () { return foo (); }
--       	],
--	glib_cv_has__inline__=yes
--        ,
--	glib_cv_has__inline__=no
--        ,)
-+       	])],
-+	[glib_cv_has__inline__=yes]
-+	[glib_cv_has__inline__=no])
- ])
- AC_MSG_RESULT($glib_cv_has__inline__)
- case x$glib_cv_has__inline__ in
-@@ -264,14 +242,13 @@ xyes) AC_DEFINE(G_HAVE___INLINE__)
- esac
- AC_MSG_CHECKING(for inline)
- AC_CACHE_VAL(glib_cv_hasinline,[
--        AC_TRY_RUN([
-+        AC_COMPILE_IFELSE(
-+	[AC_LANG_SOURCE([
- 	inline int foo () { return 0; }
- 	int main () { return foo (); }
--       	],
--	glib_cv_hasinline=yes
--        ,
--	glib_cv_hasinline=no
--        ,)
-+       	])],
-+	[glib_cv_has_inline=yes]
-+	[glib_cv_has_inline=no])
- ])
- AC_MSG_RESULT($glib_cv_hasinline)
- case x$glib_cv_hasinline in
-@@ -422,7 +399,8 @@ dnl we currently check for all three va_
- dnl all results in config.log for bug reports.
- AC_MSG_CHECKING(for an implementation of va_copy())
- AC_CACHE_VAL(glib_cv_va_copy,[
--	AC_TRY_RUN([
-+	AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM([
- 	#include <stdarg.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
-@@ -432,19 +410,15 @@ AC_CACHE_VAL(glib_cv_va_copy,[
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}],
--	glib_cv_va_copy=yes
--	,
--	glib_cv_va_copy=no
--	,)
-+	])],
-+	[glib_cv_va_copy=yes],
-+	[glib_cv_va_copy=no])
- ])
- AC_MSG_RESULT($glib_cv_va_copy)
- AC_MSG_CHECKING(for an implementation of __va_copy())
- AC_CACHE_VAL(glib_cv___va_copy,[
--	AC_TRY_RUN([
-+	AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM([
- 	#include <stdarg.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
-@@ -454,19 +428,15 @@ AC_CACHE_VAL(glib_cv___va_copy,[
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}],
--	glib_cv___va_copy=yes
--	,
--	glib_cv___va_copy=no
--	,)
-+	])],
-+	[glib_cv_va___copy=yes],
-+	[glib_cv_va___copy=no])
- ])
- AC_MSG_RESULT($glib_cv___va_copy)
- AC_MSG_CHECKING(whether va_lists can be copied by value)
- AC_CACHE_VAL(glib_cv_va_val_copy,[
--	AC_TRY_RUN([
-+	AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM([
- 	#include <stdarg.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
-@@ -476,14 +446,9 @@ AC_CACHE_VAL(glib_cv_va_val_copy,[
- 	  exit (1);
- 	va_end (args1); va_end (args2);
- 	}
--	int main() {
--	  f (0, 42);
--	  return 0;
--	}],
--	glib_cv_va_val_copy=yes
--	,
--	glib_cv_va_val_copy=no
--	,)
-+	])],
-+	[glib_cv_va_val_copy=yes],
-+	[glib_cv_va_val_copy=no])
- ])
- if test "x$glib_cv_va_copy" = "xyes"; then
-   AC_DEFINE(G_VA_COPY, va_copy)
-@@ -946,13 +911,22 @@ GLIB_IF_VAR_EQ(mutex_has_default, yes,
- dnl ****************************************
- dnl *** GLib POLL* compatibility defines ***
- dnl ****************************************
-+if test "$cross_compiling" = yes; then
-+	{ echo "#define GLIB_SYSDEF_POLLIN =1"
-+	echo "#define GLIB_SYSDEF_POLLPRI =2"
-+	echo "#define GLIB_SYSDEF_POLLOUT =4"
-+	echo "#define GLIB_SYSDEF_POLLERR =8"
-+	echo "#define GLIB_SYSDEF_POLLHUP =16"
-+	echo "#define GLIB_SYSDEF_POLLNVAL =32"
-+	} > glibconfig-sysdefs.h
-+else
- GLIB_SYSDEFS(
- [#include <sys/types.h>
- #include <sys/poll.h>],
- 	POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32,
- 	glibconfig-sysdefs.h,
- 	=)
--
-+fi
- 
- dnl ******************************
- dnl *** output the whole stuff ***
diff --git a/devel/pkg-config/patches/patch-ac b/devel/pkg-config/patches/patch-configure
index 294bfe5e88e..81d0654c1a6 100644
--- a/devel/pkg-config/patches/patch-ac
+++ b/devel/pkg-config/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2010/09/23 07:07:47 adam Exp $
+$NetBSD: patch-configure,v 1.1 2012/08/12 16:28:06 wiz Exp $
 
 Arbitrary strings should not be passed to "eval".
 
---- configure.orig	2010-05-28 15:55:57.000000000 +0000
+--- configure.orig	2011-08-06 14:17:45.000000000 +0000
 +++ configure
-@@ -11167,7 +11167,7 @@ echo use_indirect_deps=$use_indirect_dep
+@@ -13439,7 +13439,7 @@ echo use_indirect_deps=$use_indirect_dep
  $as_echo_n "checking whether to list both direct and indirect dependencies... " >&6; }
  case $use_indirect_deps in
    auto)
diff --git a/devel/pkg-config/patches/patch-glib_m4macros_Makefile.in b/devel/pkg-config/patches/patch-glib_m4macros_Makefile.in
new file mode 100644
index 00000000000..bf1fadedabb
--- /dev/null
+++ b/devel/pkg-config/patches/patch-glib_m4macros_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-glib_m4macros_Makefile.in,v 1.1 2012/08/12 16:28:06 wiz Exp $
+
+Do not install glib autoconf macros.
+
+--- glib/m4macros/Makefile.in.orig	2012-06-04 22:23:58.000000000 +0000
++++ glib/m4macros/Makefile.in
+@@ -304,7 +304,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
+ # initialize variables for unconditional += appending
+ EXTRA_DIST = $(installed_m4)
+ TEST_PROGS = 
+-installed_m4 = glib-2.0.m4 glib-gettext.m4 gsettings.m4
++installed_m4 = 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = $(installed_m4)
+ all: all-am