Update to GNOME 2.0 beta3.

Approved by:	sobomax

32 files changed, 96 insertions, 160 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 075d81d..6889eee 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 3a2137a..1ab4745 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 e78617d..8a25f41 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 7cba674..f97b65d 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 b6e72cf..0ad6970 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 622d125..4ce00b6 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 ac38155..cf1477a 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 3aa2e8e..44212a0 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 34c4161..a900345 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 97be937..1a20c33 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 e9f4cf5..d409b38 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 975a8bb..b9d7a22 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 fba0dbb..20314dc 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 01ca5ef..255faa7 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 2cc08f2..0000000
--- 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 c2d45c8..0000000
--- 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 122e0d8..3b0cbe3 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 fba0dbb..20314dc 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 01ca5ef..255faa7 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 2cc08f2..0000000
--- 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 c2d45c8..0000000
--- 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 122e0d8..3b0cbe3 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 3bbe08d..39b81ce 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 05fa712..17034cb 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 8409be2..3a8b7b6 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 340a6b5..e2ba59b 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 759a06c..392947e 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 fd05479..a787544 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 b966b6e..32b50cc 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 36afa87..f847383 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 b966b6e..32b50cc 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 36afa87..f847383 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