Update to 2.25.13.

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

6 files changed, 35 insertions, 33 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 45ba8a48b..548e46700 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.173 2010/06/24 20:58:51 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.174 2010/07/12 06:13:29 kwm Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.25.11
+PORTVERSION=	2.25.13
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 60bd006c2..f0baf3ff7 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.25.11.tar.bz2) = 19f76d17ca65f70f9b36daf8b1e57673
-SHA256 (gnome2/glib-2.25.11.tar.bz2) = f83cdc74b9a0a8514c496c68f3d4887d38d5de64ffb9b8cdede7e94bb140b16f
-SIZE (gnome2/glib-2.25.11.tar.bz2) = 6021908
+MD5 (gnome2/glib-2.25.13.tar.bz2) = 8772d3655ec6901058926c1e9df25545
+SHA256 (gnome2/glib-2.25.13.tar.bz2) = 785297b1528cba6f2d20358ba7386be49bad0e7d50aa4b965d80a44eba14a5e0
+SIZE (gnome2/glib-2.25.13.tar.bz2) = 6157668
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index bcfefe33a..289bc3381 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,21 +1,11 @@
---- Makefile.in.orig	2010-07-12 08:06:03.000000000 +0200
-+++ Makefile.in	2010-07-12 08:07:23.000000000 +0200
-@@ -415,7 +415,7 @@ EXTRA_DIST = ChangeLog.pre-2-20 ChangeLo
+--- Makefile.in.orig	2010-08-08 12:14:27.000000000 +0200
++++ Makefile.in	2010-08-08 12:15:40.000000000 +0200
+@@ -418,7 +418,7 @@
+ 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
  TEST_PROGS = 
- AUTOMAKE_OPTIONS = 1.7
- ACLOCAL_AMFLAGS = -I m4macros
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
 +SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
  DIST_SUBDIRS = $(SUBDIRS) build
  bin_SCRIPTS = glib-gettextize
  AM_CPPFLAGS = \
-@@ -434,7 +434,8 @@ BUILT_EXTRA_DIST = \
- 	config.h.win32		\
- 	gtk-doc.make
- 
--configexecincludedir = $(libdir)/glib-2.0/include
-+glibincludedir = $(includedir)/glib-2.0
-+configexecincludedir = $(glibincludedir)
- configexecinclude_DATA = glibconfig.h
- CONFIGURE_DEPENDENCIES = acglib.m4
- BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 352c0cf60..7175b8581 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,15 +1,15 @@
---- glib/libcharset/Makefile.in.orig	2008-06-04 00:03:14.000000000 +0200
-+++ glib/libcharset/Makefile.in	2008-06-04 00:05:58.000000000 +0200
-@@ -278,7 +278,7 @@ EXTRA_DIST = README config.charset ref-a
+--- glib/libcharset/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
++++ glib/libcharset/Makefile.in	2010-08-08 12:46:01.000000000 +0200
+@@ -328,7 +328,7 @@ EXTRA_DIST = README config.charset ref-a
  	codeset.m4 update.sh make-patch.sh libcharset-glib.patch
  TEST_PROGS = 
  INCLUDES = \
--	-DLIBDIR=\"$(libdir)\" -I$(top_srcdir)
-+	-DLIBDIR=\"$(prefix)/libdata\" -I$(top_srcdir)
+-	-DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
++	-DLIBDIR=\"$(prefix)/libdata\" $(config_h_INCLUDES)
  
  noinst_LTLIBRARIES = libcharset.la
  libcharset_la_SOURCES = \
-@@ -286,8 +286,8 @@ libcharset_la_SOURCES = \
+@@ -336,8 +336,8 @@ libcharset_la_SOURCES = \
  	localcharset.h		\
  	localcharset.c
  
@@ -20,9 +20,9 @@
  SUFFIXES = .sed .sin
  CLEANFILES = charset.alias ref-add.sed ref-del.sed
  all: all-am
-@@ -498,7 +498,7 @@ install-data-am:
+@@ -566,7 +566,7 @@ install-dvi: install-dvi-am
  
- install-dvi: install-dvi-am
+ install-dvi-am:
  
 -install-exec-am: install-exec-local
 +install-exec-am: # install-exec-local
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index b7563e046..d58efb723 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,6 +1,15 @@
---- 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
+--- glib/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
++++ glib/Makefile.in	2010-08-08 12:46:01.000000000 +0200
+@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+ #
+ DISTCLEANFILES = glibconfig-stamp glibconfig.h
+ CLEANFILES = $(am__append_2)
+-configexecincludedir = $(libdir)/glib-2.0/include
++configexecincludedir = $(includedir)/glib-2.0
+ nodist_configexecinclude_HEADERS = glibconfig.h
+ @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
+ @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
+@@ -1530,7 +1530,7 @@ info: info-recursive
  
  info-am:
  
@@ -9,9 +18,9 @@
  	install-glibincludeHEADERS install-glibsubincludeHEADERS \
  	install-tapsetDATA
  	@$(NORMAL_INSTALL)
-@@ -1709,9 +1709,7 @@ distclean-local:
+@@ -1786,9 +1786,7 @@ distclean-local:
  libglib-gdb.py: libglib-gdb.py.in
- 	sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ 	$(AM_V_GEN) $(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)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 756f1165e..d233952d1 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -272,6 +272,7 @@ share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kk/LC_MESSAGES/glib20.mo
 share/locale/kn/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
 share/locale/ku/LC_MESSAGES/glib20.mo
@@ -374,6 +375,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/hy/LC_MESSAGES
 @dirrmtry share/locale/hy
 @dirrmtry share/locale/en@shaw/LC_MESSAGES