29 files changed, 107 insertions, 90 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index c2c59471377e..d664df46fcbe 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.3.110
+PORTVERSION=	2.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index e52aa19ede8a..49db27d467af 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.3.110.tar.bz2) = 302dfd638348b950272aef8038f6d9b6
+MD5 (gnome2/ORBit2-2.4.0.tar.bz2) = 25eb93f5dae655db2806e6462a52a8ee
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index b6c9ce7daf80..4f6106272e63 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	atk
 PORTVERSION=	1.0.2
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-		${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITES=	${MASTER_SITE_GNOME}
+		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 #MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 #		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 #		http://www.ameth.org/gimp/%SUBDIR%/ \
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index 866910f15e84..7387720879d4 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	bonobo-activation
-PORTVERSION=	0.9.9
+PORTVERSION=	1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -28,6 +28,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+MAN1=	bonobo-activation-server.1
+
 pre-patch:
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 3cdd9b57aa00..486cd9fdf4b0 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1 +1 @@
-MD5 (gnome2/bonobo-activation-0.9.9.tar.bz2) = 088decd1510740ff16b2e5e6940e4a18
+MD5 (gnome2/bonobo-activation-1.0.0.tar.bz2) = 4cd1154d61ada02892224729275b9df0
diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist
index 8211ea59d255..d8a6d29cf364 100644
--- a/devel/bonobo-activation/pkg-plist
+++ b/devel/bonobo-activation/pkg-plist
@@ -64,7 +64,9 @@ share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
 share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
 share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
 share/locale/az/LC_MESSAGES/bonobo-activation.mo
+share/locale/ar/LC_MESSAGES/bonobo-activation.mo
 share/locale/bg/LC_MESSAGES/bonobo-activation.mo
+share/locale/ca/LC_MESSAGES/bonobo-activation.mo
 share/locale/da/LC_MESSAGES/bonobo-activation.mo
 share/locale/de/LC_MESSAGES/bonobo-activation.mo
 share/locale/el/LC_MESSAGES/bonobo-activation.mo
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 1d6588037493..aa5b5468d33e 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	1.1.10
+PORTVERSION=	1.1.11
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,7 +26,6 @@ INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-db3-includes=${LOCALBASE}/include \
 		--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 bc4d3effea82..f78e0554b25a 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/GConf-1.1.10.tar.bz2) = e30615bf27ea2ee84f411bd7a7077394
+MD5 (gnome2/GConf-1.1.11.tar.bz2) = c1107d92e7e3b0837af49b7273897c74
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index 30bf0b789414..e9ea1a42d2ce 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -47,6 +47,7 @@ share/doc/gconf/x289.html
 share/doc/gconf/x42.html
 share/doc/gconf/x462.html
 share/doc/gconf/x485.html
+share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/ca/LC_MESSAGES/GConf2.mo
 share/locale/cs/LC_MESSAGES/GConf2.mo
@@ -54,6 +55,7 @@ share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
 share/locale/es/LC_MESSAGES/GConf2.mo
+share/locale/eu/LC_MESSAGES/GConf2.mo
 share/locale/fi/LC_MESSAGES/GConf2.mo
 share/locale/fr/LC_MESSAGES/GConf2.mo
 share/locale/ga/LC_MESSAGES/GConf2.mo
@@ -62,6 +64,7 @@ share/locale/hu/LC_MESSAGES/GConf2.mo
 share/locale/it/LC_MESSAGES/GConf2.mo
 share/locale/ja/LC_MESSAGES/GConf2.mo
 share/locale/ko/LC_MESSAGES/GConf2.mo
+share/locale/ms/LC_MESSAGES/GConf2.mo
 share/locale/nl/LC_MESSAGES/GConf2.mo
 share/locale/nn/LC_MESSAGES/GConf2.mo
 share/locale/no/LC_MESSAGES/GConf2.mo
@@ -75,6 +78,7 @@ share/locale/sl/LC_MESSAGES/GConf2.mo
 share/locale/sv/LC_MESSAGES/GConf2.mo
 share/locale/tr/LC_MESSAGES/GConf2.mo
 share/locale/uk/LC_MESSAGES/GConf2.mo
