Update to GNOME 2.0 RC 1.

53 files changed, 143 insertions, 187 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 4d980d383ba5..c0d8ecd07d1f 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 267b3569e2ee..2b3b4ea839c1 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 #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 753026650e26..e686b99c23e2 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 7f235abd961d..0f53aa024a43 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ORBit2
 PORTVERSION=	2.3.108
 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 267b3569e2ee..2b3b4ea839c1 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 #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/gconf2/Makefile b/devel/gconf2/Makefile
index 2f3dc4e3b4c1..a9f503ea6893 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	1.1.9
+PORTVERSION=	1.1.10
 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-20020501
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	ORBit-2.0:${PORTSDIR}/devel/ORBit2 \
-		db3.2:${PORTSDIR}/databases/db3 \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
 
@@ -26,8 +25,8 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-db3-includes=${LOCALBASE}/include \
-		--with-html-dir=${PREFIX}/share/doc \
-		--enable-bdbbackend
+		--with-html-dir=${PREFIX}/share/doc
+#		--enable-bdbbackend
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 1a20c337c92c..bc4d3effea82 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.1.9.tar.bz2) = 6a85f08284be8d9d1f4b17155be43257
+MD5 (gnome2/GConf-1.1.10.tar.bz2) = e30615bf27ea2ee84f411bd7a7077394
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 410c5230d783..30bf0b789414 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -11,7 +11,6 @@ include/gconf/2/gconf/gconf-listeners.h
 include/gconf/2/gconf/gconf-schema.h
 include/gconf/2/gconf/gconf-value.h
 include/gconf/2/gconf/gconf.h
-lib/GConf/2/libgconfbackend-bdb.so
 lib/GConf/2/libgconfbackend-xml.so
 lib/libgconf-2.a
 lib/libgconf-2.so
@@ -77,6 +76,7 @@ share/locale/sv/LC_MESSAGES/GConf2.mo
 share/locale/tr/LC_MESSAGES/GConf2.mo
 share/locale/uk/LC_MESSAGES/GConf2.mo
 share/locale/zh_CN/LC_MESSAGES/GConf2.mo
+share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 @dirrm share/doc/gconf
 @dirrm lib/GConf/2
 @dirrm include/gconf/2/gconf
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6b47fefcfdbe..968804d6273c 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-beta4,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020501,} \
 		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 03d16d5b7b8b..aeb1a0cad9a4 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index a868e48ca3ad..faa4daefd971 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.12
+PORTVERSION=	1.9.14
 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-20020501
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 7618a2780d61..e7c7657e0cb3 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.12.tar.bz2) = 83bd2b8f31ddb32fe4d81aa8c6038148
+MD5 (gnome2/gnome-vfs-1.9.14.tar.bz2) = 7edb893e5db8efc1fe3a6029290b158f
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index f4c57afc835c..0801595ed78a 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Apr 26 12:27:40 2002
-+++ configure	Fri Apr 26 12:30:02 2002
-@@ -5586,6 +5586,7 @@
+--- configure.orig	Wed May  1 15:08:02 2002
++++ configure	Wed May  1 15:10:42 2002
+@@ -7206,6 +7206,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,40 +8,41 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9131,8 +9132,8 @@
+@@ -11986,8 +11987,8 @@
    done
  fi
  
--echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
--echo "configure:9136: checking for bzCompressInit in -lbz2" >&5
-+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
-+echo "configure:9136: checking for BZ2_bzCompressInit in -lbz2" >&5
- ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9145,10 +9146,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
+-echo "$as_me:11989: checking for bzCompressInit in -lbz2" >&5
+-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
++echo "$as_me:11989: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -12003,11 +12004,11 @@
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char bzCompressInit();
-+char BZ2_bzCompressInit();
- 
- int main() {
--bzCompressInit()
-+BZ2_bzCompressInit()
- ; return 0; }
- EOF
- if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -9421,7 +9422,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+    builtin and then its argument prototype would still apply.  */
+-char bzCompressInit ();
++char BZ2_bzCompressInit ();
+ int
+ main ()
+ {
+-bzCompressInit ();
++BZ2_bzCompressInit ();
+   ;
+   return 0;
+ }
+@@ -12319,7 +12320,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   
+ 
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- 		cat > conftest.$ac_ext <<EOF
- #line 9427 "configure"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ #line 12324 "configure"
  #include "confdefs.h"
-@@ -9456,9 +9457,9 @@
+@@ -12370,9 +12371,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,14 +52,14 @@ $FreeBSD$
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
- 		
  
-@@ -10059,7 +10060,7 @@
- s%@ORBIT_IDL@%$ORBIT_IDL%g
- s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
- s%@WARN_CFLAGS@%$WARN_CFLAGS%g
--s%@PTHREAD_LIB@%$PTHREAD_LIB%g
-+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g
- s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
- s%@ALLOCA@%$ALLOCA%g
- s%@USE_NLS@%$USE_NLS%g
+ if true; then
+@@ -13251,7 +13252,7 @@
+ s,@ORBIT_IDL@,$ORBIT_IDL,;t t
+ s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t
++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIB,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@ALLOCA@,$ALLOCA,;t t
+ s,@USE_NLS@,$USE_NLS,;t t
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index 03d16d5b7b8b..aeb1a0cad9a4 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	gnome-common-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index a868e48ca3ad..faa4daefd971 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.12
+PORTVERSION=	1.9.14
 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-20020501
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 7618a2780d61..e7c7657e0cb3 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.12.tar.bz2) = 83bd2b8f31ddb32fe4d81aa8c6038148
+MD5 (gnome2/gnome-vfs-1.9.14.tar.bz2) = 7edb893e5db8efc1fe3a6029290b158f
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index f4c57afc835c..0801595ed78a 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig	Fri Apr 26 12:27:40 2002
-+++ configure	Fri Apr 26 12:30:02 2002
-@@ -5586,6 +5586,7 @@
+--- configure.orig	Wed May  1 15:08:02 2002
++++ configure	Wed May  1 15:10:42 2002
+@@ -7206,6 +7206,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,40 +8,41 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9131,8 +9132,8 @@
+@@ -11986,8 +11987,8 @@
    done
  fi
  
--echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6
--echo "configure:9136: checking for bzCompressInit in -lbz2" >&5
-+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6
-+echo "configure:9136: checking for BZ2_bzCompressInit in -lbz2" >&5
- ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -9145,10 +9146,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
+-echo "$as_me:11989: checking for bzCompressInit in -lbz2" >&5
+-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
++echo "$as_me:11989: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
+ if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -12003,11 +12004,11 @@
+ #endif
  /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char bzCompressInit();
