Update to 2.12.0.

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

4 files changed, 23 insertions, 29 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index d4c09bb7f..a110a9aa8 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.114 2007/07/03 03:45:30 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.115 2007/07/21 21:30:12 mezz Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.11.6
+PORTVERSION=	2.12.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
@@ -41,8 +41,11 @@ USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
-USE_GETTEXT=	yes
-USE_XLIB=	yes
+USE_XORG=       dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 xaw8 xbitmaps \
+                xcomposite xcursor xdamage xdmcp xevie xext xfixes xfont xfontcache xft xi \
+                xinerama xkbfile xkbui xmu xmuu xp xpm xprintapputil xprintutil \
+                xrandr xrender xres xscrnsaver xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc \
+								                xxf86vm
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index d349bcce1..f7907f736 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.11.6.tar.bz2) = 2b35ce357e138af23c52e4bceb1a63a0
-SHA256 (gnome2/gtk+-2.11.6.tar.bz2) = da202af5b91c6243944e6b8c48872de10a4e86ba0e2b87456a4a8fa56ceb6ae8
-SIZE (gnome2/gtk+-2.11.6.tar.bz2) = 15428543
+MD5 (gnome2/gtk+-2.12.0.tar.bz2) = e9c280afec29b11772af5a7c807abf41
+SHA256 (gnome2/gtk+-2.12.0.tar.bz2) = faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
+SIZE (gnome2/gtk+-2.12.0.tar.bz2) = 15732170
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22..b64106809 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
@@ -1,25 +1,12 @@
---- gtk/xdgmime/xdgmimecache.h.orig	Mon May 29 20:04:24 2006
-+++ gtk/xdgmime/xdgmimecache.h	Mon May 29 20:11:42 2006
-@@ -32,9 +32,19 @@
- typedef struct _XdgMimeCache XdgMimeCache;
+--- gtk/xdgmime/xdgmimecache.h.orig	2007-09-13 16:35:37.000000000 -0400
++++ gtk/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)
  
- #ifdef XDG_PREFIX
--#define _xdg_mime_cache_new_from_file        XDG_ENTRY(cache_new_from_file)
--#define _xdg_mime_cache_ref                  XDG_ENTRY(cache_ref)
--#define _xdg_mime_cache_unref                XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_new_from_file                XDG_ENTRY(cache_new_from_file)
-+#define _xdg_mime_cache_ref                          XDG_ENTRY(cache_ref)
-+#define _xdg_mime_cache_unref                        XDG_ENTRY(cache_unref)
-+#define _xdg_mime_cache_get_mime_type_for_data       XDG_ENTRY(cache_get_mime_type_for_data)
-+#define _xdg_mime_cache_get_mime_type_for_file       XDG_ENTRY(cache_get_mime_type_for_file)
-+#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name)
-+#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)
-+#define _xdg_mime_cache_mime_type_subclass           XDG_ENTRY(cache_mime_type_subclass)
-+#define _xdg_mime_cache_list_mime_parents            XDG_ENTRY(cache_list_mime_parents)
-+#define _xdg_mime_cache_unalias_mime_type            XDG_ENTRY(cache_unalias_mime_type)
-+#define _xdg_mime_cache_get_max_buffer_extents       XDG_ENTRY(cache_get_max_buffer_extents)
  #endif
  
- extern XdgMimeCache **_caches;
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 2d5bc5a22..abfb5d8ad 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -532,6 +532,8 @@ share/locale/nn/LC_MESSAGES/gtk20-properties.mo
 share/locale/nn/LC_MESSAGES/gtk20.mo
 share/locale/nso/LC_MESSAGES/gtk20-properties.mo
 share/locale/nso/LC_MESSAGES/gtk20.mo
+share/locale/oc/LC_MESSAGES/gtk20-properties.mo
+share/locale/oc/LC_MESSAGES/gtk20.mo
 share/locale/or/LC_MESSAGES/gtk20-properties.mo
 share/locale/or/LC_MESSAGES/gtk20.mo
 share/locale/pa/LC_MESSAGES/gtk20-properties.mo
@@ -645,6 +647,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/sr@ije
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES