gtk-engines2:

	Re-add it, at 2.6.0. Two patches were took from gnome-themes(-extras).

gnome-themes:
	Disable all gtk engines, since gtk-engines2 took care of those now.

gnome-themes-extras:
	Disable industrial complete, gtk-engines2 took care of engine and
	themes can be install by gnome-industrial-theme port.

Only two themes, Grand Canyon and Smokey Blue, are broke because of pixmap
engine was removed from gtk-engines2.


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

4 files changed, 5 insertions, 141 deletions

diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 22d86d4cc..b84159d57 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-themes
 PORTVERSION=	2.9.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
@@ -32,7 +33,9 @@ PLIST_SUB=	GTK_VERSION="2.4.0"
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
-	@${REINPLACE_CMD} -e 's|GTK_BINARY_VERSION|GTK_VERSION|g' \
-		${WRKSRC}/gtk-engines/Smooth/Makefile.in
+	${REINPLACE_CMD} -e 's|gtk-themes gtk-engines|gtk-themes |g' \
+		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's|Crux Glider Grand-Canyon LightHouseBlue Mist Simple Smokey-Blue ThinIce|Glider Grand-Canyon Simple Smokey-Blue|g' \
+		${WRKSRC}/gtk-themes/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c b/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c
deleted file mode 100644
index 9111a7ac5..000000000
--- a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- gtk-themes/Crux/src/crux-gradient.c.orig	Thu Oct 16 20:57:05 2003
-+++ gtk-themes/Crux/src/crux-gradient.c	Thu Oct 16 21:01:18 2003
-@@ -207,7 +207,7 @@
- 			const eazel_engine_gradient *gradient)
- {
-     int rgb_size = clip_rect->height;
--    guchar *rgb = alloca (rgb_size * 3), *ptr;
-+    guchar *rgb = g_malloc (rgb_size * 3), *ptr;
- 
-     eazel_engine_fill_gradient_rgb_buffer (gradient, full_rect->height, rgb,
- 					   clip_rect->y - full_rect->y,
-@@ -239,7 +239,7 @@
-     }
-     else
-     {
--	guchar *xrgb = alloca (clip_rect->width * clip_rect->height * 3);
-+	guchar *xrgb = g_malloc (clip_rect->width * clip_rect->height * 3);
- 	int x, y;
- 	guchar *ptr_in = rgb, *ptr_out = xrgb;
- 	for (y = 0; y < clip_rect->height; y++)
-@@ -257,7 +257,10 @@
- 	gdk_draw_rgb_image (drawable, gc, clip_rect->x, clip_rect->y,
- 			    clip_rect->width, clip_rect->height,
- 			    dither_mode, xrgb, clip_rect->width * 3);
-+	g_free (xrgb);
-     }
-+
-+    g_free (rgb);
- }
- 
- static void
diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c b/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c
deleted file mode 100644
index 7813ce91f..000000000
--- a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gtk-themes/Crux/src/crux-pixmaps.c.orig	Thu Oct 16 21:01:59 2003
-+++ gtk-themes/Crux/src/crux-pixmaps.c	Thu Oct 16 21:02:17 2003
-@@ -340,9 +340,10 @@
-     {
- 	GdkPixbuf *pixbuf;
- 	size_t len = strlen (*path) + strlen (file) + 2;
--	char *buf = alloca (len);
-+	char *buf = g_malloc (len);
- 	sprintf (buf, "%s/%s", *path, file);
- 	pixbuf = gdk_pixbuf_new_from_file (buf, NULL);
-+	g_free (buf);
- 	if (pixbuf != 0)
- 	    return pixbuf;
- 	path++;
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 4dc348692..9e627ee65 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,84 +1,3 @@
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so
-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/gnome/themes/Glider/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png
@@ -1324,7 +1243,6 @@ share/locale/vi/LC_MESSAGES/gnome-themes.mo
 share/locale/wa/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo
-share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
 share/themes/Glider/gtk-2.0/iconrc
@@ -1793,7 +1711,6 @@ share/themes/LargePrint/pixmaps/volume-medium.png
 share/themes/LargePrint/pixmaps/volume-min.png
 share/themes/LargePrint/pixmaps/volume-mute.png
 share/themes/LargePrint/pixmaps/volume-zero.png
-share/themes/LighthouseBlue/gtk-2.0/gtkrc
 share/themes/LowContrast/gtk-2.0/gtkrc
 share/themes/LowContrast/index.theme.disabled
 share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
@@ -1933,7 +1850,6 @@ share/themes/LowContrastLargePrint/pixmaps/volume-medium.png
 share/themes/LowContrastLargePrint/pixmaps/volume-min.png
 share/themes/LowContrastLargePrint/pixmaps/volume-mute.png
 share/themes/LowContrastLargePrint/pixmaps/volume-zero.png
-share/themes/Mist/gtk-2.0/gtkrc
 share/themes/Mist/index.theme
 share/themes/Ocean-Dream/index.theme
 share/themes/Simple/gtk-2.0/gtkrc
@@ -1961,25 +1877,18 @@ share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png
 share/themes/Smokey-Blue/gtk-2.0/option1.png
 share/themes/Smokey-Blue/gtk-2.0/option2.png
 share/themes/Smokey-Blue/index.theme
-share/themes/ThinIce/gtk-2.0/gtkrc
 share/themes/Traditional/index.theme
 @dirrm share/themes/Traditional
-@dirrm share/themes/ThinIce/gtk-2.0
-@dirrm share/themes/ThinIce
 @dirrm share/themes/Smokey-Blue/gtk-2.0
 @dirrm share/themes/Smokey-Blue
 @dirrm share/themes/Simple/gtk-2.0
 @dirrm share/themes/Simple
 @dirrm share/themes/Ocean-Dream
-@dirrm share/themes/Mist/gtk-2.0
-@dirrm share/themes/Mist
 @dirrm share/themes/LowContrastLargePrint/pixmaps
 @dirrm share/themes/LowContrastLargePrint/gtk-2.0
 @dirrm share/themes/LowContrastLargePrint
 @dirrm share/themes/LowContrast/gtk-2.0
 @dirrm share/themes/LowContrast
-@dirrm share/themes/LighthouseBlue/gtk-2.0
-@dirrm share/themes/LighthouseBlue
 @dirrm share/themes/LargePrint/pixmaps
 @dirrm share/themes/LargePrint/gtk-2.0
 @dirrm share/themes/LargePrint
@@ -1997,8 +1906,6 @@ share/themes/Traditional/index.theme
 @dirrm share/themes/Grand-Canyon
 @dirrm share/themes/Glider/gtk-2.0
 @dirrm share/themes/Glider
-@dirrm share/themes/Crux/gtk-2.0
-@dirrm share/themes/Crux
 @dirrm share/icons/Smokey-Red/48x48/filesystems
 @dirrm share/icons/Smokey-Red/48x48/emblems
 @dirrm share/icons/Smokey-Red/48x48
@@ -2098,5 +2005,4 @@ share/themes/Traditional/index.theme
 @dirrm share/gnome/themes/Mist
 @dirrm share/gnome/themes/Glider/metacity-1
 @dirrm share/gnome/themes/Glider
-@dirrm share/eazel-engine
 @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true