Update to 2.6.2:

Overview of Changes in 2.6.2 (since 2.6.2)
==========================================
* Fix bugs #167389 and #163370 [ Andrew Johnson ]

Overview of Changes in 2.6.1 (since 2.6.0)
==========================================
* Fix bugs 162131, 163099 [ Thomas Wood ]
* Smooth updates [ Andrew Johnson ]

6 files changed, 84 insertions, 135 deletions

diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 58cdb86957c..bda5bb891f5 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2005/01/13 19:51:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2005/03/22 16:08:35 jmmv Exp $
 
-DISTNAME=		gtk-engines-2.6.0
+DISTNAME=		gtk-engines-2.6.2
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gtk-engines/2.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,7 +14,7 @@ CONFLICTS+=		gtk-engines-*
 CONFLICTS+=		gtk2-engines-industrial-*
 CONFLICTS+=		gnome-themes-extras<0.8
 
-BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.0nb2
+BUILDLINK_DEPENDS.gtk2+=	gtk2+>=2.6.4
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
diff --git a/x11/gtk2-engines/PLIST b/x11/gtk2-engines/PLIST
index 6e1a7abdc0b..8972b92f01e 100644
--- a/x11/gtk2-engines/PLIST
+++ b/x11/gtk2-engines/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/12/24 10:07:23 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/03/22 16:08:35 jmmv Exp $
 lib/gtk-2.0/2.4.0/engines/libcrux-engine.la
 lib/gtk-2.0/2.4.0/engines/libhcengine.la
 lib/gtk-2.0/2.4.0/engines/libindustrial.la
@@ -9,82 +9,82 @@ lib/gtk-2.0/2.4.0/engines/libredmond95.la
 lib/gtk-2.0/2.4.0/engines/libsmooth.la
 lib/gtk-2.0/2.4.0/engines/libthinice.la
 lib/pkgconfig/gtk-engines-2.pc
