6 files changed, 93 insertions, 42 deletions

diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index 47ea26810c59..ab8a81bd5bf3 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.105 2006/10/06 17:22:31 mezz Exp $
+#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.116 2007/03/15 03:20:01 marcus Exp $
 #
 
 PORTNAME=	gnome-themes
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 PORTREVISION=	1
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -17,9 +17,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of themes and icons for GNOME2
 
-BUILD_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 \
+BUILD_DEPENDS=	gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2 \
 		icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS=	gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2
+RUN_DEPENDS=	gtk-engines2>=2.9.0:${PORTSDIR}/x11-themes/gtk-engines2
 
 CONFLICTS=	clearlooks-metacity-0.*
 
diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo
index f938c2f8d791..18c42c3c0291 100644
--- a/x11-themes/gnome-themes/distinfo
+++ b/x11-themes/gnome-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-themes-2.16.3.tar.bz2) = ecb4d4b9b90507ba4f3d6e9e63d872d5
-SHA256 (gnome2/gnome-themes-2.16.3.tar.bz2) = 11349339edf84f745a0f24087c01d1ee5b74eb4806f641d1bcd1e77b1d4ffa3f
-SIZE (gnome2/gnome-themes-2.16.3.tar.bz2) = 2352795
+MD5 (gnome2/gnome-themes-2.18.0.tar.bz2) = 00c6cad5cd9927c9b532f49c93ea35f7
+SHA256 (gnome2/gnome-themes-2.18.0.tar.bz2) = 77654ecc14bea31dac4412e5ff32abba4f7553a9fdf39d427eaa5e0f20d546d9
+SIZE (gnome2/gnome-themes-2.18.0.tar.bz2) = 2428451
diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist
index 9971a261c960..a3a6c7cb6846 100644
--- a/x11-themes/gnome-themes/pkg-plist
+++ b/x11-themes/gnome-themes/pkg-plist
@@ -1,5 +1,6 @@
 share/gnome/themes/Clearlooks/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Glider/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Glossy/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml
 share/icons/Crux/16x16/actions/back.png
 share/icons/Crux/16x16/actions/bottom.png
@@ -347,6 +348,7 @@ share/icons/HighContrast-SVG/scalable/actions/application-exit.svg
 share/icons/HighContrast-SVG/scalable/actions/appointment-new.svg
 share/icons/HighContrast-SVG/scalable/actions/appointment.svg
 share/icons/HighContrast-SVG/scalable/actions/back.svg
+share/icons/HighContrast-SVG/scalable/actions/bookmark-view.svg
 share/icons/HighContrast-SVG/scalable/actions/bottom.svg
 share/icons/HighContrast-SVG/scalable/actions/button_cancel.svg
 share/icons/HighContrast-SVG/scalable/actions/cancel.svg
@@ -499,6 +501,7 @@ share/icons/HighContrast-SVG/scalable/actions/gtk-zoom-out.svg
 share/icons/HighContrast-SVG/scalable/actions/help-about.svg
 share/icons/HighContrast-SVG/scalable/actions/help-contents.svg
 share/icons/HighContrast-SVG/scalable/actions/help-faq.svg
+share/icons/HighContrast-SVG/scalable/actions/history-view.svg
 share/icons/HighContrast-SVG/scalable/actions/insert-image.svg
 share/icons/HighContrast-SVG/scalable/actions/insert-link.svg
 share/icons/HighContrast-SVG/scalable/actions/insert-object.svg
@@ -514,6 +517,7 @@ share/icons/HighContrast-SVG/scalable/actions/mail-mark-important.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-mark-junk.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-mark-notjunk.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-mark-read.svg
+share/icons/HighContrast-SVG/scalable/actions/mail-mark-unread.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-message-new.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-reply-all.svg
 share/icons/HighContrast-SVG/scalable/actions/mail-reply-sender.svg
@@ -580,6 +584,7 @@ share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply-to-all.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_mail-reply.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_mail-send-receive.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_mail-send.svg
+share/icons/HighContrast-SVG/scalable/actions/stock_mail-unread.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_media-fwd.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_media-next.svg
 share/icons/HighContrast-SVG/scalable/actions/stock_media-pause.svg
