Update to 2.6.1.

6 files changed, 94 insertions, 6 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 36c2fefb4f95..acde89beb69b 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 922d7c3b0c78..d9347b39cf1c 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55
-SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581
+MD5 (gnome2/gnome-panel-2.6.1.tar.bz2) = 232366bafcab15dfde3430f722ed709e
+SIZE (gnome2/gnome-panel-2.6.1.tar.bz2) = 2984590
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index e691400d6c7d..75ab893d22e9 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -19,9 +19,30 @@ etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xm
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
@@ -372,6 +393,7 @@ share/gnome/pixmaps/gnome-run.png
 share/gnome/pixmaps/gnome-screenshot.png
 share/gnome/pixmaps/panel-drawer.png
 share/gnome/pixmaps/panel-force-quit.png
+share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
@@ -395,6 +417,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
@@ -556,8 +579,29 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 36c2fefb4f95..acde89beb69b 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 922d7c3b0c78..d9347b39cf1c 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55
-SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581
+MD5 (gnome2/gnome-panel-2.6.1.tar.bz2) = 232366bafcab15dfde3430f722ed709e
+SIZE (gnome2/gnome-panel-2.6.1.tar.bz2) = 2984590
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index e691400d6c7d..75ab893d22e9 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -19,9 +19,30 @@ etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/menu_bar/%gconf.xm
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/nautilus_launcher/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml
@@ -372,6 +393,7 @@ share/gnome/pixmaps/gnome-run.png
 share/gnome/pixmaps/gnome-screenshot.png
 share/gnome/pixmaps/panel-drawer.png
 share/gnome/pixmaps/panel-force-quit.png
+share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
@@ -395,6 +417,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
@@ -556,8 +579,29 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel/background
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/top_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel/background
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels/bottom_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/toplevels
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/terminal_launcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/nautilus_launcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects/menu_bar
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/objects
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/general
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/workspace_switcher
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_menu
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/window_list
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/show_desktop_button
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/mixer
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets/clock
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default/applets
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles/default
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/profiles
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel/background
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/top_panel
+@dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel/background
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels/bottom_panel
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/toplevels
 @dirrm etc/gconf/gconf.xml.defaults/apps/panel/default_setup/objects/terminal_launcher