update to 2.12.7

changes:
-portability fixes
-bugfixes
-translation updates
-Make GKeyFile accept keys that are commonly used
-some consistency checks added
-deal with double-width and zero-width characters in --help output

based on wiz's work

7 files changed, 83 insertions, 123 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 5f924d06ff3..7f583a8faec 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.110 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.111 2007/01/08 15:56:14 drochner Exp $
 
-DISTNAME=		glib-2.12.4
+DISTNAME=		glib-2.12.7
 PKGNAME=		${DISTNAME:S/glib/glib2/}
-PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.12/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 20d568df8c9..b84a33d399d 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,17 +1,13 @@
-$NetBSD: distinfo,v 1.75 2006/10/09 17:53:25 wiz Exp $
+$NetBSD: distinfo,v 1.76 2007/01/08 15:56:14 drochner Exp $
 
-SHA1 (glib-2.12.4.tar.bz2) = 35be8f8a7ce47bb0f53ffcd50605a6f9596ebd04
-RMD160 (glib-2.12.4.tar.bz2) = 3aac5f23cedcef25f7fd7acb6d4ebfa744e38edc
-Size (glib-2.12.4.tar.bz2) = 2868828 bytes
-SHA1 (patch-aa) = 6358549c219fe492c201c566cf101bfbe957675a
+SHA1 (glib-2.12.7.tar.bz2) = 42024d775f5b1550c0f86091609cd1c7d1440413
+RMD160 (glib-2.12.7.tar.bz2) = 0c95bd3a5970263b72be9cacfc64c0e7f4bbe254
+Size (glib-2.12.7.tar.bz2) = 2900849 bytes
+SHA1 (patch-aa) = 7fc166157fc62dccfddc1bb64e27d31e511897aa
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae
-SHA1 (patch-ag) = 456ec5678684e3a440991f037e74a2b0262b156b
 SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905
-SHA1 (patch-ai) = f8a9a85a63695cffa20ac9adeea56ef5616bf0bf
-SHA1 (patch-aj) = f0c15174e83dae88cca50d040d0c09438ee9053b
-SHA1 (patch-ta) = 81bdb0ef7c62eff23de9d591e858e89f03eceb5b
 SHA1 (patch-tb) = fd559f4cb3e7a0c3b23a705875df539bce53be1e
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index d001b8ce824..bcf1f6e2377 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,20 +1,19 @@
-$NetBSD: patch-aa,v 1.31 2006/10/08 14:51:57 joerg Exp $
+$NetBSD: patch-aa,v 1.32 2007/01/08 15:56:14 drochner Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-10-02 01:05:29.000000000 +0200
+--- configure.orig	2007-01-04 22:41:19.000000000 +0100
 +++ configure
-@@ -465,7 +465,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP WINDRES ac_ct_WINDRES NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP GLIBC21 USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS G_MODULE_LDFLAGS G_MODULE_HAVE_DLERROR G_MODULE_BROKEN_RTLD_GLOBAL G_MODULE_NEED_USCORE GLIB_DEBUG_FLAGS GSPAWN GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot GLIB_MAJOR_VERSION GLIB_MINOR_VERSION GLIB_MICRO_VERSION GLIB_VERSION GLIB_INTERFACE_AGE GLIB_BINARY_AGE LT_RELEASE LT_CURRENT LT_REVISION LT_AGE LT_CURRENT_MINUS_AGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os OS_WIN32_TRUE OS_WIN32_FALSE OS_UNIX_TRUE OS_UNIX_FALSE OS_LINUX_TRUE OS_LINUX_FALSE GLIB_DEF GMODULE_DEF GOBJECT_DEF GTHREAD_DEF TESTGMODULE_EXP WINDRES ac_ct_WINDRES NM ac_ct_NM RANLIB ac_ct_RANLIB ms_librarian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE LIBTOOL_EXPORT_OPTIONS DISABLE_MEM_POOLS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE HAVE_CXX_TRUE HAVE_CXX_FALSE PKG_CONFIG PERL INDENT REBUILD PERL_PATH CPP EGREP GLIBC21 USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GETTEXT_PACKAGE ICONV_LIBS LN_S ECHO AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA HAVE_GNUC_VISIBILITY_TRUE HAVE_GNUC_VISIBILITY_FALSE HAVE_GOOD_PRINTF_TRUE HAVE_GOOD_PRINTF_FALSE G_MODULE_SUPPORTED G_MODULE_IMPL G_MODULE_LIBS G_MODULE_LIBS_EXTRA G_MODULE_PLUGIN_LIBS 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 GIO PLATFORMDEP ENABLE_TIMELOOP_TRUE ENABLE_TIMELOOP_FALSE PLATFORM_WIN32_TRUE PLATFORM_WIN32_FALSE GTHREAD_COMPILE_IMPL_DEFINES G_THREAD_CFLAGS G_THREAD_LIBS G_THREAD_LIBS_FOR_GTHREAD G_THREAD_LIBS_EXTRA G_LIBS_EXTRA CROSS_COMPILING_TRUE CROSS_COMPILING_FALSE GLIB_GENMARSHAL HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE XSLTPROC XML_CATALOG_FILE XMLCATALOG ENABLE_MAN_TRUE ENABLE_MAN_FALSE LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -32564,6 +32564,7 @@ else
+@@ -924,6 +924,7 @@ G_MODULE_PLUGIN_LIBS
+ 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
+@@ -35644,6 +35645,7 @@ else
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -22,7 +21,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -33217,6 +33218,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -36381,6 +36383,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0
  	fi
@@ -92,12 +91,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 +	else
 +  		G_MODULE_BROKEN_DLOPEN_NULL=0
 +	fi
- 	echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
- echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6
+ 	{ echo "$as_me:$LINENO: checking for preceeding underscore in symbols" >&5
+ echo $ECHO_N "checking for preceeding underscore in symbols... $ECHO_C" >&6; }
  if test "${glib_cv_uscore+set}" = set; then
-@@ -33779,102 +33846,8 @@ if test x"$have_threads" != xno; then
-          # skip cygwin and darwin -pthread or -pthreads test
-          ;;
+@@ -37010,126 +37078,8 @@ if test x"$have_threads" != xno; then
+         G_THREAD_LIBS="-lpthread -lthread"
+         ;;
        *)
 -        for flag in pthread pthreads mt; do
 -          glib_save_CFLAGS="$CFLAGS"
