6 files changed, 58 insertions, 66 deletions

diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile
index b3ae9303576d..38f88caa9233 100644
--- a/x11-themes/gnome-themes-extras/Makefile
+++ b/x11-themes/gnome-themes-extras/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.5
-PORTREVISION=	2
+PORTVERSION=	0.6
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-themes/gnome-themes-extras/distinfo b/x11-themes/gnome-themes-extras/distinfo
index 87ee24ee63ae..5f41b4b85d99 100644
--- a/x11-themes/gnome-themes-extras/distinfo
+++ b/x11-themes/gnome-themes-extras/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-extras-0.5.tar.bz2) = 8b4d38fad00689131cc1fd2b50612cc8
+MD5 (gnome2/gnome-themes-extras-0.6.tar.bz2) = 3f52f75d013bab11c5c17bc1d3465037
diff --git a/x11-themes/gnome-themes-extras/pkg-plist b/x11-themes/gnome-themes-extras/pkg-plist
index 7c1a09c0699a..2a7cf25a354c 100644
--- a/x11-themes/gnome-themes-extras/pkg-plist
+++ b/x11-themes/gnome-themes-extras/pkg-plist
@@ -19,7 +19,21 @@ share/gnome/themes/Gorilla/metacity-1/wm-max.svg
 share/gnome/themes/Gorilla/metacity-1/wm-menu.svg
 share/gnome/themes/Gorilla/metacity-1/wm-min.svg
 share/gnome/themes/Gorilla/metacity-1/wm-restore.svg
+share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
+share/gnome/themes/Lush/metacity-1/BT-fermer.png
+share/gnome/themes/Lush/metacity-1/BT-neutre.png
+share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
+share/gnome/themes/Lush/metacity-1/BT-reduire.png
+share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
+share/gnome/themes/Lush/metacity-1/coindroit-bas.png
+share/gnome/themes/Lush/metacity-1/coingauche-bas.png
+share/gnome/themes/Lush/metacity-1/cote-droit.png
+share/gnome/themes/Lush/metacity-1/cote-gauche.png
+share/gnome/themes/Lush/metacity-1/cote_suitearrondi.png
+share/gnome/themes/Lush/metacity-1/degrade-color.png
+share/gnome/themes/Lush/metacity-1/degrade-gris.png
 share/gnome/themes/Lush/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Lush/metacity-1/transition.png
 share/gnome/themes/Nuvola-old/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Nuvola-old/metacity-1/wm-close.png
 share/gnome/themes/Nuvola-old/metacity-1/wm-inac.png
@@ -36,16 +50,7 @@ share/gnome/themes/Nuvola/metacity-1/wm-min-alt.svg
 share/gnome/themes/Nuvola/metacity-1/wm-min.svg
 share/gnome/themes/Nuvola/metacity-1/wm-restore-alt.svg
 share/gnome/themes/Nuvola/metacity-1/wm-restore.svg
-share/gnome/themes/Wasp/metacity-1/close-active.png
-share/gnome/themes/Wasp/metacity-1/close-inactive.png
-share/gnome/themes/Wasp/metacity-1/maximize-active.png
-share/gnome/themes/Wasp/metacity-1/maximize-inactive.png
 share/gnome/themes/Wasp/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Wasp/metacity-1/mid-title-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-inactive.png
-share/gnome/themes/Wasp/metacity-1/restore-active.png
-share/gnome/themes/Wasp/metacity-1/restore-inactive.png
 share/icons/Amaranth/index.theme
 share/icons/Amaranth/scalable/apps/abiword_48.svg
 share/icons/Amaranth/scalable/apps/accessibility-keyboard-capplet.svg
@@ -199,9 +204,11 @@ share/icons/Amaranth/scalable/stock/stock_about.svg
 share/icons/Amaranth/scalable/stock/stock_cdrom.svg
 share/icons/Amaranth/scalable/stock/stock_copy.svg
 share/icons/Amaranth/scalable/stock/stock_cut.svg
+share/icons/Amaranth/scalable/stock/stock_delete.svg
 share/icons/Amaranth/scalable/stock/stock_dialog_error.png
 share/icons/Amaranth/scalable/stock/stock_dialog_info.png
 share/icons/Amaranth/scalable/stock/stock_dialog_warning.png
+share/icons/Amaranth/scalable/stock/stock_execute.svg
 share/icons/Amaranth/scalable/stock/stock_floppy.svg
 share/icons/Amaranth/scalable/stock/stock_go-back.svg
 share/icons/Amaranth/scalable/stock/stock_go-down.svg
@@ -731,11 +738,15 @@ share/icons/Nuvola/scalable/stock/find.svg
 share/icons/Nuvola/scalable/stock/findreplace.svg
 share/icons/Nuvola/scalable/stock/folder.svg
 share/icons/Nuvola/scalable/stock/folder_new.svg
