Update to 2.0.2.

12 files changed, 38 insertions, 18 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 5906fa0fec01..430039cae013 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-panel
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index f582cfb29d47..db2e5c7c6256 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.0.1.tar.bz2) = 3793bc3f6901a59cc2829f990af9cb1e
+MD5 (gnome2/gnome-panel-2.0.2.tar.bz2) = e56954d81a325bb4af0f704cff70a386
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 04113c0f1bf3..c26d441a176a 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -69,7 +69,6 @@ share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
 share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml
-share/gnome/gnome-panel/glade/panel-test-applets.glade2
 share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
@@ -80,7 +79,9 @@ share/doc/panel-applet/multi-applets.html
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/gnome-panel/glade/panel-test-applets.glade
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
@@ -96,9 +97,11 @@ share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
 share/gnome/help/window-list/C/figures/window_list_group.png
+share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
+share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
@@ -108,7 +111,7 @@ share/gnome/omf/gnome-panel/mailcheck-C.omf
 share/gnome/omf/gnome-panel/window-list-C.omf
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 share/gnome/panel/gnome-panel-preferences.glade
-share/gnome/panel/gnome-panel-screenshot.glade2
+share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
 share/gnome/pixmaps/fish/footguy.png
 share/gnome/pixmaps/fish/monkey.png
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index dbf2bca190f7..27c624f3bc72 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-session
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 8b25c352f18b..005c71b87d60 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.0.1.tar.bz2) = 6e8dadb1a18072312dbf66a421482bf3
+MD5 (gnome2/gnome-session-2.0.2.tar.bz2) = 9a2d9900ff6da6e432d4bf3cb9b3dc54
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 8a87ed6b789c..c637c1ab5817 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,9 +1,12 @@
-bin/gnome-login-check
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
+etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml
 etc/gconf/schemas/gnome-session.schemas
 share/gnome/control-center-2.0/capplets/session-properties.desktop
 share/gnome/default.session
@@ -55,3 +58,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 @dirrm share/gnome/pixmaps/splash
 @dirrm share/gnome/omf/gnome-core
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 5906fa0fec01..430039cae013 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-panel
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index f582cfb29d47..db2e5c7c6256 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.0.1.tar.bz2) = 3793bc3f6901a59cc2829f990af9cb1e
+MD5 (gnome2/gnome-panel-2.0.2.tar.bz2) = e56954d81a325bb4af0f704cff70a386
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 04113c0f1bf3..c26d441a176a 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -69,7 +69,6 @@ share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml
 share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml
-share/gnome/gnome-panel/glade/panel-test-applets.glade2
 share/gnome/gnome-panelrc
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
@@ -80,7 +79,9 @@ share/doc/panel-applet/multi-applets.html
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/gnome/gnome-panel/glade/panel-test-applets.glade
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
@@ -96,9 +97,11 @@ share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
 share/gnome/help/window-list/C/figures/window_list_applet.png
 share/gnome/help/window-list/C/figures/window_list_group.png
+share/gnome/help/window-list/C/figures/window_list_group_applet.png
 share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png
+share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
@@ -108,7 +111,7 @@ share/gnome/omf/gnome-panel/mailcheck-C.omf
 share/gnome/omf/gnome-panel/window-list-C.omf
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
 share/gnome/panel/gnome-panel-preferences.glade
-share/gnome/panel/gnome-panel-screenshot.glade2
+share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/pixmaps/fish/fishanim.png
 share/gnome/pixmaps/fish/footguy.png
 share/gnome/pixmaps/fish/monkey.png
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index dbf2bca190f7..27c624f3bc72 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-session
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 8b25c352f18b..005c71b87d60 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-2.0.1.tar.bz2) = 6e8dadb1a18072312dbf66a421482bf3
+MD5 (gnome2/gnome-session-2.0.2.tar.bz2) = 9a2d9900ff6da6e432d4bf3cb9b3dc54
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 8a87ed6b789c..c637c1ab5817 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -1,9 +1,12 @@
-bin/gnome-login-check
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
+etc/gconf/gconf.xml.defaults/apps/gnome-session/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-session/options/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options/%gconf.xml
 etc/gconf/schemas/gnome-session.schemas
 share/gnome/control-center-2.0/capplets/session-properties.desktop
 share/gnome/default.session
@@ -55,3 +58,7 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
 @dirrm share/gnome/pixmaps/splash
 @dirrm share/gnome/omf/gnome-core
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session/options
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-session
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session/options
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-session