Update to GNOME 2.0 beta3.

Approved by:	sobomax

61 files changed, 187 insertions, 321 deletions

diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index e78617d75e14..8a25f41af8b6 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 #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/atk/distinfo b/accessibility/atk/distinfo
index 7cba67445ced..f97b65de5fcf 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-1.0.0.tar.bz2) = 885f39a89bbc96b587da893f61943a21
+MD5 (gnome2/atk-1.0.1.tar.bz2) = b2ce84da92e64223330beee0df403450
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index f919650433ad..7cd49c3cca4f 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.9
+PORTVERSION=	0.11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index b7613b419d0f..8e198f59c807 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.9.tar.bz2) = e1644a587e4522b52181c62d1d9e57ea
+MD5 (gnome2/gail-0.11.tar.bz2) = b266bfd9fec90ceed7452b31b6078828
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 2412ec335bf1..e1a7f16ce2c8 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -1,48 +1,10 @@
 include/gail-1.0/util/gail-util.h
 include/gail-1.0/util/gailmisc.h
 include/gail-1.0/util/gailtextutil.h
-lib/libferret.so
-lib/libferret.so.9
-lib/libgail.so
-lib/libgail.so.0
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.so
 lib/libgailutil.so
-lib/libgailutil.so.9
-lib/libtestaction.so
-lib/libtestaction.so.9
-lib/libtestbutton.so
-lib/libtestbutton.so.9
-lib/libtestcombo.so
-lib/libtestcombo.so.9
-lib/libtestcomponent.so
-lib/libtestcomponent.so.9
-lib/libtestimage.so
-lib/libtestimage.so.9
-lib/libtestmenuitem.so
-lib/libtestmenuitem.so.9
-lib/libtestnotebook.so
-lib/libtestnotebook.so.9
-lib/libtestobject.so
-lib/libtestobject.so.9
-lib/libtestoptionmenu.so
-lib/libtestoptionmenu.so.9
-lib/libtestpaned.so
-lib/libtestpaned.so.9
-lib/libtestprops.so
-lib/libtestprops.so.9
-lib/libtestselection.so
-lib/libtestselection.so.9
-lib/libteststatusbar.so
-lib/libteststatusbar.so.9
-lib/libtesttable.so
-lib/libtesttable.so.9
-lib/libtesttext.so
-lib/libtesttext.so.9
-lib/libtesttoplevel.so
-lib/libtesttoplevel.so.9
-lib/libtesttreetable.so
-lib/libtesttreetable.so.9
-lib/libtestvalues.so
-lib/libtestvalues.so.9
+lib/libgailutil.so.11
 libdata/pkgconfig/gail.pc
 @dirrm include/gail-1.0/util
 @dirrm include/gail-1.0
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 075d81dd1b20..6889eee5b341 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.3.106
+PORTVERSION=	2.3.107
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 3a2137aa7e73..1ab4745b30a8 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.106.tar.bz2) = b39bc65e0ba57415afac3fff1278ee62
+MD5 (gnome2/ORBit2-2.3.107.tar.bz2) = ef5a236d51993ac6f16a34229b21a870
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index e78617d75e14..8a25f41af8b6 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	atk
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 #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/atk/distinfo b/devel/atk/distinfo
index 7cba67445ced..f97b65de5fcf 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1 +1 @@
-MD5 (gnome2/atk-1.0.0.tar.bz2) = 885f39a89bbc96b587da893f61943a21
+MD5 (gnome2/atk-1.0.1.tar.bz2) = b2ce84da92e64223330beee0df403450
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index b6e72cf12bb2..0ad69702d5af 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 622d125f2cd0..4ce00b6fc551 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.5.tar.bz2) = 6dc24bac530afc7e306913a7b67e8039
+MD5 (gnome2/bonobo-activation-0.9.6.tar.bz2) = db38496928b7a7fff0b0cce32d1fc4c9
diff --git a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
index ac381550b930..cf1477a63af6 100644
--- a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
+++ b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- bonobo-activation/bonobo-activation-fork-server.c	2002/02/14 01:06:52	1.1
-+++ bonobo-activation/bonobo-activation-fork-server.c	2002/02/14 01:07:07
-@@ -270,6 +270,8 @@
+--- bonobo-activation/bonobo-activation-fork-server.c.orig	Tue Mar 12 09:23:47 2002
++++ bonobo-activation/bonobo-activation-fork-server.c	Tue Apr  2 18:27:40 2002
+@@ -342,6 +342,8 @@
  	} else if ((childpid = fork ())) {
  		_exit (0);	/* de-zombifier process, just exit */
  	} else {
 +		sigprocmask (SIG_SETMASK, &omask, NULL);
 +
-                 if (display)
- 		  bonobo_activation_setenv ("DISPLAY", display);
- 		if (od_iorstr)
+                 if (display != NULL) {
+                         bonobo_activation_setenv ("DISPLAY", display);
+                 }
diff --git a/devel/bonobo-activation/files/patch-utils::bonobo-slay.in b/devel/bonobo-activation/files/patch-utils::bonobo-slay.in
index 3aa2e8eec3c0..44212a0418a1 100644
--- a/devel/bonobo-activation/files/patch-utils::bonobo-slay.in
+++ b/devel/bonobo-activation/files/patch-utils::bonobo-slay.in
@@ -1,24 +1,21 @@
-
-$FreeBSD$
-
---- utils/bonobo-slay.in	2002/02/13 17:51:37	1.1
-+++ utils/bonobo-slay.in	2002/02/13 17:52:04
-@@ -51,15 +51,15 @@
+--- utils/bonobo-slay.in.orig	Mon Mar 11 12:16:43 2002
++++ utils/bonobo-slay.in	Tue Apr  2 18:30:30 2002
+@@ -56,15 +56,15 @@
  
- # get OAF files
+ # get Bonobo files
  #
--@oaf_dirs = ( "@prefix@/lib/bonobo/servers" );
-+@oaf_dirs = ( "@prefix@/libdata/bonobo/servers" );
- foreach $dir (split(':', $ENV{'OAF_INFO_PATH'})) {
+-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" );
++@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" );
+ foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) {
  	if (-d $dir) {
- 		push @oaf_dirs, $dir;
+ 		push @bonobo_dirs, $dir;
  	}
  }
- foreach $dir (split(':', $ENV{'GNOME_PATH'})) {
+ foreach $dir (split(':', $ENV{'GNOME2_PATH'})) {
 -	if (-d "$dir/lib/bonobo/servers") {
--		push @oaf_dirs, "$dir/lib/bonobo/servers";
+-		push @bonobo_dirs, "$dir/lib/bonobo/servers";
 +	if (-d "$dir/libdata/bonobo/servers") {
-+		push @oaf_dirs, "$dir/libdata/bonobo/servers";
++		push @bonobo_dirs, "$dir/libdata/bonobo/servers";
  	}
  }
  
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 34c41614abe6..a9003454e081 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.9
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index 97be93702c49..1a20c337c92c 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.1.8.tar.bz2) = f44d2f4fb336e162e4a1b1606d91a8bf
+MD5 (gnome2/GConf-1.1.9.tar.bz2) = 6a85f08284be8d9d1f4b17155be43257
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index e9f4cf506077..d409b380b4f0 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 975a8bb391d0..b9d7a220d880 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-2.0.0.tar.bz2) = dd9d482ec739a41710080ee136f96444
+MD5 (gnome2/glib-2.0.1.tar.bz2) = d81814a57f3861c3077e55870faabede
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index fba0dbb1da9c..20314dc20a73 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.10
+PORTVERSION=	1.9.11
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 01ca5ef35958..255faa7eff36 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.10.tar.bz2) = 967ac50161fe0f24bc071d3d8d010081
+MD5 (gnome2/gnome-vfs-1.9.11.tar.bz2) = 51ddc69ecaf25366a1aa7eed5f5c8a53
diff --git a/devel/gnome-vfs/files/patch-modules::extfs-method.c b/devel/gnome-vfs/files/patch-modules::extfs-method.c
deleted file mode 100644
index 2cc08f2ddc95..000000000000
--- a/devel/gnome-vfs/files/patch-modules::extfs-method.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/extfs-method.c	2002/02/16 16:49:13	1.1
-+++ modules/extfs-method.c	2002/02/16 16:52:11
-@@ -52,7 +52,7 @@
- ssize_t getdelim (char **lineptr, size_t *n, int terminator, FILE *stream);
- #endif
- 
--#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs/extfs"
-+#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs2/extfs"
- 
- /* Our private handle struct.  */
- struct _ExtfsHandle {
diff --git a/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in b/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in
deleted file mode 100644
index c2d45c8d6f5b..000000000000
--- a/devel/gnome-vfs/files/patch-modules::extfs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/extfs/Makefile.in	2002/02/16 16:49:13	1.1
-+++ modules/extfs/Makefile.in	2002/02/16 16:52:26
-@@ -163,7 +163,7 @@
- XML_REQUIRED = @XML_REQUIRED@
- cxxflags_set = @cxxflags_set@
- 
--extfsdir = $(prefix)/lib/vfs/extfs
-+extfsdir = $(prefix)/lib/vfs2/extfs
- 
- extfs_DATA =  	README
- 
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 122e0d80cc66..3b0cbe3618c3 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -58,23 +58,23 @@ lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.0
-lib/vfs2/extfs/README
-lib/vfs2/extfs/a
-lib/vfs2/extfs/ar
-lib/vfs2/extfs/arj
-lib/vfs2/extfs/cpio
-lib/vfs2/extfs/deb
-lib/vfs2/extfs/hp48
-lib/vfs2/extfs/lha
-lib/vfs2/extfs/mailfs
-lib/vfs2/extfs/patchfs
-lib/vfs2/extfs/rar
-lib/vfs2/extfs/rpm
-lib/vfs2/extfs/rpms
-lib/vfs2/extfs/tar
-lib/vfs2/extfs/trpm
-lib/vfs2/extfs/zip
-lib/vfs2/extfs/zoo
+lib/vfs/2.0/extfs/README
+lib/vfs/2.0/extfs/a
+lib/vfs/2.0/extfs/ar
+lib/vfs/2.0/extfs/arj
+lib/vfs/2.0/extfs/cpio
+lib/vfs/2.0/extfs/deb
+lib/vfs/2.0/extfs/hp48
+lib/vfs/2.0/extfs/lha
+lib/vfs/2.0/extfs/mailfs
+lib/vfs/2.0/extfs/patchfs
+lib/vfs/2.0/extfs/rar
+lib/vfs/2.0/extfs/rpm
+lib/vfs/2.0/extfs/rpms
+lib/vfs/2.0/extfs/tar
+lib/vfs/2.0/extfs/trpm
+lib/vfs/2.0/extfs/zip
+lib/vfs/2.0/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
@@ -112,8 +112,9 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm share/doc/gnome-vfs
-@dirrm lib/vfs2/extfs
-@dirrm lib/vfs2
+@dirrm lib/vfs/2.0/extfs
+@dirrm lib/vfs/2.0
+@dirrm lib/vfs
 @dirrm lib/gnome-vfs-2.0/modules
 @dirrm lib/gnome-vfs-2.0
 @dirrm include/gnome-vfs-module-2.0/libgnomevfs
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index fba0dbb1da9c..20314dc20a73 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.10
+PORTVERSION=	1.9.11
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 01ca5ef35958..255faa7eff36 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.10.tar.bz2) = 967ac50161fe0f24bc071d3d8d010081
+MD5 (gnome2/gnome-vfs-1.9.11.tar.bz2) = 51ddc69ecaf25366a1aa7eed5f5c8a53
diff --git a/devel/gnomevfs2/files/patch-modules::extfs-method.c b/devel/gnomevfs2/files/patch-modules::extfs-method.c
deleted file mode 100644
index 2cc08f2ddc95..000000000000
--- a/devel/gnomevfs2/files/patch-modules::extfs-method.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/extfs-method.c	2002/02/16 16:49:13	1.1
-+++ modules/extfs-method.c	2002/02/16 16:52:11
-@@ -52,7 +52,7 @@
- ssize_t getdelim (char **lineptr, size_t *n, int terminator, FILE *stream);
- #endif
- 
--#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs/extfs"
-+#define EXTFS_COMMAND_DIR	PREFIX "/lib/vfs2/extfs"
- 
- /* Our private handle struct.  */
- struct _ExtfsHandle {
diff --git a/devel/gnomevfs2/files/patch-modules::extfs::Makefile.in b/devel/gnomevfs2/files/patch-modules::extfs::Makefile.in
deleted file mode 100644
index c2d45c8d6f5b..000000000000
--- a/devel/gnomevfs2/files/patch-modules::extfs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- modules/extfs/Makefile.in	2002/02/16 16:49:13	1.1
-+++ modules/extfs/Makefile.in	2002/02/16 16:52:26
-@@ -163,7 +163,7 @@
- XML_REQUIRED = @XML_REQUIRED@
- cxxflags_set = @cxxflags_set@
- 
--extfsdir = $(prefix)/lib/vfs/extfs
-+extfsdir = $(prefix)/lib/vfs2/extfs
- 
- extfs_DATA =  	README
- 
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 122e0d80cc66..3b0cbe3618c3 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -58,23 +58,23 @@ lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
 lib/libgnomevfs-2.so.0
-lib/vfs2/extfs/README
-lib/vfs2/extfs/a
-lib/vfs2/extfs/ar
-lib/vfs2/extfs/arj
-lib/vfs2/extfs/cpio
-lib/vfs2/extfs/deb
-lib/vfs2/extfs/hp48
-lib/vfs2/extfs/lha
-lib/vfs2/extfs/mailfs
-lib/vfs2/extfs/patchfs
-lib/vfs2/extfs/rar
-lib/vfs2/extfs/rpm
-lib/vfs2/extfs/rpms
-lib/vfs2/extfs/tar
-lib/vfs2/extfs/trpm
-lib/vfs2/extfs/zip
-lib/vfs2/extfs/zoo
+lib/vfs/2.0/extfs/README
+lib/vfs/2.0/extfs/a
+lib/vfs/2.0/extfs/ar
+lib/vfs/2.0/extfs/arj
+lib/vfs/2.0/extfs/cpio
+lib/vfs/2.0/extfs/deb
+lib/vfs/2.0/extfs/hp48
+lib/vfs/2.0/extfs/lha
+lib/vfs/2.0/extfs/mailfs
+lib/vfs/2.0/extfs/patchfs
+lib/vfs/2.0/extfs/rar
+lib/vfs/2.0/extfs/rpm
+lib/vfs/2.0/extfs/rpms
+lib/vfs/2.0/extfs/tar
+lib/vfs/2.0/extfs/trpm
+lib/vfs/2.0/extfs/zip
+lib/vfs/2.0/extfs/zoo
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
@@ -112,8 +112,9 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm share/doc/gnome-vfs
-@dirrm lib/vfs2/extfs
-@dirrm lib/vfs2
+@dirrm lib/vfs/2.0/extfs
+@dirrm lib/vfs/2.0
+@dirrm lib/vfs
 @dirrm lib/gnome-vfs-2.0/modules
 @dirrm lib/gnome-vfs-2.0
 @dirrm include/gnome-vfs-module-2.0/libgnomevfs
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 3bbe08dbd4b5..39b81ce26573 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	1.112.0
+PORTVERSION=	1.113.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 05fa712d8598..17034cbb021b 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.112.0.tar.bz2) = a4b4adf02fea1a1feca11897ecd82cc0
+MD5 (gnome2/libbonobo-1.113.0.tar.bz2) = 931f66d92ae6463a351a7e8e0603cd0e
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index 8409be27366f..3a8b7b68248b 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -105,6 +105,7 @@ share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
@@ -112,6 +113,7 @@ share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 340a6b56ecda..e2ba59bb9a91 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	1.99.8
+PORTVERSION=	1.99.10
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 759a06cf178c..392947ebb705 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.8.tar.bz2) = 982fbb9d6ca84a7f1bc712117f6a532b
+MD5 (gnome2/libglade-1.99.10.tar.bz2) = b226ee9bb83a285be1f6beccb3f2a904
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index fd054791244f..a7875449633e 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Thu Jan 31 03:44:13 2002
-+++ Makefile.in	Thu Feb 14 11:53:48 2002
+--- Makefile.in.orig	Wed Apr  3 01:58:07 2002
++++ Makefile.in	Wed Apr  3 01:59:13 2002
 @@ -34,7 +34,7 @@
  includedir = @includedir@
  oldincludedir = /usr/include
@@ -12,10 +9,10 @@ $FreeBSD$
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  
-@@ -100,7 +100,7 @@
+@@ -104,7 +104,7 @@
+ am__include = @am__include@
  am__quote = @am__quote@
  install_sh = @install_sh@
- 
 -SUBDIRS = glade doc tests
 +SUBDIRS = glade doc
  
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index b966b6eaefca..32b50cc43d48 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	pkgconfig
-PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
index 36afa873c8d2..f84738360254 100644
--- a/devel/pkg-config/distinfo
+++ b/devel/pkg-config/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0
+MD5 (gnome2/pkgconfig-0.12.0.tar.bz2) = f539fb0988eae2002bfad8dfe78cd3f3
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index b966b6eaefca..32b50cc43d48 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	pkgconfig
-PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/pkgconfig/distinfo b/devel/pkgconfig/distinfo
index 36afa873c8d2..f84738360254 100644
--- a/devel/pkgconfig/distinfo
+++ b/devel/pkgconfig/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pkgconfig-0.11.0.tar.bz2) = 8ff14b6109c3062195e3539de84487e0
+MD5 (gnome2/pkgconfig-0.12.0.tar.bz2) = f539fb0988eae2002bfad8dfe78cd3f3
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 0ba8ae85522c..a4462191096d 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	1.112.1
+PORTVERSION=	1.114.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 LIB_DEPENDS=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index da6c731295a4..59ed91d245d4 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomecanvas-1.112.1.tar.bz2) = 8dab2e48694526749f31f6635b4e260f
+MD5 (gnome2/libgnomecanvas-1.114.0.tar.bz2) = 33091b38bdff30ea92f365d8356220fb
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index e32d20010ba7..f5d0dea4b426 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -37,12 +37,14 @@ 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/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
 share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/net/linc/Makefile b/net/linc/Makefile
