10 files changed, 141 insertions, 30 deletions

diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile
index a5469984aea9..0ab7d6347375 100644
--- a/x11-themes/gnome-backgrounds/Makefile
+++ b/x11-themes/gnome-backgrounds/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/x11-themes/gnome-backgrounds/Makefile,v 1.11 2005/10/03 23:56:21 ahze Exp $
 #
 
 PORTNAME=	gnome-backgrounds
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.1
 CATEGORIES=	x11-themes graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo
index 703c9e3f6a76..07ac1d4d25b4 100644
--- a/x11-themes/gnome-backgrounds/distinfo
+++ b/x11-themes/gnome-backgrounds/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-backgrounds-2.10.2.tar.bz2) = 20b6cf2ed37c4b6ef4982dee0a5d9226
-SIZE (gnome2/gnome-backgrounds-2.10.2.tar.bz2) = 2264170
+MD5 (gnome2/gnome-backgrounds-2.12.1.tar.bz2) = 3f84adbe8c22e18033f10e8c506d601f
+SIZE (gnome2/gnome-backgrounds-2.12.1.tar.bz2) = 1756483
diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist
index 04c340adda4f..adb7d59d46ad 100644
--- a/x11-themes/gnome-backgrounds/pkg-plist
+++ b/x11-themes/gnome-backgrounds/pkg-plist
@@ -8,11 +8,12 @@ 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/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.svg
+share/gnome/pixmaps/backgrounds/gnome/translucent/rects.svg
+share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.svg
 share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/bn/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
@@ -23,12 +24,14 @@ 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/et/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/eu/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/fa/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/gl/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo
 share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo
+share/locale/hy/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
@@ -65,9 +68,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo
 @unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/ku 2> /dev/null || true
+@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/hy 2> /dev/null || true
 @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
+@unexec /bin/rmdir %D/share/gnome/gnome-background-properties 2>/dev/null || /usr/bin/true
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index c491ed6d199c..7cfc2bf07b10 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,25 +3,30 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.75 2005/10/08 19:41:41 marcus Exp $
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A collection of themes and icons for GNOME2 designed for accessibility
+COMMENT=	A collection of themes and icons for GNOME2
 
 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=	clearlooks-metacity-0.*
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack metacity libgnomeui
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index 6a6e34cb67e0..10c67e29770a 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-themes-2.10.2.tar.bz2) = 53815aac541cc2d0302e94be4892a4ec
-SIZE (gnome2/gnome-themes-2.10.2.tar.bz2) = 2563259
+MD5 (gnome2/gnome-themes-2.12.1.tar.bz2) = ab6d63ecb304506153fac3e958995ef4
+SIZE (gnome2/gnome-themes-2.12.1.tar.bz2) = 2561550
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 8f50bb423842..1a1c5e2ce58c 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,3 +1,4 @@
+share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 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
@@ -167,6 +168,7 @@ share/icons/HighContrastLargePrint/48x48/apps/acme-48.png
 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/battstat.png
 share/icons/HighContrastLargePrint/48x48/apps/charpick.png
 share/icons/HighContrastLargePrint/48x48/apps/clock.png
 share/icons/HighContrastLargePrint/48x48/apps/config-language.png
@@ -174,6 +176,7 @@ share/icons/HighContrastLargePrint/48x48/apps/config-users.png
 share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png
 share/icons/HighContrastLargePrint/48x48/apps/disks.png
 share/icons/HighContrastLargePrint/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrint/48x48/apps/drivemount-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/evolution-1.4.png
 share/icons/HighContrastLargePrint/48x48/apps/evolution.png
 share/icons/HighContrastLargePrint/48x48/apps/file-manager.png
@@ -184,12 +187,14 @@ share/icons/HighContrastLargePrint/48x48/apps/gataxx.png
 share/icons/HighContrastLargePrint/48x48/apps/gcalctool.png
 share/icons/HighContrastLargePrint/48x48/apps/gconf-editor.png
 share/icons/HighContrastLargePrint/48x48/apps/gdict.png
