Update to 2.25.8.

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

6 files changed, 23 insertions, 65 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 13f24cbac..8ccb369c8 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,13 +3,13 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.169 2010/05/28 09:17:34 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.170 2010/05/29 17:21:03 kwm Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.25.7
-PORTREVISION?=	2
+PORTVERSION=	2.25.8
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -43,6 +43,7 @@ USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
+		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 838cf40f9..fa59bce99 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.25.7.tar.bz2) = ac4867b9450f8bf5f1075336a32a1a88
-SHA256 (gnome2/glib-2.25.7.tar.bz2) = fcc8fa59515b120b88bd4ddd9c89524bc433821d384d08d4003ed69f0162440d
-SIZE (gnome2/glib-2.25.7.tar.bz2) = 5878811
+MD5 (gnome2/glib-2.25.8.tar.bz2) = 1cfd889de35414b898b68ee94ba8420f
+SHA256 (gnome2/glib-2.25.8.tar.bz2) = 4541e7665af4fdd93a83c26d1a92779e27cbd510cadc418860665c008a4b6819
+SIZE (gnome2/glib-2.25.8.tar.bz2) = 6009411
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 8dd7ae74b..b7563e046 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,15 +1,15 @@
---- 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 @@
+--- glib/Makefile.in.orig	2010-06-08 09:17:31.000000000 +0200
++++ glib/Makefile.in	2010-06-08 09:18:52.000000000 +0200
+@@ -1484,7 +1484,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local install-dist_gdbSCRIPTS \
 +install-data-am: install-data-local \
- 	install-glibincludeHEADERS install-glibsubincludeHEADERS
+ 	install-glibincludeHEADERS install-glibsubincludeHEADERS \
+ 	install-tapsetDATA
  	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1603,9 +1603,7 @@
+@@ -1709,9 +1709,7 @@ distclean-local:
  libglib-gdb.py: libglib-gdb.py.in
  	sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
  
@@ -19,4 +19,4 @@
 +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)
+ @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-glib_gvariant-serialiser.c b/devel/glib20/files/patch-glib_gvariant-serialiser.c
deleted file mode 100644
index 311be71a3..000000000
--- a/devel/glib20/files/patch-glib_gvariant-serialiser.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- glib/gvariant-serialiser.c.orig	2010-05-24 18:39:22.000000000 +0200
-+++ glib/gvariant-serialiser.c	2010-05-28 11:03:39.000000000 +0200
-@@ -129,7 +129,7 @@
- g_variant_serialised_check (GVariantSerialised serialised)
- {
-   gsize fixed_size;
--  guint alignment;
-+  gsize alignment;
- 
-   g_assert (serialised.type_info != NULL);
-   g_variant_type_info_query (serialised.type_info, &alignment, &fixed_size);
-@@ -139,6 +139,34 @@
-   else
-     g_assert (serialised.size == 0 || serialised.data != NULL);
- 
-+  /* Depending on the native alignment requirements of the machine, the
-+   * compiler will insert either 3 or 7 padding bytes after the char.
-+   * This will result in the sizeof() the struct being 12 or 16.
-+   * Subtract 9 to get 3 or 7 which is a nice bitmask to apply to get
-+   * the alignment bits that we "care about" being zero: in the
-+   * 4-aligned case, we care about 2 bits, and in the 8-aligned case, we
-+   * care about 3 bits.
-+   */
-+  alignment &= sizeof (struct {
-+                         char a;
-+                         union {
-+                           guint64 x;
-+                           void *y;
-+                           gdouble z;
-+                         } b;
-+                       }
-+                      ) - 9;
-+
-+  /* Some OSes (FreeBSD is a known example) have a malloc() that returns
-+   * unaligned memory if you request small sizes.  'malloc (1);', for
-+   * example, has been seen to return pointers aligned to 6 mod 16.
-+   *
-+   * Check if this is a small allocation and return without enforcing
-+   * the alignment assertion if this is the case.
-+   */
-+  if (serialised.size <= alignment)
-+    return;
-+
-   g_assert_cmpint (alignment & (gsize) serialised.data, ==, 0);
- }
- 
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index b8842a6f4..12a20215a 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,15 +1,15 @@
---- 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
+--- gobject/Makefile.in.orig	2010-06-08 09:19:51.000000000 +0200
++++ gobject/Makefile.in	2010-06-08 09:20:41.000000000 +0200
+@@ -1236,7 +1236,7 @@ info: info-recursive
  
  info-am:
  
 -install-data-am: install-data-local install-dist_gdbSCRIPTS \
 +install-data-am: install-data-local \
- 	install-libgobjectincludeHEADERS
+ 	install-libgobjectincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1393,9 +1393,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
@@ -19,4 +19,4 @@
 +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)
+ @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 1f09f83ad..c40a0a32a 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -21,6 +21,7 @@ include/gio-unix-2.0/gio/gunixmounts.h
 include/gio-unix-2.0/gio/gunixoutputstream.h
 include/gio-unix-2.0/gio/gunixsocketaddress.h
 include/glib-2.0/gio/gappinfo.h
+include/glib-2.0/gio/gapplication.h
 include/glib-2.0/gio/gasyncinitable.h
 include/glib-2.0/gio/gasyncresult.h
 include/glib-2.0/gio/gbufferedinputstream.h
@@ -84,11 +85,13 @@ include/glib-2.0/gio/gnativevolumemonitor.h
 include/glib-2.0/gio/gnetworkaddress.h
 include/glib-2.0/gio/gnetworkservice.h
 include/glib-2.0/gio/goutputstream.h
+include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gresolver.h
 include/glib-2.0/gio/gseekable.h
 include/glib-2.0/gio/gsettings.h
 include/glib-2.0/gio/gsettingsbackend.h
 include/glib-2.0/gio/gsimpleasyncresult.h
+include/glib-2.0/gio/gsimplepermission.h
 include/glib-2.0/gio/gsocket.h
 include/glib-2.0/gio/gsocketaddress.h
 include/glib-2.0/gio/gsocketaddressenumerator.h