index ceb48af55ebb..703657237512 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	linc
-PORTVERSION=	0.1.19
+PORTVERSION=	0.1.20
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/net/linc/distinfo b/net/linc/distinfo
index 7ece7a0e25c4..b9cf702d18f8 100644
--- a/net/linc/distinfo
+++ b/net/linc/distinfo
@@ -1 +1 @@
-MD5 (gnome2/linc-0.1.19.tar.bz2) = 322107214ca8fecf5a6a33e634d1bc5a
+MD5 (gnome2/linc-0.1.20.tar.bz2) = 21742f3f06a7378c2d45db78750a9665
diff --git a/net/linc/pkg-plist b/net/linc/pkg-plist
index 654051ef76f1..88d517c254d7 100644
--- a/net/linc/pkg-plist
+++ b/net/linc/pkg-plist
@@ -13,6 +13,9 @@ share/aclocal/linc.m4
 share/doc/linc/c4.html
 share/doc/linc/index.html
 share/doc/linc/index.sgml
+share/doc/linc/linc-config.html
+share/doc/linc/linc-linc-config.html
+share/doc/linc/linc-linc-private.html
 share/doc/linc/linc-linc-protocol.html
 share/doc/linc/linc-linc-types.html
 share/doc/linc/linc-linc.html
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 13da9d1d6e25..03fbac0c70f7 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	1.111.0
+PORTVERSION=	1.112.0
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,8 +23,8 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=/usr/X11R6/share/gnome2 \
-		--datadir=/usr/X11R6/share/gnome2
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index a6ab368b13bd..ec4c39111f96 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomeprint-1.111.0.tar.bz2) = 054583de93ba9713d8cc247f56e5268c
+MD5 (gnome2/libgnomeprint-1.112.0.tar.bz2) = 5e47284677d4ef0696c1132d494fd675
diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure
index 0302dcdc83fd..92732781f26e 100644
--- a/print/libgnomeprint/files/patch-configure
+++ b/print/libgnomeprint/files/patch-configure
@@ -1,16 +1,11 @@
-
-$FreeBSD$
-
---- configure	2002/03/19 16:34:21	1.1
-+++ configure	2002/03/19 16:35:22
-@@ -9926,8 +9926,8 @@
+--- configure.orig	Thu Apr  4 14:55:34 2002
++++ configure	Thu Apr  4 14:55:48 2002
+@@ -7180,7 +7180,7 @@
    INSTALL_FONTS_TRUE='#'
    INSTALL_FONTS_FALSE=
  fi
 -FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts
--FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
 +FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts
-+FONTMAPDIR_DYNAMIC=$sysconfdir/gnome2/libgnomeprint-2.0/fonts
+ FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts
+ 
  
- LIBGNOMEPRINT_CFLAGS="$FREETYPE_CFLAGS $CFLAGS $GLIB_CFLAGS $LIBART_CFLAGS $PANGO_CFLAGS $LIBXML_CFLAGS $LIBBONOBO_CFLAGS"
- LIBGNOMEPRINT_LIBS="$GLIB_LIBS $LIBART_LIBS $PANGO_LIBS $LIBXML_LIBS $FREETYPE_LIBS $LIBBONOBO_LIBS"
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index b8c33fb2da43..036d639935ca 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -1,4 +1,5 @@
 bin/libgnomeprint-2.0-font-install
+etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap
 include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h
@@ -23,21 +24,21 @@ lib/libgnomeprint-2.a
 lib/libgnomeprint-2.so
 lib/libgnomeprint-2.so.0
 libdata/pkgconfig/libgnomeprint-2.0.pc
-share/gnome2/fonts/README.installer
-share/gnome2/gnome-print-2.0/media/media.xml
-share/gnome2/gnome-print-2.0/models/GNOME-GENERIC-PS.model
-share/gnome2/gnome-print-2.0/models/HP-LASERJET-4ML.model
-share/gnome2/gnome-print-2.0/models/STYLUS-COLOR-740.model
-share/gnome2/gnome-print-2.0/printers/GENERIC.printer
-share/gnome2/gnome-print-2.0/vendors/EPSON.vendor
-share/gnome2/gnome-print-2.0/vendors/GNOME.vendor
-share/gnome2/gnome-print-2.0/vendors/HP.vendor
-share/gnome2/libgnomeprint-2.0/fonts/adobe-urw.font
-share/gnome2/libgnomeprint-2.0/fonts/defaults.fontmap
-share/gnome2/libgnomeprint-2.0/fonts/gnome-print.fontmap
+share/gnome/fonts/README.installer
+share/gnome/gnome-print-2.0/media/media.xml
+share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model
+share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model
+share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model
+share/gnome/gnome-print-2.0/printers/GENERIC.printer
+share/gnome/gnome-print-2.0/vendors/EPSON.vendor
+share/gnome/gnome-print-2.0/vendors/GNOME.vendor
+share/gnome/gnome-print-2.0/vendors/HP.vendor
+share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font
+share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap
 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/hu/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo
@@ -47,6 +48,7 @@ share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo
 share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo
+share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo
 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
@@ -54,15 +56,14 @@ share/locale/uk/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
-@dirrm share/gnome2/libgnomeprint-2.0/fonts
-@dirrm share/gnome2/libgnomeprint-2.0
-@dirrm share/gnome2/gnome-print-2.0/vendors
-@dirrm share/gnome2/gnome-print-2.0/printers
-@dirrm share/gnome2/gnome-print-2.0/models
-@dirrm share/gnome2/gnome-print-2.0/media
-@dirrm share/gnome2/gnome-print-2.0
-@dirrm share/gnome2/fonts
-@dirrm share/gnome2
+@dirrm share/gnome/libgnomeprint-2.0/fonts
+@dirrm share/gnome/libgnomeprint-2.0
+@dirrm share/gnome/gnome-print-2.0/vendors
+@dirrm share/gnome/gnome-print-2.0/printers
+@dirrm share/gnome/gnome-print-2.0/models
+@dirrm share/gnome/gnome-print-2.0/media
+@dirrm share/gnome/gnome-print-2.0
+@dirrm share/gnome/fonts
 @dirrm lib/gnome-print-2.0/transports
 @dirrm lib/gnome-print-2.0/drivers
 @dirrm lib/gnome-print-2.0
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index f919650433ad..7cd49c3cca4f 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.9
+PORTVERSION=	0.11
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index b7613b419d0f..8e198f59c807 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.9.tar.bz2) = e1644a587e4522b52181c62d1d9e57ea
+MD5 (gnome2/gail-0.11.tar.bz2) = b266bfd9fec90ceed7452b31b6078828
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index 2412ec335bf1..e1a7f16ce2c8 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -1,48 +1,10 @@
 include/gail-1.0/util/gail-util.h
 include/gail-1.0/util/gailmisc.h
 include/gail-1.0/util/gailtextutil.h
