* Update PKGCONFIG_OVERRIDE list to reflect reality.

* Restore pthread flag settings in configure script.
  It still in the last hunk of patch-ak (for configure.ac),
  but lost at updated to 2.32.1.
* Fixes missing pthread linkage of libglib-2.0 on OpenBSD.

Bump PKGREVISION.

4 files changed, 27 insertions, 12 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 640f6394a5e..31e978c7678 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,27 +1,24 @@
-# $NetBSD: Makefile,v 1.201 2012/05/01 18:45:51 adam Exp $
+# $NetBSD: Makefile,v 1.202 2012/05/04 10:22:08 obache Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
+PKGREVISION=		1
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
 
 USE_TOOLS+=		msgfmt perl:run
 
-PKGCONFIG_OVERRIDE=	glib-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	glib-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gmodule-no-export-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gobject-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gobject-2.0.pc.in
-PKGCONFIG_OVERRIDE+=	gthread-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gio-unix-2.0.pc.in
+PKGCONFIG_OVERRIDE+=	gio-windows-2.0.pc.in
 
 FILES_SUBST+=		GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
 FILES_SUBST+=		GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 106d1d31727..e50f3ac6a8c 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.170 2012/05/01 18:45:52 adam Exp $
+$NetBSD: distinfo,v 1.171 2012/05/04 10:22:08 obache Exp $
 
 SHA1 (glib-2.32.2.tar.xz) = 5898165e58c8f946c2b1fd05b910fe4476b64164
 RMD160 (glib-2.32.2.tar.xz) = 2ec828c54c31f07d9d28d182f1d6e8398e112928
 Size (glib-2.32.2.tar.xz) = 6117764 bytes
-SHA1 (patch-aa) = c5df19377f5f8121a17d834104dfe319bbed2cd3
+SHA1 (patch-aa) = 059197e7e9ee88c87cea168635467780912519e0
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
@@ -12,7 +12,7 @@ SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
 SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = 21da17f9f210d41aebb17a62492fffbd8bb7ecaa
+SHA1 (patch-ak) = 9b64fa949785f3e61cf7bc46ea7096da85d4a0ae
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
 SHA1 (patch-am) = 7298efee37f50d81b6a1b1b00d60dca33b19ce9f
 SHA1 (patch-an) = 45d695332ad9c79938a0a808928f89fffc86cf48
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 2e53818466c..4f5e906e62d 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-aa,v 1.53 2012/05/04 10:22:08 obache Exp $
 
 --- configure.orig	2012-05-01 00:10:54.000000000 +0000
 +++ configure
@@ -176,7 +176,7 @@ $NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26401,62 +26487,6 @@ if test x"$have_threads" = xposix; then
+@@ -26401,62 +26487,8 @@ if test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
@@ -236,6 +236,16 @@ $NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $
 -        break;
 -        fi
 -      done
++      G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
++      G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
         ;;
    esac
  fi
+@@ -26954,6 +26986,7 @@ case $host in
+     ;;
+   *-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
++    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
+   *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 8294029a977..9c109bd57cb 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.11 2012/05/01 18:45:52 adam Exp $
+$NetBSD: patch-ak,v 1.12 2012/05/04 10:22:08 obache Exp $
 
 --- configure.ac.orig	2012-05-01 00:06:39.000000000 +0000
 +++ configure.ac
@@ -145,3 +145,11 @@ $NetBSD: patch-ak,v 1.11 2012/05/01 18:45:52 adam Exp $
         ;;
    esac
  fi
+@@ -2301,6 +2334,7 @@ case $host in
+     ;;
+   *-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
++    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
+   *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"