Regenerate patch to make the (GNU?) "patch" under Mac OS X happy.

2 files changed, 13 insertions, 14 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 9f3f5ee939b..a52ea13e0fc 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2006/09/03 08:53:04 wiz Exp $
+$NetBSD: distinfo,v 1.67 2006/09/04 09:45:36 tron Exp $
 
 SHA1 (glib-2.12.3.tar.bz2) = 117abb0e73fddb46650f0f38bfbbddc658dc2ddf
 RMD160 (glib-2.12.3.tar.bz2) = 65c6d717742add451af769299428f4597effb4a8
 Size (glib-2.12.3.tar.bz2) = 2896345 bytes
-SHA1 (patch-aa) = a9e2c47fc9ce32c074f08b2d09189e923f2a07f0
+SHA1 (patch-aa) = b5b6d8fd2247d46d885947fad4b7f89a48ee088c
 SHA1 (patch-ab) = a765c6e43856ce858f23f237ffd5b48cb6d029e6
 SHA1 (patch-ac) = 43a30df9822e90e0f84df4458cc20de286509961
 SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index c563dbd1a55..150c8fc586e 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.27 2006/09/03 08:53:04 wiz Exp $
+$NetBSD: patch-aa,v 1.28 2006/09/04 09:45:36 tron Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=140329
 http://bugzilla.gnome.org/show_bug.cgi?id=141256
 
---- configure.orig	2006-08-30 05:46:14.000000000 +0000
-+++ configure
-@@ -465,7 +465,7 @@ ac_includes_default="\
+--- configure.orig	2006-08-30 06:46:14.000000000 +0100
++++ configure	2006-09-04 10:43:16.000000000 +0100
+@@ -465,7 +465,7 @@
  # include <unistd.h>
  #endif"
  
@@ -14,7 +14,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -33430,6 +33430,7 @@ else
+@@ -33430,6 +33430,7 @@
  fi
  G_MODULE_NEED_USCORE=0
  G_MODULE_BROKEN_RTLD_GLOBAL=0
@@ -22,7 +22,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
-@@ -34083,6 +34084,72 @@ echo "${ECHO_T}$glib_cv_rtldglobal_broke
+@@ -34083,6 +34084,72 @@
  	else
    		G_MODULE_BROKEN_RTLD_GLOBAL=0
  	fi
@@ -95,7 +95,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  	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
-@@ -34645,9 +34712,34 @@ if test x"$have_threads" != xno; then
+@@ -34645,9 +34712,34 @@
           # skip cygwin and darwin -pthread or -pthreads test
           ;;
        *)
@@ -132,7 +132,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
            if test "$cross_compiling" = yes; then
    cat >conftest.$ac_ext <<_ACEOF
  
-@@ -34736,12 +34828,13 @@ rm -f core *.core gmon.out bb.out confte
+@@ -34736,11 +34828,12 @@
  fi
            CFLAGS="$glib_save_CFLAGS"
            if test $glib_flag_works = yes ; then
@@ -147,8 +147,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
           ;;
      esac
    fi
- 
-@@ -34793,6 +34886,15 @@ fi
+@@ -34793,6 +34886,15 @@
  
    fi
  
@@ -164,7 +163,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
      # if we are not finding the localtime_r function, then we probably are
      # not using the proper multithread flag
  
-@@ -36746,6 +36848,10 @@ case $host in
+@@ -36746,6 +36848,10 @@
    *)
      G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
      ;;
@@ -175,7 +174,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=141256
  esac
  
  
-@@ -41020,6 +41126,7 @@ s,@G_MODULE_PLUGIN_LIBS@,$G_MODULE_PLUGI
+@@ -41020,6 +41126,7 @@
  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