+share/icons/Nuvola/scalable/stock/gaim_insert-smiley-small.svg
+share/icons/Nuvola/scalable/stock/gaim_send-im.svg
 share/icons/Nuvola/scalable/stock/gnome-logo.svg
 share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
 share/icons/Nuvola/scalable/stock/print-preview.svg
 share/icons/Nuvola/scalable/stock/printer.svg
 share/icons/Nuvola/scalable/stock/recycled.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-first.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock-gtk-remove.svg
 share/icons/Nuvola/scalable/stock/stock-media-eject.svg
 share/icons/Nuvola/scalable/stock/stock-media-ffwd.svg
@@ -812,12 +823,10 @@ share/icons/Wasp/scalable/apps/my-computer.svg
 share/icons/Wasp/scalable/apps/network-config.svg
 share/icons/Wasp/scalable/apps/network.svg
 share/icons/Wasp/scalable/apps/procman.svg
-share/icons/Wasp/scalable/apps/redhat-accessories.svg
 share/icons/Wasp/scalable/apps/redhat-config-date.svg
 share/icons/Wasp/scalable/apps/redhat-config-users.svg
 share/icons/Wasp/scalable/apps/redhat-config-xfree86.svg
 share/icons/Wasp/scalable/apps/redhat-games.svg
-share/icons/Wasp/scalable/apps/redhat-graphics.svg
 share/icons/Wasp/scalable/apps/redhat-home.svg
 share/icons/Wasp/scalable/apps/redhat-internet.svg
 share/icons/Wasp/scalable/apps/redhat-main-menu.svg
@@ -941,6 +950,11 @@ share/icons/Wasp/scalable/stock/stickies.svg
 share/icons/Wasp/scalable/stock/stock_accessories.svg
 share/icons/Wasp/scalable/stock/stock_amusements.svg
 share/icons/Wasp/scalable/stock/stock_dialog_info.svg
+share/icons/Wasp/scalable/stock/gaim_auth.svg
+share/icons/Wasp/scalable/stock/gaim_error.svg
+share/icons/Wasp/scalable/stock/gaim_info.svg
+share/icons/Wasp/scalable/stock/gaim_offline.svg
+share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/stock_gnome-logo.svg
 share/icons/Wasp/scalable/stock/stock_internet.svg
 share/icons/Wasp/scalable/stock/stock_lockscreen.svg
@@ -962,6 +976,7 @@ share/locale/nl/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/no/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/pl/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/pt/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/sk/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sr/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sv/LC_MESSAGES/gnome-themes-extra.mo
@@ -1001,24 +1016,6 @@ share/themes/Industrial/gtk-2.0/stock_up.png
 share/themes/Lush/gtk-2.0/gtkrc
 share/themes/Lush/gtk-2.0/iconrc
 share/themes/Lush/index.theme
-share/gnome/themes/Lush/metacity-1/arrondisbleu-gris.png
-share/gnome/themes/Lush/metacity-1/barre-grise.png
-share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
-share/gnome/themes/Lush/metacity-1/barre-inactive-morceaugris.png
-share/gnome/themes/Lush/metacity-1/barre-inactive_r1_c5.png
-share/gnome/themes/Lush/metacity-1/barre-inac-suitearrondigris.png
-share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
-share/gnome/themes/Lush/metacity-1/BT-fermer.png
-share/gnome/themes/Lush/metacity-1/BT-neutre.png
-share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
-share/gnome/themes/Lush/metacity-1/BT-reduire.png
-share/gnome/themes/Lush/metacity-1/coin-inactif_Bas-D.png
-share/gnome/themes/Lush/metacity-1/coin-inactive_Bas-G.png
-share/gnome/themes/Lush/metacity-1/cote-droit.png
-share/gnome/themes/Lush/metacity-1/cote-gauche.png
-share/gnome/themes/Lush/metacity-1/cote_suitearrondibleu.png
-share/gnome/themes/Lush/metacity-1/degrade-gris.png
-share/gnome/themes/Lush/metacity-1/dessousbarre-gris.png
 share/themes/Nuvola/gtk-1.0/gtkrc
 share/themes/Nuvola/gtk-2.0/gtkrc
 share/themes/Nuvola/gtk-2.0/iconrc
