15 files changed, 261 insertions, 174 deletions

diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 1f3d64b5a88e..ec0564ba0f4f 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -19,6 +19,7 @@
     SUBDIR += fluxbox-sid-pack
     SUBDIR += fvwm-themes
     SUBDIR += geramik
+    SUBDIR += gnome-backgrounds
     SUBDIR += gnome-icons
     SUBDIR += gnome-icons-aqua-fusion
     SUBDIR += gnome-icons-cool-gorilla
diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
new file mode 100644
index 000000000000..66770804d01d
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	gnome-backgrounds
+# Date Created:				12 January 2005
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnome-backgrounds
+PORTVERSION=	2.10.0
+CATEGORIES=	x11-themes graphics gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A collection of backgrounds for GNOME 2
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnometarget gnomehack intlhack
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+	       	LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
new file mode 100644
index 000000000000..8708131ef844
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-backgrounds-2.10.0.tar.bz2) = 8b4a3f293555c29d2a9e8bfd6d0014ba
+SIZE (gnome2/gnome-backgrounds-2.10.0.tar.bz2) = 2249259
diff --git a/x11-themes/gnome-backgrounds/pkg-descr b/x11-themes/gnome-backgrounds/pkg-descr
new file mode 100644
index 000000000000..bd5054b85e24
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/pkg-descr
@@ -0,0 +1 @@
+This module contains a set of backgrounds packaged with the GNOME desktop.
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
new file mode 100644
index 000000000000..bb493f890e2a
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -0,0 +1,58 @@
+share/gnome/gnome-background-properties/gnome-branded.xml
+share/gnome/gnome-background-properties/gnome-tiles.xml
+share/gnome/gnome-background-properties/gnome-translucent.xml
+share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Aqua.jpg
+share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-FraserIsland.jpg
+share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Redblurred.jpg
+share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Weirdcolours.jpg
+share/gnome/pixmaps/backgrounds/gnome/tiles/alien-artifact-trans.png
+share/gnome/pixmaps/backgrounds/gnome/tiles/cow-trans.png
+share/gnome/pixmaps/backgrounds/gnome/tiles/tiles-trans.png
+share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.png
+share/gnome/pixmaps/backgrounds/gnome/translucent/rects.png
+share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.png
+share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ca/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/da/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/de/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/el/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/es/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/hu/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/id/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/it/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ja/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ko/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/lt/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/nb/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/no/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/pa/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/pl/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/pt/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/ro/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/sk/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/sq/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/sr/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/sv/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
+@dirrm share/gnome/pixmaps/backgrounds/gnome/translucent
+@dirrm share/gnome/pixmaps/backgrounds/gnome/tiles
+@dirrm share/gnome/pixmaps/backgrounds/gnome/branded
+@dirrm share/gnome/pixmaps/backgrounds/gnome
+@dirrm share/gnome/pixmaps/backgrounds
+@dirrm share/gnome/gnome-background-properties
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 3adc130da95d..288f4b47fc2a 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -18,8 +18,6 @@ COMMENT=	A collection of themes and icons for GNOME2 designed for accessibility
 BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
 RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2
 
-CONFLICTS=	gtk-smooth-engine-[0-9]*
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 701cd2589e46..9e8a13a0bdf1 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-2.8.2.tar.bz2) = 822899efe7170ca59e04144d94d85741
-SIZE (gnome2/gnome-themes-2.8.2.tar.bz2) = 2716583
+MD5 (gnome2/gnome-themes-2.10.0.tar.bz2) = daa8b0a35f425ad442c950d615c026af
+SIZE (gnome2/gnome-themes-2.10.0.tar.bz2) = 2569321
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 7813ce91f8a5..000000000000
--- 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 7c36575ba44a..b7999567f405 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
@@ -249,6 +168,7 @@ share/icons/HighContrastLargePrint/48x48/apps/administration.png
 share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png
 share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/charpick.png
+share/icons/HighContrastLargePrint/48x48/apps/clock.png
 share/icons/HighContrastLargePrint/48x48/apps/config-language.png
 share/icons/HighContrastLargePrint/48x48/apps/config-users.png
 share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png
@@ -281,7 +201,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-clock.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png
@@ -320,7 +239,12 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-pdf.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-planner.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-remote-desktop.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-run.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-screensaver.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-screenshot.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-server-config.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
@@ -609,10 +533,11 @@ share/icons/HighContrastLargePrint/index.theme
 share/icons/HighContrastLargePrintInverse/48x48/apps/JUSimageIcon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png
