Changes 2.32.2:

* GApplication: can now have a NULL application ID
* g_clear_object: fix warnings when using it on C++ (due to lack of
  ability to implicitly cast void*)
* GDBus:
 - add our own implementation of the message bus for use on Windows only
 - fix up a few bugs that use of this bus uncovered in GDBus
 - escape nonce files in dbus addressess (think 'c:\')
 - support initial underscores in dbus codegen namespace (for private)
* Fix misdetection of GNUstep as Cocoa (for the MacOS GSettings backend)
* make sure configure fails if AC_CHECK_ALIGNOF cannot detect the alignment
* GAppInfo: overwrite the DISPLAY only if it is set in the launch context
* glib/tests/date: force US locale running the GDateTime tests
* GSocketControlMessage: Don't warn about unknown messages
* Resources:
 - fix broken use of GVDB on big endian machines
 - set a 'display name' so that pretty file names appear in Gtk CSS
   warning messages
* GMainContext:
 - block child sources when blocking the parent
 - introduce more testcases for child sources
* Translations updates:
 Brazilian Portuguese
 French
 Galician
 Italian
 Lithuanian
 Polish
 Polish
 Serbian
 Simplified Chinese
 Spanish
* Bug fixed:
 619026 avoid warning in gutils.h when using gcc with -Wconversion
 669260 Open/Save dialog hangs waiting for data with libsoup
 671249 GApplication: Allow a null application_id?
 672786 goa-daemon: action in notification doesn't work
 673409 g_resource_lookup_data may return stale data pointer
 674172 glib-2.32.1 misdetects GNUstep as Cocoa
 674345 cssprovider: Make sure to print out file name in css warnings
 674483 broken configure results when cross-compiling with gcc >= 4.5

20 files changed, 130 insertions, 117 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 5f09653bb87..640f6394a5e 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.200 2012/05/01 07:05:59 tron Exp $
+# $NetBSD: Makefile,v 1.201 2012/05/01 18:45:51 adam Exp $
 
 .include "Makefile.common"
 .include "options.mk"
 
-PKGREVISION=		1
 CATEGORIES=		devel
 
 COMMENT=		Some useful routines for C programming (glib2)
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 7ee60837c78..79eba597070 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,21 +1,21 @@
-# $NetBSD: Makefile.common,v 1.16 2012/04/30 13:53:48 drochner Exp $
+# $NetBSD: Makefile.common,v 1.17 2012/05/01 18:45:52 adam Exp $
 #
 # used by devel/glib2/Makefile
 # used by sysutils/gio-fam/Makefile
 
 # When updating this package, please apply patch-ak to configure.in and
 # then run a matching version of autoconf to regen patch-aa.
-DISTNAME=		glib-2.32.1
-PKGNAME=		${DISTNAME:S/glib/glib2/}
-CATEGORIES=		# empty; redefined in Makefile
-MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.32/ \
-			${MASTER_SITE_GNOME:=sources/glib/2.32/}
-EXTRACT_SUFX=		.tar.xz
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://developer.gnome.org/doc/API/2.0/glib/glib.html
-COMMENT=		# empty; redefined in Makefile
-LICENSE=		gnu-lgpl-v2
+DISTNAME=	glib-2.32.2
+PKGNAME=	${DISTNAME:S/glib/glib2/}
+CATEGORIES=	# empty; redefined in Makefile
+MASTER_SITES=	ftp://ftp.gtk.org/pub/glib/2.32/ \
+		${MASTER_SITE_GNOME:=sources/glib/2.32/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://developer.gnome.org/doc/API/2.0/glib/glib.html
+COMMENT=	# empty; redefined in Makefile
+LICENSE=	gnu-lgpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -30,7 +30,7 @@ DISTINFO_FILE=		${.CURDIR}/../../devel/glib2/distinfo
 PATCHDIR=		${.CURDIR}/../../devel/glib2/patches
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--disable-fam	# See sysutils/gio-fam.
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index a185bd908ff..a01546e96b7 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.66 2012/04/30 13:53:48 drochner Exp $
+@comment $NetBSD: PLIST,v 1.67 2012/05/01 18:45:52 adam Exp $
 bin/gdbus
 bin/gio-querymodules
 bin/glib-compile-resources
@@ -282,8 +282,8 @@ man/man1/gtester.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/aclocal/gsettings.m4
-share/gdb/auto-load/libglib-2.0.so.0.3200.1-gdb.py
-share/gdb/auto-load/libgobject-2.0.so.0.3200.1-gdb.py
+share/gdb/auto-load/libglib-2.0.so.0.3200.2-gdb.py
+share/gdb/auto-load/libgobject-2.0.so.0.3200.2-gdb.py
 share/glib-2.0/gdb/glib.py
 share/glib-2.0/gdb/gobject.py
 share/glib-2.0/gettext/mkinstalldirs
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index c8966f1c9f3..106d1d31727 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,37 +1,37 @@
-$NetBSD: distinfo,v 1.169 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: distinfo,v 1.170 2012/05/01 18:45:52 adam Exp $
 
-SHA1 (glib-2.32.1.tar.xz) = 3f94733d0e79e5ff10d5ca8735ae5d7f11f2edc0
-RMD160 (glib-2.32.1.tar.xz) = d56ab662502916574e2286f92c2c56dc8aad210d
-Size (glib-2.32.1.tar.xz) = 6138200 bytes
-SHA1 (patch-aa) = 7304a1a0194cc099ebb79a1c397e905da9cfa6a8
+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-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
-SHA1 (patch-af) = 4db7dff19ba34d5a204c12c0c410415fcb077f20
+SHA1 (patch-af) = f35ea2e6101625555252b95596ea335f4ede651e
 SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
-SHA1 (patch-ai) = a21e04468ea05e29e1d3778f32c2a5da90e23e56
+SHA1 (patch-ai) = ec634baa67088c08513c3dfeca137c4765e79492
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = cfe9c8d309b4bdedb398a847ed5af98ecffac71e
+SHA1 (patch-ak) = 21da17f9f210d41aebb17a62492fffbd8bb7ecaa
 SHA1 (patch-al) = bde29693322c568f9a4ad090f1d469de5f69920e
-SHA1 (patch-am) = 062d3d295f00485ac3c3839dd4697957ebc66772
-SHA1 (patch-an) = 40536177b1590e02a8ca37893997042fca694d03
+SHA1 (patch-am) = 7298efee37f50d81b6a1b1b00d60dca33b19ce9f
+SHA1 (patch-an) = 45d695332ad9c79938a0a808928f89fffc86cf48
 SHA1 (patch-ap) = eeabf999a65cc51bc792798e4d81fef2ad35837b
-SHA1 (patch-aq) = dd816807ccbce20ef4ad959d5ee3bc7750491890
-SHA1 (patch-ar) = 0ff0ddd3323263207a4fa715642dba5aeb4b3cc4
+SHA1 (patch-aq) = 42ee287341bb3569bb95959a09fcde7c94e49088
+SHA1 (patch-ar) = 17b698a22b08434690c25569cfc7d483daf08a76
 SHA1 (patch-as) = 3b83fa24811984e7e00b423cbb35da1e4ab4fa1c
 SHA1 (patch-at) = f4c4a2fbe84eb8b361fb342f3c3b0b5a226d1794
 SHA1 (patch-ba) = f4233cd4e0109f9bee5630c655b0ab7b22ba0c61
-SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
+SHA1 (patch-cb) = 56e2a9b2de04c8e528faf7ce778503fa55dcc3ac
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54
-SHA1 (patch-cd) = 9006b880e94ae4a4fc564c1978178a296dd63024
+SHA1 (patch-cd) = 312e2f322b295ddec613f9ce9760ecafeab69047
 SHA1 (patch-ce) = ab978e9acfbfcd4e1249cbc2f9ab7e503d62a53f
 SHA1 (patch-cf) = 7aec3254eb3edfa71da72f7a9c218d148a036bd4
 SHA1 (patch-cg) = be18840e9c56bf1c2c4c2759dfc73097d463923a
-SHA1 (patch-ci) = f0191fd416222617a2e95e95a05c3dcf6b6ce2d2
+SHA1 (patch-ci) = fcf75fc77bfcdaee8911f759d63978cd627d6ebb
 SHA1 (patch-cj) = e9d10c82a30049b358003b93585280ea26e12e22
 SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2
-SHA1 (patch-cl) = 3e7296d68f1ddf3d2a1b82824848f6bf6c2c8c8d
+SHA1 (patch-cl) = de1d916aa9137aea278a223990fbde5b2ab9feb9
 SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e
-SHA1 (patch-cn) = b930dc95d44eacc9448f2a3a799a95db2880bfd4
+SHA1 (patch-cn) = 7a2f42fc1199bfc3fd2ccbd2ed1c56a7f6c0028f
 SHA1 (patch-glib_goption.c) = 323297aa328b85493f156792b4baa0cb04fa82ad
diff --git a/devel/glib2/hacks.mk b/devel/glib2/hacks.mk
index c7b5b4d93b7..8c972434bb4 100644
--- a/devel/glib2/hacks.mk
+++ b/devel/glib2/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2011/01/04 09:55:15 adam Exp $
+# $NetBSD: hacks.mk,v 1.6 2012/05/01 18:45:52 adam Exp $
 
 .if !defined(GLIB2_HACKS_MK)
 GLIB2_HACKS_MK=	# defined
@@ -6,25 +6,25 @@ GLIB2_HACKS_MK=	# defined
 # Build without optimization. Avoids crash in libgobject on gtk2
 # initialization. Bug is triggered regardless of whether we're using gcc or
 # aCC.
-.  if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
+.if !empty(MACHINE_PLATFORM:MHPUX-*-hppa)
 PKG_HACKS+=	hppa-codegen
 CFLAGS:=	-O0 ${CFLAGS:C/[+,-]O[0-9]?//g}
-.  endif
+.endif
 
-.  if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin"
 PKG_HACKS+=		darwin-iconv
 SUBST_CLASSES+=		iconv
 SUBST_STAGE.iconv=	pre-configure
 SUBST_MESSAGE.iconv=	Changing libiconv_open to iconv_open.
 SUBST_FILES.iconv=	configure
 SUBST_SED.iconv=	-e 's,libiconv_open,iconv_open,g'
-.  endif
+.endif
 
 # Work around unresolved symbol g_test_config_vars during build
 .include "../../mk/compiler.mk"
-.  if !empty(PKGSRC_COMPILER:Msunpro)
+.if !empty(PKGSRC_COMPILER:Msunpro)
 PKG_HACKS+=		sunpro-visibility
 CONFIGURE_ARGS+=	--disable-visibility
-.  endif
+.endif
 
 .endif
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index 8a6c481f5eb..2e53818466c 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-aa,v 1.52 2012/05/01 18:45:52 adam Exp $
 
---- configure.orig	2012-03-24 03:02:40.000000000 +0000
+--- configure.orig	2012-05-01 00:10:54.000000000 +0000
 +++ configure
-@@ -697,6 +697,7 @@ GIO
+@@ -698,6 +698,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -22442,8 +22443,8 @@ else
+@@ -22511,8 +22512,8 @@ else
  fi
  
  
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24038,16 +24039,48 @@ fi
+@@ -24107,16 +24108,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -71,7 +71,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  esac
  
  if test "$ac_cv_func_statfs" = yes ; then
-@@ -25040,10 +25073,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -25109,10 +25142,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -84,7 +84,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -25250,13 +25284,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -25319,13 +25353,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
  	LIBS="$G_MODULE_LIBS $LIBS"
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -101,7 +101,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
  if ${glib_cv_rtldglobal_broken+:} false; then :
-@@ -25365,6 +25399,56 @@ fi
+@@ -25434,6 +25468,56 @@ fi
  
  	LIBS="$LIBS_orig"
  fi
@@ -158,7 +158,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25375,7 +25459,7 @@ fi
+@@ -25444,7 +25528,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
  $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
  export SED
@@ -167,7 +167,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -25399,6 +25483,8 @@ fi
+@@ -25468,6 +25552,8 @@ fi
  
  
  
@@ -176,7 +176,7 @@ $NetBSD: patch-aa,v 1.51 2012/04/30 13:53:48 drochner Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26147,62 +26233,6 @@ if test x"$have_threads" = xposix; then
+@@ -26401,62 +26487,6 @@ if test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
diff --git a/devel/glib2/patches/patch-af b/devel/glib2/patches/patch-af
index e3aa6be3736..fee2d9f6abb 100644
--- a/devel/glib2/patches/patch-af
+++ b/devel/glib2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.12 2010/11/02 14:52:24 drochner Exp $
+$NetBSD: patch-af,v 1.13 2012/05/01 18:45:52 adam Exp $
 
 --- glib/libcharset/Makefile.in.orig	2010-09-27 16:10:13.000000000 +0000
 +++ glib/libcharset/Makefile.in
-@@ -703,18 +703,6 @@ lcov-clean:
+@@ -728,18 +728,6 @@ lcov-clean:
  # run tests in cwd as part of make check
  check-local: test-nonrecursive
  install-exec-local: all-local
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
index bbefcd1c63d..ec21b2089ad 100644
--- a/devel/glib2/patches/patch-ai
+++ b/devel/glib2/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.19 2012/01/29 10:46:53 drochner Exp $
+$NetBSD: patch-ai,v 1.20 2012/05/01 18:45:52 adam Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=583321
 
 --- glib/gmain.c.orig	2011-10-14 04:03:10.000000000 +0000
 +++ glib/gmain.c
-@@ -4398,7 +4398,11 @@ ensure_unix_signal_handler_installed_unl
+@@ -4393,7 +4393,11 @@ ensure_unix_signal_handler_installed_unl
  
    action.sa_handler = g_unix_signal_handler;
    sigemptyset (&action.sa_mask);
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index ba346b5edc5..8294029a977 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-ak,v 1.11 2012/05/01 18:45:52 adam Exp $
 
---- configure.ac.orig	2012-03-24 03:02:16.000000000 +0000
+--- configure.ac.orig	2012-05-01 00:06:39.000000000 +0000
 +++ configure.ac
-@@ -835,7 +835,7 @@ int main (int argc, char **argv)
+@@ -852,7 +852,7 @@ int main (int argc, char **argv)
  AC_MSG_RESULT($g_have_gnuc_visibility)
  AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1086,8 +1086,20 @@ AC_CHECK_TYPE([struct ip_mreqn], [
+@@ -1103,8 +1103,20 @@ AC_CHECK_TYPE([struct ip_mreqn], [
  
  case $host in
    *-*-solaris* )
@@ -32,7 +32,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
       AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
       ;;
  esac
-@@ -1448,11 +1460,12 @@ if test x"$glib_native_win32" = xyes; th
+@@ -1465,11 +1477,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -46,7 +46,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1513,13 +1526,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
+@@ -1530,13 +1543,13 @@ if test "$G_MODULE_IMPL" = "G_MODULE_IMP
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -63,7 +63,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
  		AC_TRY_RUN([
-@@ -1582,6 +1595,38 @@ dnl *** check for having dlerror()
+@@ -1599,6 +1612,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  fi
@@ -102,7 +102,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1592,7 +1637,7 @@ fi
+@@ -1609,7 +1654,7 @@ fi
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -111,7 +111,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1611,6 +1656,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1628,6 +1673,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -120,7 +120,7 @@ $NetBSD: patch-ak,v 1.10 2012/04/30 13:53:48 drochner Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -1967,22 +2014,8 @@ if test x"$have_threads" = xposix; then
+@@ -1995,22 +2042,8 @@ if test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
diff --git a/devel/glib2/patches/patch-am b/devel/glib2/patches/patch-am
index 0676654e01b..0246b1805ef 100644
--- a/devel/glib2/patches/patch-am
+++ b/devel/glib2/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.6 2010/11/02 14:52:24 drochner Exp $
+$NetBSD: patch-am,v 1.7 2012/05/01 18:45:52 adam Exp $
 
 --- gio/tests/converter-stream.c.orig	2010-09-13 15:57:51.000000000 +0000
 +++ gio/tests/converter-stream.c
-@@ -745,7 +745,9 @@ main (int   argc,
+@@ -739,7 +739,9 @@ main (int   argc,
    CharsetTest charset_tests[] = {
      { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
      { "/converter-input-stream/charset/latin1->utf8", "ISO-8859-1", "\305rr Sant\351", "UTF-8", "\303\205rr Sant\303\251", 0 },
diff --git a/devel/glib2/patches/patch-an b/devel/glib2/patches/patch-an
index 6bccdde521f..5e3dc929baf 100644
--- a/devel/glib2/patches/patch-an
+++ b/devel/glib2/patches/patch-an
@@ -1,9 +1,9 @@
-$NetBSD: patch-an,v 1.7 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-an,v 1.8 2012/05/01 18:45:52 adam Exp $
 
---- gio/Makefile.in.orig	2012-04-13 22:16:59.000000000 +0000
+--- gio/Makefile.in.orig	2012-05-01 00:10:52.000000000 +0000
 +++ gio/Makefile.in
-@@ -755,7 +755,7 @@ EXTRA_DIST = strinfo.c data-to-c.pl gio.
- 	$(NULL) $(completion_DATA)
+@@ -760,7 +760,7 @@ EXTRA_DIST = gdbusdaemon.c gdbusdaemon.h
+ 	gschema.dtd gconstructor_as_data.h $(NULL) $(completion_DATA)
  TEST_PROGS = 
  NULL = 
 -SUBDIRS = gdbus-2.0/codegen $(am__append_1) $(am__append_4) \
@@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.7 2012/04/30 13:53:48 drochner Exp $
  	$(am__append_8) $(am__append_11) . $(am__append_14) tests
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib
  @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir)
-@@ -3400,7 +3400,7 @@ info: info-recursive
+@@ -3431,7 +3431,7 @@ info: info-recursive
  
  info-am:
  
diff --git a/devel/glib2/patches/patch-aq b/devel/glib2/patches/patch-aq
index 0afd22501ea..c680a98da74 100644
--- a/devel/glib2/patches/patch-aq
+++ b/devel/glib2/patches/patch-aq
@@ -1,6 +1,6 @@
-$NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
+$NetBSD: patch-aq,v 1.4 2012/05/01 18:45:52 adam Exp $
 
---- gio/gsocket.c.orig	Sun Mar 11 21:43:04 2012
+--- gio/gsocket.c.orig	2012-05-01 00:06:39.000000000 +0000
 +++ gio/gsocket.c
 @@ -37,6 +37,9 @@
  #include <signal.h>
@@ -12,7 +12,7 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
  
  #ifndef G_OS_WIN32
  # include <fcntl.h>
-@@ -3556,7 +3559,7 @@ g_socket_get_credentials (GSocket   *soc
+@@ -4301,7 +4304,7 @@ g_socket_get_credentials (GSocket   *soc
  
    ret = NULL;
  
@@ -21,12 +21,10 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
    {
      socklen_t optlen;
  #if defined(__linux__)
-@@ -3589,6 +3592,35 @@ g_socket_get_credentials (GSocket   *soc
-                                   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
- #endif
+@@ -4336,6 +4339,35 @@ g_socket_get_credentials (GSocket   *soc
                                    &native_creds);
-+      }
-+  }
+       }
+   }
 +#elif defined(__NetBSD__) && defined(LOCAL_PEEREID)
 +  {
 +    struct unpcbid cred;
@@ -54,6 +52,8 @@ $NetBSD: patch-aq,v 1.3 2012/04/10 19:48:17 bsiegert Exp $
 +	g_credentials_set_native (ret,
 +				  G_CREDENTIALS_TYPE_LINUX_UCRED,
 +				  &native_creds);
-       }
-   }
++      }
++  }
  #else
+   g_set_error_literal (error,
+                        G_IO_ERROR,
diff --git a/devel/glib2/patches/patch-ar b/devel/glib2/patches/patch-ar
index 14e2ad2276a..b8e10213497 100644
--- a/devel/glib2/patches/patch-ar
+++ b/devel/glib2/patches/patch-ar
@@ -1,18 +1,19 @@
-$NetBSD: patch-ar,v 1.3 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-ar,v 1.4 2012/05/01 18:45:52 adam Exp $
 
 avoid python dependency
 
---- gio/tests/Makefile.in.orig	2012-03-24 03:02:44.000000000 +0000
+--- gio/tests/Makefile.in.orig	2012-05-01 00:10:52.000000000 +0000
 +++ gio/tests/Makefile.in
-@@ -47,20 +47,17 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
+@@ -47,21 +47,18 @@ noinst_PROGRAMS = $(am__EXEEXT_5) $(am__
  @OS_UNIX_TRUE@	gdbus-names gdbus-proxy gdbus-proxy-threads \
  @OS_UNIX_TRUE@	gdbus-proxy-well-known-name gdbus-introspection \
  @OS_UNIX_TRUE@	gdbus-threading gdbus-export gdbus-error \
 -@OS_UNIX_TRUE@	gdbus-peer gdbus-exit-on-close gdbus-non-socket \
 +@OS_UNIX_TRUE@	gdbus-exit-on-close gdbus-non-socket \
- @OS_UNIX_TRUE@	gdbus-bz627724 appinfo contenttype mimeapps file \
- @OS_UNIX_TRUE@	$(NULL) live-g-file desktop-app-info unix-fd \
- @OS_UNIX_TRUE@	unix-streams gapplication basic-application \
+ @OS_UNIX_TRUE@	gdbus-bz627724 gmenumodel appinfo contenttype \
+ @OS_UNIX_TRUE@	mimeapps file $(NULL) live-g-file \
+ @OS_UNIX_TRUE@	desktop-app-info unix-fd unix-streams \
+ @OS_UNIX_TRUE@	gapplication basic-application \
 -@OS_UNIX_TRUE@	gdbus-test-codegen $(NULL)
 +@OS_UNIX_TRUE@	$(NULL)
  @OS_UNIX_TRUE@am__append_2 = \
@@ -27,7 +28,7 @@ avoid python dependency
  subdir = gio/tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-@@ -104,7 +101,7 @@ am__EXEEXT_1 =
+@@ -105,7 +102,7 @@ am__EXEEXT_1 =
  @OS_UNIX_TRUE@	gdbus-proxy-well-known-name$(EXEEXT) \
  @OS_UNIX_TRUE@	gdbus-introspection$(EXEEXT) \
  @OS_UNIX_TRUE@	gdbus-threading$(EXEEXT) gdbus-export$(EXEEXT) \
@@ -35,8 +36,8 @@ avoid python dependency
 +@OS_UNIX_TRUE@	gdbus-error$(EXEEXT) \
  @OS_UNIX_TRUE@	gdbus-exit-on-close$(EXEEXT) \
  @OS_UNIX_TRUE@	gdbus-non-socket$(EXEEXT) \
- @OS_UNIX_TRUE@	gdbus-bz627724$(EXEEXT) appinfo$(EXEEXT) \
-@@ -113,7 +110,7 @@ am__EXEEXT_1 =
+ @OS_UNIX_TRUE@	gdbus-bz627724$(EXEEXT) gmenumodel$(EXEEXT) \
+@@ -114,7 +111,7 @@ am__EXEEXT_1 =
  @OS_UNIX_TRUE@	live-g-file$(EXEEXT) desktop-app-info$(EXEEXT) \
  @OS_UNIX_TRUE@	unix-fd$(EXEEXT) unix-streams$(EXEEXT) \
  @OS_UNIX_TRUE@	gapplication$(EXEEXT) basic-application$(EXEEXT) \
@@ -45,19 +46,19 @@ avoid python dependency
  @OS_WIN32_TRUE@am__EXEEXT_3 = win32-streams$(EXEEXT)
  @HAVE_DBUS1_TRUE@am__EXEEXT_4 = gdbus-serialization$(EXEEXT)
  am__EXEEXT_5 = io-stream$(EXEEXT) memory-input-stream$(EXEEXT) \
-@@ -133,8 +130,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) memory
- 	gmenumodel$(EXEEXT) resources$(EXEEXT) $(am__EXEEXT_1) \
- 	$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4)
+@@ -134,8 +131,6 @@ am__EXEEXT_5 = io-stream$(EXEEXT) memory
+ 	resources$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
+ 	$(am__EXEEXT_3) $(am__EXEEXT_4)
  @OS_UNIX_TRUE@am__EXEEXT_6 = gdbus-example-unix-fd-client$(EXEEXT) \
 -@OS_UNIX_TRUE@	gdbus-example-objectmanager-server$(EXEEXT) \
 -@OS_UNIX_TRUE@	gdbus-example-objectmanager-client$(EXEEXT) \
  @OS_UNIX_TRUE@	$(am__EXEEXT_1)
  am__EXEEXT_7 = resolver$(EXEEXT) socket-server$(EXEEXT) \
  	socket-client$(EXEEXT) echo-server$(EXEEXT) httpd$(EXEEXT) \
-@@ -964,7 +959,6 @@ TEST_PROGS = io-stream memory-input-stre
+@@ -967,7 +962,6 @@ TEST_PROGS = io-stream memory-input-stre
  	tls-certificate tls-interaction cancellable vfs \
- 	network-monitor fileattributematcher gmenumodel resources \
- 	$(NULL) $(am__append_1) $(am__append_3) $(am__append_4)
+ 	network-monitor fileattributematcher resources $(NULL) \
+ 	$(am__append_1) $(am__append_3) $(am__append_4)
 -SUBDIRS = gdbus-object-manager-example
  INCLUDES = \
  	-g 			\
diff --git a/devel/glib2/patches/patch-cb b/devel/glib2/patches/patch-cb
index 5fee4f199c6..3b554df0aac 100644
--- a/devel/glib2/patches/patch-cb
+++ b/devel/glib2/patches/patch-cb
@@ -1,8 +1,8 @@
-$NetBSD: patch-cb,v 1.2 2008/09/06 11:07:21 obache Exp $
+$NetBSD: patch-cb,v 1.3 2012/05/01 18:45:52 adam Exp $
 
 --- gio/xdgmime/xdgmime.c.orig	2008-09-02 15:09:17.000000000 +0000
 +++ gio/xdgmime/xdgmime.c
-@@ -254,7 +254,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
+@@ -257,7 +257,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)
diff --git a/devel/glib2/patches/patch-cd b/devel/glib2/patches/patch-cd
index cccd09bfbaf..cd74619005f 100644
--- a/devel/glib2/patches/patch-cd
+++ b/devel/glib2/patches/patch-cd
@@ -1,4 +1,4 @@
-$NetBSD: patch-cd,v 1.6 2012/03/21 12:18:33 drochner Exp $
+$NetBSD: patch-cd,v 1.7 2012/05/01 18:45:53 adam Exp $
 
 sysutils/gio-fam builds the gio/fam backend as a separate module.  Force it
 to link against the installed version of glib2, as it is not rebuilt by the
@@ -18,7 +18,7 @@ package.
  am__objects_1 =
  am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
  	libgiofam_la-fam-module.lo \
-@@ -402,9 +399,7 @@ libgiofam_la_CFLAGS = \
+@@ -403,9 +400,7 @@ libgiofam_la_CFLAGS = \
  
  libgiofam_la_LDFLAGS = $(module_flags)
  libgiofam_la_LIBADD = \
@@ -29,7 +29,7 @@ package.
  		$(GLIB_LIBS) \
  		$(FAM_LIBS) \
  		$(NULL)
-@@ -842,9 +837,6 @@ lcov-clean:
+@@ -843,9 +838,6 @@ lcov-clean:
  check-local: test-nonrecursive
  
  install-data-hook:
diff --git a/devel/glib2/patches/patch-ci b/devel/glib2/patches/patch-ci
index ed9f0b7970e..471073c079b 100644
--- a/devel/glib2/patches/patch-ci
+++ b/devel/glib2/patches/patch-ci
@@ -1,10 +1,10 @@
-$NetBSD: patch-ci,v 1.1 2010/11/10 20:51:46 tez Exp $
+$NetBSD: patch-ci,v 1.2 2012/05/01 18:45:53 adam Exp $
 
 needed for calls to major() & minor()
 
 --- gio/gdbusmessage.c.orig	2010-11-10 14:02:41.786659900 -0600
 +++ gio/gdbusmessage.c	2010-11-10 14:03:53.567042800 -0600
-@@ -49,6 +49,9 @@
+@@ -52,6 +52,9 @@
  
  #ifdef G_OS_UNIX
  #include "gunixfdlist.h"
diff --git a/devel/glib2/patches/patch-cl b/devel/glib2/patches/patch-cl
index 0f7e293d8ce..dce45235902 100644
--- a/devel/glib2/patches/patch-cl
+++ b/devel/glib2/patches/patch-cl
@@ -1,6 +1,6 @@
-$NetBSD: patch-cl,v 1.5 2012/04/30 13:53:48 drochner Exp $
+$NetBSD: patch-cl,v 1.6 2012/05/01 18:45:53 adam Exp $
 
---- gio/Makefile.am.orig	2012-03-18 02:36:48.000000000 +0000
+--- gio/Makefile.am.orig	2012-05-01 00:08:03.000000000 +0000
 +++ gio/Makefile.am
 @@ -2,8 +2,6 @@ include $(top_srcdir)/Makefile.decl
  
@@ -11,7 +11,7 @@ $NetBSD: patch-cl,v 1.5 2012/04/30 13:53:48 drochner Exp $
  if OS_UNIX
  SUBDIRS += xdgmime
  endif
-@@ -692,13 +690,6 @@ gdbus_LDADD = libgio-2.0.la \
+@@ -715,13 +713,6 @@ gdbus_LDADD = libgio-2.0.la \
  	$(top_builddir)/glib/libglib-2.0.la 		\
  	$(top_builddir)/gobject/libgobject-2.0.la
  
diff --git a/devel/glib2/patches/patch-cn b/devel/glib2/patches/patch-cn
index 970ae5a74b8..7de8199ff3b 100644
--- a/devel/glib2/patches/patch-cn
+++ b/devel/glib2/patches/patch-cn
@@ -1,4 +1,4 @@
-$NetBSD: patch-cn,v 1.1 2011/10/09 19:40:03 jmmv Exp $
+$NetBSD: patch-cn,v 1.2 2012/05/01 18:45:53 adam Exp $
 
 The mem-overflow test contains a declaration of an empty struct, which breaks
 on at least SunPro cc, and presumably some other non-gcc compilers.  Skip this
@@ -7,7 +7,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=641350
 
 --- glib/tests/Makefile.am.orig	2011-06-05 23:18:49.000000000 +0000
 +++ glib/tests/Makefile.am
-@@ -66,9 +66,6 @@ hostutils_LDADD     = $(progs_ldadd)
+@@ -76,9 +76,6 @@ hostutils_LDADD     = $(progs_ldadd)
  TEST_PROGS         += gvariant
  gvariant_LDADD      = $(progs_ldadd)
  
diff --git a/sysutils/gio-fam/Makefile b/sysutils/gio-fam/Makefile
index 16cff6ff279..8ed4c48c3ea 100644
--- a/sysutils/gio-fam/Makefile
+++ b/sysutils/gio-fam/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2012/03/08 14:49:45 obache Exp $
-#
+# $NetBSD: Makefile,v 1.6 2012/05/01 18:45:53 adam Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
-PKGNAME:=		${PKGNAME:S/glib2/gio-fam/}
-PKGREVISION=		1
-CATEGORIES=		sysutils
+PKGNAME:=	${PKGNAME:S/glib2/gio-fam/}
+CATEGORIES=	sysutils
 
-COMMENT=		FAM backend for GIO, the glib VFS API
+COMMENT=	FAM backend for GIO, the glib VFS API
 
 NOT_FOR_PLATFORM=	HPUX-*-* OSF1-*-*
 
diff --git a/sysutils/gio-fam/hacks.mk b/sysutils/gio-fam/hacks.mk
new file mode 100644
index 00000000000..a8b0b2c14c7
--- /dev/null
+++ b/sysutils/gio-fam/hacks.mk
@@ -0,0 +1,15 @@
+# $NetBSD: hacks.mk,v 1.1 2012/05/01 18:45:53 adam Exp $
+
+.if !defined(GIOFAM_HACKS_MK)
+GIOFAM_HACKS_MK=	# defined
+
+.if ${OPSYS} == "Darwin"
+PKG_HACKS+=		darwin-iconv
+SUBST_CLASSES+=		iconv
+SUBST_STAGE.iconv=	pre-configure
+SUBST_MESSAGE.iconv=	Changing libiconv_open to iconv_open.
+SUBST_FILES.iconv=	configure
+SUBST_SED.iconv=	-e 's,libiconv_open,iconv_open,g'
+.endif
+
+.endif