diff --git a/x11-toolkits/gnome-themes-extras/Makefile b/x11-toolkits/gnome-themes-extras/Makefile
index b3ae9303576d..38f88caa9233 100644
--- a/x11-toolkits/gnome-themes-extras/Makefile
+++ b/x11-toolkits/gnome-themes-extras/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnome-themes-extras
-PORTVERSION=	0.5
-PORTREVISION=	2
+PORTVERSION=	0.6
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gnome-themes-extras/distinfo b/x11-toolkits/gnome-themes-extras/distinfo
index 87ee24ee63ae..5f41b4b85d99 100644
--- a/x11-toolkits/gnome-themes-extras/distinfo
+++ b/x11-toolkits/gnome-themes-extras/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-themes-extras-0.5.tar.bz2) = 8b4d38fad00689131cc1fd2b50612cc8
+MD5 (gnome2/gnome-themes-extras-0.6.tar.bz2) = 3f52f75d013bab11c5c17bc1d3465037
diff --git a/x11-toolkits/gnome-themes-extras/pkg-plist b/x11-toolkits/gnome-themes-extras/pkg-plist
index 7c1a09c0699a..2a7cf25a354c 100644
--- a/x11-toolkits/gnome-themes-extras/pkg-plist
+++ b/x11-toolkits/gnome-themes-extras/pkg-plist
@@ -19,7 +19,21 @@ share/gnome/themes/Gorilla/metacity-1/wm-max.svg
 share/gnome/themes/Gorilla/metacity-1/wm-menu.svg
 share/gnome/themes/Gorilla/metacity-1/wm-min.svg
 share/gnome/themes/Gorilla/metacity-1/wm-restore.svg
+share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
+share/gnome/themes/Lush/metacity-1/BT-fermer.png
+share/gnome/themes/Lush/metacity-1/BT-neutre.png
+share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
+share/gnome/themes/Lush/metacity-1/BT-reduire.png
+share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
+share/gnome/themes/Lush/metacity-1/coindroit-bas.png
+share/gnome/themes/Lush/metacity-1/coingauche-bas.png
+share/gnome/themes/Lush/metacity-1/cote-droit.png
+share/gnome/themes/Lush/metacity-1/cote-gauche.png
+share/gnome/themes/Lush/metacity-1/cote_suitearrondi.png
+share/gnome/themes/Lush/metacity-1/degrade-color.png
+share/gnome/themes/Lush/metacity-1/degrade-gris.png
 share/gnome/themes/Lush/metacity-1/metacity-theme-1.xml
+share/gnome/themes/Lush/metacity-1/transition.png
 share/gnome/themes/Nuvola-old/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Nuvola-old/metacity-1/wm-close.png
 share/gnome/themes/Nuvola-old/metacity-1/wm-inac.png
@@ -36,16 +50,7 @@ share/gnome/themes/Nuvola/metacity-1/wm-min-alt.svg
 share/gnome/themes/Nuvola/metacity-1/wm-min.svg
 share/gnome/themes/Nuvola/metacity-1/wm-restore-alt.svg
 share/gnome/themes/Nuvola/metacity-1/wm-restore.svg
-share/gnome/themes/Wasp/metacity-1/close-active.png
-share/gnome/themes/Wasp/metacity-1/close-inactive.png
-share/gnome/themes/Wasp/metacity-1/maximize-active.png
-share/gnome/themes/Wasp/metacity-1/maximize-inactive.png
 share/gnome/themes/Wasp/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Wasp/metacity-1/mid-title-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-active.png
-share/gnome/themes/Wasp/metacity-1/minimize-inactive.png
-share/gnome/themes/Wasp/metacity-1/restore-active.png
-share/gnome/themes/Wasp/metacity-1/restore-inactive.png
 share/icons/Amaranth/index.theme
 share/icons/Amaranth/scalable/apps/abiword_48.svg
 share/icons/Amaranth/scalable/apps/accessibility-keyboard-capplet.svg
@@ -199,9 +204,11 @@ share/icons/Amaranth/scalable/stock/stock_about.svg
 share/icons/Amaranth/scalable/stock/stock_cdrom.svg
 share/icons/Amaranth/scalable/stock/stock_copy.svg
 share/icons/Amaranth/scalable/stock/stock_cut.svg
+share/icons/Amaranth/scalable/stock/stock_delete.svg
 share/icons/Amaranth/scalable/stock/stock_dialog_error.png
 share/icons/Amaranth/scalable/stock/stock_dialog_info.png
 share/icons/Amaranth/scalable/stock/stock_dialog_warning.png
+share/icons/Amaranth/scalable/stock/stock_execute.svg
 share/icons/Amaranth/scalable/stock/stock_floppy.svg
 share/icons/Amaranth/scalable/stock/stock_go-back.svg
 share/icons/Amaranth/scalable/stock/stock_go-down.svg
@@ -731,11 +738,15 @@ share/icons/Nuvola/scalable/stock/find.svg
 share/icons/Nuvola/scalable/stock/findreplace.svg
 share/icons/Nuvola/scalable/stock/folder.svg
 share/icons/Nuvola/scalable/stock/folder_new.svg
