Update to 2.8.6:

Overview of Changes from GTK+ 2.8.5 to GTK+ 2.8.6
=================================================
* GtkFileChooser
 - Don't reload the current folder unnecessarily on map [Federico
   Mena Quintero]
* Revert a change from 2.8.5 that could lead to assertion
  failures when finalizing GtkStyles [Matthias Clasen]
* Remove context prefixes from Portugese translations [Duarte
  Henriques]

Overview of Changes from GTK+ 2.8.4 to GTK+ 2.8.5
=================================================
* GtkFileChooser
 - Don't clear the file name entry too often when
   in SAVE mode.  [Jürg Billeter]
 - Reduce the startup time in OPEN mode [Federico
   Mena Quintero]
* Stop drag in GtkPaned when grab shadowed [Matthias Clasen]
* Correct the calculation for the first weekday
  in GtkCalendar [Matthias Clasen]
* Use a larger buffer when determining the image
  format in gdk-pixbuf [Sebastian Bacher, Dom Lachowicz]
* Win32 bug fixes [Kazuki Iwamoto, Tor Lillqvist]
* Other bug fixes [Tor Lillqvist, Gustavo Carneiro,
  Paolo Borelli, Ray Strode, Søren Sandmann, Tommi Komulainen,
  Benjamin Berg]

9 files changed, 43 insertions, 30 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 1ab054bdf69..35f04101e7a 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2005/10/02 12:19:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.95 2005/10/05 14:37:44 wiz Exp $
 #
 
-DISTNAME=		gtk+-2.8.4
+DISTNAME=		gtk+-2.8.6
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index 6c7b8eb6b9a..7436d40363e 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.51 2005/10/02 12:19:06 jmmv Exp $
+$NetBSD: distinfo,v 1.52 2005/10/05 14:37:44 wiz Exp $
 
-SHA1 (gtk+-2.8.4.tar.bz2) = b2ea1f6ca230075ddedc888b633cbd8efe492bae
-RMD160 (gtk+-2.8.4.tar.bz2) = 779c549bfda9d5eab4320738165fb09f304c011a
-Size (gtk+-2.8.4.tar.bz2) = 11822425 bytes
-SHA1 (patch-aa) = 4991da77c0d8ad79ca616c7e6d80449863725b00
+SHA1 (gtk+-2.8.6.tar.bz2) = 7760e325ddd535fa7e606a047133a6a7cfb71ca4
+RMD160 (gtk+-2.8.6.tar.bz2) = c70f0dee25bd5fe95defb2dfa492ea587fd167b3
+Size (gtk+-2.8.6.tar.bz2) = 11818976 bytes
+SHA1 (patch-aa) = 7efcbf733e3459fd3853c0d49842136b434ca983
 SHA1 (patch-ab) = 213b38a1a3939194ac5c54234a1deccf935db368
 SHA1 (patch-ac) = d9a47653b8db5ffae28dc233aea0dc15399eea79
-SHA1 (patch-ad) = 1c93a494fa2040a1ec936cfd1fe31756b0fe3847
-SHA1 (patch-ae) = 1fdeeef405b2045f26335f0bb607e3c3d24b3ae6
-SHA1 (patch-af) = 6797fd34be0a34368f6edede2321562678b112ff
-SHA1 (patch-ag) = dc4d72a39e426b880ca69ba8bc499fdaf42e0da8
-SHA1 (patch-ah) = 486d6601d6dba04830a8645c6a5791755e6538d9
+SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
+SHA1 (patch-ae) = df5c64ab998e7cbfff75fdeb39157e125eecb4f7
+SHA1 (patch-af) = cac12b7a8fb37d906d70f1654d7c98f51b1e42fc
+SHA1 (patch-ag) = 2166d1832ecd928583e4a1b7e9a6a37b37f2b403
+SHA1 (patch-ah) = bb6d8fdcaba561af678e2a86aa92ca4e864e573f
+SHA1 (patch-ai) = 71d35a12d661f2ae020c57887a35cf0f59a375ed
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 075b01a3b3b..2506575f91b 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2005/05/08 09:07:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.15 2005/10/05 14:37:44 wiz Exp $
 