-share/eazel-engine/arrow_down-spinner.png
-share/eazel-engine/arrow_down.png
-share/eazel-engine/arrow_left.png
-share/eazel-engine/arrow_right.png
-share/eazel-engine/arrow_up-spinner.png
-share/eazel-engine/arrow_up.png
-share/eazel-engine/check-active-default-focus.png
-share/eazel-engine/check-active-default.png
-share/eazel-engine/check-active-hilight-focus.png
-share/eazel-engine/check-active-hilight.png
-share/eazel-engine/check-active-insensitive.png
-share/eazel-engine/check-active-pressed-focus.png
-share/eazel-engine/check-active-pressed.png
-share/eazel-engine/check-default-focus.png
-share/eazel-engine/check-default.png
-share/eazel-engine/check-hilight-focus.png
-share/eazel-engine/check-hilight.png
-share/eazel-engine/check-insensitive.png
-share/eazel-engine/check-pressed-focus.png
-share/eazel-engine/check-pressed.png
-share/eazel-engine/progressbar-left.png
-share/eazel-engine/progressbar-right.png
-share/eazel-engine/progressbar.png
-share/eazel-engine/progressbar_trough.png
-share/eazel-engine/radio-active-default-focus.png
-share/eazel-engine/radio-active-default.png
-share/eazel-engine/radio-active-hilight-focus.png
-share/eazel-engine/radio-active-hilight.png
-share/eazel-engine/radio-active-insensitive.png
-share/eazel-engine/radio-active-pressed-focus.png
-share/eazel-engine/radio-active-pressed.png
-share/eazel-engine/radio-default-focus.png
-share/eazel-engine/radio-default.png
-share/eazel-engine/radio-hilight-focus.png
-share/eazel-engine/radio-hilight.png
-share/eazel-engine/radio-insensitive.png
-share/eazel-engine/radio-pressed-focus.png
-share/eazel-engine/radio-pressed.png
-share/eazel-engine/scroller-arrow-down-hilight.png
-share/eazel-engine/scroller-arrow-down-pressed.png
-share/eazel-engine/scroller-arrow-down.png
-share/eazel-engine/scroller-arrow-left-hilight.png
-share/eazel-engine/scroller-arrow-left-pressed.png
-share/eazel-engine/scroller-arrow-left.png
-share/eazel-engine/scroller-arrow-right-hilight.png
-share/eazel-engine/scroller-arrow-right-pressed.png
-share/eazel-engine/scroller-arrow-right.png
-share/eazel-engine/scroller-arrow-up-hilight.png
-share/eazel-engine/scroller-arrow-up-pressed.png
-share/eazel-engine/scroller-arrow-up.png
-share/eazel-engine/scroller-h-hilight.png
-share/eazel-engine/scroller-h-thumb-hilight.png
-share/eazel-engine/scroller-h-thumb.png
-share/eazel-engine/scroller-h-trough.png
-share/eazel-engine/scroller-h.png
-share/eazel-engine/scroller-v-hilight.png
-share/eazel-engine/scroller-v-thumb-hilight.png
-share/eazel-engine/scroller-v-thumb.png
-share/eazel-engine/scroller-v-trough.png
-share/eazel-engine/scroller-v.png
-share/eazel-engine/slider_h_thumb.png
-share/eazel-engine/slider_h_trough.png
-share/eazel-engine/slider_h_trough_focus.png
-share/eazel-engine/slider_v_thumb.png
-share/eazel-engine/slider_v_trough.png
-share/eazel-engine/slider_v_trough_focus.png
-share/eazel-engine/tab_left-unsel.png
-share/eazel-engine/tab_left.png
-share/eazel-engine/tab_right.png
-share/eazel-engine/tab_sel-bottom.png
-share/eazel-engine/tab_sel.png
-share/eazel-engine/tab_usel-bottom-left.png
-share/eazel-engine/tab_usel-bottom.png
-share/eazel-engine/tab_usel-left.png
-share/eazel-engine/tab_usel.png
 share/themes/Crux/gtk-2.0/gtkrc
+share/themes/Crux/pixmaps/arrow_down-spinner.png
+share/themes/Crux/pixmaps/arrow_down.png
+share/themes/Crux/pixmaps/arrow_left.png
+share/themes/Crux/pixmaps/arrow_right.png
+share/themes/Crux/pixmaps/arrow_up-spinner.png
+share/themes/Crux/pixmaps/arrow_up.png
+share/themes/Crux/pixmaps/check-active-default-focus.png
+share/themes/Crux/pixmaps/check-active-default.png
+share/themes/Crux/pixmaps/check-active-hilight-focus.png
+share/themes/Crux/pixmaps/check-active-hilight.png
+share/themes/Crux/pixmaps/check-active-insensitive.png
+share/themes/Crux/pixmaps/check-active-pressed-focus.png
+share/themes/Crux/pixmaps/check-active-pressed.png
+share/themes/Crux/pixmaps/check-default-focus.png
+share/themes/Crux/pixmaps/check-default.png
+share/themes/Crux/pixmaps/check-hilight-focus.png
+share/themes/Crux/pixmaps/check-hilight.png
+share/themes/Crux/pixmaps/check-insensitive.png
+share/themes/Crux/pixmaps/check-pressed-focus.png
+share/themes/Crux/pixmaps/check-pressed.png
+share/themes/Crux/pixmaps/progressbar-left.png
+share/themes/Crux/pixmaps/progressbar-right.png
+share/themes/Crux/pixmaps/progressbar.png
+share/themes/Crux/pixmaps/progressbar_trough.png
+share/themes/Crux/pixmaps/radio-active-default-focus.png
+share/themes/Crux/pixmaps/radio-active-default.png
+share/themes/Crux/pixmaps/radio-active-hilight-focus.png
+share/themes/Crux/pixmaps/radio-active-hilight.png
+share/themes/Crux/pixmaps/radio-active-insensitive.png
+share/themes/Crux/pixmaps/radio-active-pressed-focus.png
+share/themes/Crux/pixmaps/radio-active-pressed.png
+share/themes/Crux/pixmaps/radio-default-focus.png
+share/themes/Crux/pixmaps/radio-default.png
+share/themes/Crux/pixmaps/radio-hilight-focus.png
+share/themes/Crux/pixmaps/radio-hilight.png
+share/themes/Crux/pixmaps/radio-insensitive.png
+share/themes/Crux/pixmaps/radio-pressed-focus.png
+share/themes/Crux/pixmaps/radio-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-down-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-down-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-down.png
+share/themes/Crux/pixmaps/scroller-arrow-left-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-left-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-left.png
+share/themes/Crux/pixmaps/scroller-arrow-right-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-right-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-right.png
+share/themes/Crux/pixmaps/scroller-arrow-up-hilight.png
+share/themes/Crux/pixmaps/scroller-arrow-up-pressed.png
+share/themes/Crux/pixmaps/scroller-arrow-up.png
+share/themes/Crux/pixmaps/scroller-h-hilight.png
+share/themes/Crux/pixmaps/scroller-h-thumb-hilight.png
+share/themes/Crux/pixmaps/scroller-h-thumb.png
+share/themes/Crux/pixmaps/scroller-h-trough.png
+share/themes/Crux/pixmaps/scroller-h.png
+share/themes/Crux/pixmaps/scroller-v-hilight.png
+share/themes/Crux/pixmaps/scroller-v-thumb-hilight.png
+share/themes/Crux/pixmaps/scroller-v-thumb.png
+share/themes/Crux/pixmaps/scroller-v-trough.png
+share/themes/Crux/pixmaps/scroller-v.png
+share/themes/Crux/pixmaps/slider_h_thumb.png
+share/themes/Crux/pixmaps/slider_h_trough.png
+share/themes/Crux/pixmaps/slider_h_trough_focus.png
+share/themes/Crux/pixmaps/slider_v_thumb.png
+share/themes/Crux/pixmaps/slider_v_trough.png
+share/themes/Crux/pixmaps/slider_v_trough_focus.png
+share/themes/Crux/pixmaps/tab_left-unsel.png
+share/themes/Crux/pixmaps/tab_left.png
+share/themes/Crux/pixmaps/tab_right.png
+share/themes/Crux/pixmaps/tab_sel-bottom.png
+share/themes/Crux/pixmaps/tab_sel.png
+share/themes/Crux/pixmaps/tab_usel-bottom-left.png
+share/themes/Crux/pixmaps/tab_usel-bottom.png
+share/themes/Crux/pixmaps/tab_usel-left.png
+share/themes/Crux/pixmaps/tab_usel.png
 share/themes/Industrial/gtk-2.0/gtkrc
 share/themes/LighthouseBlue/gtk-2.0/gtkrc
 share/themes/Metal/gtk-2.0/gtkrc
@@ -105,7 +105,7 @@ share/themes/ThinIce/gtk-2.0/gtkrc
 @comment in theme-dirs: @dirrm share/themes/LighthouseBlue
 @dirrm share/themes/Industrial/gtk-2.0
 @comment in theme-dirs: @dirrm share/themes/Industrial
+@dirrm share/themes/Crux/pixmaps
 @dirrm share/themes/Crux/gtk-2.0
 @comment in theme-dirs: @dirrm share/themes/Crux
-@dirrm share/eazel-engine
 @comment in gtk2: @dirrm lib/gtk-2.0/2.4.0/engines
diff --git a/x11/gtk2-engines/distinfo b/x11/gtk2-engines/distinfo
index ebed794063e..f3e447c2d90 100644
--- a/x11/gtk2-engines/distinfo
+++ b/x11/gtk2-engines/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 17:36:12 wiz Exp $
+$NetBSD: distinfo,v 1.8 2005/03/22 16:08:35 jmmv Exp $
 
