 @@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.122 2009/08/29 15:20:20 wiz Exp $
+$NetBSD: distinfo,v 1.123 2009/09/22 15:50:46 joerg Exp $
 SHA1 (glib-2.20.5.tar.bz2) = 19e2b2684d7bc35a73ff94eb7fd15fc70cc6f292
 RMD160 (glib-2.20.5.tar.bz2) = c71ccaaf0a196e21e144041ec3286db18a03a960
 Size (glib-2.20.5.tar.bz2) = 5037738 bytes
-SHA1 (patch-aa) = e8d533e6279a537fc536f61ef397165518c4bcd7
+SHA1 (patch-aa) = f5b0f0803aba8a765b51355573c62d8a3de9bbd0
 SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = fa3bbb257d37b3763a628d09681701b697b9b75c
 SHA1 (patch-ag) = 65e50668eb909353210152ef54dfea923740179b
 SHA1 (patch-ah) = 239dc3d0734424a7cafc5dd8d8381768cba2d23e
 SHA1 (patch-ai) = ff1963c05cf82059de692cd5bf08872544297b7f
 SHA1 (patch-aj) = 9e5a7ccf081e3ebdf7888a67b027b696f632177c
-SHA1 (patch-ak) = f382189966f073b3b6e6de89ea7709571241a9a0
+SHA1 (patch-ak) = 35bd1cbd5ebdb480e32b391a65ffeff24ce565f9
 SHA1 (patch-al) = 6c8b7c569fb5fae5eff719ebd2925d79f5df3b2e
 SHA1 (patch-ba) = b235c2037bce84e0cdd9c87abaac274550ec0c95
 SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff
 SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54

 @@ -1,34 +1,48 @@
-$NetBSD: patch-aa,v 1.45 2008/12/08 16:10:19 tnn Exp $
+$NetBSD: patch-aa,v 1.46 2009/09/22 15:50:46 joerg Exp $
---- configure.orig	2008-11-24 06:50:01.000000000 +0100
+--- configure.orig	2009-08-29 01:17:41.000000000 +0200
 +++ configure
