7 files changed, 9 insertions, 84 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 2518b129412..3b5ac5ac17a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.123 2006/06/13 15:59:32 drochner Exp $
+# $NetBSD: Makefile,v 1.124 2006/07/04 15:53:33 drochner Exp $
 
-DISTNAME=		gtk+-2.8.19
+DISTNAME=		gtk+-2.8.20
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.8/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/2.8/}
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.10/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.10/ \
+			${MASTER_SITE_GNOME:=sources/gtk+/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 31af664975b..6e05ff91de5 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.69 2006/07/03 19:00:38 minskim Exp $
+$NetBSD: distinfo,v 1.70 2006/07/04 15:53:34 drochner Exp $
 
-SHA1 (gtk+-2.8.19.tar.bz2) = 5108749bdd2f3ab0b500cec879a0f421a548ca35
-RMD160 (gtk+-2.8.19.tar.bz2) = 9d74e7a19f2da0361dd731757310abe1f4c08555
-Size (gtk+-2.8.19.tar.bz2) = 12303676 bytes
+SHA1 (gtk+-2.8.20.tar.bz2) = 8ea2449ff139b8bc457f8b5bcdcad93b02cfba9e
+RMD160 (gtk+-2.8.20.tar.bz2) = d20254de9e5b37b19f432758fbd78fff4c6baf1e
+Size (gtk+-2.8.20.tar.bz2) = 12247295 bytes
 SHA1 (patch-aa) = 7efcbf733e3459fd3853c0d49842136b434ca983
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
-SHA1 (patch-ae) = df5c64ab998e7cbfff75fdeb39157e125eecb4f7
-SHA1 (patch-af) = cac12b7a8fb37d906d70f1654d7c98f51b1e42fc
-SHA1 (patch-ag) = 2166d1832ecd928583e4a1b7e9a6a37b37f2b403
-SHA1 (patch-ah) = bb6d8fdcaba561af678e2a86aa92ca4e864e573f
 SHA1 (patch-ai) = 38df83add3b8f6a9f354904e73a2ba5ee0b7c972
-SHA1 (patch-aj) = ed95e08ca3fd5db47e32975b07d89a63007e33bf
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
deleted file mode 100644
index eaa35a8e606..00000000000
--- a/x11/gtk2/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2005/10/05 14:37:45 wiz Exp $
-
---- gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.orig	2005-07-12 17:58:57.000000000 +0200
-+++ gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S
-@@ -22,7 +22,7 @@ gcc2_compiled.:
- .text
- 	.align 16
- 
--#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
-+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
- 	
- /* Magic indicating no need for an executable stack */
- #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
deleted file mode 100644
index cfcac534f0c..00000000000
--- a/x11/gtk2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.12 2005/10/05 14:37:45 wiz Exp $
-
---- gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.orig	2005-07-12 17:58:57.000000000 +0200
-+++ gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S
-@@ -22,7 +22,7 @@ gcc2_compiled.:
- .text
- 	.align 16
- 
--#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
-+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
- 
- /* Magic indicating no need for an executable stack */
- #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
deleted file mode 100644
index d7f6f53e204..00000000000
--- a/x11/gtk2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2005/10/05 14:37:45 wiz Exp $
-
---- gdk-pixbuf/pixops/have_mmx.S.orig	2005-07-12 17:58:57.000000000 +0200
-+++ gdk-pixbuf/pixops/have_mmx.S
-@@ -22,7 +22,7 @@ gcc2_compiled.:
- .text
- 	.align 16
- 
--#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
-+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
- 
- /* Magic indicating no need for an executable stack */
- #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
deleted file mode 100644
index ee5b4f493dc..00000000000
--- a/x11/gtk2/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.10 2005/10/05 14:37:45 wiz Exp $
-
---- gdk-pixbuf/pixops/scale_line_22_33_mmx.S.orig	2005-07-12 17:58:57.000000000 +0200
-+++ gdk-pixbuf/pixops/scale_line_22_33_mmx.S
-@@ -22,7 +22,7 @@ gcc2_compiled.:
- .text
- 	.align 16
- 
--#if !defined(__MINGW32__) && !defined(__CYGWIN__)	
-+#if !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__INTERIX)
- 	
- /* Magic indicating no need for an executable stack */
- #if !defined __powerpc64__ && !defined __ia64__
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
deleted file mode 100644
index f51aedf7f2d..00000000000
--- a/x11/gtk2/patches/patch-aj
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aj,v 1.7 2006/01/28 02:54:32 rillig Exp $
-
-MIPSpro does not allow non-constant initializers.
-
---- demos/gtk-demo/editable_cells.c.orig	2005-05-25 08:28:30.000000000 +0200
-+++ demos/gtk-demo/editable_cells.c	2006-01-28 02:41:16.000000000 +0100
-@@ -121,7 +121,10 @@ create_numbers_model (void)
-   /* add numbers */
-   for (i = 0; i < N_NUMBERS; i++)
-     {
--      char str[2] = { '0' + i, '\0' };
-+      char str[2];
-+
-+      str[0] = '0' + i;
-+      str[1] = '\0';
- 
-       gtk_list_store_append (model, &iter);
-