-SHA1 (gtk-engines-2.6.0.tar.bz2) = afcfa78e32cbd0801dd04abf1c88524d825521da
-RMD160 (gtk-engines-2.6.0.tar.bz2) = 18ebc8508317598637d9c273c839891f94e424b1
-Size (gtk-engines-2.6.0.tar.bz2) = 453089 bytes
-SHA1 (patch-aa) = 5a87077d7311ad78626213f3947cdef43789bcbf
-SHA1 (patch-ab) = 8e401adfd63fffa9eca84b10128319989526eb2b
-SHA1 (patch-ac) = 2266402328c8bc86987d8786845f3375ed75ee14
+SHA1 (gtk-engines-2.6.2.tar.bz2) = e854844754dd621138ffc0fce83c83868979c55e
+RMD160 (gtk-engines-2.6.2.tar.bz2) = 7f391887ac5ef4b7bff2a49ce7be910b51aa0e57
+Size (gtk-engines-2.6.2.tar.bz2) = 444092 bytes
diff --git a/x11/gtk2-engines/patches/patch-aa b/x11/gtk2-engines/patches/patch-aa
deleted file mode 100644
index de45d9e312c..00000000000
--- a/x11/gtk2-engines/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/01/13 19:51:19 jmmv Exp $
-
---- engines/crux/src/crux-pixmaps.c.orig	2004-12-01 13:55:55.000000000 +0100
-+++ engines/crux/src/crux-pixmaps.c
-@@ -329,8 +329,8 @@ recolor_pixbuf (GdkPixbuf *pixbuf, eazel
- static GdkPixbuf *
- load_image (const char *file)
- {
--	printf("%s\n", file);	
-     GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
-+	printf("%s\n", file);	
-     if (pixbuf != 0)
-       return pixbuf;
-       
diff --git a/x11/gtk2-engines/patches/patch-ab b/x11/gtk2-engines/patches/patch-ab
deleted file mode 100644
index 4e09da77372..00000000000
--- a/x11/gtk2-engines/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/01/13 19:51:19 jmmv Exp $
-
---- engines/crux/src/crux-rc-style.c.orig	2004-12-01 13:55:55.000000000 +0100
-+++ engines/crux/src/crux-rc-style.c
-@@ -20,9 +20,10 @@ GtkRcStyleClass *rc_parent_class;
- static void
- crux_rc_style_init (CruxRcStyle *style)
- {
-+  gchar *path;
-   style->theme_data = NULL;
-   
--  gchar *path = g_malloc (strlen (DATADIR) + 15);
-+  path = g_malloc (strlen (DATADIR) + 15);
-   sprintf (path, "pixmap_path \"%s\"", DATADIR);
- 
-   gtk_rc_parse_string (path);
diff --git a/x11/gtk2-engines/patches/patch-ac b/x11/gtk2-engines/patches/patch-ac
deleted file mode 100644
index 56bc1c29a99..00000000000
--- a/x11/gtk2-engines/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/01/13 19:51:19 jmmv Exp $
-
---- engines/redmond/src/redmond_gtk2_drawing.c.orig	2004-12-15 17:52:56.000000000 +0100
-+++ engines/redmond/src/redmond_gtk2_drawing.c
-@@ -1581,10 +1581,10 @@ redmond_draw_handle (GtkStyle * style,
-              gint height, 
-              GtkOrientation orientation)
- {
--  g_return_if_fail(sanitize_parameters(style, window, &width, &height));
--  
-   gboolean left_cutoff = FALSE, right_cutoff = FALSE, top_cutoff = FALSE, bottom_cutoff = FALSE;
-   
-+  g_return_if_fail(sanitize_parameters(style, window, &width, &height));
-+  
-   if (IS_BONOBO_DOCK_ITEM_GRIP(widget) && 
-      (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) && 
-       orientation == (GTK_ORIENTATION_HORIZONTAL))