+share/locale/vi/LC_MESSAGES/GConf2.mo
 share/locale/zh_CN/LC_MESSAGES/GConf2.mo
 share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 @dirrm share/doc/gconf
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index de1993d2abe7..b1f6d603c8b8 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	glib
 PORTVERSION=	2.0.3
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v2.0/ \
-		${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020525,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-20020607,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.0/ \
 		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-vfs/Makefile b/devel/gnome-vfs/Makefile
index 4b6686cde745..4c0072a9e5a2 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.16
+PORTVERSION=	1.9.17
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 2bb5f1f241e0..e6a7da0eb71f 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
+MD5 (gnome2/gnome-vfs-1.9.17.tar.bz2) = 28d11daba54ab8627e4e6faaf75433e1
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 9eb96806f017..fe31e4719654 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon May 27 14:03:09 2002
-+++ configure	Mon May 27 14:04:14 2002
-@@ -7224,6 +7224,7 @@
+--- configure.orig	Mon Jun 10 13:08:18 2002
++++ configure	Mon Jun 10 13:09:52 2002
+@@ -7493,6 +7493,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12140,8 +12141,8 @@
+@@ -12412,8 +12413,8 @@
    done
  fi
  
--echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12415: 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
-@@ -12157,11 +12158,11 @@
+@@ -12429,11 +12430,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12490,7 +12491,7 @@
+@@ -12762,7 +12763,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 <<_ACEOF
- #line 12495 "configure"
+ #line 12767 "configure"
  #include "confdefs.h"
-@@ -12541,9 +12542,9 @@
+@@ -12813,9 +12814,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
                  fi
  
  if true; then
-@@ -14134,7 +14135,7 @@
+@@ -14018,7 +14019,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab
index cd5b093a93d8..535e326cd949 100644
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Mon May 27 13:58:39 2002
-+++ Makefile.in	Mon May 27 13:59:22 2002
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig	Mon Jun 10 13:10:15 2002
++++ Makefile.in	Mon Jun 10 13:10:42 2002
+@@ -182,7 +182,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
  
- SUBDIRS_GNOME = monikers doc schemas
- 
--SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
-+SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
- 
- 
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 0ab33d483231..2884f343c186 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnomevfs/Makefile.in	2002/02/16 13:12:02	1.1
-+++ libgnomevfs/Makefile.in	2002/02/16 13:13:00
-@@ -190,7 +190,7 @@
+--- libgnomevfs/Makefile.in.orig	Mon Jun 10 13:10:56 2002
++++ libgnomevfs/Makefile.in	Mon Jun 10 13:11:51 2002
+@@ -330,7 +330,7 @@
  
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
new file mode 100644
index 000000000000..14b2cf886863
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_ssh-method.c
@@ -0,0 +1,10 @@
+--- modules/ssh-method.c.orig	Mon Jun 10 13:28:42 2002
++++ modules/ssh-method.c	Mon Jun 10 13:28:51 2002
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <unistd.h>
+ 
+ typedef struct {
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 4b6686cde745..4c0072a9e5a2 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	1.9.16
+PORTVERSION=	1.9.17
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 2bb5f1f241e0..e6a7da0eb71f 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-1.9.16.tar.bz2) = 161ccd037041ae92fd742ac4705b4bb6
+MD5 (gnome2/gnome-vfs-1.9.17.tar.bz2) = 28d11daba54ab8627e4e6faaf75433e1
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 9eb96806f017..fe31e4719654 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Mon May 27 14:03:09 2002
-+++ configure	Mon May 27 14:04:14 2002
-@@ -7224,6 +7224,7 @@
+--- configure.orig	Mon Jun 10 13:08:18 2002
++++ configure	Mon Jun 10 13:09:52 2002
+@@ -7493,6 +7493,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,18 +8,18 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12140,8 +12141,8 @@
+@@ -12412,8 +12413,8 @@
    done
  fi
  
--echo "$as_me:12143: checking for bzCompressInit in -lbz2" >&5
+-echo "$as_me:12415: checking for bzCompressInit in -lbz2" >&5
 -echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:12143: checking for BZ2_bzCompressInit in -lbz2" >&5
++echo "$as_me:12415: 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
-@@ -12157,11 +12158,11 @@
+@@ -12429,11 +12430,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -33,16 +33,16 @@
    ;
    return 0;
  }