+share/icons/Nuvola/scalable/stock/gaim_insert-smiley-small.svg
+share/icons/Nuvola/scalable/stock/gaim_send-im.svg
 share/icons/Nuvola/scalable/stock/gnome-logo.svg
 share/icons/Nuvola/scalable/stock/panel-lockscreen.svg
 share/icons/Nuvola/scalable/stock/print-preview.svg
 share/icons/Nuvola/scalable/stock/printer.svg
 share/icons/Nuvola/scalable/stock/recycled.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-first.svg
+share/icons/Nuvola/scalable/stock/stock_gtk-goto-last.svg
 share/icons/Nuvola/scalable/stock/stock-gtk-remove.svg
 share/icons/Nuvola/scalable/stock/stock-media-eject.svg
 share/icons/Nuvola/scalable/stock/stock-media-ffwd.svg
@@ -812,12 +823,10 @@ share/icons/Wasp/scalable/apps/my-computer.svg
 share/icons/Wasp/scalable/apps/network-config.svg
 share/icons/Wasp/scalable/apps/network.svg
 share/icons/Wasp/scalable/apps/procman.svg
-share/icons/Wasp/scalable/apps/redhat-accessories.svg
 share/icons/Wasp/scalable/apps/redhat-config-date.svg
 share/icons/Wasp/scalable/apps/redhat-config-users.svg
 share/icons/Wasp/scalable/apps/redhat-config-xfree86.svg
 share/icons/Wasp/scalable/apps/redhat-games.svg
-share/icons/Wasp/scalable/apps/redhat-graphics.svg
 share/icons/Wasp/scalable/apps/redhat-home.svg
 share/icons/Wasp/scalable/apps/redhat-internet.svg
 share/icons/Wasp/scalable/apps/redhat-main-menu.svg
@@ -941,6 +950,11 @@ share/icons/Wasp/scalable/stock/stickies.svg
 share/icons/Wasp/scalable/stock/stock_accessories.svg
 share/icons/Wasp/scalable/stock/stock_amusements.svg
 share/icons/Wasp/scalable/stock/stock_dialog_info.svg
+share/icons/Wasp/scalable/stock/gaim_auth.svg
+share/icons/Wasp/scalable/stock/gaim_error.svg
+share/icons/Wasp/scalable/stock/gaim_info.svg
+share/icons/Wasp/scalable/stock/gaim_offline.svg
+share/icons/Wasp/scalable/stock/gaim_online.svg
 share/icons/Wasp/scalable/stock/stock_gnome-logo.svg
 share/icons/Wasp/scalable/stock/stock_internet.svg
 share/icons/Wasp/scalable/stock/stock_lockscreen.svg
@@ -962,6 +976,7 @@ share/locale/nl/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/no/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/pl/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/pt/LC_MESSAGES/gnome-themes-extra.mo
+share/locale/sk/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sr/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-themes-extra.mo
 share/locale/sv/LC_MESSAGES/gnome-themes-extra.mo
@@ -1001,24 +1016,6 @@ share/themes/Industrial/gtk-2.0/stock_up.png
 share/themes/Lush/gtk-2.0/gtkrc
 share/themes/Lush/gtk-2.0/iconrc
 share/themes/Lush/index.theme
-share/gnome/themes/Lush/metacity-1/arrondisbleu-gris.png
-share/gnome/themes/Lush/metacity-1/barre-grise.png
-share/gnome/themes/Lush/metacity-1/barre-grise-bas.png
-share/gnome/themes/Lush/metacity-1/barre-inactive-morceaugris.png
-share/gnome/themes/Lush/metacity-1/barre-inactive_r1_c5.png
-share/gnome/themes/Lush/metacity-1/barre-inac-suitearrondigris.png
-share/gnome/themes/Lush/metacity-1/BT-agrandirfenetre.png
-share/gnome/themes/Lush/metacity-1/BT-fermer.png
-share/gnome/themes/Lush/metacity-1/BT-neutre.png
-share/gnome/themes/Lush/metacity-1/BT-reduirefenetre.png
-share/gnome/themes/Lush/metacity-1/BT-reduire.png
-share/gnome/themes/Lush/metacity-1/coin-inactif_Bas-D.png
-share/gnome/themes/Lush/metacity-1/coin-inactive_Bas-G.png
-share/gnome/themes/Lush/metacity-1/cote-droit.png
-share/gnome/themes/Lush/metacity-1/cote-gauche.png
-share/gnome/themes/Lush/metacity-1/cote_suitearrondibleu.png
-share/gnome/themes/Lush/metacity-1/degrade-gris.png
-share/gnome/themes/Lush/metacity-1/dessousbarre-gris.png
 share/themes/Nuvola/gtk-1.0/gtkrc
 share/themes/Nuvola/gtk-2.0/gtkrc
 share/themes/Nuvola/gtk-2.0/iconrc