aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-05-19 20:16:06 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-05-19 20:16:06 +0000
commit63c7a0f9737c93a82ece5b35edb91dbb81752862 (patch)
tree8fd2b334d8c215b34cd6ae1ba2b59c1a19256051
parent66a40d7c787fc0b39f834a5fcfa6e97743ea368e (diff)
downloadports-63c7a0f9737c93a82ece5b35edb91dbb81752862.tar.gz
ports-63c7a0f9737c93a82ece5b35edb91dbb81752862.zip
Notes
-rw-r--r--accessibility/at-spi/Makefile2
-rw-r--r--accessibility/atk/Makefile2
-rw-r--r--accessibility/gail/Makefile2
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gnome-media/distinfo2
-rw-r--r--audio/gnome-media/pkg-plist2
-rw-r--r--audio/gnomemedia2/Makefile4
-rw-r--r--audio/gnomemedia2/distinfo2
-rw-r--r--audio/gnomemedia2/pkg-plist2
-rw-r--r--deskutils/gnome-utils/Makefile4
-rw-r--r--deskutils/gnome-utils/distinfo2
-rw-r--r--deskutils/gnome-utils/pkg-plist1
-rw-r--r--deskutils/gnomeutils2/Makefile4
-rw-r--r--deskutils/gnomeutils2/distinfo2
-rw-r--r--deskutils/gnomeutils2/pkg-plist1
-rw-r--r--devel/ORBit2/Makefile4
-rw-r--r--devel/ORBit2/distinfo2
-rw-r--r--devel/ORBit2/files/patch-src::orb::util::Makefile.in10
-rw-r--r--devel/atk/Makefile2
-rw-r--r--devel/bonobo-activation/Makefile2
-rw-r--r--devel/bugbuddy2/Makefile4
-rw-r--r--devel/bugbuddy2/distinfo2
-rw-r--r--devel/bugbuddy2/files/patch-configure10
-rw-r--r--devel/bugbuddy2/pkg-plist6
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/gnome-common/Makefile2
-rw-r--r--devel/gnome-vfs/Makefile2
-rw-r--r--devel/gnomecommon/Makefile2
-rw-r--r--devel/gnomevfs2/Makefile2
-rw-r--r--devel/libIDL/Makefile2
-rw-r--r--devel/libbonobo/Makefile2
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libglade2/distinfo2
-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/Makefile2
-rw-r--r--games/gnomegames2/Makefile2
-rw-r--r--graphics/libart_lgpl/Makefile2
-rw-r--r--graphics/libart_lgpl2/Makefile2
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvas/distinfo2
-rw-r--r--graphics/libgnomecanvas/pkg-plist22
-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-plist1
-rw-r--r--net/linc/Makefile2
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprint/distinfo2
-rw-r--r--print/libgnomeprint/pkg-plist4
-rw-r--r--sysutils/gconf-editor/Makefile2
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile2
-rw-r--r--x11-toolkits/at-spi/Makefile2
-rw-r--r--x11-toolkits/gail/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/libbonoboui/Makefile2
-rw-r--r--x11-toolkits/libgail-gnome/Makefile2
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile5
-rw-r--r--x11-toolkits/libgnomeprintui/distinfo2
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-plist3
-rw-r--r--x11-toolkits/libgnomeui/Makefile4
-rw-r--r--x11-toolkits/libgnomeui/distinfo2
-rw-r--r--x11-toolkits/libgnomeui/files/patch-Makefile.in12
-rw-r--r--x11-toolkits/libgnomeui/pkg-plist45
-rw-r--r--x11-toolkits/libwnck/Makefile4
-rw-r--r--x11-toolkits/libwnck/distinfo2
-rw-r--r--x11-toolkits/libwnck/pkg-plist4
-rw-r--r--x11-toolkits/libzvt/Makefile5
-rw-r--r--x11-toolkits/libzvt/distinfo2
-rw-r--r--x11-toolkits/pango/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-wm/sawfish2/Makefile2
-rw-r--r--x11/gnome-applets/Makefile4
-rw-r--r--x11/gnome-applets/distinfo2
-rw-r--r--x11/gnome-applets/pkg-plist25
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/distinfo2
-rw-r--r--x11/gnome-desktop/pkg-plist1
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-panel/distinfo2
-rw-r--r--x11/gnome-panel/pkg-plist8
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-session/distinfo2
-rw-r--r--x11/gnome-session/pkg-plist10
-rw-r--r--x11/gnome-terminal/Makefile4
-rw-r--r--x11/gnome-terminal/distinfo2
-rw-r--r--x11/gnome-terminal/pkg-plist2
-rw-r--r--x11/gnomeapplets2/Makefile4
-rw-r--r--x11/gnomeapplets2/distinfo2
-rw-r--r--x11/gnomeapplets2/pkg-plist25
-rw-r--r--x11/gnomedesktop/Makefile4
-rw-r--r--x11/gnomedesktop/distinfo2
-rw-r--r--x11/gnomedesktop/pkg-plist1
-rw-r--r--x11/gnomepanel/Makefile4
-rw-r--r--x11/gnomepanel/distinfo2
-rw-r--r--x11/gnomepanel/pkg-plist8
-rw-r--r--x11/gnomesession/Makefile4
-rw-r--r--x11/gnomesession/distinfo2
-rw-r--r--x11/gnomesession/pkg-plist10
-rw-r--r--x11/gnometerminal/Makefile4
-rw-r--r--x11/gnometerminal/distinfo2
-rw-r--r--x11/gnometerminal/pkg-plist2
-rw-r--r--x11/libgnome/Makefile4
-rw-r--r--x11/libgnome/distinfo2
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-program.c33
-rw-r--r--x11/libgnome/pkg-plist28
115 files changed, 243 insertions, 266 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 999fad349686..188b038aa126 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index e646b8d83eff..632abdc25b07 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= atk
PORTVERSION= 1.0.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 47cdddcc03de..9e9801b4e014 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.13
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 8409feb9e057..3625cb325a8e 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 1.520.2
+PORTVERSION= 1.547.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index 195e407bcb13..ed636d19caaa 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.520.2.tar.bz2) = 269f237dfb0a2312f9dc85fe91e75ae0
+MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index 1552dac351c8..d22c68d84a36 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -180,6 +180,7 @@ share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
share/locale/es/LC_MESSAGES/gnome-media-2.0.mo
share/locale/et/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-media-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
@@ -204,6 +205,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/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
@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 8409feb9e057..3625cb325a8e 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomemedia2
-PORTVERSION= 1.520.2
+PORTVERSION= 1.547.0
CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo
index 195e407bcb13..ed636d19caaa 100644
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-media-1.520.2.tar.bz2) = 269f237dfb0a2312f9dc85fe91e75ae0
+MD5 (gnome2/gnome-media-1.547.0.tar.bz2) = 1d472fb7e301be1856d1d8d87a86026e
diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist
index 1552dac351c8..d22c68d84a36 100644
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@@ -180,6 +180,7 @@ share/locale/el/LC_MESSAGES/gnome-media-2.0.mo
share/locale/en_GB/LC_MESSAGES/gnome-media-2.0.mo
share/locale/es/LC_MESSAGES/gnome-media-2.0.mo
share/locale/et/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/eu/LC_MESSAGES/gnome-media-2.0.mo
share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
@@ -204,6 +205,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/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
@dirrm share/gnome/pixmaps/gnome-media/gnome-sound-recorder
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 93f0649d5e66..a0e1e7923e94 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.5.0
+PORTVERSION= 1.105.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 9eb976f0a71a..064c3d82f1c1 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.5.0.tar.bz2) = 0a2d9859203a45d488de0cb01d95244c
+MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 7629db577869..6fb2d26be276 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -34,6 +34,7 @@ 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/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
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
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 93f0649d5e66..a0e1e7923e94 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.5.0
+PORTVERSION= 1.105.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 9eb976f0a71a..064c3d82f1c1 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.5.0.tar.bz2) = 0a2d9859203a45d488de0cb01d95244c
+MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 7629db577869..6fb2d26be276 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -34,6 +34,7 @@ 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/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
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
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 503e1b71c0a2..4016e71a5048 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= ORBit2
-PORTVERSION= 2.3.108
+PORTVERSION= 2.3.109
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 3d1e2ae5af37..9dcf73a09907 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.108.tar.bz2) = 0e75116b7234e4265d18eac574d89471
+MD5 (gnome2/ORBit2-2.3.109.tar.bz2) = e18fb3dce4b87a075f119631e692ee93
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
index 8ba631ea0cf4..4d96c2f2542d 100644
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
@@ -1,14 +1,14 @@
$FreeBSD$
---- src/orb/util/Makefile.in 2002/02/13 09:54:15 1.1
-+++ src/orb/util/Makefile.in 2002/02/13 09:54:28
-@@ -97,7 +97,7 @@
+--- src/orb/util/Makefile.in.orig Mon May 13 12:41:39 2002
++++ src/orb/util/Makefile.in Fri May 17 17:50:42 2002
+@@ -101,7 +101,7 @@
noinst_LTLIBRARIES = liborb-util.la
--INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(ORBIT_CFLAGS)
-+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(ORBIT_CFLAGS)
+-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(ORBIT_CFLAGS)
++INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\" -DORBIT2_INTERNAL_API $(WARN_CFLAGS) $(ORBIT_DEBUG_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) $(ORBIT_CFLAGS)
liborb_util_la_SOURCES = orbit-purify.h genrand.c orbit-options.c orbit-options.h orbit-util.c
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index e646b8d83eff..632abdc25b07 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -9,7 +9,7 @@ PORTNAME= atk
PORTVERSION= 1.0.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
#MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
# ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
# http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index f078dbabfd89..cecae1275e5d 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.9.8
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index c99630af28fa..0b76b3be970a 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= bugbuddy2
-PORTVERSION= 2.1.5
+PORTVERSION= 2.1.6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index 83bd91532a0f..f5244472cff4 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bug-buddy-2.1.5.tar.bz2) = 78d2b82e5d6d13643a1a2fb0e1fba1fc
+MD5 (gnome2/bug-buddy-2.1.6.tar.bz2) = ff1b5f08e39080597c21f6a196c9b78f
diff --git a/devel/bugbuddy2/files/patch-configure b/devel/bugbuddy2/files/patch-configure
deleted file mode 100644
index f3505cd6e26d..000000000000
--- a/devel/bugbuddy2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Tue May 14 23:25:15 2002
-+++ configure Tue May 14 23:25:40 2002
-@@ -6203,6 +6203,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index 6cb678148d5d..7ead394b1701 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -17,7 +17,7 @@ share/gnome/help/bug-buddy/C/bug-buddy.xml
share/gnome/help/bug-buddy/C/legal.xml
share/gnome/mime-info/bug-buddy.keys
share/gnome/mime-info/bug-buddy.mime
-share/gnome/omf/gdp-example1/bug-buddy-C.omf
+/share/gnome/omf/bug-buddy/bug-buddy-C.omf
share/gnome/pixmaps/bug-buddy.png
share/locale/az/LC_MESSAGES/bug-buddy.mo
share/locale/ca/LC_MESSAGES/bug-buddy.mo
@@ -28,6 +28,7 @@ share/locale/el/LC_MESSAGES/bug-buddy.mo
share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
share/locale/es/LC_MESSAGES/bug-buddy.mo
share/locale/et/LC_MESSAGES/bug-buddy.mo
+/share/locale/eu/LC_MESSAGES/bug-buddy.mo
share/locale/fi/LC_MESSAGES/bug-buddy.mo
share/locale/fr/LC_MESSAGES/bug-buddy.mo
share/locale/ga/LC_MESSAGES/bug-buddy.mo
@@ -52,10 +53,11 @@ share/locale/sl/LC_MESSAGES/bug-buddy.mo
share/locale/sv/LC_MESSAGES/bug-buddy.mo
share/locale/tr/LC_MESSAGES/bug-buddy.mo
share/locale/uk/LC_MESSAGES/bug-buddy.mo
+/share/locale/vi/LC_MESSAGES/bug-buddy.mo
share/locale/wa/LC_MESSAGES/bug-buddy.mo
share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
-@dirrm share/gnome/omf/gdp-example1
+@dirrm share/gnome/omf/bug-buddy
@dirrm share/gnome/help/bug-buddy/C/figures
@dirrm share/gnome/help/bug-buddy/C
@dirrm share/gnome/help/bug-buddy
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index ef201ce890c9..595547e65bd1 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf2
PORTVERSION= 1.1.10
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6fb760ab1b26..0745456d10a6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -9,7 +9,7 @@ PORTNAME= glib
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020509,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 02b7a6fe2a5d..600ae0d73aee 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 83e521cea194..f6d9c85ec9fc 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomevfs2
PORTVERSION= 1.9.15
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index 02b7a6fe2a5d..600ae0d73aee 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 83e521cea194..f6d9c85ec9fc 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomevfs2
PORTVERSION= 1.9.15
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index b9176ae28487..36fc8db1f606 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libIDL
PORTVERSION= 0.7.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index c37f22338add..0bec4b46f2a2 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libbonobo
PORTVERSION= 1.116.0
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 27c977254c7c..8ce63dbb769f 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libglade2
-PORTVERSION= 1.99.11
+PORTVERSION= 1.99.12
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 0449cd9de1e6..0dd43447d59b 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.11.tar.bz2) = 7ff77ce4a644d211c2a1f786fb30fa46
+MD5 (gnome2/libglade-1.99.12.tar.bz2) = a907318f6d84537b72f64c0c4aebe5a8
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index c6a4fae2cbbf..19a287df7619 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-beta4
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 1f3bf9def2ac..f3d1830b8935 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 1f3bf9def2ac..f3d1830b8935 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 4ca62d3c8e7a..a74d5fc675b6 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gedit2
-PORTVERSION= 1.118.0
+PORTVERSION= 1.119.0
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo
index ccacbd1b286c..f89fb90ee672 100644
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gedit2-1.118.0.tar.bz2) = 28ad57362d6c562962a7312b8a185644
+MD5 (gnome2/gedit2-1.119.0.tar.bz2) = f43637331c04264a3980766758baa6c9
diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index e9ea15996bb9..bf4e5c500117 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -42,6 +42,7 @@ share/locale/de/LC_MESSAGES/gedit-2.0.mo
share/locale/el/LC_MESSAGES/gedit-2.0.mo
share/locale/es/LC_MESSAGES/gedit-2.0.mo
share/locale/et/LC_MESSAGES/gedit-2.0.mo
+share/locale/eu/LC_MESSAGES/gedit-2.0.mo
share/locale/fi/LC_MESSAGES/gedit-2.0.mo
share/locale/fr/LC_MESSAGES/gedit-2.0.mo
share/locale/ga/LC_MESSAGES/gedit-2.0.mo
@@ -66,6 +67,7 @@ share/locale/sv/LC_MESSAGES/gedit-2.0.mo
share/locale/ta/LC_MESSAGES/gedit-2.0.mo
share/locale/tr/LC_MESSAGES/gedit-2.0.mo
share/locale/uk/LC_MESSAGES/gedit-2.0.mo
+share/locale/vi/LC_MESSAGES/gedit-2.0.mo
share/locale/wa/LC_MESSAGES/gedit-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gedit-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index b4f9856d4499..aeae92642895 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 1.92.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index b4f9856d4499..aeae92642895 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomegames2
PORTVERSION= 1.92.0
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 01b68e53c7c9..adfc8cc0f5f4 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 01b68e53c7c9..adfc8cc0f5f4 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 38b18d1ae4b3..d239e5c725f4 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomecanvas
-PORTVERSION= 1.116.0
+PORTVERSION= 1.117.0
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
LIB_DEPENDS= glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index f0deaf0de118..3c71005309f8 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.116.0.tar.bz2) = 4409eb546c541c1524aaeb74eb8e1341
+MD5 (gnome2/libgnomecanvas-1.117.0.tar.bz2) = e294e835dd6e6ed48466ae40f39a0d8b
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index d18dee419b7b..ce02109aeb87 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -17,31 +17,13 @@ lib/libgnomecanvas-2.a
lib/libgnomecanvas-2.so
lib/libgnomecanvas-2.so.0
libdata/pkgconfig/libgnomecanvas-2.0.pc
-share/doc/libgnomecanvas/c4.html
-share/doc/libgnomecanvas/index.html
-share/doc/libgnomecanvas/index.sgml
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
-share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspixbuf.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaspolygon.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html
-share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html
-share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html
share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -58,10 +40,10 @@ share/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
-@dirrm share/doc/libgnomecanvas
@dirrm lib/libglade/2.0
@dirrm lib/libglade
@dirrm include/libgnomecanvas-2.0/libgnomecanvas
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index 6dce2034d418..ba875fad49a0 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2002.05.02
PORTREVISION= 1
CATEGORIES= lang gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= librep-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 8453672e0ab5..5b65ea0f48e2 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index 8453672e0ab5..5b65ea0f48e2 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-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 93f0649d5e66..a0e1e7923e94 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= gnomeutils2
-PORTVERSION= 1.5.0
+PORTVERSION= 1.105.0
PORTEPOCH= 1
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index 9eb976f0a71a..064c3d82f1c1 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-1.5.0.tar.bz2) = 0a2d9859203a45d488de0cb01d95244c
+MD5 (gnome2/gnome-utils-1.105.0.tar.bz2) = 401bda405425ec429608e55ee4ad2b46
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 7629db577869..6fb2d26be276 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -34,6 +34,7 @@ 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/gnome-dictionary.xml
share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
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
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 680b8988f551..1c3a037567a5 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= linc
PORTVERSION= 0.1.21
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 867a327afaab..c62f0ab00b23 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnomeprint
-PORTVERSION= 1.112.0
-PORTREVISION= 2
+PORTVERSION= 1.113.0
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index ec4c39111f96..e35ad5e2380e 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.112.0.tar.bz2) = 5e47284677d4ef0696c1132d494fd675
+MD5 (gnome2/libgnomeprint-1.113.0.tar.bz2) = fc99e013dd40450c8ff93ed2cb58f908
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 036d639935ca..876f27c60a1a 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -39,7 +39,10 @@ share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -53,6 +56,7 @@ share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 81f74121a568..d612a3891446 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gconf-editor
PORTVERSION= 0.1
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 03b1e2ea9466..169f8c22213f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 03b1e2ea9466..169f8c22213f 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnomecontrolcenter2
PORTVERSION= 1.99.10
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 999fad349686..188b038aa126 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 47cdddcc03de..9e9801b4e014 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gail
PORTVERSION= 0.13
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index e038cc5fba15..4abd484e0112 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020509,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e038cc5fba15..4abd484e0112 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.0.2
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020509,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index a652ef0ce7f9..9c0186522d20 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -9,7 +9,7 @@ PORTNAME= libbonoboui
PORTVERSION= 1.116.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 5ab491d2d7b1..339fd03a4104 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 0.5.0
PORTREVISION= 2
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 087242a618ff..a1e49d5a5df8 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libgnomeprintui
-PORTVERSION= 1.112.0
-PORTREVISION= 2
+PORTVERSION= 1.113.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index a0c42da4cdf2..b4836483bb2c 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprintui-1.112.0.tar.bz2) = 7e0e7c7038cd4fc197ff4d6355c9f1d4
+MD5 (gnome2/libgnomeprintui-1.113.0.tar.bz2) = 0e6b2263d3f606679fa729a7f5105025
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 274a68440021..3652d7f959ef 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -12,7 +12,9 @@ libdata/pkgconfig/libgnomeprintui-2.0.pc
share/locale/az/LC_MESSAGES/libgnomeprintui.mo
share/locale/ca/LC_MESSAGES/libgnomeprintui.mo
share/locale/de/LC_MESSAGES/libgnomeprintui.mo
+share/locale/es/LC_MESSAGES/libgnomeprintui.mo
share/locale/et/LC_MESSAGES/libgnomeprintui.mo
+share/locale/eu/LC_MESSAGES/libgnomeprintui.mo
share/locale/ko/LC_MESSAGES/libgnomeprintui.mo
share/locale/ms/LC_MESSAGES/libgnomeprintui.mo
share/locale/pl/LC_MESSAGES/libgnomeprintui.mo
@@ -20,6 +22,7 @@ share/locale/pt/LC_MESSAGES/libgnomeprintui.mo
share/locale/sl/LC_MESSAGES/libgnomeprintui.mo
share/locale/sv/LC_MESSAGES/libgnomeprintui.mo
share/locale/ta/LC_MESSAGES/libgnomeprintui.mo
+share/locale/vi/LC_MESSAGES/libgnomeprintui.mo
share/locale/wa/LC_MESSAGES/libgnomeprintui.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeprintui.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeprintui.mo
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 4f895a4ab60e..7db4ce357f38 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnomeui
-PORTVERSION= 1.116.1
+PORTVERSION= 1.117.0
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo
index 2c5b1172c89b..cbd0499c4ee2 100644
--- a/x11-toolkits/libgnomeui/distinfo
+++ b/x11-toolkits/libgnomeui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeui-1.116.1.tar.bz2) = bef4ec27310c8f428729600e1393292b
+MD5 (gnome2/libgnomeui-1.117.0.tar.bz2) = 73d78f8a28c04d53fd2662dfde4dccc4
diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in
index bf593d319609..a0bf02e31068 100644
--- a/x11-toolkits/libgnomeui/files/patch-Makefile.in
+++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig Sun Apr 7 19:42:23 2002
-+++ Makefile.in Sun Apr 7 19:42:35 2002
-@@ -120,7 +120,7 @@
+--- Makefile.in.orig Fri May 17 20:27:51 2002
++++ Makefile.in Fri May 17 20:29:00 2002
+@@ -115,7 +115,7 @@
+ VERSION = @VERSION@
YACC = @YACC@
- cxxflags_set = @cxxflags_set@
-SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests
+SUBDIRS = libgnomeui glade images demos doc po #tests
-
- EXTRA_DIST = message-of-doom
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist
index 10a24ca8ea4e..5dbf8c42cdd1 100644
--- a/x11-toolkits/libgnomeui/pkg-plist
+++ b/x11-toolkits/libgnomeui/pkg-plist
@@ -47,50 +47,6 @@ lib/libgnomeui-2.a
lib/libgnomeui-2.so
lib/libgnomeui-2.so.0
libdata/pkgconfig/libgnomeui-2.0.pc
-share/doc/libgnomeui/c4.html
-share/doc/libgnomeui/gnomeabout.html
-share/doc/libgnomeui/gnomeapp.html
-share/doc/libgnomeui/gnomeappbar.html
-share/doc/libgnomeui/gnomeclient.html
-share/doc/libgnomeui/gnomecolorpicker.html
-share/doc/libgnomeui/gnomedateedit.html
-share/doc/libgnomeui/gnomedialog.html
-share/doc/libgnomeui/gnomedruid.html
-share/doc/libgnomeui/gnomedruidpage.html
-share/doc/libgnomeui/gnomedruidpageedge.html
-share/doc/libgnomeui/gnomedruidpagestandard.html
-share/doc/libgnomeui/gnomeentry.html
-share/doc/libgnomeui/gnomefileentry.html
-share/doc/libgnomeui/gnomefontpicker.html
-share/doc/libgnomeui/gnomehref.html
-share/doc/libgnomeui/gnomeiconentry.html
-share/doc/libgnomeui/gnomeiconlist.html
-share/doc/libgnomeui/gnomeiconselection.html
-share/doc/libgnomeui/gnomemdi.html
-share/doc/libgnomeui/gnomemdichild.html
-share/doc/libgnomeui/gnomemdigenericchild.html
-share/doc/libgnomeui/gnomemessagebox.html
-share/doc/libgnomeui/gnomepixmap.html
-share/doc/libgnomeui/gnomepixmapentry.html
-share/doc/libgnomeui/gnomepropertybox.html
-share/doc/libgnomeui/gnomescores.html
-share/doc/libgnomeui/index.html
-share/doc/libgnomeui/index.sgml
-share/doc/libgnomeui/libgnomeui-gnome-app-helper.html
-share/doc/libgnomeui/libgnomeui-gnome-app-util.html
-share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html
-share/doc/libgnomeui/libgnomeui-gnome-gconf-ui.html
-share/doc/libgnomeui/libgnomeui-gnome-ice.html
-share/doc/libgnomeui/libgnomeui-gnome-macros.html
-share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html
-share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html
-share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html
-share/doc/libgnomeui/libgnomeui-gnome-types.html
-share/doc/libgnomeui/libgnomeui-gnome-ui-init.html
-share/doc/libgnomeui/libgnomeui-gnome-uidefs.html
-share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html
-share/doc/libgnomeui/libgnomeui-gnome-window.html
-share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html
share/gnome/pixmaps/gnome-about-logo.png
share/gnome/pixmaps/gnome-default-dlg.png
share/gnome/pixmaps/gnome-error.png
@@ -127,7 +83,6 @@ share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo
-@dirrm share/doc/libgnomeui
@dirrm include/libgnomeui-2.0/libgnomeui
@dirrm include/libgnomeui-2.0
@unexec /bin/rmdir %D/share/gnome/pixmaps 2>/dev/null || /usr/bin/true
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index bca59634aca5..74b8d19b5b2b 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libwnck
-PORTVERSION= 0.9
+PORTVERSION= 0.10
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index 2cbf91ff2771..632c961d4537 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.9.tar.bz2) = 414658395318df22201ad2eb816fe242
+MD5 (gnome2/libwnck-0.10.tar.bz2) = 807eb95515bbefae96142b69ae1b0c20
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index e29ca071a864..80514055e608 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -13,12 +13,14 @@ lib/libwnck-1.a
lib/libwnck-1.so
lib/libwnck-1.so.2
libdata/pkgconfig/libwnck-1.0.pc
+share/locale/az/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
share/locale/et/LC_MESSAGES/libwnck.mo
share/locale/fi/LC_MESSAGES/libwnck.mo
share/locale/fr/LC_MESSAGES/libwnck.mo
+share/locale/it/LC_MESSAGES/libwnck.mo
share/locale/ja/LC_MESSAGES/libwnck.mo
share/locale/ko/LC_MESSAGES/libwnck.mo
share/locale/lv/LC_MESSAGES/libwnck.mo
@@ -33,7 +35,9 @@ share/locale/sk/LC_MESSAGES/libwnck.mo
share/locale/sl/LC_MESSAGES/libwnck.mo
share/locale/sv/LC_MESSAGES/libwnck.mo
share/locale/tr/LC_MESSAGES/libwnck.mo
+share/locale/vi/LC_MESSAGES/libwnck.mo
share/locale/uk/LC_MESSAGES/libwnck.mo
+share/locale/wa/LC_MESSAGES/libwnck.mo
share/locale/zh_CN/LC_MESSAGES/libwnck.mo
share/locale/zh_TW/LC_MESSAGES/libwnck.mo
@dirrm include/libwnck-1.0/libwnck
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 3e39bd183233..697839e594e0 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= libzvt
-PORTVERSION= 1.114.0
-PORTREVISION= 1
+PORTVERSION= 1.115.2
CATEGORIES= x11-toolkits gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
diff --git a/x11-toolkits/libzvt/distinfo b/x11-toolkits/libzvt/distinfo
index 132b236fcc0d..0509c9665556 100644
--- a/x11-toolkits/libzvt/distinfo
+++ b/x11-toolkits/libzvt/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libzvt-1.114.0.tar.bz2) = 647713b39bd642434262ac80a8340ef1
+MD5 (gnome2/libzvt-1.115.2.tar.bz2) = 23334720cc5d529d719efa5274ea6b83
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 9552a0906d46..fa0f467e1c00 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pango
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= x11-toolkits
-MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020509,} \
+MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta5,} \
ftp://ftp.gtk.org/pub/gtk/v1.3/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
http://www.ameth.org/gimp/gtk/v1.3/
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 33687c342f6d..4673d90427cb 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rep-gtk2
PORTVERSION= 2002.05.02
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= rep-gtk-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index f9b5ec4fd492..98ded3bc5c7b 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= sawfish2
PORTVERSION= 2002.05.02
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= sawfish-${PORTVERSION:S/./-/g}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index bb287f18f170..3ae05bb84647 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.101.0
+PORTVERSION= 1.102.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 0cb44471847a..d9acd878c002 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.101.0.tar.bz2) = 0b9e1eecb826b03543d8d2dc73d58146
+MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 211f012eb552..c69b86c3faa7 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -33,8 +33,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/prefs/%gconf.xml
etc/gconf/schemas/battstat.schemas
etc/gconf/schemas/cdplayer.schemas
etc/gconf/schemas/charpick.schemas
@@ -46,11 +44,7 @@ etc/gconf/schemas/gweather.schemas
etc/gconf/schemas/mini-commander.schemas
etc/gconf/schemas/modemlights.schemas
etc/gconf/schemas/multiload.schemas
-etc/gconf/schemas/panel-menu.schemas
etc/sound/events/battstat_applet.soundlist
-lib/libpanel-menu.a
-lib/libpanel-menu.so
-lib/libpanel-menu.so.0
libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
libdata/bonobo/servers/GNOME_CharpickerApplet.server
@@ -63,7 +57,6 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
libdata/bonobo/servers/GNOME_MixerApplet.server
libdata/bonobo/servers/GNOME_ModemLightsApplet.server
libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-libdata/bonobo/servers/GNOME_PanelMenuApplet.server
share/gnome/battstat_applet/battstat_applet.glade
share/gnome/geyes/Bizarre/Bizarre-eye.png
share/gnome/geyes/Bizarre/Bizarre-pupil.png
@@ -102,6 +95,7 @@ share/gnome/gkb/DE_German.keyprop
share/gnome/gkb/DE_German_x.keyprop
share/gnome/gkb/DK_Danish.keyprop
share/gnome/gkb/DK_Danish_x.keyprop
+share/gnome/gkb/Dvorak.keyprop
share/gnome/gkb/EE_Estonian.keyprop
share/gnome/gkb/EE_Estonian_x.keyprop
share/gnome/gkb/ES_Spanish.keyprop
@@ -159,6 +153,7 @@ share/gnome/gkb/PortugalDeadkeys.keyprop
share/gnome/gkb/RO_Romanian.keyprop
share/gnome/gkb/RU_Russian.keyprop
share/gnome/gkb/RU_Russian_x.keyprop
+share/gnome/gkb/RU_Russian_x_rev.keyprop
share/gnome/gkb/RussianCyril.keyprop
share/gnome/gkb/SE_Swedish.keyprop
share/gnome/gkb/SI_Slovenian.keyprop
@@ -215,6 +210,13 @@ share/gnome/help/char-palette/C/legal.xml
share/gnome/help/command-line/C/command-line.xml
share/gnome/help/command-line/C/figures/command-line.png
share/gnome/help/command-line/C/legal.xml
+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/gtik2_applet2/C/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/C/legal.xml
share/gnome/help/gweather/C/figures/gweather_applet.png
share/gnome/help/gweather/C/figures/gweather_settings.png
share/gnome/help/gweather/C/figures/gweather_weather.png
@@ -224,6 +226,8 @@ share/gnome/help/gweather/C/topic.dat
share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
share/gnome/omf/gnome-applets/char-palette-C.omf
share/gnome/omf/gnome-applets/command-line-C.omf
+share/gnome/omf/gnome-applets/geyes-C.omf
+share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
share/gnome/omf/gnome-applets/gweather_applet-C.omf
share/gnome/pixmaps/battstat.png
share/gnome/pixmaps/charpick.png
@@ -257,7 +261,7 @@ share/gnome/pixmaps/gkb/fi.png
share/gnome/pixmaps/gkb/fr.png
share/gnome/pixmaps/gkb/gb.png
share/gnome/pixmaps/gkb/ge.png
-share/gnome/pixmaps/gkb/gkb-foot.png
+share/gnome/pixmaps/gkb/gkb.png
share/gnome/pixmaps/gkb/gr.png
share/gnome/pixmaps/gkb/hr.png
share/gnome/pixmaps/gkb/hu.png
@@ -313,7 +317,6 @@ share/gnome/pixmaps/gnome-mixer-applet.png
share/gnome/pixmaps/gweather/tstorm.xpm
share/gnome/pixmaps/mini-commander/browser-mini.xpm
share/gnome/pixmaps/mini-commander/history-mini.xpm
-share/gnome/pixmaps/panel-menu-icon.png
share/gnome/xmodmap/xmodmap.am
share/gnome/xmodmap/xmodmap.be
share/gnome/xmodmap/xmodmap.bg
@@ -365,6 +368,7 @@ share/gnome/xmodmap/xmodmap.qc
share/gnome/xmodmap/xmodmap.qc-2
share/gnome/xmodmap/xmodmap.ro
share/gnome/xmodmap/xmodmap.ru
+share/gnome/xmodmap/xmodmap.ru-rev
share/gnome/xmodmap/xmodmap.ru_yawerty
share/gnome/xmodmap/xmodmap.se
share/gnome/xmodmap/xmodmap.sf
@@ -422,6 +426,7 @@ share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@@ -445,8 +450,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/geyes/Bizarre
@dirrm share/gnome/geyes
@dirrm share/gnome/battstat_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index a3bf403dfe2a..f167d6c7260e 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.18
+PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index a1723c157f78..45e9c13f6ce5 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.18.tar.bz2) = 2080d9e0f6ce4c03118248cdd0558914
+MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index d5233a9bf1c6..a506e4e8c8d4 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -1,5 +1,6 @@
bin/gnome-about
include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h
include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
lib/libgnome-desktop-2.a
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 6ff4e5ab88df..b4f467795dae 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.20
+PORTVERSION= 1.5.21
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 15293c365add..d7317b5b99d9 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.20.tar.bz2) = 7adee4de5eba5d204ba537ca0af8d1f9
+MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 6ee349b32c83..cbcafeee13cf 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -84,6 +84,10 @@ 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/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
@@ -126,6 +130,7 @@ share/gnome/help/workspace-switcher/C/legal.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/gnome-panel/clock-C.omf
+share/gnome/omf/gnome-panel/fish-applet-2-C.omf
share/gnome/omf/gnome-panel/mailcheck-C.omf
share/gnome/omf/gnome-panel/panel-C.omf
share/gnome/omf/gnome-panel/window-list-C.omf
@@ -202,6 +207,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/mailcheck/C/figures
@dirrm share/gnome/help/mailcheck/C
@dirrm share/gnome/help/mailcheck
+@dirrm share/gnome/help/fish-applet-2/C/figures
+@dirrm share/gnome/help/fish-applet-2/C
+@dirrm share/gnome/help/fish-applet-2
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ef7240918e60..302733eb2cbb 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesession
-PORTVERSION= 1.5.18
+PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index e4288731a42c..87fda53fdf5e 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-1.5.18.tar.bz2) = 1b3f6f304cd56eba6265d36b568332c2
+MD5 (gnome2/gnome-session-1.5.19.tar.bz2) = a723f5954097eec8c1ce4528d59d2179
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 9132f92eb6e2..b539945ccd7e 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -1,14 +1,12 @@
bin/gnome-libice-check
bin/gnome-login-check
bin/gnome-session
+bin/gnome-session-properties
+bin/gnome-session-save
bin/gnome-smproxy
bin/gnome-wm
-bin/save-session
-bin/session-properties
-bin/session-properties-capplet
+etc/gconf/schemas/gnome-session.schemas
share/gnome/control-center-2.0/capplets/session-properties.desktop
-share/gnome/control-center-2.0/capplets/session.desktop
-share/gnome/control-center/Session/session-properties.desktop
share/gnome/default.session
share/gnome/default.wm
share/gnome/pixmaps/splash/gnome-splash-1.4.0.png
@@ -57,5 +55,3 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
@dirrm share/gnome/pixmaps/splash
@dirrm share/gnome/omf/gnome-core
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index fe82bf97d89f..ebe585c1272c 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 1.9.5
+PORTVERSION= 1.9.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 8edf3bd9ee25..772d3699b0d0 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-1.9.5.tar.bz2) = 81a0d2961cbfcf753c96f2be3f6bccf8
+MD5 (gnome2/gnome-terminal-1.9.6.tar.bz2) = e509c5ba638aeeea320527daa1f996d7
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 9e31206ff25b..603ceff36454 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -9,7 +9,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/schemas/profterm.schemas
+etc/gconf/schemas/gnome-terminal.schemas
libdata/bonobo/servers/gnome-terminal.server
share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index bb287f18f170..3ae05bb84647 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomeapplets2
-PORTVERSION= 1.101.0
+PORTVERSION= 1.102.1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-applets-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 0cb44471847a..d9acd878c002 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-1.101.0.tar.bz2) = 0b9e1eecb826b03543d8d2dc73d58146
+MD5 (gnome2/gnome-applets-1.102.1.tar.bz2) = b3352bc38788295e200eedfc3da5dabe
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 211f012eb552..c69b86c3faa7 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -33,8 +33,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/multiload/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/prefs/%gconf.xml
etc/gconf/schemas/battstat.schemas
etc/gconf/schemas/cdplayer.schemas
etc/gconf/schemas/charpick.schemas
@@ -46,11 +44,7 @@ etc/gconf/schemas/gweather.schemas
etc/gconf/schemas/mini-commander.schemas
etc/gconf/schemas/modemlights.schemas
etc/gconf/schemas/multiload.schemas
-etc/gconf/schemas/panel-menu.schemas
etc/sound/events/battstat_applet.soundlist
-lib/libpanel-menu.a
-lib/libpanel-menu.so
-lib/libpanel-menu.so.0
libdata/bonobo/servers/GNOME_BattstatApplet.server
libdata/bonobo/servers/GNOME_CDPlayerApplet.server
libdata/bonobo/servers/GNOME_CharpickerApplet.server
@@ -63,7 +57,6 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
libdata/bonobo/servers/GNOME_MixerApplet.server
libdata/bonobo/servers/GNOME_ModemLightsApplet.server
libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
-libdata/bonobo/servers/GNOME_PanelMenuApplet.server
share/gnome/battstat_applet/battstat_applet.glade
share/gnome/geyes/Bizarre/Bizarre-eye.png
share/gnome/geyes/Bizarre/Bizarre-pupil.png
@@ -102,6 +95,7 @@ share/gnome/gkb/DE_German.keyprop
share/gnome/gkb/DE_German_x.keyprop
share/gnome/gkb/DK_Danish.keyprop
share/gnome/gkb/DK_Danish_x.keyprop
+share/gnome/gkb/Dvorak.keyprop
share/gnome/gkb/EE_Estonian.keyprop
share/gnome/gkb/EE_Estonian_x.keyprop
share/gnome/gkb/ES_Spanish.keyprop
@@ -159,6 +153,7 @@ share/gnome/gkb/PortugalDeadkeys.keyprop
share/gnome/gkb/RO_Romanian.keyprop
share/gnome/gkb/RU_Russian.keyprop
share/gnome/gkb/RU_Russian_x.keyprop
+share/gnome/gkb/RU_Russian_x_rev.keyprop
share/gnome/gkb/RussianCyril.keyprop
share/gnome/gkb/SE_Swedish.keyprop
share/gnome/gkb/SI_Slovenian.keyprop
@@ -215,6 +210,13 @@ share/gnome/help/char-palette/C/legal.xml
share/gnome/help/command-line/C/command-line.xml
share/gnome/help/command-line/C/figures/command-line.png
share/gnome/help/command-line/C/legal.xml
+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/gtik2_applet2/C/figures/gtik_applet.png
+share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
+share/gnome/help/gtik2_applet2/C/legal.xml
share/gnome/help/gweather/C/figures/gweather_applet.png
share/gnome/help/gweather/C/figures/gweather_settings.png
share/gnome/help/gweather/C/figures/gweather_weather.png
@@ -224,6 +226,8 @@ share/gnome/help/gweather/C/topic.dat
share/gnome/omf/gnome-applets/cdplayer_applet-C.omf
share/gnome/omf/gnome-applets/char-palette-C.omf
share/gnome/omf/gnome-applets/command-line-C.omf
+share/gnome/omf/gnome-applets/geyes-C.omf
+share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
share/gnome/omf/gnome-applets/gweather_applet-C.omf
share/gnome/pixmaps/battstat.png
share/gnome/pixmaps/charpick.png
@@ -257,7 +261,7 @@ share/gnome/pixmaps/gkb/fi.png
share/gnome/pixmaps/gkb/fr.png
share/gnome/pixmaps/gkb/gb.png
share/gnome/pixmaps/gkb/ge.png
-share/gnome/pixmaps/gkb/gkb-foot.png
+share/gnome/pixmaps/gkb/gkb.png
share/gnome/pixmaps/gkb/gr.png
share/gnome/pixmaps/gkb/hr.png
share/gnome/pixmaps/gkb/hu.png
@@ -313,7 +317,6 @@ share/gnome/pixmaps/gnome-mixer-applet.png
share/gnome/pixmaps/gweather/tstorm.xpm
share/gnome/pixmaps/mini-commander/browser-mini.xpm
share/gnome/pixmaps/mini-commander/history-mini.xpm
-share/gnome/pixmaps/panel-menu-icon.png
share/gnome/xmodmap/xmodmap.am
share/gnome/xmodmap/xmodmap.be
share/gnome/xmodmap/xmodmap.bg
@@ -365,6 +368,7 @@ share/gnome/xmodmap/xmodmap.qc
share/gnome/xmodmap/xmodmap.qc-2
share/gnome/xmodmap/xmodmap.ro
share/gnome/xmodmap/xmodmap.ru
+share/gnome/xmodmap/xmodmap.ru-rev
share/gnome/xmodmap/xmodmap.ru_yawerty
share/gnome/xmodmap/xmodmap.se
share/gnome/xmodmap/xmodmap.sf
@@ -422,6 +426,7 @@ share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@@ -445,8 +450,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
@dirrm share/gnome/geyes/Bizarre
@dirrm share/gnome/geyes
@dirrm share/gnome/battstat_applet
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet/prefs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel-menu-applet
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index a3bf403dfe2a..f167d6c7260e 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomedesktop
-PORTVERSION= 1.5.18
+PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-desktop-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index a1723c157f78..45e9c13f6ce5 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.18.tar.bz2) = 2080d9e0f6ce4c03118248cdd0558914
+MD5 (gnome2/gnome-desktop-1.5.19.tar.bz2) = e7cce4ee06d204c9dcc6118cae21e847
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index d5233a9bf1c6..a506e4e8c8d4 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -1,5 +1,6 @@
bin/gnome-about
include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h
include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
lib/libgnome-desktop-2.a
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 6ff4e5ab88df..b4f467795dae 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomepanel
-PORTVERSION= 1.5.20
+PORTVERSION= 1.5.21
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-panel-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 15293c365add..d7317b5b99d9 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-1.5.20.tar.bz2) = 7adee4de5eba5d204ba537ca0af8d1f9
+MD5 (gnome2/gnome-panel-1.5.21.tar.bz2) = 1de639dcbb3f8f33833e8bd57790d692
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 6ee349b32c83..cbcafeee13cf 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -84,6 +84,10 @@ 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/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
@@ -126,6 +130,7 @@ share/gnome/help/workspace-switcher/C/legal.xml
share/gnome/help/workspace-switcher/C/workspace-switcher.xml
share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl
share/gnome/omf/gnome-panel/clock-C.omf
+share/gnome/omf/gnome-panel/fish-applet-2-C.omf
share/gnome/omf/gnome-panel/mailcheck-C.omf
share/gnome/omf/gnome-panel/panel-C.omf
share/gnome/omf/gnome-panel/window-list-C.omf
@@ -202,6 +207,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
@dirrm share/gnome/help/mailcheck/C/figures
@dirrm share/gnome/help/mailcheck/C
@dirrm share/gnome/help/mailcheck
+@dirrm share/gnome/help/fish-applet-2/C/figures
+@dirrm share/gnome/help/fish-applet-2/C
+@dirrm share/gnome/help/fish-applet-2
@dirrm share/gnome/help/clock/C/figures
@dirrm share/gnome/help/clock/C
@dirrm share/gnome/help/clock
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index ef7240918e60..302733eb2cbb 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnomesession
-PORTVERSION= 1.5.18
+PORTVERSION= 1.5.19
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-session-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index e4288731a42c..87fda53fdf5e 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-session-1.5.18.tar.bz2) = 1b3f6f304cd56eba6265d36b568332c2
+MD5 (gnome2/gnome-session-1.5.19.tar.bz2) = a723f5954097eec8c1ce4528d59d2179
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 9132f92eb6e2..b539945ccd7e 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -1,14 +1,12 @@
bin/gnome-libice-check
bin/gnome-login-check
bin/gnome-session
+bin/gnome-session-properties
+bin/gnome-session-save
bin/gnome-smproxy
bin/gnome-wm
-bin/save-session
-bin/session-properties
-bin/session-properties-capplet
+etc/gconf/schemas/gnome-session.schemas
share/gnome/control-center-2.0/capplets/session-properties.desktop
-share/gnome/control-center-2.0/capplets/session.desktop
-share/gnome/control-center/Session/session-properties.desktop
share/gnome/default.session
share/gnome/default.wm
share/gnome/pixmaps/splash/gnome-splash-1.4.0.png
@@ -57,5 +55,3 @@ share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
@dirrm share/gnome/pixmaps/splash
@dirrm share/gnome/omf/gnome-core
-@dirrm share/gnome/control-center/Session
-@dirrm share/gnome/control-center
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index fe82bf97d89f..ebe585c1272c 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= gnometerminal
-PORTVERSION= 1.9.5
+PORTVERSION= 1.9.6
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DISTNAME= gnome-terminal-${PORTVERSION}
DIST_SUBDIR= gnome2
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 8edf3bd9ee25..772d3699b0d0 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-1.9.5.tar.bz2) = 81a0d2961cbfcf753c96f2be3f6bccf8
+MD5 (gnome2/gnome-terminal-1.9.6.tar.bz2) = e509c5ba638aeeea320527daa1f996d7
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 9e31206ff25b..603ceff36454 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -9,7 +9,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/global/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default/%gconf.xml
-etc/gconf/schemas/profterm.schemas
+etc/gconf/schemas/gnome-terminal.schemas
libdata/bonobo/servers/gnome-terminal.server
share/gnome/applications/gnome-terminal.desktop
share/gnome/gnome-terminal/glade/gnome-terminal.glade2
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 4ebe5e385ab1..c87cb41d9d65 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= libgnome
-PORTVERSION= 1.116.0
+PORTVERSION= 1.117.0
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509
+MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta5
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f22c9f4a8108..8c24d34981b4 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.116.0.tar.bz2) = 64cd727e6cbfd7fc6f01c8a7f323ac32
+MD5 (gnome2/libgnome-1.117.0.tar.bz2) = 154158d266dbc2f18b76157191e3750e
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
new file mode 100644
index 000000000000..4c3c6b33cea4
--- /dev/null
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -0,0 +1,33 @@
+--- libgnome/gnome-program.c.orig Fri May 17 20:18:53 2002
++++ libgnome/gnome-program.c Fri May 17 20:19:50 2002
+@@ -882,12 +882,12 @@
+ attr_rel = "";
+ break;
+ case GNOME_FILE_DOMAIN_SOUND:
+- prefix_rel = "/share/sounds";
++ prefix_rel = "/share/gnome/sounds";
+ attr_name = GNOME_PARAM_GNOME_DATADIR;
+ attr_rel = "/sounds";
+ break;
+ case GNOME_FILE_DOMAIN_PIXMAP:
+- prefix_rel = "/share/pixmaps";
++ prefix_rel = "/share/gnome/pixmaps";
+ attr_name = GNOME_PARAM_GNOME_DATADIR;
+ attr_rel = "/pixmaps";
+ break;
+@@ -914,13 +914,13 @@
+ search_path = FALSE;
+ break;
+ case GNOME_FILE_DOMAIN_APP_SOUND:
+- prefix_rel = "/share/sounds";
++ prefix_rel = "/share/gnome/sounds";
+ attr_name = GNOME_PARAM_APP_DATADIR;
+ attr_rel = "/sounds";
+ search_path = FALSE;
+ break;
+ case GNOME_FILE_DOMAIN_APP_PIXMAP:
+- prefix_rel = "/share/pixmaps";
++ prefix_rel = "/share/gnome/pixmaps";
+ attr_name = GNOME_PARAM_APP_DATADIR;
+ attr_rel = "/pixmaps";
+ search_path = FALSE;
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 9ce4366dfcaf..d91a7e6ea3d4 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -12,7 +12,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/file-views/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
@@ -87,27 +87,6 @@ lib/libgnome-2.so
lib/libgnome-2.so.0
libdata/bonobo/servers/GNOME_Moniker_std.server
libdata/pkgconfig/libgnome-2.0.pc
-share/doc/libgnome/index.html
-share/doc/libgnome/index.sgml
-share/doc/libgnome/libgnome-gnome-config.html
-share/doc/libgnome/libgnome-gnome-exec.html
-share/doc/libgnome/libgnome-gnome-gconf.html
-share/doc/libgnome/libgnome-gnome-help.html
-share/doc/libgnome/libgnome-gnome-i18n.html
-share/doc/libgnome/libgnome-gnome-init.html
-share/doc/libgnome/libgnome-gnome-program.html
-share/doc/libgnome/libgnome-gnome-score.html
-share/doc/libgnome/libgnome-gnome-sound.html
-share/doc/libgnome/libgnome-gnome-triggers.html
-share/doc/libgnome/libgnome-gnome-url.html
-share/doc/libgnome/libgnome-gnome-util.html
-share/doc/libgnome/libgnome-libgnometypebuiltins.html
-share/doc/libgnome/libgnome.html
-share/doc/libgnome/x1277.html
-share/doc/libgnome/x2848.html
-share/doc/libgnome/x3213.html
-share/doc/libgnome/x4055.html
-share/doc/libgnome/x9.html
share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml
@@ -115,6 +94,7 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo
share/locale/da/LC_MESSAGES/libgnome-2.0.mo
share/locale/de/LC_MESSAGES/libgnome-2.0.mo
share/locale/es/LC_MESSAGES/libgnome-2.0.mo
+share/locale/eu/LC_MESSAGES/libgnome-2.0.mo
share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
share/locale/it/LC_MESSAGES/libgnome-2.0.mo
@@ -126,6 +106,7 @@ share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
share/locale/no/LC_MESSAGES/libgnome-2.0.mo
share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
share/locale/pt/LC_MESSAGES/libgnome-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo
share/locale/ru/LC_MESSAGES/libgnome-2.0.mo
share/locale/sk/LC_MESSAGES/libgnome-2.0.mo
share/locale/sl/LC_MESSAGES/libgnome-2.0.mo
@@ -133,6 +114,7 @@ share/locale/sv/LC_MESSAGES/libgnome-2.0.mo
share/locale/ta/LC_MESSAGES/libgnome-2.0.mo
share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
+share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@@ -178,7 +160,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file-views
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal