4 files changed, 18 insertions, 9 deletions
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index f5799d902c16..8a89b6e972e9 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue May  1 20:39:42 2007
-+++ Makefile.in	Tue May  1 20:40:23 2007
-@@ -239,7 +239,7 @@ target_alias = @target_alias@
+--- Makefile.in.orig	Thu May  3 15:19:30 2007
++++ Makefile.in	Thu May  3 15:19:44 2007
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
  
  AUTOMAKE_OPTIONS = 1.7
  
@@ -9,7 +9,7 @@
  
  bin_SCRIPTS = glib-gettextize
  
-@@ -292,8 +292,8 @@ BUILT_EXTRA_DIST = \
+@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
  	config.h.win32		\
  	gtk-doc.make
  
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
new file mode 100644
index 000000000000..ef7f0a87b9ff
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gregex.c
@@ -0,0 +1,13 @@
+--- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
++++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
+@@ -164,8 +164,10 @@ match_error (gint errcode)
+     case PCRE_ERROR_DFA_RECURSE:
+     case PCRE_ERROR_RECURSIONLIMIT:
+       return _("recursion limit reached");
++#ifdef PCRE_ERROR_NULLWSLIMIT
+     case PCRE_ERROR_NULLWSLIMIT:
+       return _("workspace limit for empty substrings reached");
++#endif
+     case PCRE_ERROR_BADNEWLINE:
+       return _("invalid combination of newline flags");
+     default:
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index 8fd5f9ead041..95a02e475ac0 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
  
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++          data_dirs = "/usr/local/share/";
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index 47ca3e672044..586d7f80bd62 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
-
 --- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
 +++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
 @@ -104,6 +104,7 @@