@@ -905,11 +910,24 @@ share/icons/HighContrast-SVG/scalable/devices/yast_joystick.svg
 share/icons/HighContrast-SVG/scalable/devices/yast_mouse.svg
 share/icons/HighContrast-SVG/scalable/devices/yast_printer.svg
 share/icons/HighContrast-SVG/scalable/devices/yast_soundcard.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-default.svg
 share/icons/HighContrast-SVG/scalable/emblems/emblem-documents.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-downloads.svg
 share/icons/HighContrast-SVG/scalable/emblems/emblem-favorite.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-important.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-mail.svg
 share/icons/HighContrast-SVG/scalable/emblems/emblem-photos.svg
 share/icons/HighContrast-SVG/scalable/emblems/emblem-readonly.svg
 share/icons/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg
+share/icons/HighContrast-SVG/scalable/emblems/emblem-system.svg
+share/icons/HighContrast-SVG/scalable/emblems/stock_mail-priority-high.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-glasses.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-plain.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-sad.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-smile-big.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-smile.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-surprise.svg
+share/icons/HighContrast-SVG/scalable/emotes/face-wink.svg
 share/icons/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg
 share/icons/HighContrast-SVG/scalable/mimetypes/ascii.svg
 share/icons/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg
@@ -1022,6 +1040,10 @@ share/icons/HighContrast-SVG/scalable/places/user-desktop.svg
 share/icons/HighContrast-SVG/scalable/places/user-home.svg
 share/icons/HighContrast-SVG/scalable/places/user-trash.svg
 share/icons/HighContrast-SVG/scalable/places/xfce-trash_empty.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-high.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-low.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-medium.svg
+share/icons/HighContrast-SVG/scalable/status/audio-volume-muted.svg
 share/icons/HighContrast-SVG/scalable/status/connect_no.svg
 share/icons/HighContrast-SVG/scalable/status/dialog-error.svg
 share/icons/HighContrast-SVG/scalable/status/dialog-information.svg
@@ -1068,6 +1090,12 @@ share/icons/HighContrast-SVG/scalable/status/stock_lock-open.svg
 share/icons/HighContrast-SVG/scalable/status/stock_lock.svg
 share/icons/HighContrast-SVG/scalable/status/stock_open.svg
 share/icons/HighContrast-SVG/scalable/status/stock_trash_full.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-0.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-max.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-med.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-min.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume-mute.svg
+share/icons/HighContrast-SVG/scalable/status/stock_volume.svg
 share/icons/HighContrast-SVG/scalable/status/trashcan_full.svg
 share/icons/HighContrast-SVG/scalable/status/user-trash-full.svg
 share/icons/HighContrast-SVG/scalable/status/xfce-trash_full.svg
@@ -2108,18 +2136,18 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png
 share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png
 share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png
 share/icons/LowContrastLargePrint/index.theme
-share/icons/Mist/16x16/actions/document-open.svg
-share/icons/Mist/16x16/actions/fileopen.svg
-share/icons/Mist/16x16/actions/gtk-open.svg
+share/icons/Mist/16x16/actions/document-open.png
+share/icons/Mist/16x16/actions/fileopen.png
+share/icons/Mist/16x16/actions/gtk-open.png
 share/icons/Mist/16x16/places/application-x-gnome-saved-search.png
 share/icons/Mist/16x16/places/folder-new.png
 share/icons/Mist/16x16/places/folder-remote.png
 share/icons/Mist/16x16/places/folder-saved-search.png
 share/icons/Mist/16x16/places/folder.png
-share/icons/Mist/16x16/places/folder_home.svg
+share/icons/Mist/16x16/places/folder_home.png
 share/icons/Mist/16x16/places/gnome-fs-directory.png
 share/icons/Mist/16x16/places/gnome-fs-ftp.png
-share/icons/Mist/16x16/places/gnome-fs-home.svg
+share/icons/Mist/16x16/places/gnome-fs-home.png
 share/icons/Mist/16x16/places/gnome-fs-nfs.png
 share/icons/Mist/16x16/places/gnome-fs-share.png
 share/icons/Mist/16x16/places/gnome-fs-smb.png
@@ -2127,15 +2155,15 @@ share/icons/Mist/16x16/places/gnome-fs-ssh.png
 share/icons/Mist/16x16/places/gnome-mime-x-directory-smb-share.png
 share/icons/Mist/16x16/places/network.png
 share/icons/Mist/16x16/places/stock_folder.png
-share/icons/Mist/16x16/places/user-home.svg
+share/icons/Mist/16x16/places/user-home.png
 share/icons/Mist/16x16/status/folder-drag-accept.svg
 share/icons/Mist/16x16/status/folder-open.svg
 share/icons/Mist/16x16/status/folder_open.svg
 share/icons/Mist/16x16/status/gnome-fs-directory-accept.svg
 share/icons/Mist/16x16/status/stock_open.svg
-share/icons/Mist/22x22/actions/document-open.svg
-share/icons/Mist/22x22/actions/fileopen.svg
-share/icons/Mist/22x22/actions/gtk-open.svg
+share/icons/Mist/22x22/actions/document-open.png
+share/icons/Mist/22x22/actions/fileopen.png
+share/icons/Mist/22x22/actions/gtk-open.png
 share/icons/Mist/22x22/places/application-x-gnome-saved-search.png
 share/icons/Mist/22x22/places/folder-new.png
 share/icons/Mist/22x22/places/folder-remote.png
@@ -2153,11 +2181,11 @@ share/icons/Mist/22x22/places/gnome-mime-x-directory-smb-share.png
 share/icons/Mist/22x22/places/network.png
 share/icons/Mist/22x22/places/stock_folder.png
 share/icons/Mist/22x22/places/user-home.svg
-share/icons/Mist/22x22/status/folder-drag-accept.svg
-share/icons/Mist/22x22/status/folder-open.svg
-share/icons/Mist/22x22/status/folder_open.svg
-share/icons/Mist/22x22/status/gnome-fs-directory-accept.svg
-share/icons/Mist/22x22/status/stock_open.svg
+share/icons/Mist/22x22/status/folder-drag-accept.png
+share/icons/Mist/22x22/status/folder-open.png
+share/icons/Mist/22x22/status/folder_open.png
+share/icons/Mist/22x22/status/gnome-fs-directory-accept.png
+share/icons/Mist/22x22/status/stock_open.png
 share/icons/Mist/24x24/actions/document-open.png
 share/icons/Mist/24x24/actions/fileopen.png
 share/icons/Mist/24x24/actions/gtk-open.png
@@ -2315,6 +2343,8 @@ share/themes/Clearlooks/index.theme
 share/themes/Crux/index.theme
 share/themes/Glider/gtk-2.0/gtkrc
 share/themes/Glider/index.theme
+share/themes/Glossy/gtk-2.0/gtkrc
+share/themes/Glossy/index.theme
 share/themes/HighContrast/gtk-2.0/gtkrc
 share/themes/HighContrast/index.theme
 share/themes/HighContrastInverse/gtk-2.0/gtkrc
@@ -2598,7 +2628,7 @@ share/themes/HighContrastLargePrintInverse/pixmaps/volume-min.png
 share/themes/HighContrastLargePrintInverse/pixmaps/volume-mute.png
 share/themes/HighContrastLargePrintInverse/pixmaps/volume-zero.png
 share/themes/LargePrint/gtk-2.0/gtkrc
-share/themes/LargePrint/index.theme
+share/themes/LargePrint/index.theme.disabled
 share/themes/LargePrint/pixmaps/double-click-maybe.png
 share/themes/LargePrint/pixmaps/double-click-off.png
 share/themes/LargePrint/pixmaps/double-click-on.png
@@ -2737,7 +2767,7 @@ share/themes/LargePrint/pixmaps/volume-min.png
 share/themes/LargePrint/pixmaps/volume-mute.png
 share/themes/LargePrint/pixmaps/volume-zero.png
 share/themes/LowContrast/gtk-2.0/gtkrc
-share/themes/LowContrast/index.theme.disabled
+share/themes/LowContrast/index.theme
 share/themes/LowContrastLargePrint/gtk-2.0/gtkrc
 share/themes/LowContrastLargePrint/index.theme.disabled
 share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png
@@ -2900,6 +2930,8 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/themes/HighContrastInverse
 @dirrm share/themes/HighContrast/gtk-2.0
 @dirrm share/themes/HighContrast
+@dirrm share/themes/Glossy/gtk-2.0
+@dirrm share/themes/Glossy
 @dirrm share/themes/Glider/gtk-2.0
 @dirrm share/themes/Glider
 @dirrm share/themes/Crux
@@ -2959,6 +2991,7 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrm share/icons/HighContrast-SVG/scalable/status
 @dirrm share/icons/HighContrast-SVG/scalable/places
 @dirrm share/icons/HighContrast-SVG/scalable/mimetypes
+@dirrm share/icons/HighContrast-SVG/scalable/emotes
 @dirrm share/icons/HighContrast-SVG/scalable/emblems
 @dirrm share/icons/HighContrast-SVG/scalable/devices
 @dirrm share/icons/HighContrast-SVG/scalable/categories
@@ -2993,6 +3026,8 @@ share/themes/Simple/gtk-2.0/gtkrc
 @dirrmtry share/icons
 @dirrm share/gnome/themes/Mist/metacity-1
 @dirrm share/gnome/themes/Mist