---- gdk-pixbuf/Makefile.in.orig	2005-04-12 22:31:06.000000000 +0200
+--- gdk-pixbuf/Makefile.in.orig	2005-10-04 06:31:25.000000000 +0200
 +++ gdk-pixbuf/Makefile.in
-@@ -528,7 +528,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
+@@ -526,7 +526,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-
  gdk_pixbuf_csource_LDADD = $(LDADDS)
  
  gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
diff --git a/x11/gtk2/patches/patch-ad b/x11/gtk2/patches/patch-ad
index 5db400da270..aeef9e635c7 100644
--- a/x11/gtk2/patches/patch-ad
+++ b/x11/gtk2/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.13 2005/04/15 13:47:25 wiz Exp $
+$NetBSD: patch-ad,v 1.14 2005/10/05 14:37:45 wiz Exp $
 
---- gtk/xdgmime/xdgmime.c.orig	2005-04-03 05:56:50.000000000 +0200
+--- gtk/xdgmime/xdgmime.c.orig	2005-08-07 15:32:27.000000000 +0200
 +++ gtk/xdgmime/xdgmime.c
-@@ -233,7 +233,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
+@@ -236,7 +236,7 @@ xdg_run_command_on_dirs (XdgDirectoryFun
  
    xdg_data_dirs = getenv ("XDG_DATA_DIRS");
    if (xdg_data_dirs == NULL)
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index 50206364f92..eaa35a8e606 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.9 2005/03/02 15:39:06 wiz Exp $
+$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-02-28 19:08:34.000000000 +0100
+--- 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
-@@ -4,7 +4,7 @@ gcc2_compiled.:
+@@ -22,7 +22,7 @@ gcc2_compiled.:
  .text
  	.align 16
  
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index d207747ae67..cfcac534f0c 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.11 2005/03/02 15:39:06 wiz Exp $
+$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-02-28 19:08:34.000000000 +0100
+--- 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
-@@ -4,7 +4,7 @@ gcc2_compiled.:
+@@ -22,7 +22,7 @@ gcc2_compiled.:
  .text
  	.align 16
  
diff --git a/x11/gtk2/patches/patch-ag b/x11/gtk2/patches/patch-ag
index bd292d79e13..d7f6f53e204 100644
--- a/x11/gtk2/patches/patch-ag
+++ b/x11/gtk2/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2005/03/02 15:39:06 wiz Exp $
+$NetBSD: patch-ag,v 1.8 2005/10/05 14:37:45 wiz Exp $
 
---- gdk-pixbuf/pixops/have_mmx.S.orig	2005-02-28 19:08:34.000000000 +0100
+--- gdk-pixbuf/pixops/have_mmx.S.orig	2005-07-12 17:58:57.000000000 +0200
 +++ gdk-pixbuf/pixops/have_mmx.S
-@@ -4,7 +4,7 @@ gcc2_compiled.:
+@@ -22,7 +22,7 @@ gcc2_compiled.:
  .text
  	.align 16
  
diff --git a/x11/gtk2/patches/patch-ah b/x11/gtk2/patches/patch-ah
index a201e6545dc..ee5b4f493dc 100644
--- a/x11/gtk2/patches/patch-ah
+++ b/x11/gtk2/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.9 2005/03/02 15:39:06 wiz Exp $
+$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-02-28 19:08:34.000000000 +0100
+--- 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
-@@ -4,7 +4,7 @@ gcc2_compiled.:
+@@ -22,7 +22,7 @@ gcc2_compiled.:
  .text
  	.align 16
  
diff --git a/x11/gtk2/patches/patch-ai b/x11/gtk2/patches/patch-ai
new file mode 100644
index 00000000000..678e0d1bb94
--- /dev/null
+++ b/x11/gtk2/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.11 2005/10/05 14:37:45 wiz Exp $
+
+--- gtk/gtkcalendar.c.orig	2005-10-04 05:24:16.000000000 +0200
++++ gtk/gtkcalendar.c
+@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar
+   GtkCalendarPrivate *priv;
+   gchar *year_before;
+   gchar *langinfo;
++  gchar *week_start;
+   gint week_1stday = 0;
+   gint first_weekday = 1;
+   guint week_origin;