@@ -117,24 +116,36 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-	 { 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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (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
@@ -143,9 +154,10 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--glib_flag_works=no
+-	glib_flag_works=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -f core conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -167,13 +179,22 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -}
 -_ACEOF
 -rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (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
@@ -186,8 +207,10 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -( exit $ac_status )
 -glib_flag_works=no
 -fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-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
@@ -195,12 +218,12 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
 -	     break;
 -          fi
 -        done
-+         G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
-+         G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
++	 G_THREAD_LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
++	 G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
           ;;
      esac
    fi
-@@ -35880,6 +35853,10 @@ case $host in
+@@ -39453,6 +39403,10 @@ case $host in
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -211,11 +234,20 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -40154,6 +40131,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
- s,@G_MODULE_LDFLAGS@,$G_MODULE_LDFLAGS,;t t
- s,@G_MODULE_HAVE_DLERROR@,$G_MODULE_HAVE_DLERROR,;t t
- s,@G_MODULE_BROKEN_RTLD_GLOBAL@,$G_MODULE_BROKEN_RTLD_GLOBAL,;t t
-+s,@G_MODULE_BROKEN_DLOPEN_NULL@,$G_MODULE_BROKEN_DLOPEN_NULL,;t t
- s,@G_MODULE_NEED_USCORE@,$G_MODULE_NEED_USCORE,;t t
- s,@GLIB_DEBUG_FLAGS@,$GLIB_DEBUG_FLAGS,;t t
- s,@GSPAWN@,$GSPAWN,;t t
+@@ -44639,6 +44593,7 @@ G_MODULE_PLUGIN_LIBS!$G_MODULE_PLUGIN_LI
+ 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
+@@ -44665,7 +44620,7 @@ GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_L
+ XSLTPROC!$XSLTPROC$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/devel/glib2/patches/patch-ag b/devel/glib2/patches/patch-ag
deleted file mode 100644
index b58d3a0a962..00000000000
--- a/devel/glib2/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.11 2006/10/03 02:31:46 dmcmahill Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=347944
-
---- tests/run-markup-tests.sh.orig	2006-05-28 18:58:41.000000000 -0400
-+++ tests/run-markup-tests.sh
-@@ -26,7 +26,8 @@ for I in ${srcdir:-.}/markups/fail-*.gma
-   fi  
- done
- 
--for (( I=1 ; I < 100 ; I++ )) ; do
-+I=1
-+while test $I -lt 100 ; do
-   F=${srcdir:-.}/markups/valid-$I.gmarkup
-   if [ -f $F ] ; then
-     echo_v "Parsing $F, should succeed"
-@@ -34,6 +35,7 @@ for (( I=1 ; I < 100 ; I++ )) ; do
-     diff -u ${srcdir:-.}/markups/expected-$I actual || fail "unexpected output on $F"
-     rm actual
-   fi
-+  I=`expr $I + 1`
- done
- 
- echo_v "All tests passed."
diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai
deleted file mode 100644
index fc4a74e203b..00000000000
--- a/devel/glib2/patches/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ai,v 1.11 2006/10/09 17:53:25 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=359190
-
---- glib/gtimer.c.orig	2006-10-01 05:51:15.000000000 +0000
-+++ glib/gtimer.c
-@@ -257,7 +257,7 @@ g_timer_elapsed (GTimer *timer,
- 
-   if (microseconds)
-     *microseconds = (elapsed / 10) % 1000000;
--#elif HAVE_CLOCK_GETTIME
-+#elif USE_CLOCK_GETTIME
-   if (timer->active)
-     GETTIME (timer->end);
- 
diff --git a/devel/glib2/patches/patch-aj b/devel/glib2/patches/patch-aj
deleted file mode 100644
index d86f452303f..00000000000
--- a/devel/glib2/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2006/02/25 13:31:03 wiz Exp $
-
---- glib/gmain.c.orig	2006-02-24 15:02:53.000000000 +0100
-+++ glib/gmain.c
-@@ -52,7 +52,7 @@
- /* The poll() emulation on OS/X doesn't handle fds=NULL, nfds=0,
-  * so we prefer our own poll emulation.
-  */
--#ifdef _POLL_EMUL_H_
-+#ifdef __APPLE__
- #undef HAVE_POLL
- #endif
-    
diff --git a/devel/glib2/patches/patch-ta b/devel/glib2/patches/patch-ta
deleted file mode 100644
index 91dbb3ec44b..00000000000
--- a/devel/glib2/patches/patch-ta
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ta,v 1.1 2006/10/08 20:55:12 rillig Exp $
-
-$RANDOM is specific to Bash.
-
---- tests/Makefile.in.orig	2006-08-30 07:46:11.000000000 +0200
-+++ tests/Makefile.in	2006-10-06 09:46:35.000000000 +0200
-@@ -348,7 +348,7 @@ TESTS = $(test_programs) $(test_scripts)
- TESTS_ENVIRONMENT = srcdir=$(srcdir) \
- 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
- 	MALLOC_CHECK_=2	\
--	MALLOC_PERTURB_=$$(($$RANDOM % 256))
-+	MALLOC_PERTURB_=`expr $$$$ % 256`
- 
- 
- progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)