-@@ -12490,7 +12491,7 @@
+@@ -12762,7 +12763,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 <<_ACEOF
- #line 12495 "configure"
+ #line 12767 "configure"
  #include "confdefs.h"
-@@ -12541,9 +12542,9 @@
+@@ -12813,9 +12814,9 @@
  
  		msg_openssl="yes"
                  if test x$with_openssl_libs != x/usr/lib; then
@@ -54,7 +54,7 @@
                  fi
  
  if true; then
-@@ -14134,7 +14135,7 @@
+@@ -14018,7 +14019,7 @@
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
  s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab
index cd5b093a93d8..535e326cd949 100644
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Mon May 27 13:58:39 2002
-+++ Makefile.in	Mon May 27 13:59:22 2002
-@@ -169,7 +169,7 @@
+--- Makefile.in.orig	Mon Jun 10 13:10:15 2002
++++ Makefile.in	Mon Jun 10 13:10:42 2002
+@@ -182,7 +182,6 @@
+ 	schemas					\
+ 	devel-docs				\
+ 	doc					\
+-	test					\
+ 	monikers				\
+ 	po
  
- SUBDIRS_GNOME = monikers doc schemas
- 
--SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
-+SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
- 
- 
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 0ab33d483231..2884f343c186 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- libgnomevfs/Makefile.in	2002/02/16 13:12:02	1.1
-+++ libgnomevfs/Makefile.in	2002/02/16 13:13:00
-@@ -190,7 +190,7 @@
+--- libgnomevfs/Makefile.in.orig	Mon Jun 10 13:10:56 2002
++++ libgnomevfs/Makefile.in	Mon Jun 10 13:11:51 2002
+@@ -330,7 +330,7 @@
  
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c
new file mode 100644
index 000000000000..14b2cf886863
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_ssh-method.c
@@ -0,0 +1,10 @@
+--- modules/ssh-method.c.orig	Mon Jun 10 13:28:42 2002
++++ modules/ssh-method.c	Mon Jun 10 13:28:51 2002
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ #include <unistd.h>
+ 
+ typedef struct {
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 40d0971313b1..267ed1cbaab5 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libIDL
-PORTVERSION=	0.7.4
+PORTVERSION=	0.8.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libIDL/distinfo b/devel/libIDL/distinfo
index 40e3cc956a93..fd17db3527c4 100644
--- a/devel/libIDL/distinfo
+++ b/devel/libIDL/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libIDL-0.7.4.tar.bz2) = 837b1b11e411d58dd5472715c0b1e68f
+MD5 (gnome2/libIDL-0.8.0.tar.bz2) = 4f5f60b0b9cc9a6994d8b4792091595d
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 78ae5443577e..5c4d14a1f0bb 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	1.117.0
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 23c1f81a5c1e..ad14705f4368 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libbonobo-1.117.0.tar.bz2) = e3ecc01f2f250b3143f0dee600f42e80
+MD5 (gnome2/libbonobo-2.0.0.tar.bz2) = fee1e4af2e5f04a7f6bcce6c066de957
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 956bce6087e1..d85aeeb3b797 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	1.99.12
+PORTVERSION=	2.0.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020525
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-20020607
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 0dd43447d59b..56f60f53f724 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libglade-1.99.12.tar.bz2) = a907318f6d84537b72f64c0c4aebe5a8
+MD5 (gnome2/libglade-2.0.0.tar.bz2) = 3f56880824523fe24381c03a411dea6a
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 2266d9bb1e82..26d93e2c2867 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -13,7 +13,6 @@ share/doc/libglade/libglade-dtd.html
 share/doc/libglade/libglade-dtd-exceptions.html
 share/doc/libglade/libglade-embedding.html
 share/doc/libglade/libglade-extending.html
-share/doc/libglade/libglade-gnome.html
 share/doc/libglade/libglade-i18n.html
 share/doc/libglade/libglade-lib.html
 share/doc/libglade/libglade-libglade-build.html