aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/gnome-media/Makefile6
-rw-r--r--audio/gnome-media/distinfo2
-rw-r--r--audio/gnome-media/pkg-plist34
-rw-r--r--audio/gnomemedia2/Makefile6
-rw-r--r--audio/gnomemedia2/distinfo2
-rw-r--r--audio/gnomemedia2/pkg-plist34
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnome-utils/distinfo2
-rw-r--r--deskutils/gnome-utils/pkg-plist5
-rw-r--r--deskutils/gnomeutils2/Makefile4
-rw-r--r--deskutils/gnomeutils2/distinfo2
-rw-r--r--deskutils/gnomeutils2/pkg-plist5
-rw-r--r--devel/bugbuddy2/Makefile2
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnomecommon/Makefile2
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/pkg-config/Makefile2
-rw-r--r--devel/pkgconfig/Makefile2
-rw-r--r--editors/gedit2/Makefile4
-rw-r--r--editors/gedit2/distinfo2
-rw-r--r--editors/gedit2/pkg-plist2
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/gnome-games/distinfo2
-rw-r--r--games/gnome-games/pkg-plist86
-rw-r--r--games/gnomegames2/Makefile4
-rw-r--r--games/gnomegames2/distinfo2
-rw-r--r--games/gnomegames2/pkg-plist86
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/librsvg2/Makefile2
-rw-r--r--lang/librep2/Makefile2
-rw-r--r--misc/gnome-mime-data/Makefile2
-rw-r--r--misc/gnomemimedata/Makefile2
-rw-r--r--misc/gnomeutils2/Makefile4
-rw-r--r--misc/gnomeutils2/distinfo2
-rw-r--r--misc/gnomeutils2/pkg-plist5
-rw-r--r--misc/metatheme2/Makefile2
-rw-r--r--sysutils/gconf-editor/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile3
-rw-r--r--sysutils/gnome-system-monitor/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile3
-rw-r--r--sysutils/gnomesystemmonitor/Makefile2
-rw-r--r--www/libgtkhtml/Makefile6
-rw-r--r--www/libgtkhtml/distinfo2
-rw-r--r--x11-fm/nautilus2/Makefile5
-rw-r--r--x11-fm/nautilus2/distinfo2
-rw-r--r--x11-fm/nautilus2/files/patch-aa14
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c25
-rw-r--r--x11-fm/nautilus2/pkg-plist164
-rw-r--r--x11-toolkits/eel2/Makefile6
-rw-r--r--x11-toolkits/eel2/distinfo2
-rw-r--r--x11-toolkits/eel2/pkg-plist1
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo2
-rw-r--r--x11-toolkits/libwnck/pkg-plist2
-rw-r--r--x11-toolkits/libzvt/Makefile4
-rw-r--r--x11-toolkits/libzvt/distinfo2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-wm/sawfish2/Makefile2
-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
100 files changed, 465 insertions, 628 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index fd537277cfe6..30e865c03598 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 1.547.0
+PORTVERSION= 1.999999999.0 # Uh, a little crazy, don't you think?
CATEGORIES= audio 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-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index ed636d19caaa..02a411610466 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
+MD5 (gnome2/gnome-media-1.999999999.0.tar.bz2) = d148d8d3049edaf2d18e52258f73cab7
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index d22c68d84a36..05fbd0006b0f 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -28,25 +28,40 @@ share/gnome/applications/gnome-volume-control.desktop
share/gnome/applications/reclevel.desktop
share/gnome/applications/vumeter.desktop
share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/help/gmix/C/figures/gmix-prefs.png
-share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix.xml
-share/gnome/help/gmix/C/legal.xml
-share/gnome/help/gmix/C/topic.dat
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
share/gnome/help/gnome-cd/C/figures/gnome-cd.png
+share/gnome/help/gnome-cd/C/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
share/gnome/help/gnome-cd/C/gnome-cd.xml
share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
share/gnome/help/grecord/C/figures/grecord-prefs-path.png
share/gnome/help/grecord/C/figures/grecord-prefs-play.png
share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
share/gnome/help/grecord/C/figures/grecord.png
+share/gnome/help/grecord/C/figures/grecord_window.png
share/gnome/help/grecord/C/grecord.xml
share/gnome/help/grecord/C/legal.xml
share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/grecord-C.omf
share/gnome/pixmaps/gnome-cd.png
share/gnome/pixmaps/gnome-cd/a-eject-menu.png
share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
@@ -171,6 +186,7 @@ share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
share/gnome/pixmaps/gnome-mixer.png
share/gnome/pixmaps/gnome-reclevel.png
share/gnome/pixmaps/gnome-vumeter.png
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
@@ -205,6 +221,7 @@ share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@@ -215,15 +232,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes
@dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
@dirrm share/gnome/help/grecord/C/figures
@dirrm share/gnome/help/grecord/C
@dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/C/figures
+@dirrm share/gnome/help/gnome-volume-control/C
+@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-cd/C/figures
@dirrm share/gnome/help/gnome-cd/C
@dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/help/gmix/C/figures
-@dirrm share/gnome/help/gmix/C
-@dirrm share/gnome/help/gmix
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index fd537277cfe6..30e865c03598 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 1.547.0
+PORTVERSION= 1.999999999.0 # Uh, a little crazy, don't you think?
CATEGORIES= audio 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-media-${PORTVERSION}
DIST_SUBDIR= gnome2
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index ed636d19caaa..02a411610466 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
+MD5 (gnome2/gnome-media-1.999999999.0.tar.bz2) = d148d8d3049edaf2d18e52258f73cab7
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index d22c68d84a36..05fbd0006b0f 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -28,25 +28,40 @@ share/gnome/applications/gnome-volume-control.desktop
share/gnome/applications/reclevel.desktop
share/gnome/applications/vumeter.desktop
share/gnome/control-center-2.0/capplets/cddb-slave.desktop
-share/gnome/help/gmix/C/figures/gmix-prefs.png
-share/gnome/help/gmix/C/figures/gmix.png
-share/gnome/help/gmix/C/gmix.xml
-share/gnome/help/gmix/C/legal.xml
-share/gnome/help/gmix/C/topic.dat
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/C/figures/eject_button.png
+share/gnome/help/gnome-cd/C/figures/forward_button.png
share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
share/gnome/help/gnome-cd/C/figures/gnome-cd.png
+share/gnome/help/gnome-cd/C/figures/next_button.png
+share/gnome/help/gnome-cd/C/figures/pause_button.png
+share/gnome/help/gnome-cd/C/figures/play_button.png
+share/gnome/help/gnome-cd/C/figures/preferences_button.png
+share/gnome/help/gnome-cd/C/figures/previous_button.png
+share/gnome/help/gnome-cd/C/figures/rewind_button.png
+share/gnome/help/gnome-cd/C/figures/stop_button.png
share/gnome/help/gnome-cd/C/gnome-cd.xml
share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
+share/gnome/help/gnome-volume-control/C/figures/gmix.png
+share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
+share/gnome/help/gnome-volume-control/C/legal.xml
share/gnome/help/grecord/C/figures/grecord-prefs-path.png
share/gnome/help/grecord/C/figures/grecord-prefs-play.png
share/gnome/help/grecord/C/figures/grecord-prefs-rec.png
share/gnome/help/grecord/C/figures/grecord-prefs-sound.png
share/gnome/help/grecord/C/figures/grecord-prefs-ui.png
share/gnome/help/grecord/C/figures/grecord.png
+share/gnome/help/grecord/C/figures/grecord_window.png
share/gnome/help/grecord/C/grecord.xml
share/gnome/help/grecord/C/legal.xml
share/gnome/idl/GNOME_Media_CDDBSlave2.idl
+share/gnome/omf/gnome-media/gnome-cd-C.omf
+share/gnome/omf/gnome-media/gnome-volume-control-C.omf
+share/gnome/omf/gnome-media/grecord-C.omf
share/gnome/pixmaps/gnome-cd.png
share/gnome/pixmaps/gnome-cd/a-eject-menu.png
share/gnome/pixmaps/gnome-cd/a-eject-pressed.png
@@ -171,6 +186,7 @@ share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png
share/gnome/pixmaps/gnome-mixer.png
share/gnome/pixmaps/gnome-reclevel.png
share/gnome/pixmaps/gnome-vumeter.png
+share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
@@ -205,6 +221,7 @@ share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo
share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@@ -215,15 +232,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes
@dirrm share/gnome/pixmaps/gnome-cd
+@dirrm share/gnome/omf/gnome-media
@dirrm share/gnome/help/grecord/C/figures
@dirrm share/gnome/help/grecord/C
@dirrm share/gnome/help/grecord
+@dirrm share/gnome/help/gnome-volume-control/C/figures
+@dirrm share/gnome/help/gnome-volume-control/C
+@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-cd/C/figures
@dirrm share/gnome/help/gnome-cd/C
@dirrm share/gnome/help/gnome-cd
-@dirrm share/gnome/help/gmix/C/figures
-@dirrm share/gnome/help/gmix/C
-@dirrm share/gnome/help/gmix
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 34aa6340e1de..e5e5a1e08779 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.106.0
+PORTVERSION= 1.108.0
PORTEPOCH= 1
CATEGORIES= misc 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-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 4c4239694ed2..e278f52ef7b4 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
+MD5 (gnome2/gnome-utils-1.108.0.tar.bz2) = ae61948c696521fabc63ade9770b2356
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 6fb2d26be276..1faf7f44213e 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -32,6 +32,8 @@ share/gnome/help/gnome-dictionary/C/figures/gdict-main.png
share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png
share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png
share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
@@ -39,10 +41,9 @@ share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png
share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-system-log/C/figures/gnome-system-log.png
+share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/idl/gsu.idl
share/gnome/omf/gnome-utils/archive-generator-C.omf
share/gnome/omf/gnome-utils/gnome-calculator-C.omf
share/gnome/omf/gnome-utils/gnome-character-map-C.omf
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 34aa6340e1de..e5e5a1e08779 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.106.0
+PORTVERSION= 1.108.0
PORTEPOCH= 1
CATEGORIES= misc 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-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 4c4239694ed2..e278f52ef7b4 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
+MD5 (gnome2/gnome-utils-1.108.0.tar.bz2) = ae61948c696521fabc63ade9770b2356
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 6fb2d26be276..1faf7f44213e 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -32,6 +32,8 @@ share/gnome/help/gnome-dictionary/C/figures/gdict-main.png
share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png
share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png
share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
@@ -39,10 +41,9 @@ share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png
share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-system-log/C/figures/gnome-system-log.png
+share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/idl/gsu.idl
share/gnome/omf/gnome-utils/archive-generator-C.omf
share/gnome/omf/gnome-utils/gnome-calculator-C.omf
share/gnome/omf/gnome-utils/gnome-character-map-C.omf
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index fdf2a391bba4..38982f7ed24b 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bugbuddy2
PORTVERSION= 2.1.6
CATEGORIES= devel 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= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 16fba134ac52..dcee3493de4a 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
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-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index 16fba134ac52..dcee3493de4a 100644
--- a/devel/gnomecommon/Makefile
+++ b/devel/gnomecommon/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecommon
PORTVERSION= 1.2.4
CATEGORIES= devel
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-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 71f46b7afddc..32b9eedbea35 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.90.2
PORTREVISION= 1
CATEGORIES= devel 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= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 84859e59f874..527c4c8994a7 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
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
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 84859e59f874..527c4c8994a7 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pkgconfig
PORTVERSION= 0.12.0
CATEGORIES= devel
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
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index f4b082028341..78b9195aa6ac 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gedit2
-PORTVERSION= 1.120.0
+PORTVERSION= 1.121.1
CATEGORIES= editors 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
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index 39aa19f8a25e..360c73c964ae 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit2-1.120.0.tar.bz2) = 7ddec48fcbaf0763764d8b7219db1bbf
+MD5 (gnome2/gedit2-1.121.1.tar.bz2) = eb1dd7c174e6e9555d500617f61ffc84
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index bf4e5c500117..2300746d783a 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -34,7 +34,9 @@ share/gnome/pixmaps/gedit-icon.png
share/gnome/pixmaps/gedit-logo.png
share/gnome/pixmaps/gedit-plugin-manager.png
share/gnome/pixmaps/shell-output-logo.png
+share/locale/ar/LC_MESSAGES/gedit-2.0.mo
share/locale/az/LC_MESSAGES/gedit-2.0.mo
+share/locale/bg/LC_MESSAGES/gedit-2.0.mo
share/locale/ca/LC_MESSAGES/gedit-2.0.mo
share/locale/cs/LC_MESSAGES/gedit-2.0.mo
share/locale/da/LC_MESSAGES/gedit-2.0.mo
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index f9c346cb31e4..da6a1932fd54 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 1.92.0
+PORTVERSION= 1.94.0
CATEGORIES= games 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-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index eca28c2b8249..e9ec42377a31 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-1.92.0.tar.bz2) = 2e37620aa1d3d45a52f0fd6f82a7d51e
+MD5 (gnome2/gnome-games-1.94.0.tar.bz2) = e5a04c8c20c154b62ae6cc779c1beb15
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 2a4b6d522a31..c6f88b8e148f 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -25,6 +25,7 @@ etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml
@@ -36,6 +37,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml
etc/gconf/schemas/freecell.schemas
etc/gconf/schemas/gataxx.schemas
@@ -44,6 +46,7 @@ etc/gconf/schemas/gnometris.schemas
etc/gconf/schemas/gnomine.schemas
etc/gconf/schemas/gtali.schemas
etc/gconf/schemas/iagno.schemas
+etc/gconf/schemas/mahjongg.schemas
etc/gconf/schemas/same-gnome.schemas
etc/sound/events/gataxx.soundlist
etc/sound/events/gnect.soundlist
@@ -297,44 +300,25 @@ share/gnome/help/gnobots2/es/index.html
share/gnome/help/gnobots2/es/topic.dat
share/gnome/help/gnobots2/it/index.html
share/gnome/help/gnobots2/it/topic.dat
-share/gnome/help/gnome-mines/C/figures/advanced_121_a.png
-share/gnome/help/gnome-mines/C/figures/advanced_121_b.png
-share/gnome/help/gnome-mines/C/figures/advanced_121_c.png
-share/gnome/help/gnome-mines/C/figures/basic-corner.png
-share/gnome/help/gnome-mines/C/figures/basic-flat3.png
-share/gnome/help/gnome-mines/C/figures/basic-wall.png
-share/gnome/help/gnome-mines/C/figures/gnomine-begin-play.png
-share/gnome/help/gnome-mines/C/figures/gnomine-fail.png
-share/gnome/help/gnome-mines/C/figures/gnomine-fresh.png
-share/gnome/help/gnome-mines/C/figures/gnomine-preferences.png
-share/gnome/help/gnome-mines/C/figures/gnomine-won.png
-share/gnome/help/gnome-mines/C/gnome-mines.xml
-share/gnome/help/gnome-mines/C/legal.xml
share/gnome/help/gnome-stones/C/figures/main-game.png
share/gnome/help/gnome-stones/C/figures/main-start.png
share/gnome/help/gnome-stones/C/figures/preferences-joystick.png
share/gnome/help/gnome-stones/C/figures/preferences-main.png
share/gnome/help/gnome-stones/C/gnome-stones.xml
share/gnome/help/gnome-stones/C/legal.xml
-share/gnome/help/gnome-xbill/C/figures/bucket.png
-share/gnome/help/gnome-xbill/C/figures/cable.png
-share/gnome/help/gnome-xbill/C/figures/computer.png
-share/gnome/help/gnome-xbill/C/figures/fakeseg.png
-share/gnome/help/gnome-xbill/C/figures/fallenos.png
-share/gnome/help/gnome-xbill/C/figures/infected.png
-share/gnome/help/gnome-xbill/C/figures/mainwin.png
-share/gnome/help/gnome-xbill/C/figures/microbill.png
-share/gnome/help/gnome-xbill/C/figures/network.png
-share/gnome/help/gnome-xbill/C/figures/remove.png
-share/gnome/help/gnome-xbill/C/figures/removeos.png
-share/gnome/help/gnome-xbill/C/figures/score.png
-share/gnome/help/gnome-xbill/C/figures/scores.png
-share/gnome/help/gnome-xbill/C/figures/spark.png
-share/gnome/help/gnome-xbill/C/figures/splat.png
-share/gnome/help/gnome-xbill/C/figures/startgame.png
-share/gnome/help/gnome-xbill/C/figures/toasters.png
-share/gnome/help/gnome-xbill/C/gnome-xbill.xml
-share/gnome/help/gnome-xbill/C/legal.xml
+share/gnome/help/gnomine/C/figures/advanced_121_a.png
+share/gnome/help/gnomine/C/figures/advanced_121_b.png
+share/gnome/help/gnomine/C/figures/advanced_121_c.png
+share/gnome/help/gnomine/C/figures/basic-corner.png
+share/gnome/help/gnomine/C/figures/basic-flat3.png
+share/gnome/help/gnomine/C/figures/basic-wall.png
+share/gnome/help/gnomine/C/figures/gnomine-begin-play.png
+share/gnome/help/gnomine/C/figures/gnomine-fail.png
+share/gnome/help/gnomine/C/figures/gnomine-fresh.png
+share/gnome/help/gnomine/C/figures/gnomine-preferences.png
+share/gnome/help/gnomine/C/figures/gnomine-won.png
+share/gnome/help/gnomine/C/gnomine.xml
+share/gnome/help/gnomine/C/legal.xml
share/gnome/help/gnotravex/C/figures/gnotravex_game.png
share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/C/gnotravex.xml
@@ -370,6 +354,25 @@ share/gnome/help/same-gnome/C/figures/same-planets-fig.png
share/gnome/help/same-gnome/C/figures/score-dialog.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
+share/gnome/help/xbill/C/figures/bucket.png
+share/gnome/help/xbill/C/figures/cable.png
+share/gnome/help/xbill/C/figures/computer.png
+share/gnome/help/xbill/C/figures/fakeseg.png
+share/gnome/help/xbill/C/figures/fallenos.png
+share/gnome/help/xbill/C/figures/infected.png
+share/gnome/help/xbill/C/figures/mainwin.png
+share/gnome/help/xbill/C/figures/microbill.png
+share/gnome/help/xbill/C/figures/network.png
+share/gnome/help/xbill/C/figures/remove.png
+share/gnome/help/xbill/C/figures/removeos.png
+share/gnome/help/xbill/C/figures/score.png
+share/gnome/help/xbill/C/figures/scores.png
+share/gnome/help/xbill/C/figures/spark.png
+share/gnome/help/xbill/C/figures/splat.png
+share/gnome/help/xbill/C/figures/startgame.png
+share/gnome/help/xbill/C/figures/toasters.png
+share/gnome/help/xbill/C/legal.xml
+share/gnome/help/xbill/C/xbill.xml
share/gnome/mime-info/gnome-stones.keys
share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
@@ -378,14 +381,14 @@ share/gnome/omf/gnome-games/glines-C.omf
share/gnome/omf/gnome-games/gnect-C.omf
share/gnome/omf/gnome-games/gnibbles-C.omf
share/gnome/omf/gnome-games/gnobots2-C.omf
-share/gnome/omf/gnome-games/gnome-mines-C.omf
share/gnome/omf/gnome-games/gnome-stones-C.omf
-share/gnome/omf/gnome-games/gnome-xbill-C.omf
+share/gnome/omf/gnome-games/gnomine-C.omf
share/gnome/omf/gnome-games/gnotravex-C.omf
share/gnome/omf/gnome-games/gtali-C.omf
share/gnome/omf/gnome-games/iagno-C.omf
share/gnome/omf/gnome-games/mahjongg-C.omf
share/gnome/omf/gnome-games/same-gnome-C.omf
+share/gnome/omf/gnome-games/xbill-C.omf
share/gnome/pixmaps/cards/backs/beige.png
share/gnome/pixmaps/cards/backs/face.png
share/gnome/pixmaps/cards/backs/grey.png
@@ -737,6 +740,7 @@ share/locale/sl/LC_MESSAGES/gnome-games.mo
share/locale/sv/LC_MESSAGES/gnome-games.mo
share/locale/tr/LC_MESSAGES/gnome-games.mo
share/locale/uk/LC_MESSAGES/gnome-games.mo
+share/locale/vi/LC_MESSAGES/gnome-games.mo
share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@@ -773,6 +777,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/cards/backs
@dirrm share/gnome/pixmaps/cards
@dirrm share/gnome/omf/gnome-games
+@dirrm share/gnome/help/xbill/C/figures
+@dirrm share/gnome/help/xbill/C
+@dirrm share/gnome/help/xbill
@dirrm share/gnome/help/same-gnome/C/figures
@dirrm share/gnome/help/same-gnome/C
@dirrm share/gnome/help/same-gnome
@@ -789,15 +796,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/gnotravex/C/figures
@dirrm share/gnome/help/gnotravex/C
@dirrm share/gnome/help/gnotravex
-@dirrm share/gnome/help/gnome-xbill/C/figures
-@dirrm share/gnome/help/gnome-xbill/C
-@dirrm share/gnome/help/gnome-xbill
+@dirrm share/gnome/help/gnomine/C/figures
+@dirrm share/gnome/help/gnomine/C
+@dirrm share/gnome/help/gnomine
@dirrm share/gnome/help/gnome-stones/C/figures
@dirrm share/gnome/help/gnome-stones/C
@dirrm share/gnome/help/gnome-stones
-@dirrm share/gnome/help/gnome-mines/C/figures
-@dirrm share/gnome/help/gnome-mines/C
-@dirrm share/gnome/help/gnome-mines
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/es
@dirrm share/gnome/help/gnobots2/da
@@ -828,6 +832,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/apps/Games
@dirrm include/gdkcardimage
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
@@ -837,6 +842,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell
@dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome
+@dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg
@dirrm etc/gconf/gconf.xml.defaults/apps/iagno
@dirrm etc/gconf/gconf.xml.defaults/apps/gtali
@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index f9c346cb31e4..da6a1932fd54 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomegames2
-PORTVERSION= 1.92.0
+PORTVERSION= 1.94.0
CATEGORIES= games 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-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index eca28c2b8249..e9ec42377a31 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-1.92.0.tar.bz2) = 2e37620aa1d3d45a52f0fd6f82a7d51e
+MD5 (gnome2/gnome-games-1.94.0.tar.bz2) = e5a04c8c20c154b62ae6cc779c1beb15
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 2a4b6d522a31..c6f88b8e148f 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -25,6 +25,7 @@ etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml
@@ -36,6 +37,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml
etc/gconf/schemas/freecell.schemas
etc/gconf/schemas/gataxx.schemas
@@ -44,6 +46,7 @@ etc/gconf/schemas/gnometris.schemas
etc/gconf/schemas/gnomine.schemas
etc/gconf/schemas/gtali.schemas
etc/gconf/schemas/iagno.schemas
+etc/gconf/schemas/mahjongg.schemas
etc/gconf/schemas/same-gnome.schemas
etc/sound/events/gataxx.soundlist
etc/sound/events/gnect.soundlist
@@ -297,44 +300,25 @@ share/gnome/help/gnobots2/es/index.html
share/gnome/help/gnobots2/es/topic.dat
share/gnome/help/gnobots2/it/index.html
share/gnome/help/gnobots2/it/topic.dat
-share/gnome/help/gnome-mines/C/figures/advanced_121_a.png
-share/gnome/help/gnome-mines/C/figures/advanced_121_b.png
-share/gnome/help/gnome-mines/C/figures/advanced_121_c.png
-share/gnome/help/gnome-mines/C/figures/basic-corner.png
-share/gnome/help/gnome-mines/C/figures/basic-flat3.png
-share/gnome/help/gnome-mines/C/figures/basic-wall.png
-share/gnome/help/gnome-mines/C/figures/gnomine-begin-play.png
-share/gnome/help/gnome-mines/C/figures/gnomine-fail.png
-share/gnome/help/gnome-mines/C/figures/gnomine-fresh.png
-share/gnome/help/gnome-mines/C/figures/gnomine-preferences.png
-share/gnome/help/gnome-mines/C/figures/gnomine-won.png
-share/gnome/help/gnome-mines/C/gnome-mines.xml
-share/gnome/help/gnome-mines/C/legal.xml
share/gnome/help/gnome-stones/C/figures/main-game.png
share/gnome/help/gnome-stones/C/figures/main-start.png
share/gnome/help/gnome-stones/C/figures/preferences-joystick.png
share/gnome/help/gnome-stones/C/figures/preferences-main.png
share/gnome/help/gnome-stones/C/gnome-stones.xml
share/gnome/help/gnome-stones/C/legal.xml
-share/gnome/help/gnome-xbill/C/figures/bucket.png
-share/gnome/help/gnome-xbill/C/figures/cable.png
-share/gnome/help/gnome-xbill/C/figures/computer.png
-share/gnome/help/gnome-xbill/C/figures/fakeseg.png
-share/gnome/help/gnome-xbill/C/figures/fallenos.png
-share/gnome/help/gnome-xbill/C/figures/infected.png
-share/gnome/help/gnome-xbill/C/figures/mainwin.png
-share/gnome/help/gnome-xbill/C/figures/microbill.png
-share/gnome/help/gnome-xbill/C/figures/network.png
-share/gnome/help/gnome-xbill/C/figures/remove.png
-share/gnome/help/gnome-xbill/C/figures/removeos.png
-share/gnome/help/gnome-xbill/C/figures/score.png
-share/gnome/help/gnome-xbill/C/figures/scores.png
-share/gnome/help/gnome-xbill/C/figures/spark.png
-share/gnome/help/gnome-xbill/C/figures/splat.png
-share/gnome/help/gnome-xbill/C/figures/startgame.png
-share/gnome/help/gnome-xbill/C/figures/toasters.png
-share/gnome/help/gnome-xbill/C/gnome-xbill.xml
-share/gnome/help/gnome-xbill/C/legal.xml
+share/gnome/help/gnomine/C/figures/advanced_121_a.png
+share/gnome/help/gnomine/C/figures/advanced_121_b.png
+share/gnome/help/gnomine/C/figures/advanced_121_c.png
+share/gnome/help/gnomine/C/figures/basic-corner.png
+share/gnome/help/gnomine/C/figures/basic-flat3.png
+share/gnome/help/gnomine/C/figures/basic-wall.png
+share/gnome/help/gnomine/C/figures/gnomine-begin-play.png
+share/gnome/help/gnomine/C/figures/gnomine-fail.png
+share/gnome/help/gnomine/C/figures/gnomine-fresh.png
+share/gnome/help/gnomine/C/figures/gnomine-preferences.png
+share/gnome/help/gnomine/C/figures/gnomine-won.png
+share/gnome/help/gnomine/C/gnomine.xml
+share/gnome/help/gnomine/C/legal.xml
share/gnome/help/gnotravex/C/figures/gnotravex_game.png
share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png
share/gnome/help/gnotravex/C/gnotravex.xml
@@ -370,6 +354,25 @@ share/gnome/help/same-gnome/C/figures/same-planets-fig.png
share/gnome/help/same-gnome/C/figures/score-dialog.png
share/gnome/help/same-gnome/C/legal.xml
share/gnome/help/same-gnome/C/same-gnome.xml
+share/gnome/help/xbill/C/figures/bucket.png
+share/gnome/help/xbill/C/figures/cable.png
+share/gnome/help/xbill/C/figures/computer.png
+share/gnome/help/xbill/C/figures/fakeseg.png
+share/gnome/help/xbill/C/figures/fallenos.png
+share/gnome/help/xbill/C/figures/infected.png
+share/gnome/help/xbill/C/figures/mainwin.png
+share/gnome/help/xbill/C/figures/microbill.png
+share/gnome/help/xbill/C/figures/network.png
+share/gnome/help/xbill/C/figures/remove.png
+share/gnome/help/xbill/C/figures/removeos.png
+share/gnome/help/xbill/C/figures/score.png
+share/gnome/help/xbill/C/figures/scores.png
+share/gnome/help/xbill/C/figures/spark.png
+share/gnome/help/xbill/C/figures/splat.png
+share/gnome/help/xbill/C/figures/startgame.png
+share/gnome/help/xbill/C/figures/toasters.png
+share/gnome/help/xbill/C/legal.xml
+share/gnome/help/xbill/C/xbill.xml
share/gnome/mime-info/gnome-stones.keys
share/gnome/mime-info/gnome-stones.mime
share/gnome/omf/gnome-games/aisleriot-C.omf
@@ -378,14 +381,14 @@ share/gnome/omf/gnome-games/glines-C.omf
share/gnome/omf/gnome-games/gnect-C.omf
share/gnome/omf/gnome-games/gnibbles-C.omf
share/gnome/omf/gnome-games/gnobots2-C.omf
-share/gnome/omf/gnome-games/gnome-mines-C.omf
share/gnome/omf/gnome-games/gnome-stones-C.omf
-share/gnome/omf/gnome-games/gnome-xbill-C.omf
+share/gnome/omf/gnome-games/gnomine-C.omf
share/gnome/omf/gnome-games/gnotravex-C.omf
share/gnome/omf/gnome-games/gtali-C.omf
share/gnome/omf/gnome-games/iagno-C.omf
share/gnome/omf/gnome-games/mahjongg-C.omf
share/gnome/omf/gnome-games/same-gnome-C.omf
+share/gnome/omf/gnome-games/xbill-C.omf
share/gnome/pixmaps/cards/backs/beige.png
share/gnome/pixmaps/cards/backs/face.png
share/gnome/pixmaps/cards/backs/grey.png
@@ -737,6 +740,7 @@ share/locale/sl/LC_MESSAGES/gnome-games.mo
share/locale/sv/LC_MESSAGES/gnome-games.mo
share/locale/tr/LC_MESSAGES/gnome-games.mo
share/locale/uk/LC_MESSAGES/gnome-games.mo
+share/locale/vi/LC_MESSAGES/gnome-games.mo
share/locale/wa/LC_MESSAGES/gnome-games.mo
share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@@ -773,6 +777,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/pixmaps/cards/backs
@dirrm share/gnome/pixmaps/cards
@dirrm share/gnome/omf/gnome-games
+@dirrm share/gnome/help/xbill/C/figures
+@dirrm share/gnome/help/xbill/C
+@dirrm share/gnome/help/xbill
@dirrm share/gnome/help/same-gnome/C/figures
@dirrm share/gnome/help/same-gnome/C
@dirrm share/gnome/help/same-gnome
@@ -789,15 +796,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/help/gnotravex/C/figures
@dirrm share/gnome/help/gnotravex/C
@dirrm share/gnome/help/gnotravex
-@dirrm share/gnome/help/gnome-xbill/C/figures
-@dirrm share/gnome/help/gnome-xbill/C
-@dirrm share/gnome/help/gnome-xbill
+@dirrm share/gnome/help/gnomine/C/figures
+@dirrm share/gnome/help/gnomine/C
+@dirrm share/gnome/help/gnomine
@dirrm share/gnome/help/gnome-stones/C/figures
@dirrm share/gnome/help/gnome-stones/C
@dirrm share/gnome/help/gnome-stones
-@dirrm share/gnome/help/gnome-mines/C/figures
-@dirrm share/gnome/help/gnome-mines/C
-@dirrm share/gnome/help/gnome-mines
@dirrm share/gnome/help/gnobots2/it
@dirrm share/gnome/help/gnobots2/es
@dirrm share/gnome/help/gnobots2/da
@@ -828,6 +832,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/apps/Games
@dirrm include/gdkcardimage
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
@@ -837,6 +842,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell
@dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome
+@dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg
@dirrm etc/gconf/gconf.xml.defaults/apps/iagno
@dirrm etc/gconf/gconf.xml.defaults/apps/gtali
@dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 8c58e8d29deb..2403b37f6bff 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.8
CATEGORIES= graphics
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= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 8c58e8d29deb..2403b37f6bff 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libart_lgpl2
PORTVERSION= 2.3.8
CATEGORIES= graphics
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= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 6f934093b105..5e41a95b41a9 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= librsvg2
PORTVERSION= 1.1.6
CATEGORIES= graphics 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
DISTNAME= librsvg-${PORTVERSION}
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index c07ffd88ccde..37c4ec517243 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= librep2
PORTVERSION= 2002.05.24
CATEGORIES= lang 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= librep-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index bb81e484db29..cb3def05b55e 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemimedata
PORTVERSION= 1.0.8
CATEGORIES= misc 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-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index bb81e484db29..cb3def05b55e 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomemimedata
PORTVERSION= 1.0.8
CATEGORIES= misc 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-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 34aa6340e1de..e5e5a1e08779 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.106.0
+PORTVERSION= 1.108.0
PORTEPOCH= 1
CATEGORIES= misc 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-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index 4c4239694ed2..e278f52ef7b4 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.106.0.tar.bz2) = d119a8d4f75ff0fdc51cb09e26e00164
+MD5 (gnome2/gnome-utils-1.108.0.tar.bz2) = ae61948c696521fabc63ade9770b2356
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 6fb2d26be276..1faf7f44213e 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -32,6 +32,8 @@ share/gnome/help/gnome-dictionary/C/figures/gdict-main.png
share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png
share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png
share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
+share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
@@ -39,10 +41,9 @@ share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png
share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png
share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-system-log/C/figures/gnome-system-log.png
+share/gnome/help/gnome-system-log/C/figures/syslog_window.png
share/gnome/help/gnome-system-log/C/gnome-system-log.xml
share/gnome/help/gnome-system-log/C/legal.xml
-share/gnome/idl/gsu.idl
share/gnome/omf/gnome-utils/archive-generator-C.omf
share/gnome/omf/gnome-utils/gnome-calculator-C.omf
share/gnome/omf/gnome-utils/gnome-character-map-C.omf
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 8f27bcf10502..fa8858d31dec 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= metatheme2
PORTVERSION= 0.9.7
CATEGORIES= misc 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-20020607
DISTNAME= metatheme-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 5e86403a6ea7..964511842297 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf-editor
PORTVERSION= 0.2
CATEGORIES= sysutils 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
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 4bdc252d6b37..1d565af8eb5a 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -7,9 +7,10 @@
PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
+PORTREVISION= 1
CATEGORIES= sysutils 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= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 18e7bb03dc7f..873b29f01a0d 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor
PORTVERSION= 1.1.7
CATEGORIES= sysutils 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-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 4bdc252d6b37..1d565af8eb5a 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -7,9 +7,10 @@
PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
+PORTREVISION= 1
CATEGORIES= sysutils 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= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 18e7bb03dc7f..873b29f01a0d 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomesystemmonitor
PORTVERSION= 1.1.7
CATEGORIES= sysutils 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-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 1d8ce3dc4ec2..ce2be20fca50 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -6,17 +6,17 @@
#
PORTNAME= libgtkhtml
-PORTVERSION= 1.99.7
+PORTVERSION= 2.0.0
CATEGORIES= www 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
LIB_DEPENDS= xslt.1:${PORTSDIR}/textproc/libxslt \
gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo
index d21b1400134f..763d1b5185cd 100644
--- a/www/libgtkhtml/distinfo
+++ b/www/libgtkhtml/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgtkhtml-1.99.7.tar.bz2) = 3dd0a733c35c132020921e94d7522c9d
+MD5 (gnome2/libgtkhtml-2.0.0.tar.bz2) = a8c164b18a9dee09fa8dc260d7f86e6e
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 242738e97c4e..6975f0258499 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= nautilus2
-PORTVERSION= 1.1.17
-PORTREVISION= 1
+PORTVERSION= 1.1.19
CATEGORIES= x11-fm 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
DISTNAME= nautilus-${PORTVERSION}
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 4f5c69535381..350ae49d59a6 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-1.1.17.tar.bz2) = 2c12ff181865d1690fe21bb320f779eb
+MD5 (gnome2/nautilus-1.1.19.tar.bz2) = 949a4f64cc27ebb1f84db51524df9bff
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index 1352642e2602..ffb0e09b476e 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig Tue May 28 00:57:18 2002
-+++ configure Tue May 28 01:00:25 2002
-@@ -7495,6 +7495,7 @@
+--- configure.orig Tue Jun 11 17:44:27 2002
++++ configure Tue Jun 11 17:46:59 2002
+@@ -7480,6 +7480,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,7 +8,7 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12398,14 +12399,14 @@
+@@ -11770,14 +11771,14 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -18,14 +18,14 @@
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_LIBS $LIBJPEG $x_libs"
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
-CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
-@@ -13114,9 +13115,9 @@
+@@ -12469,9 +12470,9 @@
s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -37,7 +37,7 @@
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -13171,22 +13172,22 @@
+@@ -12522,22 +12523,22 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c
index 5b3898d8b2c3..e69de29bb2d1 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-monitor.c
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-monitor.c 2001/12/07 22:54:34 1.1
-+++ libnautilus-private/nautilus-monitor.c 2001/12/07 23:10:06
-@@ -274,7 +274,8 @@
- }
-
- monitor = g_new0 (NautilusMonitor, 1);
-- FAMMonitorFile (connection, path, &monitor->request, NULL);
-+ if (FAMMonitorFile (connection, path, &monitor->request, NULL) == -1)
-+ return NULL;
-
- g_free (path);
-
-@@ -314,7 +315,8 @@
- }
-
- monitor = g_new0 (NautilusMonitor, 1);
-- FAMMonitorDirectory (connection, path, &monitor->request, NULL);
-+ if (FAMMonitorDirectory (connection, path, &monitor->request, NULL) == -1)
-+ return NULL;
-
- g_assert (g_hash_table_lookup (get_request_hash_table (),
- GINT_TO_POINTER (FAMREQUEST_GETREQNUM (&monitor->request))) == NULL);
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index a6dcde2304f7..4bcb1bcf60d3 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -16,6 +16,7 @@ etc/X11/starthere/sysconfig.desktop
etc/X11/sysconfig/.directory
etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/news/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/xalf/%gconf.xml
@@ -23,6 +24,7 @@ etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/xalf/%gconf.xml
@@ -74,131 +76,6 @@ share/gnome/gnome-2.0/ui/nautilus-sample-content-view-ui.xml
share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml
-share/gnome/help/gnufdl/C/gnufdl.sgml
-share/gnome/help/gnugpl/C/gnugpl.sgml
-share/gnome/help/nautilus-quick-reference/C/figures/backgrounds_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/emblems_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/find.png
-share/gnome/help/nautilus-quick-reference/C/figures/locationbar_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/menus_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/music_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/nautilus_window_full_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/sidebar_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/softcat.png
-share/gnome/help/nautilus-quick-reference/C/figures/storage.png
-share/gnome/help/nautilus-quick-reference/C/figures/themes_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/toolbar_nqr.png
-share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png
-share/gnome/help/nautilus-quick-reference/C/index.html
-share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/emblems_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/ff_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/find_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/full_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/locbar_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/menubar_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/music_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/navbar_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/sidebar_small.png
-share/gnome/help/nautilus-quick-reference/es/figures/softcat.png
-share/gnome/help/nautilus-quick-reference/es/figures/storage.png
-share/gnome/help/nautilus-quick-reference/es/figures/themes_small.png
-share/gnome/help/nautilus-quick-reference/es/index.html
-share/gnome/help/nautilus-quick-reference/ko/figures/emblems.png
-share/gnome/help/nautilus-quick-reference/ko/figures/find.png
-share/gnome/help/nautilus-quick-reference/ko/figures/full.png
-share/gnome/help/nautilus-quick-reference/ko/figures/locbar.png
-share/gnome/help/nautilus-quick-reference/ko/figures/menubar.png
-share/gnome/help/nautilus-quick-reference/ko/figures/music.png
-share/gnome/help/nautilus-quick-reference/ko/figures/navbar.png
-share/gnome/help/nautilus-quick-reference/ko/figures/patterns.png
-share/gnome/help/nautilus-quick-reference/ko/figures/sidebar.png
-share/gnome/help/nautilus-quick-reference/ko/figures/softcat.png
-share/gnome/help/nautilus-quick-reference/ko/figures/storage.png
-share/gnome/help/nautilus-quick-reference/ko/figures/themes.png
-share/gnome/help/nautilus-quick-reference/ko/figures/viewmenu.png
-share/gnome/help/nautilus-quick-reference/ko/index.html
-share/gnome/help/nautilus-quick-reference/no/figures/colors_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/emblems_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/ff_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/find_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/full_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/locbar_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/menubar_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/music_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/navbar_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/sidebar_small.png
-share/gnome/help/nautilus-quick-reference/no/figures/softcat.png
-share/gnome/help/nautilus-quick-reference/no/figures/storage.png
-share/gnome/help/nautilus-quick-reference/no/figures/themes_small.png
-share/gnome/help/nautilus-quick-reference/no/index.html
-share/gnome/help/nautilus-quick-reference/sv/figures/emblems.png
-share/gnome/help/nautilus-quick-reference/sv/figures/find.png
-share/gnome/help/nautilus-quick-reference/sv/figures/full.png
-share/gnome/help/nautilus-quick-reference/sv/figures/locbar.png
-share/gnome/help/nautilus-quick-reference/sv/figures/menubar.png
-share/gnome/help/nautilus-quick-reference/sv/figures/music.png
-share/gnome/help/nautilus-quick-reference/sv/figures/navbar.png
-share/gnome/help/nautilus-quick-reference/sv/figures/patterns.png
-share/gnome/help/nautilus-quick-reference/sv/figures/sidebar.png
-share/gnome/help/nautilus-quick-reference/sv/figures/softcat.png
-share/gnome/help/nautilus-quick-reference/sv/figures/storage.png
-share/gnome/help/nautilus-quick-reference/sv/figures/themes.png
-share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png
-share/gnome/help/nautilus-quick-reference/sv/index.html
-share/gnome/help/nautilus-release-notes/C/beta.html
-share/gnome/help/nautilus-release-notes/C/index.html
-share/gnome/help/nautilus-release-notes/C/legalnotice.html
-share/gnome/help/nautilus-release-notes/C/medusa.html
-share/gnome/help/nautilus-release-notes/C/mozilla.html
-share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml
-share/gnome/help/nautilus-release-notes/C/new10.html
-share/gnome/help/nautilus-release-notes/C/new102.html
-share/gnome/help/nautilus-release-notes/C/new103.html
-share/gnome/help/nautilus-release-notes/C/new104.html
-share/gnome/help/nautilus-release-notes/C/require.html
-share/gnome/help/nautilus-release-notes/C/session.html
-share/gnome/help/nautilus-screenshot-guidelines/C/callouts.html
-share/gnome/help/nautilus-screenshot-guidelines/C/circling.html
-share/gnome/help/nautilus-screenshot-guidelines/C/dropshadow.html
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_after.png
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/callout_before.png
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_after.png
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/circle_callout_before.png
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_after.png
-share/gnome/help/nautilus-screenshot-guidelines/C/figures/dropshadow_before.png
-share/gnome/help/nautilus-screenshot-guidelines/C/finishingtouches.html
-share/gnome/help/nautilus-screenshot-guidelines/C/generalguidelines.html
-share/gnome/help/nautilus-screenshot-guidelines/C/index.html
-share/gnome/help/nautilus-screenshot-guidelines/C/legalnotice.html
-share/gnome/help/nautilus-screenshot-guidelines/C/nautilus-screenshot-guidelines.sgml
-share/gnome/help/nautilus-screenshot-guidelines/C/resources.html
-share/gnome/help/nautilus-screenshot-guidelines/C/tools.html
-share/gnome/help/nautilus-user-manual/C/figures/custom_icon_num.png
-share/gnome/help/nautilus-user-manual/C/figures/full-1.png
-share/gnome/help/nautilus-user-manual/C/figures/full-2.png
-share/gnome/help/nautilus-user-manual/C/figures/full-3.png
-share/gnome/help/nautilus-user-manual/C/figures/full-4.png
-share/gnome/help/nautilus-user-manual/C/figures/full-5.png
-share/gnome/help/nautilus-user-manual/C/figures/full-6.png
-share/gnome/help/nautilus-user-manual/C/figures/help_num.png
-share/gnome/help/nautilus-user-manual/C/figures/home_folder_num.png
-share/gnome/help/nautilus-user-manual/C/figures/link.png
-share/gnome/help/nautilus-user-manual/C/figures/locationbar_nqr.png
-share/gnome/help/nautilus-user-manual/C/figures/nautilus_window_full_num.png
-share/gnome/help/nautilus-user-manual/C/figures/news_num.png
-share/gnome/help/nautilus-user-manual/C/figures/noread.png
-share/gnome/help/nautilus-user-manual/C/figures/nowrite.png
-share/gnome/help/nautilus-user-manual/C/figures/player-1.png
-share/gnome/help/nautilus-user-manual/C/figures/player-2.png
-share/gnome/help/nautilus-user-manual/C/figures/player-3.png
-share/gnome/help/nautilus-user-manual/C/figures/player-4.png
-share/gnome/help/nautilus-user-manual/C/figures/player.png
-share/gnome/help/nautilus-user-manual/C/figures/preferences_menu_num.png
-share/gnome/help/nautilus-user-manual/C/figures/sidebar_num.png
-share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png
-share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png
-share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.xml
share/gnome/idl/nautilus-distributed-undo.idl
share/gnome/idl/nautilus-view-component.idl
share/gnome/nautilus/browser.xml
@@ -265,13 +142,6 @@ share/gnome/nautilus/services/text/webster.xml
share/gnome/nautilus/starthere-link.desktop
share/gnome/nautilus/starthere.desktop
share/gnome/nautilus/static_bookmarks.xml
-share/gnome/omf/nautilus/nautilus-quick-reference-C.omf
-share/gnome/omf/nautilus/nautilus-quick-reference-es.omf
-share/gnome/omf/nautilus/nautilus-quick-reference-ko.omf
-share/gnome/omf/nautilus/nautilus-quick-reference-no.omf
-share/gnome/omf/nautilus/nautilus-quick-reference-sv.omf
-share/gnome/omf/nautilus/nautilus-release-notes-C.omf
-share/gnome/omf/nautilus/nautilus-user-manual-C.omf
share/gnome/pixmaps/gnome-starthere-96.png
share/gnome/pixmaps/gnome-starthere.png
share/gnome/pixmaps/nautilus/CD_drive.png
@@ -687,6 +557,7 @@ share/gnome/pixmaps/nautilus/throbber/rest.png
share/gnome/pixmaps/nautilus/thumbnail_frame.png
share/gnome/pixmaps/nautilus/zoom_body.png
share/locale/az/LC_MESSAGES/nautilus.mo
+share/locale/bg/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
share/locale/da/LC_MESSAGES/nautilus.mo
@@ -740,44 +611,18 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds
@dirrm share/gnome/pixmaps/nautilus/crux_eggplant
@dirrm share/gnome/pixmaps/nautilus
-@dirrm share/gnome/omf/nautilus
@dirrm share/gnome/nautilus/services/text
@dirrm share/gnome/nautilus/services
@dirrm share/gnome/nautilus/patterns
@dirrm share/gnome/nautilus/emblems
@dirrm share/gnome/nautilus
-@dirrm share/gnome/help/nautilus-user-manual/C/figures
-@dirrm share/gnome/help/nautilus-user-manual/C
-@dirrm share/gnome/help/nautilus-user-manual
-@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/stylesheet-images
-@dirrm share/gnome/help/nautilus-screenshot-guidelines/C/figures
-@dirrm share/gnome/help/nautilus-screenshot-guidelines/C
-@dirrm share/gnome/help/nautilus-screenshot-guidelines
-@dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images
-@dirrm share/gnome/help/nautilus-release-notes/C/figures
-@dirrm share/gnome/help/nautilus-release-notes/C
-@dirrm share/gnome/help/nautilus-release-notes
-@dirrm share/gnome/help/nautilus-quick-reference/sv/figures
-@dirrm share/gnome/help/nautilus-quick-reference/sv
-@dirrm share/gnome/help/nautilus-quick-reference/no/figures
-@dirrm share/gnome/help/nautilus-quick-reference/no
-@dirrm share/gnome/help/nautilus-quick-reference/ko/figures
-@dirrm share/gnome/help/nautilus-quick-reference/ko
-@dirrm share/gnome/help/nautilus-quick-reference/es/figures
-@dirrm share/gnome/help/nautilus-quick-reference/es
-@dirrm share/gnome/help/nautilus-quick-reference/C/figures
-@dirrm share/gnome/help/nautilus-quick-reference/C
-@dirrm share/gnome/help/nautilus-quick-reference
-@dirrm share/gnome/help/gnugpl/C
-@dirrm share/gnome/help/gnugpl
-@dirrm share/gnome/help/gnufdl/C
-@dirrm share/gnome/help/gnufdl
@dirrm include/libnautilus
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/xalf
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
@@ -785,6 +630,7 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/xalf
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/news
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus
@dirrm etc/X11/sysconfig
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 6106a3d1c979..ad29d99027d9 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= eel2
-PORTVERSION= 1.1.15
+PORTVERSION= 1.1.17
CATEGORIES= x11-toolkits 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
DISTNAME= eel-${PORTVERSION}
@@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
- gailutil.13:${PORTSDIR}/x11-toolkits/gail \
+ gailutil.15:${PORTSDIR}/x11-toolkits/gail \
gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
USE_BZIP2= yes
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo
index b07e3dfe6d55..5e964cb6736d 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/eel-1.1.15.tar.bz2) = f9136c5b1bf500af3336e0557a2fdb2a
+MD5 (gnome2/eel-1.1.17.tar.bz2) = 130ec640246520bbbc9d3f67f8bbc38c
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist
index cd976ffaad83..606df0afc78e 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel2/pkg-plist
@@ -52,6 +52,7 @@ lib/libeel-2.a
lib/libeel-2.so
lib/libeel-2.so.2
libdata/pkgconfig/eel-2.0.pc
+share/locale/ar/LC_MESSAGES/eel-2.0.mo
share/locale/az/LC_MESSAGES/eel-2.0.mo
share/locale/ca/LC_MESSAGES/eel-2.0.mo
share/locale/cs/LC_MESSAGES/eel-2.0.mo
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index a0aa448722e1..71b25683f5df 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libwnck
-PORTVERSION= 0.12
+PORTVERSION= 0.13
CATEGORIES= x11-toolkits 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
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 4b6c6b800054..0ca7dfc87d45 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.12.tar.bz2) = 262dc0cdb49df6a2a7838834b7842276
+MD5 (gnome2/libwnck-0.13.tar.bz2) = 268216c3be599720a6056c8bd99aba21
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 9741c86d8e98..dd8ab6feaddb 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -14,6 +14,8 @@ lib/libwnck-1.so
lib/libwnck-1.so.4
libdata/pkgconfig/libwnck-1.0.pc
share/locale/az/LC_MESSAGES/libwnck.mo
+share/locale/bg/LC_MESSAGES/libwnck.mo
+share/locale/ca/LC_MESSAGES/libwnck.mo
share/locale/da/LC_MESSAGES/libwnck.mo
share/locale/de/LC_MESSAGES/libwnck.mo
share/locale/es/LC_MESSAGES/libwnck.mo
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 0860a08a701a..01fee8b7782d 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libzvt
-PORTVERSION= 1.115.2
+PORTVERSION= 1.117.0
CATEGORIES= x11-toolkits 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
diff --git a/x11-toolkits/libzvt/distinfo b/x11-toolkits/libzvt/distinfo
index 0509c9665556..efeb2baad758 100644
--- a/x11-toolkits/libzvt/distinfo
+++ b/x11-toolkits/libzvt/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libzvt-1.115.2.tar.bz2) = 23334720cc5d529d719efa5274ea6b83
+MD5 (gnome2/libzvt-1.117.0.tar.bz2) = a548f5f591de96d5b526ff042879f4c8
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 984925f890b4..30afe3e2cc32 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rep-gtk2
PORTVERSION= 2002.05.24
CATEGORIES= x11-toolkits
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= rep-gtk-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 6bb7166387c6..e89ae6321cc9 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sawfish2
PORTVERSION= 2002.05.24
CATEGORIES= x11-wm
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= sawfish-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
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