update to 2.24.1

This switches to the new gtk-2.24 branch which is intended to
help transition to glib/gtk3. Still binary compatible.

3 files changed, 15 insertions, 17 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index c6a67e5c4e7..3c9df420add 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.211 2011/01/13 13:36:21 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2011/03/09 11:24:05 drochner Exp $
 
-DISTNAME=		gtk+-2.22.1
+DISTNAME=		gtk+-2.24.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.22/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/2.22/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.24/ \
+			${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -93,7 +92,7 @@ _BUILDING_GTK2=	yes
 BUILDLINK_API_DEPENDS.atk+=	atk>=1.30.0
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.24.0
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.28.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
 
diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST
index 77d79ff10be..7d7c6c8ce48 100644
--- a/x11/gtk2/PLIST
+++ b/x11/gtk2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.74 2010/11/23 13:31:33 tnn Exp $
+@comment $NetBSD: PLIST,v 1.75 2011/03/09 11:24:05 drochner Exp $
 bin/gtk-builder-convert
 bin/gtk-demo
 bin/gtk-query-immodules-2.0
@@ -86,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
@@ -537,6 +538,7 @@ share/gtk-doc/html/gtk/GtkColorSelectionDialog.html
 share/gtk-doc/html/gtk/GtkCombo.html
 share/gtk-doc/html/gtk/GtkComboBox.html
 share/gtk-doc/html/gtk/GtkComboBoxEntry.html
+share/gtk-doc/html/gtk/GtkComboBoxText.html
 share/gtk-doc/html/gtk/GtkContainer.html
 share/gtk-doc/html/gtk/GtkCurve.html
 share/gtk-doc/html/gtk/GtkDialog.html
@@ -600,6 +602,7 @@ share/gtk-doc/html/gtk/GtkOptionMenu.html
 share/gtk-doc/html/gtk/GtkPageSetup.html
 share/gtk-doc/html/gtk/GtkPageSetupUnixDialog.html
 share/gtk-doc/html/gtk/GtkPaned.html
+share/gtk-doc/html/gtk/GtkPaperSize.html
 share/gtk-doc/html/gtk/GtkPixmap.html
 share/gtk-doc/html/gtk/GtkPlug.html
 share/gtk-doc/html/gtk/GtkPreview.html
@@ -642,6 +645,7 @@ share/gtk-doc/html/gtk/GtkTable.html
 share/gtk-doc/html/gtk/GtkTearoffMenuItem.html
 share/gtk-doc/html/gtk/GtkText.html
 share/gtk-doc/html/gtk/GtkTextBuffer.html
+share/gtk-doc/html/gtk/GtkTextIter.html
 share/gtk-doc/html/gtk/GtkTextMark.html
 share/gtk-doc/html/gtk/GtkTextTag.html
 share/gtk-doc/html/gtk/GtkTextTagTable.html
@@ -708,6 +712,7 @@ share/gtk-doc/html/gtk/api-index-2-18.html
 share/gtk-doc/html/gtk/api-index-2-2.html
 share/gtk-doc/html/gtk/api-index-2-20.html
 share/gtk-doc/html/gtk/api-index-2-22.html
+share/gtk-doc/html/gtk/api-index-2-24.html
 share/gtk-doc/html/gtk/api-index-2-4.html
 share/gtk-doc/html/gtk/api-index-2-6.html
 share/gtk-doc/html/gtk/api-index-2-8.html
@@ -801,8 +806,6 @@ share/gtk-doc/html/gtk/gtk-Feature-Test-Macros.html
 share/gtk-doc/html/gtk/gtk-Filesystem-utilities.html
 share/gtk-doc/html/gtk/gtk-General.html
 share/gtk-doc/html/gtk/gtk-Graphics-Contexts.html
-share/gtk-doc/html/gtk/gtk-GtkPaperSize.html
-share/gtk-doc/html/gtk/gtk-GtkTextIter.html
 share/gtk-doc/html/gtk/gtk-GtkTreeView-drag-and-drop.html
 share/gtk-doc/html/gtk/gtk-High-level-Printing-API.html
 share/gtk-doc/html/gtk/gtk-Keyboard-Accelerators.html
@@ -1064,8 +1067,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
@@ -1074,8 +1075,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
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index a7464e747a6..ea5ad314a0a 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.131 2010/11/23 13:31:33 tnn Exp $
+$NetBSD: distinfo,v 1.132 2011/03/09 11:24:05 drochner Exp $
 
-SHA1 (gtk+-2.22.1.tar.bz2) = c88d8be4aebd6e59d6ca44d57f6acd18e2be1c08
-RMD160 (gtk+-2.22.1.tar.bz2) = f7d5cd312dc982a599e6a834c87c1bc07ff87e2d
-Size (gtk+-2.22.1.tar.bz2) = 18306164 bytes
+SHA1 (gtk+-2.24.1.tar.bz2) = 4e3bb7ad801e86133ef2ed5ed3b6728cea2d0574
+RMD160 (gtk+-2.24.1.tar.bz2) = 2a416bbe02cd8ca6b50a43f33c70a85d1c1235ca
+Size (gtk+-2.24.1.tar.bz2) = 17600141 bytes
 SHA1 (patch-aa) = 57c8f35646237495a4916fba49fb2d002dfd77c1
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = 9e3009396f2377ece4dba1f79d6f65c3478ec81f