Update the glib and gtk stack to the lastest stable releases.

Add new ports for the new stable releases of gtk+-3.0.
Update vala to the newest stable release 0.12.1.

Thanks to pav@ for doing multiple exp-runs, and marcus@ for repo-copies.
Full contributors acknowledgment will be given in the GNOME 3 import.

7 files changed, 56 insertions, 50 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index ede6012e5f76..cb0896554cc6 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,12 +3,13 @@
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.209 2010/11/15 21:17:48 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.224 2011/06/16 17:36:39 kwm Exp $
 #
+# Remember to update graphics/gtk-update-icon-cache too.
 
 PORTNAME=	gtk
-PORTVERSION=	2.22.1
-PORTREVISION?=	1
+PORTVERSION=	2.24.5
+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/%SUBDIR%/ \
@@ -22,11 +23,11 @@ DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
+COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
+USE_XZ=		yes
 LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
@@ -40,16 +41,16 @@ USE_PERL5_BUILD=yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack
+USE_GNOME=	gnomehack atk pango gdkpixbuf2 ltverhack gtk-update-icon-cache
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
-CONFIGURE_ARGS=	--enable-static --with-xinput=yes --with-libjasper
+CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
+MAN1=		gtk-query-immodules-2.0.1
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
@@ -57,7 +58,7 @@ CONFIGURE_ARGS+=	--enable-debug=yes
 
 OPTIONS=	CUPS "Enable cups printing support" on
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(WITH_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
@@ -77,6 +78,12 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
 
+pre-configure:
+.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc)
+	@${ECHO_CMD} "${PKGNAME}: Needs cairo build with X11 support."
+	@${FALSE}
+.endif
+
 pre-build:
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
@@ -89,6 +96,6 @@ post-install:
 	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/docs/reference/gtk/|} \
 		${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index a6827d508561..53e9d1c878f5 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gtk+-2.22.1.tar.bz2) = 965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
-SIZE (gnome2/gtk+-2.22.1.tar.bz2) = 18306164
+SHA256 (gnome2/gtk+-2.24.5.tar.xz) = d6b30889efbb9fab9aa598092d08887826a7b2a3069b3bd5155dede28d9866f3
+SIZE (gnome2/gtk+-2.24.5.tar.xz) = 13252580
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index b6a6a71721f5..cc9e4c46a65a 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-12-25 20:26:59.000000000 +0100
-+++ docs/Makefile.in	2009-12-25 20:27:35.000000000 +0100
-@@ -241,7 +241,7 @@
+--- docs/Makefile.in.orig	2010-12-24 00:14:51.000000000 +0100
++++ docs/Makefile.in	2010-12-24 00:15:52.000000000 +0100
+@@ -220,7 +220,7 @@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MANIFEST_TOOL = @MANIFEST_TOOL@
  MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure
deleted file mode 100644
index 06a6f7b9fa22..000000000000
--- a/x11-toolkits/gtk20/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	2009-12-26 21:41:27.000000000 +0100
-+++ configure	2009-12-26 21:51:04.000000000 +0100
-@@ -33884,9 +33884,9 @@
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
--       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in
new file mode 100644
index 000000000000..b1a3d8374f4b
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-docs_reference_gtk_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/reference/gtk/Makefile.in.orig	2011-03-04 12:25:26.000000000 +0100
++++ docs/reference/gtk/Makefile.in	2011-03-04 12:25:42.000000000 +0100
+@@ -748,7 +748,7 @@
+ @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp
+ 
+ ########################################################################
+-@ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
++@ENABLE_MAN_TRUE@man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
+ @ENABLE_MAN_TRUE@BUILT_EXTRA_DIST = $(man_MANS)
+ all: all-am
+ 
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 82740da0a1b7..9846a2751331 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -2,9 +2,19 @@ Stock icons. This was removed in 2.21.x, however it is used by atleast firefox.
 
 https://bugzilla.gnome.org/show_bug.cgi?id=629878
 
---- gtk/Makefile.in.orig	2010-11-21 16:06:15.000000000 +0100
-+++ gtk/Makefile.in	2010-11-21 16:36:39.000000000 +0100
-@@ -1352,9 +1352,9 @@
+--- gtk/Makefile.in.orig	2011-03-04 12:02:32.000000000 +0100
++++ gtk/Makefile.in	2011-03-04 12:03:28.000000000 +0100
+@@ -71,8 +71,7 @@
+ @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = --add-include-path=$(top_builddir)/gdk/x11
+ @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-2.0.gir
+ @HAVE_INTROSPECTION_TRUE@am__append_17 = $(gir_DATA) $(typelibs_DATA)
+-bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT) \
+-	gtk-update-icon-cache$(EXEEXT)
++bin_PROGRAMS = gtk-query-immodules-2.0$(EXEEXT)
+ @OS_WIN32_TRUE@am__append_18 = \
+ @OS_WIN32_TRUE@	$(GTK_UPDATE_ICON_CACHE_MANIFEST)
+ 
+@@ -1358,9 +1357,9 @@
  # gtk-update-icon-cache.exe doesn't require any special privileges.
  @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