-@@ -835,6 +835,7 @@ GIO
+@@ -837,6 +837,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
 +G_MODULE_BROKEN_DLOPEN_NULL
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -34079,6 +34080,7 @@ else
+@@ -34078,10 +34079,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
 -  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 +  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
 +G_MODULE_BROKEN_DLOPEN_NULL=0
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -34914,6 +34916,87 @@ fi
+@@ -34656,7 +34658,7 @@ 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
 -	${SHELL} ./libtool --mode=compile ${CC} -shared \
 +	${SHELL} libtool --mode=compile ${CC} -shared \
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	{ $as_echo "$as_me:$LINENO: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
@@ -34917,6 +34919,87 @@ fi
  	LIBS="$LIBS_orig"
  fi
 +	{ $as_echo "$as_me:$LINENO: checking for dlopen(NULL, 0) brokenness" >&5
 +$as_echo_n "checking for dlopen(NULL, 0) brokenness... " >&6; }
 +if test "${glib_cv_dlopennull_broken+set}" = set; then
 +  $as_echo_n "(cached) " >&6
 +else
++
 +		if test "$cross_compiling" = yes; then
 +  glib_cv_dlopennull_broken=no
 +else
 +  cat >conftest.$ac_ext <<_ACEOF
 @@ -96,36 +110,45 @@ $NetBSD: patch-aa,v 1.45 2008/12/08 16:1
++
++
 +fi
 +{ $as_echo "$as_me:$LINENO: result: $glib_cv_dlopennull_broken" >&5
 +$as_echo "$glib_cv_dlopennull_broken" >&6; }
 +	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
 +		G_MODULE_BROKEN_DLOPEN_NULL=1
 +	else
 +		G_MODULE_BROKEN_DLOPEN_NULL=0
 +	fi
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -34950,6 +35033,8 @@ fi
+@@ -34927,7 +35010,7 @@ fi
  { $as_echo "$as_me:$LINENO: checking for the suffix of module shared libraries" >&5
  $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
  export SED
 -shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
 +shrext_cmds=`libtool --config | grep '^shrext_cmds='`
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
@@ -34953,6 +35036,8 @@ fi
++
++
  { $as_echo "$as_me:$LINENO: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -36696,117 +36781,8 @@ if test x"$have_threads" != xno; then
+@@ -36800,117 +36885,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
 -        for flag in pthread pthreads mt; do
 -          glib_save_CFLAGS="$CFLAGS"
 -          CFLAGS="$CFLAGS -$flag"
 -          if test "$cross_compiling" = yes; then
 -  cat >conftest.$ac_ext <<_ACEOF
+-
 -#include <pthread.h>
 -int check_me = 0;
 -void* func(void* data) {check_me = 42; return &check_me;}
 -int main()
 @@ -225,24 +248,24 @@ $NetBSD: patch-aa,v 1.45 2008/12/08 16:1
+-
 -          CFLAGS="$glib_save_CFLAGS"
 -          if test $glib_flag_works = yes ; then
 -             G_THREAD_CFLAGS=-$flag
 -	     G_THREAD_LIBS=-$flag
 -	     break;
 -          fi
 -        done
 +	G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 +	G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
           ;;
      esac
    fi
-@@ -39000,6 +38976,10 @@ case $host in
+@@ -39104,6 +39080,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
 +  *-*-netbsd*)
 +    # On NetBSD, pkgsrc's libtool does the right thing.
 +    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
 +    ;;
  esac

 @@ -1,26 +1,41 @@
-$NetBSD: patch-ak,v 1.3 2008/09/06 11:07:20 obache Exp $
+$NetBSD: patch-ak,v 1.4 2009/09/22 15:50:46 joerg Exp $
---- configure.in.orig	2008-09-02 17:47:31.000000000 +0000
+--- configure.in.orig	2009-08-28 05:43:57.000000000 +0200
 +++ configure.in
-@@ -1304,6 +1304,7 @@ fi
+@@ -1297,11 +1297,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
 -  G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 +  G_MODULE_LDFLAGS=`(libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
  fi
  dnl G_MODULE_IMPL= don't reset, so cmd-line can override
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
 +G_MODULE_BROKEN_DLOPEN_NULL=0
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader
  if test -z "$G_MODULE_IMPL"; then
-@@ -1428,6 +1429,38 @@ dnl *** check for having dlerror()
+@@ -1362,7 +1363,7 @@ 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
 -	${SHELL} ./libtool --mode=compile ${CC} -shared \
 +	${SHELL} libtool --mode=compile ${CC} -shared \
  		-export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
@@ -1426,6 +1427,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  fi
 +dnl *** check for dlopen(NULL, 0) brokenness
 +	AC_CACHE_CHECK([for dlopen(NULL, 0) brokenness],
 +		glib_cv_dlopennull_broken,[
 +		AC_TRY_RUN([
 +#include <stdio.h>
 +#include <dlfcn.h>
 +#ifndef RTLD_GLOBAL
 +#  define RTLD_GLOBAL 0
 +#endif
 +#ifndef RTLD_LAZY
 @@ -39,58 +54,67 @@ $NetBSD: patch-ak,v 1.3 2008/09/06 11:07
 +		],
 +		[glib_cv_dlopennull_broken=no],
 +		[glib_cv_dlopennull_broken=yes],
 +		[glib_cv_dlopennull_broken=no])
 +	])
 +	if test "x$glib_cv_dlopennull_broken" = "xyes"; then
 +		G_MODULE_BROKEN_DLOPEN_NULL=1
 +	else
 +		G_MODULE_BROKEN_DLOPEN_NULL=0
 +	fi
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1457,6 +1490,8 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+@@ -1436,7 +1469,7 @@ fi
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
 -shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
 +shrext_cmds=`libtool --config | grep '^shrext_cmds='`
  eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
@@ -1455,6 +1488,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)
 +AC_SUBST(G_MODULE_BROKEN_DLOPEN_NULL)
++
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
-@@ -1844,22 +1879,8 @@ if test x"$have_threads" != xno; then
+@@ -1843,22 +1878,8 @@ if test x"$have_threads" != xno; then
          G_THREAD_LIBS="-lpthread -lthread"
          ;;
        *)
 -        for flag in pthread pthreads mt; do
 -          glib_save_CFLAGS="$CFLAGS"
 -          CFLAGS="$CFLAGS -$flag"
 -          AC_TRY_RUN(glib_thread_test(0),
 -                     glib_flag_works=yes,
 -                     glib_flag_works=no,
 -                     [AC_LINK_IFELSE(glib_thread_test(0),
 -                                     glib_flag_works=yes,
 -                                     glib_flag_works=no)])
 -          CFLAGS="$glib_save_CFLAGS"
 -          if test $glib_flag_works = yes ; then
 -             G_THREAD_CFLAGS=-$flag
 -	     G_THREAD_LIBS=-$flag
 -	     break;
 -          fi
 -        done
 +	G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 +	G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
           ;;
      esac
    fi
-@@ -2255,6 +2276,10 @@ case $host in
+@@ -2254,6 +2275,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
 +  *-*-netbsd*)
 +    # On NetBSD, pkgsrc's libtool does the right thing.
 +    G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
 +    ;;
  esac
  AC_DEFINE_UNQUOTED(G_THREAD_SOURCE,"gthread-$have_threads.c",