-+char BZ2_bzCompressInit();
- 
- int main() {
--bzCompressInit()
-+BZ2_bzCompressInit()
- ; return 0; }
- EOF
- if { (eval echo configure:9155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -9421,7 +9422,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
+    builtin and then its argument prototype would still apply.  */
+-char bzCompressInit ();
++char BZ2_bzCompressInit ();
+ int
+ main ()
+ {
+-bzCompressInit ();
++BZ2_bzCompressInit ();
+   ;
+   return 0;
+ }
+@@ -12319,7 +12320,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-   
+ 
 -		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl"
 +		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl"
- 		cat > conftest.$ac_ext <<EOF
- #line 9427 "configure"
+ 		cat >conftest.$ac_ext <<_ACEOF
+ #line 12324 "configure"
  #include "confdefs.h"
-@@ -9456,9 +9457,9 @@
+@@ -12370,9 +12371,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,14 +52,14 @@ $FreeBSD$
 -                	OPENSSL_LIBS="-lssl -lcrypto"
 +                	OPENSSL_LIBS="-lssl -lcryptofoo"
                  fi
- 		
  
-@@ -10059,7 +10060,7 @@
- s%@ORBIT_IDL@%$ORBIT_IDL%g
- s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g
- s%@WARN_CFLAGS@%$WARN_CFLAGS%g
--s%@PTHREAD_LIB@%$PTHREAD_LIB%g
-+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g
- s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g
- s%@ALLOCA@%$ALLOCA%g
- s%@USE_NLS@%$USE_NLS%g
+ if true; then
+@@ -13251,7 +13252,7 @@
+ s,@ORBIT_IDL@,$ORBIT_IDL,;t t
+ s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
+ s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t
++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIB,;t t
+ s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+ s,@ALLOCA@,$ALLOCA,;t t
+ s,@USE_NLS@,$USE_NLS,;t t
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 4b27f03a3354..73eb63c6b383 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index c3b3772c7089..0b9f1b6010d6 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	1.115.0
+PORTVERSION=	1.116.0
 CATEGORIES=	devel
 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 1b695b2de518..848f5a137553 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.115.0.tar.bz2) = 57b7e361bf2c1e87d20292e21f1a65b5
+MD5 (gnome2/libbonobo-1.116.0.tar.bz2) = a4c5c79d6997c3073806d602930a0a5d
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 4d973d0e9991..a5cea661738e 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -40,43 +40,6 @@ lib/orbit-2.0/Bonobo_module.so
 libdata/bonobo/servers/Bonobo_Moniker_std.server
 libdata/bonobo/servers/Bonobo_Sample_Echo.server
 libdata/pkgconfig/libbonobo-2.0.pc
-share/doc/libbonobo/c4.html
-share/doc/libbonobo/index.html
-share/doc/libbonobo/index.sgml
-share/doc/libbonobo/libbonobo-bonobo-arg.html
-share/doc/libbonobo/libbonobo-bonobo-config-database.html
-share/doc/libbonobo/libbonobo-bonobo-context.html
-share/doc/libbonobo/libbonobo-bonobo-event-source.html
-share/doc/libbonobo/libbonobo-bonobo-exception.html
-share/doc/libbonobo/libbonobo-bonobo-generic-factory.html
-share/doc/libbonobo/libbonobo-bonobo-i18n.html
-share/doc/libbonobo/libbonobo-bonobo-item-container.html
-share/doc/libbonobo/libbonobo-bonobo-item-handler.html
-share/doc/libbonobo/libbonobo-bonobo-listener.html
-share/doc/libbonobo/libbonobo-bonobo-macros.html
-share/doc/libbonobo/libbonobo-bonobo-main.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html
-share/doc/libbonobo/libbonobo-bonobo-moniker-util.html
-share/doc/libbonobo/libbonobo-bonobo-moniker.html
-share/doc/libbonobo/libbonobo-bonobo-object.html
-share/doc/libbonobo/libbonobo-bonobo-persist-client.html
-share/doc/libbonobo/libbonobo-bonobo-persist-file.html
-share/doc/libbonobo/libbonobo-bonobo-persist-stream.html
-share/doc/libbonobo/libbonobo-bonobo-persist.html
-share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html
-share/doc/libbonobo/libbonobo-bonobo-property-bag.html
-share/doc/libbonobo/libbonobo-bonobo-running-context.html
-share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html
-share/doc/libbonobo/libbonobo-bonobo-shutdown.html
-share/doc/libbonobo/libbonobo-bonobo-storage-memory.html
-share/doc/libbonobo/libbonobo-bonobo-storage.html
-share/doc/libbonobo/libbonobo-bonobo-stream-client.html
-share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
-share/doc/libbonobo/libbonobo-bonobo-transient.html
-share/doc/libbonobo/libbonobo-bonobo-types.html
-share/doc/libbonobo/libbonobo-bonobo-xobject.html
 share/idl/bonobo-2.0/Bonobo.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 58677ef88d28..24ec29f24352 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	1.99.10
+PORTVERSION=	1.99.11
 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-20020501
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 392947ebb705..0449cd9de1e6 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.10.tar.bz2) = b226ee9bb83a285be1f6beccb3f2a904
+MD5 (gnome2/libglade-1.99.11.tar.bz2) = 7ff77ce4a644d211c2a1f786fb30fa46
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 5f66caff97a2..ca49f1080730 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 5f66caff97a2..ca49f1080730 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index a8841b595f41..4f9ef1b146ec 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index a8841b595f41..4f9ef1b146ec 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 1d80ba2ccbcc..3c869ee5bdae 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	1.115.0
+PORTVERSION=	1.116.0
 CATEGORIES=	graphics 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-20020501
 DIST_SUBDIR=	gnome2
 
 LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 8c6db84dfddb..f0deaf0de118 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.115.0.tar.bz2) = e0a37edf981798058a1233bbd31c47c2
+MD5 (gnome2/libgnomecanvas-1.116.0.tar.bz2) = 4409eb546c541c1524aaeb74eb8e1341
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index c37cca8c0c49..747f36a067f8 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomemimedata
 PORTVERSION=	1.0.7
 CATEGORIES=	misc 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-20020501
 DISTNAME=	gnome-mime-data-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index c37cca8c0c49..747f36a067f8 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gnomemimedata
 PORTVERSION=	1.0.7
 CATEGORIES=	misc 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-20020501
 DISTNAME=	gnome-mime-data-${PORTVERSION}
 DIST_SUBDIR=	gnome
 
diff --git a/net/linc/Makefile b/net/linc/Makefile
index d32af948fe4d..c25052d5fcd9 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 727fd2acd325..b6161a5ebe89 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.112.0
 PORTREVISION=	2
 CATEGORIES=	print 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 4d980d383ba5..c0d8ecd07d1f 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 753026650e26..e686b99c23e2 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index f0ef85284ac8..12f0604809cb 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-beta4,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020501,} \
 		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 f0ef85284ac8..12f0604809cb 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-beta4,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020501,} \
 		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 3f741bd7a869..835d4709d2d7 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libbonoboui
-PORTVERSION=	1.115.0
-PORTREVISION=	1
+PORTVERSION=	1.116.0
 CATEGORIES=	x11-toolkits 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo
index 700c1cc598a0..00e7af6698d2 100644
--- a/x11-toolkits/libbonoboui/distinfo
+++ b/x11-toolkits/libbonoboui/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonoboui-1.115.0.tar.bz2) = e7678b3947ae9e6135288b8c2f282d1c
+MD5 (gnome2/libbonoboui-1.116.0.tar.bz2) = db9796cb3ed29f189a86f72105746c57
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 098042044608..28e40c309c10 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-beta4
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 6f00d876f4ba..ce5e66c07482 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.112.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 64bd1fb17513..f87805a42ba1 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libwnck
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	x11-toolkits 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo
index be4f3035be14..2cbf91ff2771 100644
--- a/x11-toolkits/libwnck/distinfo
+++ b/x11-toolkits/libwnck/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libwnck-0.8.tar.bz2) = a2958cbea24f7873eb2a9c2ec8c6b1df
+MD5 (gnome2/libwnck-0.9.tar.bz2) = 414658395318df22201ad2eb816fe242
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 8af0cb65511e..d4134ecb3bf2 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.114.0
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 5f4e194f64bb..ad264f97f2c0 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-beta4,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020501,} \
 		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/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 70b18ccc9d2f..fa8f9320dd45 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.17
-PORTREVISION=	1
+PORTVERSION=	1.5.18
 CATEGORIES=	x11 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-20020501
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 96d0cc6fe998..a1723c157f78 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.17.tar.bz2) = 74cd91b5841c753edf5cbfa6f60b9575
+MD5 (gnome2/gnome-desktop-1.5.18.tar.bz2) = 2080d9e0f6ce4c03118248cdd0558914
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index a1729bbc79a0..d5233a9bf1c6 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -189,6 +189,7 @@ share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 70b18ccc9d2f..fa8f9320dd45 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	1.5.17
-PORTREVISION=	1
+PORTVERSION=	1.5.18
 CATEGORIES=	x11 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-20020501
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 96d0cc6fe998..a1723c157f78 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-1.5.17.tar.bz2) = 74cd91b5841c753edf5cbfa6f60b9575
+MD5 (gnome2/gnome-desktop-1.5.18.tar.bz2) = 2080d9e0f6ce4c03118248cdd0558914
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index a1729bbc79a0..d5233a9bf1c6 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -189,6 +189,7 @@ share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 1c986a31a809..f8950647e0e0 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	1.115.0
-PORTREVISION=	1
+PORTVERSION=	1.116.0
 CATEGORIES?=	x11 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-20020501
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index e28b1fbf874b..f22c9f4a8108 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.115.0.tar.bz2) = b9f851259656a5aeaf2f6c0a983cf4bb
+MD5 (gnome2/libgnome-1.116.0.tar.bz2) = 64cd727e6cbfd7fc6f01c8a7f323ac32