@@ -16,7 +26,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
  gtk_update_icon_cache_SOURCES = updateiconcache.c 
  STOCK_ICONS = \
  	stock-icons/16/document-open-recent.png		\
-@@ -1595,7 +1595,171 @@
+@@ -1601,7 +1600,171 @@  	
  	stock-icons/24/folder-remote.png 		\
  	stock-icons/24/user-home.png 			\
  	stock-icons/24/user-desktop.png 		\
@@ -189,10 +199,10 @@ https://bugzilla.gnome.org/show_bug.cgi?id=629878
  
  @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
  @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2866,6 +3030,88 @@
+@@ -2873,6 +3036,88 @@
  	   && $(LN_S) folder.png user-desktop.png 			\
- 	   && $(RM) text-x-generic.png 					\
- 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
+ 	   && $(RM) user-home.png.png 					\
+ 	   && $(LN_S) folder.png user-home.png 				\
 +	   && $(LN_S) application-exit.png gtk-quit.png                 \
 +	   && $(LN_S) dialog-info.png gtk-info.png                      \
 +	   && $(LN_S) document-new.png gtk-file.png                     \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 06e2e8485b92..a4ac7f4e6b0f 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,7 +1,6 @@
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
-bin/gtk-update-icon-cache
 etc/gtk-2.0/gtk.immodules
 etc/gtk-2.0/im-multipress.conf
 include/gail-1.0/gail/gailwidget.h
@@ -87,6 +86,7 @@ include/gtk-2.0/gtk/gtkcolorseldialog.h
 include/gtk-2.0/gtk/gtkcombo.h
 include/gtk-2.0/gtk/gtkcombobox.h
 include/gtk-2.0/gtk/gtkcomboboxentry.h
+include/gtk-2.0/gtk/gtkcomboboxtext.h
 include/gtk-2.0/gtk/gtkcontainer.h
 include/gtk-2.0/gtk/gtkctree.h
 include/gtk-2.0/gtk/gtkcurve.h
@@ -487,8 +487,6 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ka/LC_MESSAGES/gtk20-properties.mo
 share/locale/ka/LC_MESSAGES/gtk20.mo
-share/locale/kg/LC_MESSAGES/gtk20-properties.mo
-share/locale/kg/LC_MESSAGES/gtk20.mo
 share/locale/kk/LC_MESSAGES/gtk20-properties.mo
 share/locale/kk/LC_MESSAGES/gtk20.mo
 share/locale/kn/LC_MESSAGES/gtk20-properties.mo
@@ -497,8 +495,6 @@ share/locale/ko/LC_MESSAGES/gtk20-properties.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
 share/locale/ku/LC_MESSAGES/gtk20-properties.mo
 share/locale/ku/LC_MESSAGES/gtk20.mo
-share/locale/lg/LC_MESSAGES/gtk20-properties.mo
-share/locale/lg/LC_MESSAGES/gtk20.mo
 share/locale/li/LC_MESSAGES/gtk20-properties.mo
 share/locale/li/LC_MESSAGES/gtk20.mo
 share/locale/lt/LC_MESSAGES/gtk20-properties.mo
@@ -611,10 +607,12 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true
 @unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true
 @dirrm share/themes/Raleigh/gtk-2.0
-@dirrm share/themes/Raleigh
+@dirrmtry share/themes/Raleigh
 @dirrm share/themes/Emacs/gtk-2.0-key
-@dirrm share/themes/Emacs
+@dirrmtry share/themes/Emacs
 @dirrm share/themes/Default/gtk-2.0-key
+@dirrmtry share/themes/Default
+@dirrmtry share/themes
 @dirrm share/gtk-2.0/demo
 @dirrm share/gtk-2.0
 @dirrm include/gtk-unix-print-2.0/gtk
@@ -629,8 +627,6 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/engines
 @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK2_VERSION%%/loaders
-@dirrmtry share/themes/Default
-@dirrmtry share/themes
 @dirrmtry lib/gtk-2.0/modules
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/printbackends
 @dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/modules
@@ -680,14 +676,10 @@ share/themes/Raleigh/gtk-2.0/gtkrc
 @dirrmtry share/locale/mi
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
-@dirrmtry share/locale/lg/LC_MESSAGES
-@dirrmtry share/locale/lg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
-@dirrmtry share/locale/kg/LC_MESSAGES
-@dirrmtry share/locale/kg
 @dirrmtry share/locale/io/LC_MESSAGES
 @dirrmtry share/locale/io
 @dirrmtry share/locale/ia/LC_MESSAGES