+@dirrm share/gnome/themes/Glossy/metacity-1
+@dirrm share/gnome/themes/Glossy
 @dirrm share/gnome/themes/Glider/metacity-1
 @dirrm share/gnome/themes/Glider
 @dirrm share/gnome/themes/Clearlooks/metacity-1
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 1cf3c1915fd9..9868e20839a8 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.29 2006/10/03 01:32:23 ahze Exp $
+#   $MCom: ports/x11-themes/gtk-engines2/Makefile,v 1.37 2007/03/13 12:52:05 ahze Exp $
 #
 
 PORTNAME=	gtk-engines2
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,21 +19,24 @@ COMMENT=	Theme engine for the gtk+-2.0 toolkit
 
 CONFLICTS=	gtk-smooth-engine-[0-9]* clearlooks-[0-9]*
 
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gtk20
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITH_ANIMATION)
 CONFIGURE_ARGS+=	--enable-animation
 .endif
 
-pre-everything:: 	 
-.if !defined(WITH_ANIMATION) 	 
-	@${ECHO_MSG} "" 	 
-	@${ECHO_MSG} " You can enable experimental animated progressbars" 	 
-	@${ECHO_MSG} " with the clearlooks engine by defining" 	 
-	@${ECHO_MSG} " WITH_ANIMATION" 	 
-	@${ECHO_MSG} "" 	 
+pre-everything::
+.if !defined(WITH_ANIMATION)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " You can enable experimental animated progressbars"
+	@${ECHO_MSG} " with the clearlooks engine by defining"
+	@${ECHO_MSG} " WITH_ANIMATION"
+	@${ECHO_MSG} ""
 .endif
 
 # Disable the gtk1 theme.
diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo
index 636989d069e4..4a9b213d729a 100644
--- a/x11-themes/gtk-engines2/distinfo
+++ b/x11-themes/gtk-engines2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk-engines-2.8.2.tar.bz2) = 0c5b0254b57910b1ebcda47ac6a3b1ba
-SHA256 (gnome2/gtk-engines-2.8.2.tar.bz2) = c789ceb35f9972cdc41655d663e579150bfb3703a917a8be254f227c57730734
-SIZE (gnome2/gtk-engines-2.8.2.tar.bz2) = 461623
+MD5 (gnome2/gtk-engines-2.10.0.tar.bz2) = 245d0939025f8f9856c2309071cf075e
+SHA256 (gnome2/gtk-engines-2.10.0.tar.bz2) = 6b605a71d1509f89fae7607ca25849e0d5fceab1af83cc27d521bd2ae2c83abc
+SIZE (gnome2/gtk-engines-2.10.0.tar.bz2) = 641141
diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist
index 0d123b434980..e4df8056d792 100644
--- a/x11-themes/gtk-engines2/pkg-plist
+++ b/x11-themes/gtk-engines2/pkg-plist
@@ -17,6 +17,18 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libsmooth.so
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.la
 lib/gtk-2.0/%%GTK2_VERSION%%/engines/libthinice.so
 libdata/pkgconfig/gtk-engines-2.pc
+share/gtk-engines/clearlooks.xml
+share/gtk-engines/crux.xml
+share/gtk-engines/glide.xml
+share/gtk-engines/hc.xml
+share/gtk-engines/industrial.xml
+share/gtk-engines/mist.xml
+share/gtk-engines/redmond.xml
+share/gtk-engines/smooth.xml
+share/gtk-engines/thinice.xml
+share/locale/de/LC_MESSAGES/gtk-engines.mo
+share/locale/en_GB/LC_MESSAGES/gtk-engines.mo
+share/locale/nl/LC_MESSAGES/gtk-engines.mo
 share/themes/Clearlooks/gtk-2.0/gtkrc
 share/themes/Crux/gtk-2.0/gtkrc
 share/themes/Industrial/gtk-2.0/gtkrc
@@ -24,14 +36,15 @@ 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
+@dirrmtry share/themes/ThinIce
 @dirrm share/themes/Redmond/gtk-2.0
+@dirrmtry share/themes/Redmond
 @dirrm share/themes/Mist/gtk-2.0
+@dirrmtry share/themes/Mist
 @dirrm share/themes/Industrial/gtk-2.0
+@dirrmtry share/themes/Industrial
 @dirrm share/themes/Crux/gtk-2.0
+@dirrmtry share/themes/Crux
 @dirrm share/themes/Clearlooks/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/Industrial 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true
-@unexec /bin/rmdir %D/share/themes/Clearlooks 2>/dev/null || true
+@dirrmtry share/themes/Clearlooks
+@dirrm share/gtk-engines