+share/icons/HighContrastLargePrint/48x48/apps/gdm-setup.png
+share/icons/HighContrastLargePrint/48x48/apps/gdm-xnest.png
 share/icons/HighContrastLargePrint/48x48/apps/gdm.png
 share/icons/HighContrastLargePrint/48x48/apps/gedit-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gkb.png
 share/icons/HighContrastLargePrint/48x48/apps/glade-2.png
 share/icons/HighContrastLargePrint/48x48/apps/glines.png
-share/icons/HighContrastLargePrint/48x48/apps/glow.png
+share/icons/HighContrastLargePrint/48x48/apps/glow-app-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gnect-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-application-generic.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-applications.png
@@ -205,7 +210,6 @@ 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
 share/icons/HighContrastLargePrint/48x48/apps/gnome-folder-generic.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-folder.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-ftp.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-ghex.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-ghostview.png
@@ -230,6 +234,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-mini-commander.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-mixer.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-modem.png
+share/icons/HighContrastLargePrint/48x48/apps/gnome-money.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-monitor.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-multimedia.png
 share/icons/HighContrastLargePrint/48x48/apps/gnome-nibbles.png
@@ -270,6 +275,7 @@ share/icons/HighContrastLargePrint/48x48/apps/gnomemeeting-logo-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gnopernicus.png
 share/icons/HighContrastLargePrint/48x48/apps/gnotski-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/gok.png
+share/icons/HighContrastLargePrint/48x48/apps/gswitchit-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/gthumb.png
 share/icons/HighContrastLargePrint/48x48/apps/gtkam-camera.png
 share/icons/HighContrastLargePrint/48x48/apps/gucharmap.png
@@ -287,15 +293,16 @@ share/icons/HighContrastLargePrint/48x48/apps/logviewer.png
 share/icons/HighContrastLargePrint/48x48/apps/media-player-48.png
 share/icons/HighContrastLargePrint/48x48/apps/mozilla-icon.png
 share/icons/HighContrastLargePrint/48x48/apps/nb48x48.png
+share/icons/HighContrastLargePrint/48x48/apps/netapplet.png
 share/icons/HighContrastLargePrint/48x48/apps/network-config.png
 share/icons/HighContrastLargePrint/48x48/apps/network.png
+share/icons/HighContrastLargePrint/48x48/apps/panel-notification-area.png
 share/icons/HighContrastLargePrint/48x48/apps/password.png
 share/icons/HighContrastLargePrint/48x48/apps/perfmeter.png
 share/icons/HighContrastLargePrint/48x48/apps/postscript-viewer.png
 share/icons/HighContrastLargePrint/48x48/apps/procman.png
+share/icons/HighContrastLargePrint/48x48/apps/quick-lounge-applet.png
 share/icons/HighContrastLargePrint/48x48/apps/realplay.png
-share/icons/HighContrastLargePrint/48x48/apps/realplayer.xpm
-share/icons/HighContrastLargePrint/48x48/apps/rp7.xpm
 share/icons/HighContrastLargePrint/48x48/apps/screensaver.png
 share/icons/HighContrastLargePrint/48x48/apps/serviceconf.png
 share/icons/HighContrastLargePrint/48x48/apps/sound-capplet.png
@@ -303,8 +310,10 @@ share/icons/HighContrastLargePrint/48x48/apps/star.png
 share/icons/HighContrastLargePrint/48x48/apps/staroffice-calc.png
 share/icons/HighContrastLargePrint/48x48/apps/staroffice-impress.png
 share/icons/HighContrastLargePrint/48x48/apps/staroffice-writer.png
+share/icons/HighContrastLargePrint/48x48/apps/stock_notes.png
 share/icons/HighContrastLargePrint/48x48/apps/stock_proxy.png
 share/icons/HighContrastLargePrint/48x48/apps/stock_timezone.png
+share/icons/HighContrastLargePrint/48x48/apps/stock_weather-storm.png
 share/icons/HighContrastLargePrint/48x48/apps/sun_java.png
 share/icons/HighContrastLargePrint/48x48/apps/web-browser.png
 share/icons/HighContrastLargePrint/48x48/apps/window-capplet.png
@@ -318,6 +327,8 @@ share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-ball.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-network.png
+share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer-new.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-printer.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-removable.png
 share/icons/HighContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png
@@ -536,6 +547,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.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/battstat.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png
@@ -543,6 +555,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/disks.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/drivemount-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/evolution-1.4.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png
@@ -553,12 +566,14 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gataxx.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gcalctool.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gconf-editor.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gdict.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-setup.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gdm-xnest.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gdm.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gedit-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png
 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/glow-app-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png
@@ -574,7 +589,6 @@ 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
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder-generic.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ftp.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghex.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ghostview.png
@@ -599,6 +613,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-modem.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-money.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-multimedia.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-nibbles.png
@@ -639,6 +654,7 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnomemeeting-logo-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnopernicus.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gnotski-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gok.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gswitchit-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gthumb.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png
@@ -656,15 +672,16 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/logviewer.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/media-player-48.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/nb48x48.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/netapplet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/network-config.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/network.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/panel-notification-area.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/password.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/postscript-viewer.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/procman.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/quick-lounge-applet.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/realplay.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/realplayer.xpm
-share/icons/HighContrastLargePrintInverse/48x48/apps/rp7.xpm
 share/icons/HighContrastLargePrintInverse/48x48/apps/screensaver.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/serviceconf.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/sound-capplet.png
@@ -672,8 +689,10 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/star.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-calc.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-impress.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/staroffice-writer.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/stock_notes.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/stock_proxy.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/stock_timezone.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/stock_weather-storm.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/sun_java.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/web-browser.png
 share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png
@@ -687,6 +706,8 @@ share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-jazdisk.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-ball.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-network.png
+share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-new.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable.png
 share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-zipdisk.png
@@ -976,6 +997,9 @@ share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-jazdisk.png
 share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-keyboard.png
 share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-memory.png
 share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-mouse-optical.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-network.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer-new.png
+share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-printer.png
 share/icons/LowContrastLargePrint/48x48/devices/gnome-dev-zipdisk.png
 share/icons/LowContrastLargePrint/48x48/emblems/emblem-art.png
 share/icons/LowContrastLargePrint/48x48/emblems/emblem-camera.png
@@ -1255,6 +1279,7 @@ share/locale/wa/LC_MESSAGES/gnome-themes.mo
 share/locale/xh/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/Clearlooks/index.theme
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
 share/themes/Glider/index.theme
@@ -1907,12 +1932,9 @@ share/themes/Traditional/index.theme
 @dirrm share/themes/Glider/gtk-2.0
 @dirrm share/themes/Glider
 @dirrm share/themes/Crux
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@dirrm share/themes/Clearlooks
 @unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/ug 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @dirrm share/icons/Smokey-Red/96x96/filesystems
 @dirrm share/icons/Smokey-Red/96x96
 @dirrm share/icons/Smokey-Red/72x72/filesystems
@@ -2023,4 +2045,6 @@ share/themes/Traditional/index.theme
 @dirrm share/gnome/themes/Mist
 @dirrm share/gnome/themes/Glider/metacity-1
 @dirrm share/gnome/themes/Glider
+@dirrm share/gnome/themes/Clearlooks/metacity-1
+@dirrm share/gnome/themes/Clearlooks
 @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 45e178f6bb6f..d2272c2458e0 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,10 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.10 2005/09/07 05:44:23 marcus Exp $
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.6.4
+PORTVERSION=	2.6.5
+PORTREVISION=	2
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.6
@@ -21,7 +23,7 @@ CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gtk20
 PLIST_SUB=	GTK_VERSION="2.4.0"
 
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index de098903150a..f9922ae6e745 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtk-engines-2.6.4.tar.bz2) = 3389a92b62b9c8b916fbb52c4529f072
-SIZE (gnome2/gtk-engines-2.6.4.tar.bz2) = 477425
+MD5 (gnome2/gtk-engines-2.6.5.tar.bz2) = 28469a797ba1e6aaa3f7eea4c9f5f9b7
+SIZE (gnome2/gtk-engines-2.6.5.tar.bz2) = 477897
diff --git a/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict
new file mode 100644
index 000000000000..0d742c2ec86f
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-clearlooks-symbol-conflict
@@ -0,0 +1,54 @@
+--- engines/clearlooks/src/clearlooks_style.c.orig	Wed Sep  7 01:41:42 2005
++++ engines/clearlooks/src/clearlooks_style.c	Wed Sep  7 01:41:49 2005
+@@ -178,7 +178,7 @@ clearlooks_draw_arrow (GtkStyle      *st
+ 	
+ 	sanitize_size (window, &width, &height);
+ 	
+-	if (is_combo_box (widget))
++	if (is_combo_box_cl (widget))
+ 	{
+ 		width = 7;
+ 		height = 5;
+--- engines/clearlooks/src/support.c.orig	Wed Sep  7 01:40:25 2005
++++ engines/clearlooks/src/support.c	Wed Sep  7 01:40:59 2005
+@@ -959,7 +959,7 @@ GdkColor *get_parent_bgcolor (GtkWidget 
+ }
+ 
+ GtkWidget *
+-find_combo_box_widget (GtkWidget * widget)
++find_combo_box_widget_cl (GtkWidget * widget)
+ {
+ 	GtkWidget *result = NULL;
+ 	
+@@ -968,14 +968,14 @@ find_combo_box_widget (GtkWidget * widge
+ 		if (GTK_IS_COMBO_BOX (widget))
+ 			result = widget;
+ 		else
+-			result = find_combo_box_widget(widget->parent);
++			result = find_combo_box_widget_cl(widget->parent);
+ 	}
+ 	
+ 	return result;
+ }
+ 
+ gboolean
+-is_combo_box (GtkWidget * widget)
++is_combo_box_cl (GtkWidget * widget)
+ {
+-	return (find_combo_box_widget(widget) != NULL);
++	return (find_combo_box_widget_cl(widget) != NULL);
+ }
+--- engines/clearlooks/src/support.h.orig	Wed Sep  7 01:41:03 2005
++++ engines/clearlooks/src/support.h	Wed Sep  7 01:41:17 2005
+@@ -102,9 +102,9 @@ GtkWidget *get_parent_window (GtkWidget 
+ 
+ GdkColor *get_parent_bgcolor (GtkWidget *widget);
+ 
+-gboolean is_combo_box (GtkWidget * widget);
++gboolean is_combo_box_cl (GtkWidget * widget);
+ 
+-GtkWidget *find_combo_box_widget (GtkWidget * widget);
++GtkWidget *find_combo_box_widget_cl (GtkWidget * widget);
+ 
+ void gtk_clist_get_header_index (GtkCList *clist, GtkWidget *button,
+                                  gint *column_index, gint *columns);
diff --git a/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c
new file mode 100644
index 000000000000..371abad8e669
--- /dev/null
+++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-draw.c
@@ -0,0 +1,20 @@
+--- engines/crux/src/crux-draw.c.orig	Wed Aug 24 12:45:47 2005
++++ engines/crux/src/crux-draw.c	Wed Aug 24 12:46:08 2005
+@@ -2323,6 +2323,8 @@ draw_extension (GtkStyle *style,
+     GdkRectangle rect;
+ 
+     eazel_theme_data *theme_data;
++    GtkWidget* parent_widget;
++    gint relative_x;
+ 
+     g_return_if_fail (style != NULL);
+     g_return_if_fail (window != NULL);
+@@ -2334,8 +2336,6 @@ draw_extension (GtkStyle *style,
+ 	    detail, state_type, shadow_type, x, y, width, height);
+ 
+ 	/* Get x relative to parent widget, not window */
+-	GtkWidget* parent_widget;
+-	gint relative_x;
+ 	if (widget != NULL)
+ 	{
+ 		parent_widget = gtk_widget_get_parent(widget);