3 files changed, 4 insertions, 38 deletions

diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index b917fbe04f65..2a92fa4b0b04 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	1.5.24
+PORTVERSION=	2.0.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-rc1
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index f999107bc18a..c974ae3bc8dd 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.24.tar.bz2) = 32fb9c407b879f76f1a610a5208be8b6
+MD5 (gnome2/gnome-panel-2.0.0.tar.bz2) = 539847acb8919e85aef73350a3218a82
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index fe0134aba0b5..76895157c835 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -10,8 +10,6 @@ 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
 etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/panel/%gconf.xml
@@ -94,33 +92,6 @@ share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/C/legal.xml
 share/gnome/help/mailcheck/C/mailcheck.xml
-share/gnome/help/panel/C/figures/controlcenter_icon.png
-share/gnome/help/panel/C/figures/drawerprop_dialog.png
-share/gnome/help/panel/C/figures/footprint_icon.png
-share/gnome/help/panel/C/figures/four_hide_button.png
-share/gnome/help/panel/C/figures/gnome_panel.png
-share/gnome/help/panel/C/figures/gnometerminal_icon.png
-share/gnome/help/panel/C/figures/help_icon.png
-share/gnome/help/panel/C/figures/launcherprop1_dialog.png
-share/gnome/help/panel/C/figures/launcherprop2_dialog.png
-share/gnome/help/panel/C/figures/lockscreen_icon.png
-share/gnome/help/panel/C/figures/logout_icon.png
-share/gnome/help/panel/C/figures/menu_panel.png
-share/gnome/help/panel/C/figures/netscape_icon.png
-share/gnome/help/panel/C/figures/open_drawer.png
-share/gnome/help/panel/C/figures/panel_object_popup_menu.png
-share/gnome/help/panel/C/figures/panelprop_dialog.png
-share/gnome/help/panel/C/figures/runprogram_dialog.png
-share/gnome/help/panel/C/figures/runprogram_icon.png
-share/gnome/help/panel/C/figures/sample_applet.png
-share/gnome/help/panel/C/figures/statusdock2_button.png
-share/gnome/help/panel/C/figures/statusdock_button.png
-share/gnome/help/panel/C/figures/swallapp_dialog.png
-share/gnome/help/panel/C/figures/swallow_applet.png
-share/gnome/help/panel/C/figures/tasklist_applet.png
-share/gnome/help/panel/C/figures/typical_menu.png
-share/gnome/help/panel/C/legal.xml
-share/gnome/help/panel/C/panel.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/legal.xml
@@ -132,7 +103,6 @@ share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/gnome/omf/gnome-panel/clock-C.omf
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
 share/gnome/omf/gnome-panel/mailcheck-C.omf
-share/gnome/omf/gnome-panel/panel-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
@@ -203,9 +173,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/window-list/C/figures
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
-@dirrm share/gnome/help/panel/C/figures
-@dirrm share/gnome/help/panel/C
-@dirrm share/gnome/help/panel
 @dirrm share/gnome/help/mailcheck/C/figures
 @dirrm share/gnome/help/mailcheck/C
 @dirrm share/gnome/help/mailcheck
@@ -215,6 +182,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
+@dirrm share/gnome/gen_util
 @dirrm share/gnome/gnome-panel/glade
 @dirrm share/gnome/gnome-panel
 @dirrm share/gnome/control-center-2.0/capplets
@@ -250,8 +218,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/prefs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_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/global