Subject: pkg/36731: devel/glib2 2.12.13 to 2.13.7
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: None <makoto@ki.nu>
List: pkgsrc-bugs
Date: 08/04/2007 10:50:01
>Number: 36731
>Category: pkg
>Synopsis: devel/glib2 update 2.12.13 to 2.13.7
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sat Aug 04 10:50:01 +0000 2007
>Originator: Makoto Fujiwara
>Release: NetBSD 4.99.25
>Organization:
KINU Corporation
>Environment:
System: NetBSD livorno 4.99.25 NetBSD 4.99.25 (GENERIC) #0: Wed Jul 25 01:52:32 PDT 2007 builds@wb43:/home/builds/ab/HEAD/i386/200707240002Z-obj/home/builds/ab/HEAD/src/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:
(1) glib2 is now updated to 2.13.7
(2) Some application ask for gregex.h, which only new version
has.
(3) pkgsrc directory does not have patche for configure.in
(4) patches/patch-aa should be deleted
(5) A part of NEWS follows
Overview of Changes from GLib 2.13.6 to GLib 2.13.7
===================================================
* The memory corruption warning from the slice allocator that
occurred when threads were initialized after the slice allocator
has been removed, as the slice allocator now works fine
in this scenario.
* New functions g_once_init_enter() and g_once_init_leave() make
it easier to write threadsafe one-time initialization functions
* Bugs fixed:
454473 Simple XML Subset Parser terminates on invalid XML
445813 g_module_open error, add file name
453796 errno gets clobbered by g_filename_display_name
341988 don't use "-c" with msgfmt in Makefile.in.in
447048 Please produce slightly more output during long tests
454785 GModule documentation lists same block of code twice.
454786 GModule documentation lists same paragraph twice.
383155 small docs quirks in gobject/closure API documentation
65041 _get_type() functions aren't thread safe
* Updated translations
Assamese (as)
Spanish (es)
Gujarati (gu)
Japanese (ja)
Korean (ko)
Macedonian (mk)
(2.13.6 .. 2.13.1 ommitted)
Overview of Changes from GLib 2.12 to GLib 2.13.0
=================================================
* Add GSequence, a list that is implemented using
a balanced binary tree.
* Add GRegex, an implementation of Perl regular expressions,
based on PCRE.
* Use Posix monotonic clocks instead of gettimeofday()
for GTimer when available.
* Support static initialization of GQeues with G_QUEUE_INIT,
g_queue_init() and g_queue_clear().
* Add g_string_chunk_clear() for clearing a
GStringChunk.
* Add g_unichar_get_script() to obtain Unicode
script information.
* Add g_unichar_iszerowidth() to obtain information
about zero-width characters.
* Add G_GNUC_MAY_ALIAS which wraps the gcc may_alias
type attribute.
* G_GNUC_INTERNAL has a working definition for the
Sun Studio compiler. This requires the macro to
be positioned before the function declaration.
* The slice allocator can produce detailed debugging
information with G_SLICE=debug-blocks.
* Modules support G_DEBUG flags resident-modules and
bind-now-modules.
* Add G_DEFINE_DYNAMIC_TYPE() to make it easier
to define types in modules.
* Bug fixes: too many to list them in detail here.
* New and updated translations (be,bg,bn,ca,cs,de,
en_CA,en_GB,et,fa,fr,he,hu,it,ja,ku,lt,mg,mk,ml,
nb,ne,nn,pt,pt_BR,ro,sr,sr@Latn,sv,ta,uk,vi,zh_CN,
zh_HK,zh_TW)
>How-To-Repeat:
cd pkgsrc/devel/glib2
make package
>Fix:
Index: Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/devel/glib2/Makefile,v
retrieving revision 1.117
diff -u -u -r1.117 Makefile
--- Makefile 21 Jul 2007 21:56:07 -0000 1.117
+++ Makefile 4 Aug 2007 16:57:34 -0000
@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.117 2007/07/21 21:56:07 wiz Exp $
-DISTNAME= glib-2.12.13
+DISTNAME= glib-2.13.7
PKGNAME= ${DISTNAME:S/glib/glib2/}
CATEGORIES= devel
-MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.12/ \
- ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \
- ${MASTER_SITE_GNOME:=sources/glib/2.12/}
+MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.13/ \
+ ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.13/ \
+ ${MASTER_SITE_GNOME:=sources/glib/2.13/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
Index: distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/devel/glib2/distinfo,v
retrieving revision 1.82
diff -u -u -r1.82 distinfo
--- distinfo 19 Jul 2007 21:25:46 -0000 1.82
+++ distinfo 4 Aug 2007 18:49:12 -0000
@@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.82 2007/07/19 21:25:46 wiz Exp $
-SHA1 (glib-2.12.13.tar.bz2) = 81ce0e53f5583be970623d12523c785a392647bf
-RMD160 (glib-2.12.13.tar.bz2) = 0d13e73cb2173e7d63ce188fdb77746cca3b04d6
-Size (glib-2.12.13.tar.bz2) = 2938164 bytes
-SHA1 (patch-aa) = d6224959a9422706f20d5df63a3270330e51e718
+SHA1 (glib-2.13.7.tar.bz2) = 88c8d4fb715b4ad55948818489f892b8f5e16129
+RMD160 (glib-2.13.7.tar.bz2) = 00fbf163f384a5fe58e93596580186a6c17c5ff4
+Size (glib-2.13.7.tar.bz2) = 3291156 bytes
SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
@@ -12,3 +11,5 @@
SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7
SHA1 (patch-aj) = a8c4e79113828e6dadf0b158777bb860aa44de3e
+SHA1 (patch-ak) = 00c10d3fdd16cf39c493224a89200306055fec43
+SHA1 (patch-al) = ffde35810cd77352476fc10c646585447fd11209
Index: patches/patch-ak
===================================================================
RCS file: patches/patch-ak
diff -N patches/patch-ak
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ak 4 Aug 2007 18:27:33 -0000
@@ -0,0 +1,57 @@
+$NetBSD$
+
+--- configure.in.orig 2007-07-13 02:19:29.000000000 +0900
++++ configure.in 2007-08-05 03:26:47.000000000 +0900
+@@ -1205,6 +1205,7 @@
+ 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
+@@ -1358,6 +1359,8 @@
+ 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)
+
+@@ -1601,22 +1604,8 @@
+ 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
+@@ -1972,6 +1961,10 @@
+ *)
+ 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",
Index: patches/patch-al
===================================================================
RCS file: patches/patch-al
diff -N patches/patch-al
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-al 4 Aug 2007 18:49:04 -0000
@@ -0,0 +1,405 @@
+$NetBSD$
+
+--- configure.orig 2007-07-13 02:20:26.000000000 +0900
++++ configure 2007-08-05 03:45:34.000000000 +0900
+@@ -929,6 +929,7 @@
+ G_MODULE_LDFLAGS
+ G_MODULE_HAVE_DLERROR
+ G_MODULE_BROKEN_RTLD_GLOBAL
++G_MODULE_BROKEN_DLOPEN_NULL
+ G_MODULE_NEED_USCORE
+ GLIB_DEBUG_FLAGS
+ GSPAWN
+@@ -10644,7 +10645,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 10647 "configure"' > conftest.$ac_ext
++ echo '#line 10648 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -12820,11 +12821,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:12823: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12824: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:12827: \$? = $ac_status" >&5
++ echo "$as_me:12828: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -13088,11 +13089,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13091: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13092: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:13095: \$? = $ac_status" >&5
++ echo "$as_me:13096: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -13192,11 +13193,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:13195: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13196: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:13199: \$? = $ac_status" >&5
++ echo "$as_me:13200: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -14689,7 +14690,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 14692 "configure"' > conftest.$ac_ext
++ echo '#line 14693 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -15665,7 +15666,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 15668 "configure"
++#line 15669 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -15765,7 +15766,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 15768 "configure"
++#line 15769 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -18133,11 +18134,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18136: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18137: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18140: \$? = $ac_status" >&5
++ echo "$as_me:18141: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18237,11 +18238,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18240: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18241: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18244: \$? = $ac_status" >&5
++ echo "$as_me:18245: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18773,7 +18774,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 18776 "configure"' > conftest.$ac_ext
++ echo '#line 18777 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -19828,11 +19829,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:19831: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19832: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:19835: \$? = $ac_status" >&5
++ echo "$as_me:19836: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -19932,11 +19933,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:19935: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19936: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:19939: \$? = $ac_status" >&5
++ echo "$as_me:19940: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -21409,7 +21410,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 21412 "configure"' > conftest.$ac_ext
++ echo '#line 21413 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -22183,11 +22184,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:22186: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:22187: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:22190: \$? = $ac_status" >&5
++ echo "$as_me:22191: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -22451,11 +22452,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:22454: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:22455: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:22458: \$? = $ac_status" >&5
++ echo "$as_me:22459: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -22555,11 +22556,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:22558: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:22559: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:22562: \$? = $ac_status" >&5
++ echo "$as_me:22563: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -24052,7 +24053,7 @@
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+- echo '#line 24055 "configure"' > conftest.$ac_ext
++ echo '#line 24056 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -36706,6 +36707,7 @@
+ 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
+@@ -37665,6 +37667,8 @@
+
+
+
++
++
+ { echo "$as_me:$LINENO: checking for gspawn implementation" >&5
+ echo $ECHO_N "checking for gspawn implementation... $ECHO_C" >&6; }
+ case "$host" in
+@@ -38063,126 +38067,8 @@
+ 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()
+- { pthread_t t;
+- void *ret;
+- pthread_create (&t, 0, func, 0);
+- pthread_join (t, &ret);
+- return (check_me != 42 || ret != &check_me);
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- glib_flag_works=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- glib_flag_works=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <pthread.h>
+-int check_me = 0;
+-void* func(void* data) {check_me = 42; return &check_me;}
+-int main()
+- { pthread_t t;
+- void *ret;
+- pthread_create (&t, 0, func, 0);
+- pthread_join (t, &ret);
+- return (check_me != 42 || ret != &check_me);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_link") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- glib_flag_works=yes
+-else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-glib_flag_works=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-
+- 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
+@@ -40506,6 +40392,10 @@
+ *)
+ 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
+
+
+@@ -46187,6 +46077,7 @@
+ G_MODULE_LDFLAGS!$G_MODULE_LDFLAGS$ac_delim
+ G_MODULE_HAVE_DLERROR!$G_MODULE_HAVE_DLERROR$ac_delim
+ G_MODULE_BROKEN_RTLD_GLOBAL!$G_MODULE_BROKEN_RTLD_GLOBAL$ac_delim
++G_MODULE_BROKEN_DLOPEN_NULL!$G_MODULE_BROKEN_DLOPEN_NULL$ac_delim
+ G_MODULE_NEED_USCORE!$G_MODULE_NEED_USCORE$ac_delim
+ GLIB_DEBUG_FLAGS!$GLIB_DEBUG_FLAGS$ac_delim
+ GSPAWN!$GSPAWN$ac_delim
+@@ -46205,7 +46096,6 @@
+ ENABLE_REGEX_FALSE!$ENABLE_REGEX_FALSE$ac_delim
+ USE_SYSTEM_PCRE_TRUE!$USE_SYSTEM_PCRE_TRUE$ac_delim
+ USE_SYSTEM_PCRE_FALSE!$USE_SYSTEM_PCRE_FALSE$ac_delim
+-PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -46247,6 +46137,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++PCRE_CFLAGS!$PCRE_CFLAGS$ac_delim
+ PCRE_LIBS!$PCRE_LIBS$ac_delim
+ PCRE_WARN_CFLAGS!$PCRE_WARN_CFLAGS$ac_delim
+ G_LIBS_EXTRA!$G_LIBS_EXTRA$ac_delim
+@@ -46267,7 +46158,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
>Unformatted: