Update to the latest GNOME 2.0 snapshot, the "Stay on target!" release.

31 files changed, 106 insertions, 95 deletions

diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 52061616e2a3..85137a6252e9 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gdm2
 PORTVERSION=	2.3.90.3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=		pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=		pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gdm-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index a15e0b692fe3..a1f254d8d71c 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	1.102.1
-PORTREVISION=	1
+PORTVERSION=	1.103.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index d9acd878c002..a9908b3ef575 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
+MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index c69b86c3faa7..48ada08139fa 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -200,6 +200,12 @@ share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
 share/gnome/gweather/Locations
 share/gnome/help/cdplayer/C/cdplayer.xml
 share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
 share/gnome/help/cdplayer/C/legal.xml
 share/gnome/help/cdplayer/C/topic.dat
 share/gnome/help/char-palette/C/char-palette.xml
@@ -218,17 +224,20 @@ share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
 share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/gweather_settings.png
-share/gnome/help/gweather/C/figures/gweather_weather.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/C/topic.dat
-share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
+share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/C/legal.xml
+share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/C/topic.dat
+share/gnome/omf/gnome-applets/cdplayer-C.omf
 share/gnome/omf/gnome-applets/char-palette-C.omf
 share/gnome/omf/gnome-applets/command-line-C.omf
 share/gnome/omf/gnome-applets/geyes-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
-share/gnome/omf/gnome-applets/gweather_applet-C.omf
+share/gnome/omf/gnome-applets/gweather-C.omf
+share/gnome/omf/gnome-applets/mixer_applet2-C.omf
 share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
@@ -435,12 +444,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/gweather
 @dirrm share/gnome/pixmaps/gkb
 @dirrm share/gnome/omf/gnome-applets
+@dirrm share/gnome/help/mixer_applet2/C/figures
+@dirrm share/gnome/help/mixer_applet2/C
+@dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/C/figures
+@dirrm share/gnome/help/gweather/C
+@dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/C/figures
+@dirrm share/gnome/help/gtik2_applet2/C
+@dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/geyes/C/figures
+@dirrm share/gnome/help/geyes/C
+@dirrm share/gnome/help/geyes
 @dirrm share/gnome/help/command-line/C/figures
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/C/figures
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
+@dirrm share/gnome/help/cdplayer/C/figures
+@dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
 @dirrm share/gnome/geyes/Horrid
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f167d6c7260e..836f0bb3381b 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.19
+PORTVERSION=	1.5.20
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 45e9c13f6ce5..4794ea4cbf02 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
+MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index a506e4e8c8d4..e590b8fa56b4 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
 share/gnome/pixmaps/gnome-panel.png
 share/gnome/pixmaps/gnome-qeye.png
 share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-screenshot.png
 share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
 share/gnome/pixmaps/gnome-settings.png
@@ -167,12 +168,14 @@ share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 58caf809b294..2000a3db95a5 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	1.5.21
-PORTREVISION=	1
+PORTVERSION=	1.5.22
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck \
+LIB_DEPENDS=	wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
 		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d7317b5b99d9..a54fc7b7ae38 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
+MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index cbcafeee13cf..2c8eefaaf9dc 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -8,8 +8,6 @@ etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%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
-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
@@ -169,6 +167,7 @@ share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -250,8 +249,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @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/fish_applet/prefs
-@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/global
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 302733eb2cbb..ef8749b4521c 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesession
 PORTVERSION=	1.5.19
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index ebe585c1272c..9d50cd2ad709 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnometerminal
 PORTVERSION=	1.9.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index a15e0b692fe3..a1f254d8d71c 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	1.102.1
-PORTREVISION=	1
+PORTVERSION=	1.103.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index d9acd878c002..a9908b3ef575 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
+MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index c69b86c3faa7..48ada08139fa 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -200,6 +200,12 @@ share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
 share/gnome/gweather/Locations
 share/gnome/help/cdplayer/C/cdplayer.xml
 share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
 share/gnome/help/cdplayer/C/legal.xml
 share/gnome/help/cdplayer/C/topic.dat
 share/gnome/help/char-palette/C/char-palette.xml
@@ -218,17 +224,20 @@ share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
 share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/gweather_settings.png
-share/gnome/help/gweather/C/figures/gweather_weather.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/C/topic.dat
-share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
+share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/C/legal.xml
+share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/C/topic.dat
+share/gnome/omf/gnome-applets/cdplayer-C.omf
 share/gnome/omf/gnome-applets/char-palette-C.omf
 share/gnome/omf/gnome-applets/command-line-C.omf
 share/gnome/omf/gnome-applets/geyes-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
-share/gnome/omf/gnome-applets/gweather_applet-C.omf
+share/gnome/omf/gnome-applets/gweather-C.omf
+share/gnome/omf/gnome-applets/mixer_applet2-C.omf
 share/gnome/pixmaps/battstat.png
 share/gnome/pixmaps/charpick.png
 share/gnome/pixmaps/drivemount-applet.png
@@ -435,12 +444,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/gweather
 @dirrm share/gnome/pixmaps/gkb
 @dirrm share/gnome/omf/gnome-applets
+@dirrm share/gnome/help/mixer_applet2/C/figures
+@dirrm share/gnome/help/mixer_applet2/C
+@dirrm share/gnome/help/mixer_applet2
+@dirrm share/gnome/help/gweather/C/figures
+@dirrm share/gnome/help/gweather/C
+@dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/C/figures
+@dirrm share/gnome/help/gtik2_applet2/C
+@dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/geyes/C/figures
+@dirrm share/gnome/help/geyes/C
+@dirrm share/gnome/help/geyes
 @dirrm share/gnome/help/command-line/C/figures
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/C/figures
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
+@dirrm share/gnome/help/cdplayer/C/figures
+@dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
 @dirrm share/gnome/geyes/Horrid
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index f167d6c7260e..836f0bb3381b 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.19
+PORTVERSION=	1.5.20
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 45e9c13f6ce5..4794ea4cbf02 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
+MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index a506e4e8c8d4..e590b8fa56b4 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -114,6 +114,7 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
 share/gnome/pixmaps/gnome-panel.png
 share/gnome/pixmaps/gnome-qeye.png
 share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-screenshot.png
 share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
 share/gnome/pixmaps/gnome-settings.png
@@ -167,12 +168,14 @@ share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 58caf809b294..2000a3db95a5 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	1.5.21
-PORTREVISION=	1
+PORTVERSION=	1.5.22
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	wnck-1.2:${PORTSDIR}/x11-toolkits/libwnck \
+LIB_DEPENDS=	wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \
 		gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop
 
 USE_BZIP2=	yes
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index d7317b5b99d9..a54fc7b7ae38 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
+MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index cbcafeee13cf..2c8eefaaf9dc 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -8,8 +8,6 @@ etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/panel/global/%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
-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
@@ -169,6 +167,7 @@ share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -250,8 +249,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @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/fish_applet/prefs
-@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/global
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 302733eb2cbb..ef8749b4521c 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomesession
 PORTVERSION=	1.5.19
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-session-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index ebe585c1272c..9d50cd2ad709 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnometerminal
 PORTVERSION=	1.9.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index ea2ee34daa62..c82d2bf4216c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	1.117.0
-PORTREVISION=	2
+PORTVERSION=	1.117.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 8c24d34981b4..8b21e2b0e9f0 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.117.0.tar.bz2) = 154158d266dbc2f18b76157191e3750e
+MD5 (gnome2/libgnome-1.117.1.tar.bz2) = 665b6c80370b4ecf1737db59a8582ea8
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index d91a7e6ea3d4..e0345d2ccc86 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -7,7 +7,6 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
@@ -19,9 +18,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
@@ -31,7 +28,6 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml
@@ -43,15 +39,12 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.x
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown/%gconf.xml
 etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_applications_browser.schemas
-etc/gconf/schemas/desktop_gnome_applications_editor.schemas
 etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
 etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
 etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
@@ -127,9 +120,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
@@ -141,7 +132,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
@@ -151,9 +141,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
@@ -165,7 +153,6 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 112d0139068b..dbc7e2606889 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta5
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index ab45419dc8a7..c0b7f04dddc8 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-0.7.tar.bz2) = 7394c5ab597a3a4188c96e5720600381
+MD5 (gnome2/yelp-0.8.tar.bz2) = 0590082e2d0ecf1da3bef4019cb08130
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
index 16961b59b62f..a6e8fbc286f0 100644
--- a/x11/yelp/files/patch-configure
+++ b/x11/yelp/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Mon May 20 15:11:25 2002
-+++ configure	Mon May 20 15:12:24 2002
-@@ -7374,6 +7374,7 @@
+--- configure.orig	Tue May 28 02:02:29 2002
++++ configure	Tue May 28 02:03:10 2002
+@@ -7381,6 +7381,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,12 +8,12 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9978,7 +9979,7 @@
+@@ -9979,7 +9980,7 @@
  
- YELP_MODULES="libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
+ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
  
--YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
+-YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
 +YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| xargs -n1 echo -n ' -I '`"
  
- echo "$as_me:9983: checking for bzread in -lbz2" >&5
+ echo "$as_me:9984: checking for bzread in -lbz2" >&5
  echo $ECHO_N "checking for bzread in -lbz2... $ECHO_C" >&6
diff --git a/x11/yelp/files/patch-src_yelp-info.c b/x11/yelp/files/patch-src_yelp-info.c
deleted file mode 100644
index 6013c2faf2af..000000000000
--- a/x11/yelp/files/patch-src_yelp-info.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/yelp-info.c.orig	Mon May 20 17:53:50 2002
-+++ src/yelp-info.c	Mon May 20 17:54:27 2002
-@@ -105,7 +105,6 @@
- 	struct stat   stat_dir2;
- 	GSList       *info_list = NULL;
- 	GSList       *node;
--	YelpSection  *section;
- 	gchar       **infopathes;
- 	gchar        *infopath;
- 	gint          i;
-@@ -141,7 +140,7 @@
- 
- 	for (node = info_list; node; node = node->next) {
- 		g_node_append_data (root, node->data);
--		*index = g_list_prepend (*index, section);
-+		*index = g_list_prepend (*index, node->data);
- 	}
- 
- 	g_slist_free (info_list);
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index 104aefe92305..ff8a8894291d 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -2,6 +2,9 @@ bin/gnome-help
 bin/yelp
 libdata/bonobo/servers/GNOME_Yelp.server
 share/gnome/applications/yelp.desktop
+share/gnome/images/yelp/bcg.png
+share/gnome/images/yelp/empty.png
+share/gnome/images/yelp/gnome2-button.png
 share/gnome/sgml/docbook/yelp/l10n.xml
 share/gnome/sgml/docbook/yelp/yelp-custom.xsl
 share/gnome/sgml/docbook/yelp/yelp-customization.xsl
@@ -37,3 +40,4 @@ share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp
+@dirrm share/gnome/images/yelp