@@ -635,8 +560,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/glade-2.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/glines.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/glow.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-blackjack.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png
@@ -645,7 +570,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-clock.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png
@@ -684,7 +608,12 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-pdf.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-planner.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-remote-desktop.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-run.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screensaver.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screenshot.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-server-config.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png
@@ -976,6 +905,7 @@ share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png
 share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png
 share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png
 share/icons/LowContrastLargePrint/48x48/apps/charpick.png
+share/icons/LowContrastLargePrint/48x48/apps/clock.png
 share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png
 share/icons/LowContrastLargePrint/48x48/apps/file-manager.png
 share/icons/LowContrastLargePrint/48x48/apps/file-roller.png
@@ -991,7 +921,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-clock.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-devel.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-eog.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-ghex.png
@@ -1011,6 +940,11 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-run.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-screenshot.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png
 share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png
@@ -1233,24 +1167,25 @@ share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png
 share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png
 share/icons/Sandy/index.theme
 share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-72.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-96.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-nfs.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty-accept.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full-accept.png
-share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty-accept.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full-accept.png
+share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Blue/72x72/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Blue/96x96/filesystems/gnome-fs-directory.png
 share/icons/Smokey-Blue/index.theme
 share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-72.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-96.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory.png
-share/icons/Smokey-Red/48x48/filesystems/gnome-fs-nfs.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png
 share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.icon
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Red/64x64/filesystems/gnome-fs-nfs.png
+share/icons/Smokey-Red/72x72/filesystems/gnome-fs-directory.png
+share/icons/Smokey-Red/96x96/filesystems/gnome-fs-directory.png
 share/icons/Smokey-Red/index.theme
 share/locale/am/LC_MESSAGES/gnome-themes.mo
 share/locale/ar/LC_MESSAGES/gnome-themes.mo
@@ -1292,6 +1227,7 @@ share/locale/ml/LC_MESSAGES/gnome-themes.mo
 share/locale/mn/LC_MESSAGES/gnome-themes.mo
 share/locale/ms/LC_MESSAGES/gnome-themes.mo
 share/locale/nb/LC_MESSAGES/gnome-themes.mo
+share/locale/ne/LC_MESSAGES/gnome-themes.mo
 share/locale/nl/LC_MESSAGES/gnome-themes.mo
 share/locale/nn/LC_MESSAGES/gnome-themes.mo
 share/locale/no/LC_MESSAGES/gnome-themes.mo
@@ -1315,22 +1251,8 @@ 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
-share/themes/Glider/gtk-2.0/stock_apply.png
-share/themes/Glider/gtk-2.0/stock_bottom.png
-share/themes/Glider/gtk-2.0/stock_cancel.png
-share/themes/Glider/gtk-2.0/stock_down.png
-share/themes/Glider/gtk-2.0/stock_first.png
-share/themes/Glider/gtk-2.0/stock_last.png
-share/themes/Glider/gtk-2.0/stock_left.png
-share/themes/Glider/gtk-2.0/stock_ok.png
-share/themes/Glider/gtk-2.0/stock_refresh.png
-share/themes/Glider/gtk-2.0/stock_right.png
-share/themes/Glider/gtk-2.0/stock_top.png
-share/themes/Glider/gtk-2.0/stock_up.png
 share/themes/Glider/index.theme
 share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png
 share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png
@@ -1784,7 +1706,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
@@ -1924,7 +1845,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
@@ -1952,25 +1872,19 @@ 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
@@ -1988,13 +1902,23 @@ 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/96x96/filesystems
+@dirrm share/icons/Smokey-Red/96x96
+@dirrm share/icons/Smokey-Red/72x72/filesystems
+@dirrm share/icons/Smokey-Red/72x72
+@dirrm share/icons/Smokey-Red/64x64/filesystems
+@dirrm share/icons/Smokey-Red/64x64
 @dirrm share/icons/Smokey-Red/48x48/filesystems
 @dirrm share/icons/Smokey-Red/48x48/emblems
 @dirrm share/icons/Smokey-Red/48x48
 @dirrm share/icons/Smokey-Red
