Update to 2.6.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3608 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 79 insertions, 123 deletions

diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 3493bd1ce..c66d0bacc 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 2356bdf5b..39e8552a6 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtk-engines-2.6.0.tar.bz2) = 396a4bead002c95e588b38af13232627
-SIZE (gnome2/gtk-engines-2.6.0.tar.bz2) = 453089
+MD5 (gnome2/gtk-engines-2.6.1.tar.bz2) = 87849bc511cdba018c87fe5d6f7ba347
+SIZE (gnome2/gtk-engines-2.6.1.tar.bz2) = 447413
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c
deleted file mode 100644
index 04c4dbf45..000000000
--- a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-pixmaps.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- engines/crux/src/crux-pixmaps.c.orig	Thu Dec 23 16:13:44 2004
-+++ engines/crux/src/crux-pixmaps.c	Thu Dec 23 16:14:09 2004
-@@ -329,8 +329,9 @@
- static GdkPixbuf *
- load_image (const char *file)
- {
-+    GdkPixbuf *pixbuf;
- 	printf("%s\n", file);	
--    GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
-+    pixbuf = gdk_pixbuf_new_from_file (file, NULL);
-     if (pixbuf != 0)
-       return pixbuf;
-       
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c
deleted file mode 100644
index ecaff5537..000000000
--- a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-rc-style.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- engines/crux/src/crux-rc-style.c.orig	Thu Dec 23 16:14:48 2004
-+++ engines/crux/src/crux-rc-style.c	Thu Dec 23 16:15:02 2004
-@@ -20,9 +20,10 @@
- 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-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c b/x11-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c
deleted file mode 100644
index 8ff91069a..000000000
--- a/x11-themes/gtk-engines2/files/patch-engines_redmond_src_redmond_gtk2_drawing.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- engines/redmond/src/redmond_gtk2_drawing.c.orig	Thu Dec 23 16:16:27 2004
-+++ engines/redmond/src/redmond_gtk2_drawing.c	Thu Dec 23 16:18:06 2004
-@@ -1581,9 +1581,13 @@
-              gint height, 
-              GtkOrientation orientation)
- {
-+  gboolean left_cutoff, top_cutoff, bottom_cutoff, right_cutoff;
-   g_return_if_fail(sanitize_parameters(style, window, &width, &height));
-   
--  gboolean left_cutoff = FALSE, right_cutoff = FALSE, top_cutoff = FALSE, bottom_cutoff = FALSE;
-+  left_cutoff = FALSE;
-+  right_cutoff = FALSE;
-+  top_cutoff = FALSE;
-+  bottom_cutoff = FALSE;
-   
-   if (IS_BONOBO_DOCK_ITEM_GRIP(widget) && 
-      (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) && 
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 18e43bb0f..9d469f0d6 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -8,82 +8,82 @@ lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
 libdata/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
@@ -96,8 +96,8 @@ share/themes/ThinIce/gtk-2.0/gtkrc
 @dirrm share/themes/Metal/gtk-2.0
 @dirrm share/themes/LighthouseBlue/gtk-2.0
 @dirrm share/themes/Industrial/gtk-2.0
+@dirrm share/themes/Crux/pixmaps
 @dirrm share/themes/Crux/gtk-2.0
-@dirrm share/eazel-engine
 @unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true
 @unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true
 @unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true