Update to 2.15.2.

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

5 files changed, 31 insertions, 5 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 9d0957594..0c70ee884 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/devel/glib20/Makefile,v 1.1 2007/11/30 18:48:03 marcus Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.107 2008/01/09 19:55:21 marcus Exp $
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.15.1
+PORTVERSION=	2.15.2
 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 7215bcdad..bd1d74a79 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.15.1.tar.bz2) = b3a2ca18e618927d03d39000f2155958
-SHA256 (gnome2/glib-2.15.1.tar.bz2) = 1e380efc1f7906a74672e5088777aea524234c063947cf9c7eab67206ea29c9c
-SIZE (gnome2/glib-2.15.1.tar.bz2) = 4238577
+MD5 (gnome2/glib-2.15.2.tar.bz2) = 633243dd337464a61336146ab862a646
+SHA256 (gnome2/glib-2.15.2.tar.bz2) = bccca292a11ea2710f897d709c1afb49316a5bccc693e0dd8bcc2286d9296608
+SIZE (gnome2/glib-2.15.2.tar.bz2) = 4291168
diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmime.c b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c
new file mode 100644
index 000000000..8c36dc5d8
--- /dev/null
+++ b/devel/glib20/files/patch-gio_xdgmime_xdgmime.c
@@ -0,0 +1,11 @@
+--- gio/xdgmime/xdgmime.c.orig	Mon Nov  8 22:25:27 2004
++++ gio/xdgmime/xdgmime.c	Sat Nov 13 10:27:22 2004
+@@ -204,7 +204,7 @@
+ 
+   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
+   if (xdg_data_dirs == NULL)
+-    xdg_data_dirs = "/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/";
+ 
+   ptr = xdg_data_dirs;
+ 
diff --git a/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
new file mode 100644
index 000000000..58aa93037
--- /dev/null
+++ b/devel/glib20/files/patch-gio_xdgmime_xdgmimecache.h
@@ -0,0 +1,12 @@
+--- gio/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
++++ gio/xdgmime/xdgmimecache.h	2007-09-14 00:59:43.000000000 -0400
+@@ -42,6 +42,9 @@ typedef struct _XdgMimeCache XdgMimeCach
+ #define _xdg_mime_cache_list_mime_parents             XDG_ENTRY(cache_list_mime_parents)
+ #define _xdg_mime_cache_mime_type_subclass            XDG_ENTRY(cache_mime_type_subclass)
+ #define _xdg_mime_cache_unalias_mime_type             XDG_ENTRY(cache_unalias_mime_type)
++#define _xdg_mime_cache_is_valid_mime_type            XDG_ENTRY(cache_is_valid_mime_type)
++#define _xdg_mime_cache_mime_type_equal               XDG_ENTRY(cache_mime_type_equal)
++#define _xdg_mime_cache_media_type_equal              XDG_ENTRY(cache_media_type_equal)
+ 
+ #endif
+ 
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 685cc6036..2bfbf8c18 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -223,6 +223,7 @@ share/locale/pt_BR/LC_MESSAGES/glib20.mo
 share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/rw/LC_MESSAGES/glib20.mo
+share/locale/si/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
@@ -267,6 +268,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@ije/LC_MESSAGES
 @dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES