Update to 2.38.0.

Enable stage support, install gdb python scripts.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18754 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 51 insertions, 62 deletions

diff --git a/devel/glib20/files/extra-glib_gdbscripts b/devel/glib20/files/extra-glib_gdbscripts
new file mode 100644
index 000000000..0d82e625a
--- /dev/null
+++ b/devel/glib20/files/extra-glib_gdbscripts
@@ -0,0 +1,20 @@
+--- glib/Makefile.in.orig	2013-09-26 18:20:03.000000000 +0200
++++ glib/Makefile.in	2013-09-26 18:21:19.000000000 +0200
+@@ -2824,7 +2824,7 @@
+ info-am:
+ 
+ install-data-am: install-data-local install-deprecatedincludeHEADERS \
+-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
++	install-glibincludeHEADERS \
+ 	install-glibsubincludeHEADERS \
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+@@ -3125,8 +3125,6 @@
+ 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
+ 
+ install-data-hook: libglib-gdb.py
+-	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+-	$(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+ @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).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/extra-gobject_gdbscripts
index f99ec4a97..57daae32c 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/extra-gobject_gdbscripts
@@ -1,15 +1,15 @@
---- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
-+++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
-@@ -1381,7 +1381,7 @@
+--- gobject/Makefile.in.orig	2013-09-26 18:22:19.000000000 +0200
++++ gobject/Makefile.in	2013-09-26 18:23:11.000000000 +0200
+@@ -2001,7 +2001,7 @@
  
  info-am:
  
 -install-data-am: install-data-local install-dist_gdbSCRIPTS \
 +install-data-am: install-data-local \
- 	install-libgobjectincludeHEADERS install-tapsetDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1649,9 +1649,7 @@
+ 	install-installed_testLTLIBRARIES \
+ 	install-installed_testPROGRAMS install-installed_testSCRIPTS \
+ 	install-installed_test_metaDATA \
+@@ -2279,9 +2279,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 9396ef32a..2a22839ea 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,5 +1,5 @@
---- configure.orig	2013-08-29 23:29:13.255661322 +0200
-+++ configure	2013-08-29 23:48:08.845647995 +0200
+--- configure.orig	2013-09-26 18:07:07.000000000 +0200
++++ configure	2013-09-26 18:08:15.000000000 +0200
 @@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5778,7 +5781,7 @@
+@@ -5977,7 +5980,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,7 +19,7 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -7444,13 +7447,12 @@
+@@ -7643,13 +7646,12 @@
  
        ;;
      native)
@@ -35,7 +35,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -8648,6 +8650,7 @@
+@@ -8684,6 +8686,7 @@
      ;;
    native)
  
@@ -43,7 +43,7 @@
  $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
  
      ;;
-@@ -23201,7 +23204,7 @@
+@@ -23369,7 +23372,7 @@
  fi
  done
  
@@ -52,16 +52,16 @@
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -26741,10 +26744,10 @@
- #  b) FreeBSD doesn't do this either.
- #
- case $host in
+@@ -27013,10 +27016,10 @@
+   *android*)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+     ;;
 -  *-*-freebsd*|*-*-linux*)
 +  *-*-linux*)
      G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
      ;;
 -  *-*-openbsd*)
-+  *-*-openbsd*|*-*-freebsd*)
++  *-*-freebsd*|*-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"
      ;;
    *)
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
index 3784d16b8..8e3dfab92 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-ah
@@ -1,9 +1,9 @@
---- docs/reference/Makefile.in.orig	2007-12-21 16:54:10.000000000 -0500
-+++ docs/reference/Makefile.in	2007-12-21 16:54:40.000000000 -0500
-@@ -268,7 +268,7 @@ GTESTER_REPORT = $(top_builddir)/glib/gt
- # initialize variables for unconditional += appending
- EXTRA_DIST = 
- TEST_PROGS = 
+--- docs/reference/Makefile.in.orig	2013-09-26 18:08:36.000000000 +0200
++++ docs/reference/Makefile.in	2013-09-26 18:08:53.000000000 +0200
+@@ -422,7 +422,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = glib gobject gio
 +SUBDIRS = #glib gobject gio
  all: all-recursive
diff --git a/devel/glib20/files/patch-gio_tests_gdbus-peer.c b/devel/glib20/files/patch-gio_tests_gdbus-peer.c
deleted file mode 100644
index 1ab76dc8c..000000000
--- a/devel/glib20/files/patch-gio_tests_gdbus-peer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/tests/gdbus-peer.c.orig	2010-08-16 21:30:03.000000000 +0200
-+++ gio/tests/gdbus-peer.c	2010-08-16 23:13:32.000000000 +0200
-@@ -42,6 +42,8 @@
- #include <sys/socket.h>
- #endif
- 
-+#include <sys/socket.h>
-+
- /* used in test_overflow */
- #ifdef G_OS_UNIX
- #include <gio/gunixconnection.h>
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 30d6f1be8..fc0b7438c 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,31 +1,11 @@
---- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
-+++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
-@@ -585,7 +585,7 @@
- #
- DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
+--- glib/Makefile.in.orig	2013-09-26 18:18:49.000000000 +0200
++++ glib/Makefile.in	2013-09-26 18:19:38.000000000 +0200
+@@ -961,7 +961,7 @@
+ @ENABLE_INSTALLED_TESTS_TRUE@                      $(dist_test_scripts) $(dist_installed_test_scripts)
+ 
+ @ENABLE_INSTALLED_TESTS_TRUE@installed_test_meta_DATA = $(installed_testcases:=.test)
 -configexecincludedir = $(libdir)/glib-2.0/include
-+configexecincludedir = $(includedir)/glib-2.0
++configexecincludedir = $(prefix)/include/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1617,7 +1617,7 @@
- info-am:
- 
- install-data-am: install-data-local install-deprecatedincludeHEADERS \
--	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
-+	install-glibincludeHEADERS \
- 	install-glibsubincludeHEADERS install-tapsetDATA
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1906,9 +1906,7 @@
- libglib-gdb.py: libglib-gdb.py.in
- 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
- 
--install-data-hook: libglib-gdb.py
--	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) $(builddir)/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).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)