-@dirrm share/icons/Smokey-Blue/48x48/filesystems
+@dirrm share/icons/Smokey-Blue/96x96/filesystems
+@dirrm share/icons/Smokey-Blue/96x96
+@dirrm share/icons/Smokey-Blue/72x72/filesystems
+@dirrm share/icons/Smokey-Blue/72x72
+@dirrm share/icons/Smokey-Blue/64x64/filesystems
+@dirrm share/icons/Smokey-Blue/64x64
 @dirrm share/icons/Smokey-Blue/48x48/emblems
 @dirrm share/icons/Smokey-Blue/48x48
 @dirrm share/icons/Smokey-Blue
@@ -2089,5 +2013,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
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index f38c53bb4745..ce8640dfc4c4 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -6,30 +6,28 @@
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.2.0
-PORTREVISION=	6
+PORTVERSION=	2.6.2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Theme engine for the gtk+-2.0 toolkit
 
+CONFLICTS=	gtk-smooth-engine-[0-9]*
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 USE_GNOME=	gnomehack gtk20
 PLIST_SUB=	GTK_VERSION="2.4.0"
 
-THEMES=		metal redmond95
-
+# Disable the gtk1 theme.
 post-patch:
-	@for theme in ${THEMES}; do \
-		cd ${WRKSRC}/$$theme/Theme/gtk-2.0; \
-		${MV} gtkrc gtkrc.tmp; \
-		${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \
-	done
+	@${REINPLACE_CMD} -e 's|gtk gtk-2.0|gtk-2.0|' \
+		${WRKSRC}/themes/Redmond/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index c1a36b1eebbf..39e695fd0838 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263
-SIZE (gnome2/gtk-engines-2.2.0.tar.bz2) = 401883
+MD5 (gnome2/gtk-engines-2.6.2.tar.bz2) = 11f9a1dcabf002aa904facac4293c1fd
+SIZE (gnome2/gtk-engines-2.6.2.tar.bz2) = 444092
diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
index 9111a7ac593f..ec5a85340f62 100644
--- a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c
+++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c
@@ -1,5 +1,5 @@
---- 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
+--- engines/crux/src/crux-gradient.c.orig	Thu Oct 16 20:57:05 2003
++++ engines/crux/src/crux-gradient.c	Thu Oct 16 21:01:18 2003
 @@ -207,7 +207,7 @@
  			const eazel_engine_gradient *gradient)
  {
diff --git a/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c
new file mode 100644
index 000000000000..f545a6a65ec5
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c
@@ -0,0 +1,10 @@
+--- engines/industrial/src/industrial_style.c.orig	Tue Mar 16 16:55:11 2004
++++ engines/industrial/src/industrial_style.c	Tue Mar 16 16:58:23 2004
+@@ -1801,6 +1801,7 @@
+ 	     gint             width,
+ 	     gint             height)
+ {
++	g_return_if_fail (widget != NULL);
+ #if DEBUG
+   printf ("draw_shadow: %p %p %s %i %i %i %i\n", widget, window, detail, x, y,
+ 	  width, height);
diff --git a/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c b/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c
deleted file mode 100644
index 7d26e2d451bf..000000000000
--- a/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- pixbuf/pixbuf-draw.c.orig	Mon Aug 23 11:59:28 2004
-+++ pixbuf/pixbuf-draw.c	Mon Aug 23 12:00:13 2004
-@@ -75,7 +75,7 @@
- 	continue;
- 
-       if (image->match_data.detail &&
--	  (!image->match_data.detail ||
-+	  (!match_data->detail ||
- 	   strcmp (match_data->detail, image->match_data.detail) != 0))
-       continue;
- 
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 5f867a912e1c..9d469f0d6c79 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -1,12 +1,107 @@
+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/libindustrial.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so
-lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so
 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/themes/Metal/README.html
+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
-share/themes/Redmond95/README.html
-share/themes/Redmond95/gtk-2.0/gtkrc
-@dirrm share/themes/Redmond95/gtk-2.0
+share/themes/Mist/gtk-2.0/gtkrc
+share/themes/Redmond/gtk-2.0/gtkrc
+share/themes/ThinIce/gtk-2.0/gtkrc
+@dirrm share/themes/ThinIce/gtk-2.0
+@dirrm share/themes/Redmond/gtk-2.0
+@dirrm share/themes/Mist/gtk-2.0
 @dirrm share/themes/Metal/gtk-2.0
-@unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true
+@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
+@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
 @unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/themes/LighthouseBlue 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true
+@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true