7 files changed, 50 insertions, 69 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 02f312ec599d..14da84939ea3 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,21 +3,21 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.101 2006/10/08 21:05:26 marcus Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.120 2007/10/17 07:12:55 mezz Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.10.14
-PORTREVISION?=	3
+PORTVERSION=	2.12.1
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -41,11 +41,11 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	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
+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 266f7458bd20..636864095eb5 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.10.14.tar.bz2) = 018d7dd0fa7de01cfdb77c7c55e7ba26
-SHA256 (gnome2/gtk+-2.10.14.tar.bz2) = d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
-SIZE (gnome2/gtk+-2.10.14.tar.bz2) = 15172170
+MD5 (gnome2/gtk+-2.12.1.tar.bz2) = c46f34addc2fe3ea6756055d59fb8856
+SHA256 (gnome2/gtk+-2.12.1.tar.bz2) = 7dceb0a5e6edc2398cd94415b336d7b37eb8941c2c41403c2c60bfb6ae47d6d6
+SIZE (gnome2/gtk+-2.12.1.tar.bz2) = 15856678
diff --git a/x11-toolkits/gtk20/files/patch-ak b/x11-toolkits/gtk20/files/patch-ak
index 27156d238e58..f8dda5cbffaf 100644
--- a/x11-toolkits/gtk20/files/patch-ak
+++ b/x11-toolkits/gtk20/files/patch-ak
@@ -1,6 +1,6 @@
 
 $FreeBSD$
-  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.19 2006/10/10 20:22:27 mezz Exp $
+  $MCom: ports/x11-toolkits/gtk20/files/patch-ak,v 1.21 2007/04/26 17:22:32 marcus Exp $
 
 --- gdk/Makefile.in.orig	Thu Feb 14 12:38:26 2002
 +++ gdk/Makefile.in	Thu Feb 14 12:45:37 2002
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
index c33fc40e8264..e0fd02d4fbac 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
+++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c
@@ -5,7 +5,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/gnome/:/usr/local/share/:/usr/share/";
++    xdg_data_dirs = "/usr/local/share/";
  
    ptr = xdg_data_dirs;
  
diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmimecache.h
index 266d74c22365..b64106809ef6 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/files/patch-modules_printbackends_cups_gtkcupsutils.c b/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
deleted file mode 100644
index 612f57b60af0..000000000000
--- a/x11-toolkits/gtk20/files/patch-modules_printbackends_cups_gtkcupsutils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- modules/printbackends/cups/gtkcupsutils.c.orig	2007-07-16 15:45:18.000000000 -0400
-+++ modules/printbackends/cups/gtkcupsutils.c	2007-10-01 14:27:17.000000000 -0400
-@@ -627,9 +627,7 @@ _post_send (GtkCupsRequest *request)
-   httpClearFields(request->http);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_LENGTH, length);
-   httpSetField(request->http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField (request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpPost(request->http, request->resource))
-     {
-@@ -966,9 +964,7 @@ _get_send (GtkCupsRequest *request)
-     }
- 
-   httpClearFields(request->http);
--#ifdef HAVE_HTTP_AUTHSTRING
--  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, request->http->authstring);
--#endif
-+  httpSetField(request->http, HTTP_FIELD_AUTHORIZATION, httpGetAuthString (request->http));
- 
-   if (httpGet(request->http, request->resource))
-     {
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 05b3430cf44f..462c4c459bfa 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,10 +1,12 @@
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
+bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
 bin/gtk-update-icon-cache
 etc/gtk-2.0/gdk-pixbuf.loaders
 etc/gtk-2.0/gtk.immodules
+etc/gtk-2.0/im-multipress.conf
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
 include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h
@@ -68,6 +70,8 @@ include/gtk-2.0/gtk/gtkbbox.h
 include/gtk-2.0/gtk/gtkbin.h
 include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
+include/gtk-2.0/gtk/gtkbuildable.h
+include/gtk-2.0/gtk/gtkbuilder.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
 include/gtk-2.0/gtk/gtkcelleditable.h
@@ -177,6 +181,7 @@ include/gtk-2.0/gtk/gtkradiomenuitem.h
 include/gtk-2.0/gtk/gtkradiotoolbutton.h
 include/gtk-2.0/gtk/gtkrange.h
 include/gtk-2.0/gtk/gtkrc.h
+include/gtk-2.0/gtk/gtkrecentaction.h
 include/gtk-2.0/gtk/gtkrecentchooser.h
 include/gtk-2.0/gtk/gtkrecentchooserdialog.h
 include/gtk-2.0/gtk/gtkrecentchoosermenu.h
@@ -185,6 +190,7 @@ include/gtk-2.0/gtk/gtkrecentfilter.h
 include/gtk-2.0/gtk/gtkrecentmanager.h
 include/gtk-2.0/gtk/gtkruler.h
 include/gtk-2.0/gtk/gtkscale.h
+include/gtk-2.0/gtk/gtkscalebutton.h
 include/gtk-2.0/gtk/gtkscrollbar.h
 include/gtk-2.0/gtk/gtkscrolledwindow.h
 include/gtk-2.0/gtk/gtkselection.h
@@ -220,6 +226,7 @@ include/gtk-2.0/gtk/gtktoggletoolbutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktoolbutton.h
 include/gtk-2.0/gtk/gtktoolitem.h
+include/gtk-2.0/gtk/gtktooltip.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreednd.h
@@ -239,6 +246,7 @@ include/gtk-2.0/gtk/gtkvbbox.h
 include/gtk-2.0/gtk/gtkvbox.h
 include/gtk-2.0/gtk/gtkversion.h
 include/gtk-2.0/gtk/gtkviewport.h
+include/gtk-2.0/gtk/gtkvolumebutton.h
 include/gtk-2.0/gtk/gtkvpaned.h
 include/gtk-2.0/gtk/gtkvruler.h
 include/gtk-2.0/gtk/gtkvscale.h
@@ -268,6 +276,9 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.la
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-multipress.so
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.a
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai.so
@@ -363,11 +374,13 @@ share/gtk-2.0/demo/apple-red.png
 share/gtk-2.0/demo/appwindow.c
 share/gtk-2.0/demo/assistant.c
 share/gtk-2.0/demo/background.jpg
+share/gtk-2.0/demo/builder.c
 share/gtk-2.0/demo/button_box.c
 share/gtk-2.0/demo/changedisplay.c
 share/gtk-2.0/demo/clipboard.c
 share/gtk-2.0/demo/colorsel.c
 share/gtk-2.0/demo/combobox.c
+share/gtk-2.0/demo/demo.ui
 share/gtk-2.0/demo/dialog.c
 share/gtk-2.0/demo/drawingarea.c
 share/gtk-2.0/demo/editable_cells.c
@@ -481,6 +494,8 @@ share/locale/ia/LC_MESSAGES/gtk20-properties.mo
 share/locale/ia/LC_MESSAGES/gtk20.mo
 share/locale/id/LC_MESSAGES/gtk20-properties.mo
 share/locale/id/LC_MESSAGES/gtk20.mo
+share/locale/io/LC_MESSAGES/gtk20-properties.mo
+share/locale/io/LC_MESSAGES/gtk20.mo
 share/locale/is/LC_MESSAGES/gtk20-properties.mo
 share/locale/is/LC_MESSAGES/gtk20.mo
 share/locale/it/LC_MESSAGES/gtk20-properties.mo
@@ -521,6 +536,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
@@ -537,8 +554,6 @@ share/locale/ru/LC_MESSAGES/gtk20-properties.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
 share/locale/rw/LC_MESSAGES/gtk20-properties.mo
 share/locale/rw/LC_MESSAGES/gtk20.mo
-share/locale/si/LC_MESSAGES/gtk20-properties.mo
-share/locale/si/LC_MESSAGES/gtk20.mo
 share/locale/sk/LC_MESSAGES/gtk20-properties.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
 share/locale/sl/LC_MESSAGES/gtk20-properties.mo
@@ -571,8 +586,8 @@ share/locale/ur/LC_MESSAGES/gtk20-properties.mo
 share/locale/ur/LC_MESSAGES/gtk20.mo
 share/locale/uz/LC_MESSAGES/gtk20-properties.mo
 share/locale/uz/LC_MESSAGES/gtk20.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20-properties.mo
-share/locale/uz@Latn/LC_MESSAGES/gtk20.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20-properties.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gtk20.mo
 share/locale/vi/LC_MESSAGES/gtk20-properties.mo
 share/locale/vi/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20-properties.mo
@@ -597,6 +612,7 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrm share/themes/Emacs/gtk-2.0-key
 @dirrm share/themes/Emacs
 @dirrm share/themes/Default/gtk-2.0-key
+@dirrm share/themes/Default
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
 @dirrm include/gtk-unix-print-2.0/gtk
@@ -624,8 +640,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@Latn/LC_MESSAGES
-@dirrmtry share/locale/uz@Latn
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/tt/LC_MESSAGES
@@ -634,10 +650,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @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
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/nso/LC_MESSAGES
 @dirrmtry share/locale/nso
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -646,6 +662,8 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/io/LC_MESSAGES
+@dirrmtry share/locale/io
 @dirrmtry share/locale/ia/LC_MESSAGES
 @dirrmtry share/locale/ia
 @dirrmtry share/locale/hy/LC_MESSAGES