-lib/libferret.so
-lib/libferret.so.9
-lib/libgail.so
-lib/libgail.so.0
+lib/gtk-2.0/modules/libferret.so
+lib/gtk-2.0/modules/libgail.so
 lib/libgailutil.so
-lib/libgailutil.so.9
-lib/libtestaction.so
-lib/libtestaction.so.9
-lib/libtestbutton.so
-lib/libtestbutton.so.9
-lib/libtestcombo.so
-lib/libtestcombo.so.9
-lib/libtestcomponent.so
-lib/libtestcomponent.so.9
-lib/libtestimage.so
-lib/libtestimage.so.9
-lib/libtestmenuitem.so
-lib/libtestmenuitem.so.9
-lib/libtestnotebook.so
-lib/libtestnotebook.so.9
-lib/libtestobject.so
-lib/libtestobject.so.9
-lib/libtestoptionmenu.so
-lib/libtestoptionmenu.so.9
-lib/libtestpaned.so
-lib/libtestpaned.so.9
-lib/libtestprops.so
-lib/libtestprops.so.9
-lib/libtestselection.so
-lib/libtestselection.so.9
-lib/libteststatusbar.so
-lib/libteststatusbar.so.9
-lib/libtesttable.so
-lib/libtesttable.so.9
-lib/libtesttext.so
-lib/libtesttext.so.9
-lib/libtesttoplevel.so
-lib/libtesttoplevel.so.9
-lib/libtesttreetable.so
-lib/libtesttreetable.so.9
-lib/libtestvalues.so
-lib/libtestvalues.so.9
+lib/libgailutil.so.11
 libdata/pkgconfig/gail.pc
 @dirrm include/gail-1.0/util
 @dirrm include/gail-1.0
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 33b5623741da..65e9e5a0911f 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -38,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
+PLIST_SUB=	GTK_VERSION="2.0.0"
 
 MAN1=		gdk-pixbuf-csource.1
 
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 49a25add2423..ec4543e633c2 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.0.tar.bz2) = 3afdfc83cf2099af1811e261a82c7ccb
+MD5 (gnome2/gtk+-2.0.1.tar.bz2) = 3e0c9e5c171912f5668f969b56fe0278
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index e2696d2d1382..20b60321be0d 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -278,6 +278,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%
+@dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk
 @dirrm include/gtk-2.0/gdk-pixbuf-xlib
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 33b5623741da..65e9e5a0911f 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -38,7 +38,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	GTK_VERSION="${PORTVERSION}"
+PLIST_SUB=	GTK_VERSION="2.0.0"
 
 MAN1=		gdk-pixbuf-csource.1
 
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 49a25add2423..ec4543e633c2 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gtk+-2.0.0.tar.bz2) = 3afdfc83cf2099af1811e261a82c7ccb
+MD5 (gnome2/gtk+-2.0.1.tar.bz2) = 3e0c9e5c171912f5668f969b56fe0278
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index e2696d2d1382..20b60321be0d 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -278,6 +278,7 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
 @dirrm lib/gtk-2.0/%%GTK_VERSION%%
+@dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk
 @dirrm include/gtk-2.0/gdk-pixbuf-xlib
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 3de30d881c51..e29dac765dec 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pango
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta3,} \
 		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/
@@ -39,7 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			-I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION="1.0.0"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo
index d3175c7bc0d4..4a48f8db7368 100644
--- a/x11-toolkits/pango/distinfo
+++ b/x11-toolkits/pango/distinfo
@@ -1 +1 @@
-MD5 (gnome2/pango-1.0.0.tar.bz2) = bfb7b217600fc9304889805d40dd5bd3
+MD5 (gnome2/pango-1.0.1.tar.bz2) = 489b44d55af53e907a2d186f0999a3d9
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 21ff74bb8292..978fb24ac0c1 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	1.112.1
+PORTVERSION=	1.114.0
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta2
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
@@ -25,8 +25,8 @@ USE_ESOUND=	yes
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome2 \
-		--datadir=${PREFIX}/share/gnome2 \
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
 		--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 49e2718ea9ab..08d26b7c009d 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnome-1.112.1.tar.bz2) = a1c760a617b6fbdd4f037f09bca983b8
+MD5 (gnome2/libgnome-1.114.0.tar.bz2) = 7ba43857ca90bb6fb2a6f899952f3289
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 9f818989fd63..a9185c9d2375 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -31,6 +31,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_applications_browser.schemas
 etc/gconf/schemas/desktop_gnome_applications_editor.schemas
 etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
@@ -41,6 +42,7 @@ etc/gconf/schemas/desktop_gnome_file_views.schemas
 etc/gconf/schemas/desktop_gnome_interface.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
 etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
+etc/gconf/schemas/desktop_gnome_sound.schemas
 etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gnome-vfs-2.0/modules/help-methods.conf
 etc/sound/events/gnome-2.soundlist
@@ -83,16 +85,17 @@ 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/x1278.html
-share/doc/libgnome/x2849.html
-share/doc/libgnome/x3213.html
-share/doc/libgnome/x4055.html
+share/doc/libgnome/x1277.html
+share/doc/libgnome/x2848.html
+share/doc/libgnome/x3212.html
+share/doc/libgnome/x4054.html
 share/doc/libgnome/x9.html
-share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
-share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
-share/gnome2/sgml/docbook/gnome-customization-0.1/l10n.xml
+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
 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/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
@@ -115,10 +118,10 @@ share/locale/uk/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
-@dirrm share/gnome2/sgml/docbook/gnome-customization-0.1
-@dirrm share/gnome2/sgml/docbook
-@dirrm share/gnome2/sgml
-@dirrm share/gnome2
+@dirrm share/gnome/sgml/docbook/gnome-customization-0.1
+@dirrm share/gnome/sgml/docbook
+@dirrm share/gnome/sgml
+@dirrm share/gnome
 @dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0