5 files changed, 66 insertions, 11 deletions
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 4791780e29c..01f856f74c0 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig	2008-12-01 16:15:34.000000000 -0500
-+++ glib/Makefile.in	2008-12-01 16:16:03.000000000 -0500
-@@ -272,7 +272,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+--- glib/Makefile.in.orig	2009-05-31 13:14:18.000000000 +0200
++++ glib/Makefile.in	2009-05-31 13:15:08.000000000 +0200
+@@ -272,7 +272,7 @@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
  LD = @LD@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -licui18n
+ LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 0345b8acd04..4699afdbedd 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2008-11-24 13:44:42.000000000 -0600
-+++ configure	2008-11-24 13:50:51.000000000 -0600
-@@ -29576,6 +29576,12 @@
+--- configure.orig	2009-09-05 10:54:38.000000000 +0200
++++ configure	2009-09-05 10:56:40.000000000 +0200
+@@ -29571,6 +29571,12 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -13,16 +13,16 @@
  int
  main ()
  {
-@@ -31407,7 +31413,7 @@
+@@ -31611,7 +31617,7 @@ done
  
  
  
--for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
++for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
  do
  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -36810,6 +36816,8 @@
+@@ -39943,6 +39949,8 @@ fi
           ;;
      esac
    fi
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
new file mode 100644
index 00000000000..966dd27a689
--- /dev/null
+++ b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
@@ -0,0 +1,11 @@
+--- gio/libasyncns/asyncns.c.orig	2009-05-05 15:25:10.000000000 -0400
++++ gio/libasyncns/asyncns.c	2009-05-05 15:25:51.000000000 -0400
+@@ -35,6 +35,8 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <sys/time.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
new file mode 100644
index 00000000000..8dd7ae74bb8
--- /dev/null
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -0,0 +1,22 @@
+--- glib/Makefile.in.orig	2009-09-30 09:37:39.000000000 +0200
++++ glib/Makefile.in	2009-09-30 09:38:48.000000000 +0200
+@@ -1396,7 +1396,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ 	install-glibincludeHEADERS install-glibsubincludeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1603,9 +1603,7 @@
+ libglib-gdb.py: libglib-gdb.py.in
+ 	sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ 
+-install-data-hook: libglib-gdb.py
+-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+-	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
new file mode 100644
index 00000000000..b8842a6f46e
--- /dev/null
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -0,0 +1,22 @@
+--- gobject/Makefile.in.orig	2009-09-30 09:39:51.000000000 +0200
++++ gobject/Makefile.in	2009-09-30 09:40:17.000000000 +0200
+@@ -1186,7 +1186,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_gdbSCRIPTS \
++install-data-am: install-data-local \
+ 	install-libgobjectincludeHEADERS
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+ uninstall-gdb:
+ 	-rm -r $(DESTDIR)$(datadir)/gdb
+ 
+-install-data-hook: libgobject-gdb.py
+-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
+-	$(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
++install-data-hook:
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)