aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-06-12 08:18:21 +0800
committermarcus <marcus@FreeBSD.org>2002-06-12 08:18:21 +0800
commitff292a3ed3034292e0ce66572d2b78c76bec423f (patch)
tree10bf74a01a0404d933c011da4243c1e8b838f965 /x11
parent0ada6a7c1b9e2fce5707438f0b08c6549bafe609 (diff)
downloadfreebsd-ports-gnome-ff292a3ed3034292e0ce66572d2b78c76bec423f.tar.gz
freebsd-ports-gnome-ff292a3ed3034292e0ce66572d2b78c76bec423f.tar.zst
freebsd-ports-gnome-ff292a3ed3034292e0ce66572d2b78c76bec423f.zip
Update to the latest GNOME 2 snapshot.
Diffstat (limited to 'x11')
-rw-r--r--x11/gdm2/Makefile4
-rw-r--r--x11/gdm2/distinfo2
-rw-r--r--x11/gdm2/files/patch-ab6
-rw-r--r--x11/gdm2/files/patch-ap79
-rw-r--r--x11/gdm2/files/patch-daemon::slave.c111
-rw-r--r--x11/gdm2/files/patch-gui::gdmlogin.c26
-rw-r--r--x11/gdm2/pkg-message2
-rw-r--r--x11/gdm2/pkg-plist3
-rw-r--r--x11/gnome-applets/Makefile6
-rw-r--r--x11/gnome-applets/distinfo2
-rw-r--r--x11/gnome-applets/pkg-plist12
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo2
-rw-r--r--x11/gnome-desktop/pkg-plist4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-panel/distinfo2
-rw-r--r--x11/gnome-panel/pkg-plist9
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-session/distinfo2
-rw-r--r--x11/gnome-session/pkg-plist3
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-terminal/distinfo2
-rw-r--r--x11/gnome-terminal/pkg-plist3
-rw-r--r--x11/gnomeapplets2/Makefile6
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/pkg-plist12
-rw-r--r--x11/gnomedesktop/Makefile4
-rw-r--r--x11/gnomedesktop/distinfo2
-rw-r--r--x11/gnomedesktop/pkg-plist4
-rw-r--r--x11/gnomepanel/Makefile4
-rw-r--r--x11/gnomepanel/distinfo2
-rw-r--r--x11/gnomepanel/pkg-plist9
-rw-r--r--x11/gnomesession/Makefile4
-rw-r--r--x11/gnomesession/distinfo2
-rw-r--r--x11/gnomesession/pkg-plist3
-rw-r--r--x11/gnometerminal/Makefile4
-rw-r--r--x11/gnometerminal/distinfo2
-rw-r--r--x11/gnometerminal/pkg-plist3
-rw-r--r--x11/yelp/Makefile6
-rw-r--r--x11/yelp/distinfo2
-rw-r--r--x11/yelp/pkg-plist134
41 files changed, 230 insertions, 271 deletions
diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile
index 85137a6252e9..0beaea0551da 100644
--- a/x11/gdm2/Makefile
+++ b/x11/gdm2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gdm2
-PORTVERSION= 2.3.90.3
+PORTVERSION= 2.3.90.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gdm-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo
index 4fdca20c7f87..c2aaf97cd188 100644
--- a/x11/gdm2/distinfo
+++ b/x11/gdm2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gdm-2.3.90.3.tar.bz2) = 8545d607c518b8b0819d27bcc66c800e
+MD5 (gnome2/gdm-2.3.90.6.tar.bz2) = f3e6f339c6c322c7346fbb1516e09ad0
diff --git a/x11/gdm2/files/patch-ab b/x11/gdm2/files/patch-ab
index 4165942a4b05..e98b9c539a34 100644
--- a/x11/gdm2/files/patch-ab
+++ b/x11/gdm2/files/patch-ab
@@ -1,5 +1,5 @@
---- config/gdm.conf.in.orig Mon May 20 23:50:34 2002
-+++ config/gdm.conf.in Mon May 20 23:53:04 2002
+--- config/gdm.conf.in.orig Sat Jun 1 12:10:13 2002
++++ config/gdm.conf.in Tue Jun 11 16:45:25 2002
@@ -17,7 +17,7 @@
# want gdm to kill/restart the server, turn this on
AlwaysRestartServer=false
@@ -34,7 +34,7 @@
-StandardXServer=/usr/X11R6/bin/X
+StandardXServer=@EXPANDED_BINDIR@/X
FlexibleXServers=5
--Xnest=/usr/X11R6/bin/Xnest -name Xnest
+-Xnest=/usr/X11R6/bin/Xnest -name Xnest -kb
+Xnest=@EXPANDED_BINDIR@/Xnest -name Xnest
[security]
diff --git a/x11/gdm2/files/patch-ap b/x11/gdm2/files/patch-ap
index fa2852604e44..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-ap
+++ b/x11/gdm2/files/patch-ap
@@ -1,79 +0,0 @@
---- config/locale.alias.orig Wed May 1 13:01:47 2002
-+++ config/locale.alias Tue May 21 00:01:09 2002
-@@ -26,42 +26,41 @@
- # it with the rest of us. Send it using the `glibcbug' script to
- # bugs@gnu.org.
-
--catalan ca_ES.ISO-8859-1
-+catalan ca_ES.ISO_8859-1
- chinese(simplified) zh_CN.GB2312
- chinese(traditional) zh_TW.Big5
--croatian hr_HR.ISO-8859-2
--czech cs_CZ.ISO-8859-2
--danish da_DK.ISO-8859-1
--dansk da_DK.ISO-8859-1
--deutsch de_DE.ISO-8859-1
--dutch nl_NL.ISO-8859-1
--english.us en_US.ISO-8859-1
--english.gb en_GB.ISO-8859-1
--estonian et_EE.ISO-8859-15
--finnish fi_FI.ISO-8859-1
--french fr_FR.ISO-8859-1
--galician gl_ES.ISO-8859-1
--german de_DE.ISO-8859-1
--greek el_GR.ISO-8859-7
--hebrew iw_IL.ISO-8859-8
--hrvatski hr_HR.ISO-8859-2
--hungarian hu_HU.ISO-8859-2
--icelandic is_IS.ISO-8859-1
--italian it_IT.ISO-8859-1
--japanese ja_JP.SJIS
--japanese.euc ja_JP.eucJP
--korean ko_KR.eucKR
--lithuanian lt_LT.ISO-8859-13
--norwegian no_NO.ISO-8859-1
--nynorsk nn_NO.ISO-8859-1
--polish pl_PL.ISO-8859-2
--portuguese pt_PT.ISO-8859-1
--portuguese.br pt_BR.ISO-8859-1
--romanian ro_RO.ISO-8859-2
-+croatian hr_HR.ISO_8859-2
-+czech cs_CZ.ISO_8859-2
-+danish da_DK.ISO_8859-1
-+dansk da_DK.ISO_8859-1
-+deutsch de_DE.ISO_8859-1
-+dutch nl_NL.ISO_8859-1
-+english.us en_US.ISO_8859-1
-+english.gb en_GB.ISO_8859-1
-+estonian et_EE.ISO_8859-15
-+finnish fi_FI.ISO_8859-1
-+french fr_FR.ISO_8859-1
-+galician gl_ES.ISO_8859-1
-+german de_DE.ISO_8859-1
-+greek el_GR.ISO_8859-7
-+hebrew iw_IL.ISO_8859-8
-+hrvatski hr_HR.ISO_8859-2
-+hungarian hu_HU.ISO_8859-2
-+icelandic is_IS.ISO_8859-1
-+italian it_IT.ISO_8859-1
-+japanese ja_JP.EUC
-+korean ko_KR.EUC
-+lithuanian lt_LT.ISO_8859-13
-+norwegian no_NO.ISO_8859-1
-+nynorsk nn_NO.ISO_8859-1
-+polish pl_PL.ISO_8859-2
-+portuguese pt_PT.ISO_8859-1
-+portuguese.br pt_BR.ISO_8859-1
-+romanian ro_RO.ISO_8859-2
- russian ru_RU.KOI8-R
--slovak sk_SK.ISO-8859-2
--slovenian sl_SI.ISO-8859-2
--spanish es_ES.ISO-8859-1
--swedish sv_SE.ISO-8859-1
--turkish tr_TR.ISO-8859-9
-+slovak sk_SK.ISO_8859-2
-+slovenian sl_SI.ISO_8859-2
-+spanish es_ES.ISO_8859-1
-+swedish sv_SE.ISO_8859-1
-+turkish tr_TR.ISO_8859-9
- ukrainian uk_UA.KOI8-U
diff --git a/x11/gdm2/files/patch-daemon::slave.c b/x11/gdm2/files/patch-daemon::slave.c
index f3722dcec3c1..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-daemon::slave.c
+++ b/x11/gdm2/files/patch-daemon::slave.c
@@ -1,111 +0,0 @@
---- daemon/slave.c.orig Tue May 21 00:04:14 2002
-+++ daemon/slave.c Tue May 21 00:17:55 2002
-@@ -26,6 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#ifdef HAVE_LOGINCAP
-+#include <login_cap.h>
-+#endif
-+
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -2008,6 +2012,7 @@
- const char *session,
- const char *save_session,
- const char *language,
-+ gboolean def_language,
- const char *gnome_session,
- gboolean usrcfgok,
- gboolean savesess,
-@@ -2023,6 +2028,11 @@
-
- gdm_clearenv ();
-
-+ if (setsid() < 0)
-+ /* should never happen */
-+ gdm_error (_("%s: setsid() failed: %s!"),
-+ "session_child_run", strerror(errno));
-+
- /* Prepare user session */
- gnome_setenv ("XAUTHORITY", d->userauth, TRUE);
- gnome_setenv ("DISPLAY", d->name, TRUE);
-@@ -2050,10 +2060,6 @@
- language = unaliaslang (language);
- }
-
-- /* Set locale */
-- gnome_setenv ("LANG", language, TRUE);
-- gnome_setenv ("GDM_LANG", language, TRUE);
--
- setpgid (0, 0);
-
- umask (022);
-@@ -2069,10 +2075,35 @@
- * not to leave the egid around */
- setegid (pwent->pw_gid);
-
-+#ifdef HAVE_LOGINCAP
-+ if (setusercontext (NULL, pwent, pwent->pw_uid,
-+ LOGIN_SETLOGIN | LOGIN_SETPATH |
-+ LOGIN_SETPRIORITY | LOGIN_SETRESOURCES |
-+ LOGIN_SETUMASK | LOGIN_SETUSER) < 0)
-+ gdm_child_exit (DISPLAY_REMANAGE,
-+ _("%s: setusercontext() failed for %s. "
-+ "Aborting."), "gdm_slave_session_start",
-+ login);
-+ /* A different language was selected, or taken from the saved
-+ * prefs of the user */
-+ if ( ! def_language) {
-+ gnome_setenv ("LANG", language, TRUE);
-+ gnome_setenv ("GDM_LANG", language, TRUE);
-+ } else {
-+ /* setusercontext sets up user languages */
-+ gnome_setenv ("GDM_LANG", g_getenv ("LANG"), TRUE);
-+ }
-+#else
-+
- if (setuid (pwent->pw_uid) < 0)
- gdm_child_exit (DISPLAY_REMANAGE,
- _("gdm_slave_session_start: Could not become %s. Aborting."), login);
-
-+ /* Set locale */
-+ gnome_setenv ("LANG", language, TRUE);
-+ gnome_setenv ("GDM_LANG", language, TRUE);
-+#endif
-+
- chdir (home_dir);
-
- /* anality, make sure nothing is in memory for gnome_config
-@@ -2259,6 +2290,7 @@
- char *gnome_session = NULL;
- gboolean savesess = FALSE, savelang = FALSE, savegnomesess = FALSE;
- gboolean usrcfgok = FALSE, sessoptok = FALSE, authok = FALSE;
-+ gboolean def_language = FALSE;
- const char *home_dir = NULL;
- gboolean home_dir_ok = FALSE;
- pid_t pid;
-@@ -2392,12 +2424,13 @@
- language = g_strdup (lang);
- else
- language = g_strdup (GdmDefaultLocale);
-- savelang = TRUE;
-
- if (ve_string_empty (language)) {
- g_free (language);
- language = g_strdup ("C");
- }
-+
-+ def_language = TRUE;
- }
-
- /* save this session as the users session */
-@@ -2499,6 +2532,7 @@
- session,
- save_session,
- language,
-+ def_language,
- gnome_session,
- usrcfgok,
- savesess,
diff --git a/x11/gdm2/files/patch-gui::gdmlogin.c b/x11/gdm2/files/patch-gui::gdmlogin.c
index 379619b734ca..e69de29bb2d1 100644
--- a/x11/gdm2/files/patch-gui::gdmlogin.c
+++ b/x11/gdm2/files/patch-gui::gdmlogin.c
@@ -1,26 +0,0 @@
---- gui/gdmlogin.c.orig Tue May 21 00:19:12 2002
-+++ gui/gdmlogin.c Tue May 21 00:20:02 2002
-@@ -3419,7 +3419,9 @@
- static gboolean
- gdm_login_check_exclude (struct passwd *pwent)
- {
-+#ifdef HAVE_SHADOW
- const char * const lockout_passes[] = { "*", "!!", NULL };
-+#endif
- gint i;
-
- if ( ! GdmAllowRoot && pwent->pw_uid == 0)
-@@ -3428,11 +3430,13 @@
- if ( ! GdmAllowRemoteRoot && ! login_is_local && pwent->pw_uid == 0)
- return TRUE;
-
-+#ifdef HAVE_SHADOW
- for (i=0 ; lockout_passes[i] != NULL ; i++) {
- if (strcmp (lockout_passes[i], pwent->pw_passwd) == 0) {
- return TRUE;
- }
- }
-+#endif
-
- if (GdmExclude != NULL &&
- GdmExclude[0] != '\0') {
diff --git a/x11/gdm2/pkg-message b/x11/gdm2/pkg-message
index 86f8373665b9..3f44dbe90135 100644
--- a/x11/gdm2/pkg-message
+++ b/x11/gdm2/pkg-message
@@ -14,7 +14,7 @@ gdm session required pam_permit.so
- To enable GDM after booting, edit your /etc/ttys(5), and change the line
for ttyv8 to
-ttyv8 "/usr/X11R6/bin/gdm -nodaemon" xterm on
+ttyv8 "/usr/X11R6/bin/gdm --nodaemon" xterm on
These notes were written by: Yukihiro Nakai <nakai@FreeBSD.org>
and updated by: Joe Marcus Clarke <marcus@marcuscom.com>
diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist
index 82d68c1a0f39..13cbb9e4d710 100644
--- a/x11/gdm2/pkg-plist
+++ b/x11/gdm2/pkg-plist
@@ -27,7 +27,7 @@ share/gnome/applications/gdmsetup.desktop
share/gnome/capplets/gdmphotosetup.desktop
share/gnome/gdm/gdmchooser.glade
share/gnome/gdm/gdmsetup.glade
-share/gnome/gdm/themes/circles/GdmGreeterTheme.info
+share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
share/gnome/gdm/themes/circles/background.svg
share/gnome/gdm/themes/circles/circles.xml
share/gnome/gdm/themes/circles/flower.png
@@ -38,6 +38,7 @@ share/gnome/pixmaps/gdm.xpm
share/gnome/pixmaps/login-photo.png
share/gnome/pixmaps/nobody.png
share/gnome/pixmaps/nohost.png
+share/locale/ar/LC_MESSAGES/gdm-2.4.mo
share/locale/az/LC_MESSAGES/gdm-2.4.mo
share/locale/ca/LC_MESSAGES/gdm-2.4.mo
share/locale/cs/LC_MESSAGES/gdm-2.4.mo
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 3d629bb96f11..7e59dd5990bd 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.103.0
+PORTVERSION= 1.105.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail \
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail \
gtop-2.0:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index a9908b3ef575..452ffaee3530 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
+MD5 (gnome2/gnome-applets-1.105.0.tar.bz2) = aadfcffd014406b5464bbfdacd5f9aa8
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 1ad4cdf13e86..9968653d2346 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -198,6 +198,12 @@ share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gweather/Locations
+%%BATTERY%%share/gnome/help/battstat/C/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/C/topic.dat
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
@@ -220,6 +226,9 @@ share/gnome/help/geyes/C/figures/geyes_applet.png
share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
share/gnome/help/geyes/C/topic.dat
+share/gnome/help/gkb/C/figures/gkb_applet.png
+share/gnome/help/gkb/C/gkb.xml
+share/gnome/help/gkb/C/legal.xml
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
@@ -231,10 +240,12 @@ 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
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
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/gkb-C.omf
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
share/gnome/omf/gnome-applets/gweather-C.omf
share/gnome/omf/gnome-applets/mixer_applet2-C.omf
@@ -400,6 +411,7 @@ share/gnome/xmodmap/xmodmap.us-sun
share/gnome/xmodmap/xmodmap.us.old
share/gnome/xmodmap/xmodmap.us_intl
share/gnome/xmodmap/xmodmap.yu
+share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 836f0bb3381b..9a2f31569d45 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.20
+PORTVERSION= 1.5.22
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 4794ea4cbf02..5230000863d5 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
+MD5 (gnome2/gnome-desktop-1.5.22.tar.bz2) = db0b8ac8b648230b7817afa96b2dcb8d
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index e590b8fa56b4..bf7abacb74dc 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -8,7 +8,7 @@ lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.0
libdata/pkgconfig/gnome-desktop-2.0.pc
share/gnome/gnome-about/contributors.dat
-share/gnome/gnome-about/gnome-version
+share/gnome/gnome-about/gnome-version.xml
share/gnome/help/fdl/C/fdl.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
@@ -36,6 +36,7 @@ share/gnome/pixmaps/gnome-applications.png
share/gnome/pixmaps/gnome-audio2.png
share/gnome/pixmaps/gnome-background.png
share/gnome/pixmaps/gnome-calc2.png
+share/gnome/pixmaps/gnome-calc3.png
share/gnome/pixmaps/gnome-calendar.png
share/gnome/pixmaps/gnome-cardgame.png
share/gnome/pixmaps/gnome-ccbackground.png
@@ -153,6 +154,7 @@ share/gnome/pixmaps/panel-folder.png
share/gnome/pixmaps/panel-knob.png
share/gnome/pixmaps/panel-menu-main.png
share/gnome/pixmaps/vnterm.xpm
+share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 2000a3db95a5..b917fbe04f65 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.22
+PORTVERSION= 1.5.24
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index a54fc7b7ae38..f999107bc18a 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
+MD5 (gnome2/gnome-panel-1.5.24.tar.bz2) = 32fb9c407b879f76f1a610a5208be8b6
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 2c8eefaaf9dc..fe0134aba0b5 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -8,6 +8,8 @@ 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
@@ -68,6 +70,7 @@ 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
share/doc/panel-applet/applet-writing.html
@@ -81,17 +84,16 @@ share/doc/panel-applet/session-saving.html
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
share/gnome/help/clock/C/legal.xml
-share/gnome/help/clock/C/topic.dat
share/gnome/help/fish-applet-2/C/figures/fish_applet.png
+share/gnome/help/fish-applet-2/C/figures/fish_settings.png
share/gnome/help/fish-applet-2/C/fish-applet-2.xml
share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/fish-applet-2/C/topic.dat
share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
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/mailcheck/C/topic.dat
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
@@ -146,6 +148,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png
share/gnome/pixmaps/mailcheck/email-tiny.png
share/gnome/pixmaps/mailcheck/email.png
share/gnome/pixmaps/mailcheck/tux-anim.png
+share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ef8749b4521c..d5ab093d0197 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesession
-PORTVERSION= 1.5.19
+PORTVERSION= 1.5.21
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 87fda53fdf5e..54ebc069304e 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-1.5.19.tar.bz2) = a723f5954097eec8c1ce4528d59d2179
+MD5 (gnome2/gnome-session-1.5.21.tar.bz2) = 405a7835d5ba6103b21082b015c89a37
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index b539945ccd7e..5a07971a5deb 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,4 +1,3 @@
-bin/gnome-libice-check
bin/gnome-login-check
bin/gnome-session
bin/gnome-session-properties
@@ -26,12 +25,14 @@ share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 9d50cd2ad709..4cfe6586c1e9 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 1.9.6
+PORTVERSION= 1.9.7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 772d3699b0d0..ad4792a3e843 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-1.9.6.tar.bz2) = e509c5ba638aeeea320527daa1f996d7
+MD5 (gnome2/gnome-terminal-1.9.7.tar.bz2) = f675430f351ca25f9efa45e2fed982d0
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 603ceff36454..4b59a7c09290 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -15,6 +15,7 @@ share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
share/gnome/pixmaps/gnome-terminal.png
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
@@ -37,9 +38,9 @@ share/locale/sl/LC_MESSAGES/gnome-terminal.mo
share/locale/sv/LC_MESSAGES/gnome-terminal.mo
share/locale/tr/LC_MESSAGES/gnome-terminal.mo
share/locale/uk/LC_MESSAGES/gnome-terminal.mo
+share/locale/vi/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
@dirrm share/gnome/gnome-terminal/glade
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 3d629bb96f11..7e59dd5990bd 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.103.0
+PORTVERSION= 1.105.0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail \
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail \
gtop-2.0:${PORTSDIR}/devel/libgtop2
USE_BZIP2= yes
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index a9908b3ef575..452ffaee3530 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.103.0.tar.bz2) = 899f2e0dac0df07e1e79317ddd91b85e
+MD5 (gnome2/gnome-applets-1.105.0.tar.bz2) = aadfcffd014406b5464bbfdacd5f9aa8
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 1ad4cdf13e86..9968653d2346 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -198,6 +198,12 @@ share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml
share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
share/gnome/gweather/Locations
+%%BATTERY%%share/gnome/help/battstat/C/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/C/legal.xml
+%%BATTERY%%share/gnome/help/battstat/C/topic.dat
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
@@ -220,6 +226,9 @@ share/gnome/help/geyes/C/figures/geyes_applet.png
share/gnome/help/geyes/C/geyes.xml
share/gnome/help/geyes/C/legal.xml
share/gnome/help/geyes/C/topic.dat
+share/gnome/help/gkb/C/figures/gkb_applet.png
+share/gnome/help/gkb/C/gkb.xml
+share/gnome/help/gkb/C/legal.xml
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
@@ -231,10 +240,12 @@ 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
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
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/gkb-C.omf
share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
share/gnome/omf/gnome-applets/gweather-C.omf
share/gnome/omf/gnome-applets/mixer_applet2-C.omf
@@ -400,6 +411,7 @@ share/gnome/xmodmap/xmodmap.us-sun
share/gnome/xmodmap/xmodmap.us.old
share/gnome/xmodmap/xmodmap.us_intl
share/gnome/xmodmap/xmodmap.yu
+share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 836f0bb3381b..9a2f31569d45 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.20
+PORTVERSION= 1.5.22
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 4794ea4cbf02..5230000863d5 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.20.tar.bz2) = 6276d06e37fc5d954ea0b9b1f2107b1c
+MD5 (gnome2/gnome-desktop-1.5.22.tar.bz2) = db0b8ac8b648230b7817afa96b2dcb8d
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index e590b8fa56b4..bf7abacb74dc 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -8,7 +8,7 @@ lib/libgnome-desktop-2.so
lib/libgnome-desktop-2.so.0
libdata/pkgconfig/gnome-desktop-2.0.pc
share/gnome/gnome-about/contributors.dat
-share/gnome/gnome-about/gnome-version
+share/gnome/gnome-about/gnome-version.xml
share/gnome/help/fdl/C/fdl.xml
share/gnome/help/gpl/C/gpl.xml
share/gnome/help/lgpl/C/lgpl.xml
@@ -36,6 +36,7 @@ share/gnome/pixmaps/gnome-applications.png
share/gnome/pixmaps/gnome-audio2.png
share/gnome/pixmaps/gnome-background.png
share/gnome/pixmaps/gnome-calc2.png
+share/gnome/pixmaps/gnome-calc3.png
share/gnome/pixmaps/gnome-calendar.png
share/gnome/pixmaps/gnome-cardgame.png
share/gnome/pixmaps/gnome-ccbackground.png
@@ -153,6 +154,7 @@ share/gnome/pixmaps/panel-folder.png
share/gnome/pixmaps/panel-knob.png
share/gnome/pixmaps/panel-menu-main.png
share/gnome/pixmaps/vnterm.xpm
+share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-desktop-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 2000a3db95a5..b917fbe04f65 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.22
+PORTVERSION= 1.5.24
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index a54fc7b7ae38..f999107bc18a 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.22.tar.bz2) = 74f20921f67fa23bcf6f2bc046653f1e
+MD5 (gnome2/gnome-panel-1.5.24.tar.bz2) = 32fb9c407b879f76f1a610a5208be8b6
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 2c8eefaaf9dc..fe0134aba0b5 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -8,6 +8,8 @@ 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
@@ -68,6 +70,7 @@ 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
share/doc/panel-applet/applet-writing.html
@@ -81,17 +84,16 @@ share/doc/panel-applet/session-saving.html
share/gnome/help/clock/C/clock.xml
share/gnome/help/clock/C/figures/clock_applet.png
share/gnome/help/clock/C/legal.xml
-share/gnome/help/clock/C/topic.dat
share/gnome/help/fish-applet-2/C/figures/fish_applet.png
+share/gnome/help/fish-applet-2/C/figures/fish_settings.png
share/gnome/help/fish-applet-2/C/fish-applet-2.xml
share/gnome/help/fish-applet-2/C/legal.xml
-share/gnome/help/fish-applet-2/C/topic.dat
share/gnome/help/mailcheck/C/figures/mailcheck-applet.png
share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png
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/mailcheck/C/topic.dat
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
@@ -146,6 +148,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png
share/gnome/pixmaps/mailcheck/email-tiny.png
share/gnome/pixmaps/mailcheck/email.png
share/gnome/pixmaps/mailcheck/tux-anim.png
+share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-panel-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-panel-2.0.mo
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index ef8749b4521c..d5ab093d0197 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesession
-PORTVERSION= 1.5.19
+PORTVERSION= 1.5.21
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 87fda53fdf5e..54ebc069304e 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-1.5.19.tar.bz2) = a723f5954097eec8c1ce4528d59d2179
+MD5 (gnome2/gnome-session-1.5.21.tar.bz2) = 405a7835d5ba6103b21082b015c89a37
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index b539945ccd7e..5a07971a5deb 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -1,4 +1,3 @@
-bin/gnome-libice-check
bin/gnome-login-check
bin/gnome-session
bin/gnome-session-properties
@@ -26,12 +25,14 @@ share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo
share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 9d50cd2ad709..4cfe6586c1e9 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 1.9.6
+PORTVERSION= 1.9.7
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 772d3699b0d0..ad4792a3e843 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-1.9.6.tar.bz2) = e509c5ba638aeeea320527daa1f996d7
+MD5 (gnome2/gnome-terminal-1.9.7.tar.bz2) = f675430f351ca25f9efa45e2fed982d0
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 603ceff36454..4b59a7c09290 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -15,6 +15,7 @@ share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
share/gnome/help/gnome-terminal/C/gnome-terminal.xml
share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
share/gnome/pixmaps/gnome-terminal.png
share/locale/da/LC_MESSAGES/gnome-terminal.mo
share/locale/de/LC_MESSAGES/gnome-terminal.mo
@@ -37,9 +38,9 @@ share/locale/sl/LC_MESSAGES/gnome-terminal.mo
share/locale/sv/LC_MESSAGES/gnome-terminal.mo
share/locale/tr/LC_MESSAGES/gnome-terminal.mo
share/locale/uk/LC_MESSAGES/gnome-terminal.mo
+share/locale/vi/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
-@dirrm share/gnome/help/gnome-terminal/C/figures
@dirrm share/gnome/help/gnome-terminal/C
@dirrm share/gnome/help/gnome-terminal
@dirrm share/gnome/gnome-terminal/glade
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index dbc7e2606889..75c551b3bcfa 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= yelp
-PORTVERSION= 0.8
+PORTVERSION= 0.10
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020607
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
@@ -34,5 +34,7 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(libdir\)/bonobo/servers|\$\(prefix\)/libdata/bonobo/servers|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+ @${PERL} -pi -e 's|\@prefix\@/share|\@datadir\@|g' \
+ ${WRKSRC}/stylesheets/docbook/catalog.in
.include <bsd.port.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index c0b7f04dddc8..f49d0517791b 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1 +1 @@
-MD5 (gnome2/yelp-0.8.tar.bz2) = 0590082e2d0ecf1da3bef4019cb08130
+MD5 (gnome2/yelp-0.10.tar.bz2) = d1aac304ad5792f340e132a1fdd8b36e
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index ff8a8894291d..9c31e9cc3571 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,13 +1,138 @@
bin/gnome-help
bin/yelp
+bin/yelp-db2html
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/docbook/VERSION
+share/gnome/sgml/docbook/yelp/docbook/common/af.xml
+share/gnome/sgml/docbook/yelp/docbook/common/ca.xml
+share/gnome/sgml/docbook/yelp/docbook/common/common.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/cs.xml
+share/gnome/sgml/docbook/yelp/docbook/common/da.xml
+share/gnome/sgml/docbook/yelp/docbook/common/de.xml
+share/gnome/sgml/docbook/yelp/docbook/common/el.xml
+share/gnome/sgml/docbook/yelp/docbook/common/en.xml
+share/gnome/sgml/docbook/yelp/docbook/common/es.xml
+share/gnome/sgml/docbook/yelp/docbook/common/et.xml
+share/gnome/sgml/docbook/yelp/docbook/common/eu.xml
+share/gnome/sgml/docbook/yelp/docbook/common/fi.xml
+share/gnome/sgml/docbook/yelp/docbook/common/fr.xml
+share/gnome/sgml/docbook/yelp/docbook/common/gentext.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/hu.xml
+share/gnome/sgml/docbook/yelp/docbook/common/id.xml
+share/gnome/sgml/docbook/yelp/docbook/common/it.xml
+share/gnome/sgml/docbook/yelp/docbook/common/ja.xml
+share/gnome/sgml/docbook/yelp/docbook/common/ko.xml
+share/gnome/sgml/docbook/yelp/docbook/common/l10n.dtd
+share/gnome/sgml/docbook/yelp/docbook/common/l10n.xml
+share/gnome/sgml/docbook/yelp/docbook/common/l10n.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/labels.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/nl.xml
+share/gnome/sgml/docbook/yelp/docbook/common/nn.xml
+share/gnome/sgml/docbook/yelp/docbook/common/no.xml
+share/gnome/sgml/docbook/yelp/docbook/common/pl.xml
+share/gnome/sgml/docbook/yelp/docbook/common/pt.xml
+share/gnome/sgml/docbook/yelp/docbook/common/pt_br.xml
+share/gnome/sgml/docbook/yelp/docbook/common/ro.xml
+share/gnome/sgml/docbook/yelp/docbook/common/ru.xml
+share/gnome/sgml/docbook/yelp/docbook/common/sk.xml
+share/gnome/sgml/docbook/yelp/docbook/common/sl.xml
+share/gnome/sgml/docbook/yelp/docbook/common/sr.xml
+share/gnome/sgml/docbook/yelp/docbook/common/subtitles.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/sv.xml
+share/gnome/sgml/docbook/yelp/docbook/common/table.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/th.xml
+share/gnome/sgml/docbook/yelp/docbook/common/titles.xsl
+share/gnome/sgml/docbook/yelp/docbook/common/tr.xml
+share/gnome/sgml/docbook/yelp/docbook/common/uk.xml
+share/gnome/sgml/docbook/yelp/docbook/common/xh.xml
+share/gnome/sgml/docbook/yelp/docbook/common/zh_cn.xml
+share/gnome/sgml/docbook/yelp/docbook/common/zh_tw.xml
+share/gnome/sgml/docbook/yelp/docbook/dtd/calstblx.dtd
+share/gnome/sgml/docbook/yelp/docbook/dtd/catalog
+share/gnome/sgml/docbook/yelp/docbook/dtd/dbcentx.mod
+share/gnome/sgml/docbook/yelp/docbook/dtd/dbgenent.mod
+share/gnome/sgml/docbook/yelp/docbook/dtd/dbhierx.mod
+share/gnome/sgml/docbook/yelp/docbook/dtd/dbnotnx.mod
+share/gnome/sgml/docbook/yelp/docbook/dtd/dbpoolx.mod
+share/gnome/sgml/docbook/yelp/docbook/dtd/docbookx.dtd
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsa.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsb.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsc.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsn.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amso.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-amsr.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-box.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr1.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-cyr2.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-dia.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk1.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk2.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk3.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-grk4.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat1.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-lat2.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-num.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-pub.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/ent/iso-tech.ent
+share/gnome/sgml/docbook/yelp/docbook/dtd/soextblx.dtd
+share/gnome/sgml/docbook/yelp/docbook/html/admon.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/autoidx.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/autotoc.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/biblio.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/block.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/calc-chunks.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/callout.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/changebars.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/chunk-experimental.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/chunk.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/chunker.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/component.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/division.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/docbook.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/ebnf.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/expchunk.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/footnote.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/formal.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/glossary.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/graphics.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/html.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/index.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/info.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/inline.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/keywords.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/lists.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/math.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/oldchunker.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/onechunk.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/param.xml
+share/gnome/sgml/docbook/yelp/docbook/html/param.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/pi.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/qandaset.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/refentry.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/sections.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/synop.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/table.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xml
+share/gnome/sgml/docbook/yelp/docbook/html/titlepage.templates.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/titlepage.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/toc.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/verbatim.xsl
+share/gnome/sgml/docbook/yelp/docbook/html/xref.xsl
+share/gnome/sgml/docbook/yelp/docbook/images/blank.png
+share/gnome/sgml/docbook/yelp/docbook/images/caution.png
+share/gnome/sgml/docbook/yelp/docbook/images/important.png
+share/gnome/sgml/docbook/yelp/docbook/images/note.png
+share/gnome/sgml/docbook/yelp/docbook/images/tip.png
+share/gnome/sgml/docbook/yelp/docbook/images/warning.png
+share/gnome/sgml/docbook/yelp/docbook/lib/lib.xsl
share/gnome/sgml/docbook/yelp/l10n.xml
share/gnome/sgml/docbook/yelp/yelp-custom.xsl
share/gnome/sgml/docbook/yelp/yelp-customization.xsl
+share/gnome/yelp/catalog
share/gnome/yelp/important_docs.xml
share/locale/az/LC_MESSAGES/yelp.mo
share/locale/bg/LC_MESSAGES/yelp.mo
@@ -18,6 +143,8 @@ share/locale/el/LC_MESSAGES/yelp.mo
share/locale/es/LC_MESSAGES/yelp.mo
share/locale/et/LC_MESSAGES/yelp.mo
share/locale/fr/LC_MESSAGES/yelp.mo
+share/locale/gl/LC_MESSAGES/yelp.mo
+share/locale/it/LC_MESSAGES/yelp.mo
share/locale/ja/LC_MESSAGES/yelp.mo
share/locale/ko/LC_MESSAGES/yelp.mo
share/locale/lv/LC_MESSAGES/yelp.mo
@@ -39,5 +166,12 @@ share/locale/wa/LC_MESSAGES/yelp.mo
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/docbook/lib
+@dirrm share/gnome/sgml/docbook/yelp/docbook/images
+@dirrm share/gnome/sgml/docbook/yelp/docbook/html
+@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd/ent
+@dirrm share/gnome/sgml/docbook/yelp/docbook/dtd
+@dirrm share/gnome/sgml/docbook/yelp/docbook/common
+@dirrm share/gnome/sgml/docbook/yelp/docbook
@dirrm share/gnome/sgml/docbook/yelp
@dirrm share/gnome/images/yelp