Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

88 files changed, 1638 insertions, 1447 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 0fa37b24407d..c048a73e3e54 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ORBit2
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,9 +21,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gnomehack libidl
-CONFIGURE_ARGS= --disable-indent \
+USE_LIBTOOL_VER=13
+USE_GNOME=	gnomehack lthack libidl
+CONFIGURE_ARGS=	--disable-indent \
 		--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
index 610e0d208774..b32abca376d0 100644
--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/ORBit2-2.8.3.tar.bz2) = c6c4b63de2f70310e33a52a37257ddaf
-SIZE (gnome2/ORBit2-2.8.3.tar.bz2) = 633145
+MD5 (gnome2/ORBit2-2.10.0.tar.bz2) = fe86ec038fc51ee0e90e84169a8dda6c
+SIZE (gnome2/ORBit2-2.10.0.tar.bz2) = 643687
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
index 57f1e2d4c301..281d27bbf89e 100644
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@@ -1,17 +1,17 @@
---- Makefile.in.orig	Sat Jun 14 01:50:29 2003
-+++ Makefile.in	Sat Jun 14 01:51:03 2003
-@@ -35,7 +35,7 @@
- DESTDIR =
- 
+--- Makefile.in.orig	Fri Mar  5 23:34:38 2004
++++ Makefile.in	Fri Mar  5 23:35:59 2004
+@@ -34,7 +34,7 @@
+ includedir = @includedir@
+ oldincludedir = /usr/include
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
- 
  top_builddir = .
-@@ -115,7 +115,7 @@
  
- AUTOMAKE_OPTIONS = 1.3
+@@ -125,7 +125,7 @@
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  
 -SUBDIRS = linc2 src include test docs
 +SUBDIRS = linc2 src include docs
diff --git a/devel/ORBit2/files/patch-configure b/devel/ORBit2/files/patch-configure
deleted file mode 100644
index 3c4e6cd0faf9..000000000000
--- a/devel/ORBit2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- configure	2002/04/26 07:38:33	1.1
-+++ configure	2002/04/26 07:38:42
-@@ -6201,6 +6201,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
index 0c2cb69a98bc..e048ca634226 100644
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
@@ -1,6 +1,6 @@
---- src/orb/util/Makefile.in.orig	Tue Jul 15 13:16:53 2003
-+++ src/orb/util/Makefile.in	Tue Jul 15 13:17:32 2003
-@@ -189,7 +189,7 @@
+--- src/orb/util/Makefile.in.orig	Fri Mar  5 23:39:16 2004
++++ src/orb/util/Makefile.in	Fri Mar  5 23:39:43 2004
+@@ -126,7 +126,7 @@
  INCLUDES = \
  	-I$(top_srcdir)/include				\
  	-I$(top_builddir)/include			\
diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
index 48972837628b..44dfb3fb0690 100644
--- a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
+++ b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
@@ -1,6 +1,6 @@
---- src/orb/orb-core/orbit-typelib.c.orig	Sun May 11 20:37:14 2003
-+++ src/orb/orb-core/orbit-typelib.c	Sun May 11 20:40:42 2003
-@@ -215,6 +215,8 @@
+--- src/orb/orb-core/orbit-typelib.c.orig	Fri Mar  5 23:42:33 2004
++++ src/orb/orb-core/orbit-typelib.c	Fri Mar  5 23:43:00 2004
+@@ -218,6 +218,8 @@
  	paths = g_ptr_array_sized_new (8);
  
  	g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR));
diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr
index 8336574a1661..57ee9653d674 100644
--- a/devel/ORBit2/pkg-descr
+++ b/devel/ORBit2/pkg-descr
@@ -1,3 +1,3 @@
 ORBit is a high-performance CORBA ORB with support for the C language.
-It allows programs to send requests and receive replies from other
-programs, regardless of the locations of the two programs.
+It allows programs to comminucate with each other, regardless of their
+physical and logical locations.
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
index ea2dca5ab3ae..c18fe8f28e9c 100644
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@@ -64,19 +64,9 @@ libdata/pkgconfig/ORBit-idl-2.0.pc
 libdata/pkgconfig/ORBit-imodule-2.0.pc
 libdata/pkgconfig/ORBit-CosNaming-2.0.pc
 share/aclocal/ORBit2.m4
-share/doc/ORBit2/ORBit2-orbit2-allocators.html
-share/doc/ORBit2/ORBit2-orbit2-small.html
-share/doc/ORBit2/ORBit2.devhelp
-share/doc/ORBit2/general.html
-share/doc/ORBit2/home.png
-share/doc/ORBit2/index.html
-share/doc/ORBit2/index.sgml
-share/doc/ORBit2/left.png
-share/doc/ORBit2/right.png
-share/doc/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
 @dirrm share/idl/orbit-2.0
-@dirrm share/doc/ORBit2
+@dirrm %%DOCSDIR%%
 @unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/orbit-2.0 2>/dev/null || /usr/bin/true
 @dirrm include/orbit-2.0/orbit/util
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 7d7135716e49..cd7e13f7afde 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	bugbuddy2
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.4
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.6
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -19,9 +18,10 @@ COMMENT=	A bug reporting tool for GNOME 2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
-USE_GNOME=	gnomeprefix gnomehack gnomedesktop intlhack
+USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomedesktop
 GNOME_DESKTOP_VERSION=2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
index 10a87afd3cf9..481abff6c22c 100644
--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/bug-buddy-2.4.2.tar.bz2) = e30d5c84ab8279fee62376f8d422c699
-SIZE (gnome2/bug-buddy-2.4.2.tar.bz2) = 563631
+MD5 (gnome2/bug-buddy-2.6.0.tar.bz2) = 27e9dfa28e7639a15a42c31794f0c510
+SIZE (gnome2/bug-buddy-2.6.0.tar.bz2) = 833465
diff --git a/devel/bugbuddy2/pkg-descr b/devel/bugbuddy2/pkg-descr
index 0a572e8ccc7f..7268130ab17d 100644
--- a/devel/bugbuddy2/pkg-descr
+++ b/devel/bugbuddy2/pkg-descr
@@ -1,5 +1,6 @@
-This is a graphical bug reporting tool.  It can extract debugging
-information from a core file or crashed application (via gnome_segv).
+This is a bug reporting tool.  It pops up automatically when a GNOME
+app crashes under the GNOME desktop (via gnome_segv), and allows
+the crash information to be sent to the app's developers.
 
 Jacob Berkman  <jberkman@andrew.cmu.edu>
 
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
index d9feab027dcc..a6f570ff02d6 100644
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@@ -1,4 +1,7 @@
 bin/bug-buddy
+etc/gconf/gconf.xml.defaults/apps/bug-buddy/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy/%gconf.xml
+etc/gconf/schemas/bug-buddy.schemas
 share/gnome/application-registry/bug-buddy.applications
 share/gnome/applications/bug-buddy.desktop
 share/gnome/bug-buddy/bug-buddy.glade
@@ -16,10 +19,59 @@ share/gnome/bug-buddy/gnome.png
 share/gnome/bug-buddy/ximian.png
 share/gnome/help/bug-buddy/C/bug-buddy.xml
 share/gnome/help/bug-buddy/C/legal.xml
+share/gnome/help/bug-buddy/de/bug-buddy.xml
+share/gnome/help/bug-buddy/de/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/de/legal.xml
+share/gnome/help/bug-buddy/es/bug-buddy.xml
+share/gnome/help/bug-buddy/es/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/es/legal.xml
+share/gnome/help/bug-buddy/fr/bug-buddy.xml
+share/gnome/help/bug-buddy/fr/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/fr/legal.xml
+share/gnome/help/bug-buddy/it/bug-buddy.xml
+share/gnome/help/bug-buddy/it/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/it/legal.xml
+share/gnome/help/bug-buddy/ja/bug-buddy.xml
+share/gnome/help/bug-buddy/ja/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/ja/legal.xml
+share/gnome/help/bug-buddy/ko/bug-buddy.xml
+share/gnome/help/bug-buddy/ko/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/ko/legal.xml
+share/gnome/help/bug-buddy/sv/bug-buddy.xml
+share/gnome/help/bug-buddy/sv/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/sv/legal.xml
+share/gnome/help/bug-buddy/zh_CN/bug-buddy.xml
+share/gnome/help/bug-buddy/zh_CN/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/zh_CN/legal.xml
+share/gnome/help/bug-buddy/zh_HK/bug-buddy.xml
+share/gnome/help/bug-buddy/zh_HK/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/zh_HK/legal.xml
+share/gnome/help/bug-buddy/zh_TW/bug-buddy.xml
+share/gnome/help/bug-buddy/zh_TW/figures/bug-buddy_window.png
+share/gnome/help/bug-buddy/zh_TW/legal.xml
 share/gnome/mime-info/bug-buddy.keys
-share/gnome/mime-info/bug-buddy.mime
 share/gnome/omf/bug-buddy/bug-buddy-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
@@ -33,6 +85,8 @@ share/locale/cy/LC_MESSAGES/bug-buddy.mo
 share/locale/da/LC_MESSAGES/bug-buddy.mo
 share/locale/de/LC_MESSAGES/bug-buddy.mo
 share/locale/el/LC_MESSAGES/bug-buddy.mo
+share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
+share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
 share/locale/es/LC_MESSAGES/bug-buddy.mo
 share/locale/et/LC_MESSAGES/bug-buddy.mo
 share/locale/eu/LC_MESSAGES/bug-buddy.mo
@@ -43,6 +97,7 @@ share/locale/ga/LC_MESSAGES/bug-buddy.mo
 share/locale/gl/LC_MESSAGES/bug-buddy.mo
 share/locale/he/LC_MESSAGES/bug-buddy.mo
 share/locale/hi/LC_MESSAGES/bug-buddy.mo
+share/locale/hr/LC_MESSAGES/bug-buddy.mo
 share/locale/hu/LC_MESSAGES/bug-buddy.mo
 share/locale/id/LC_MESSAGES/bug-buddy.mo
 share/locale/it/LC_MESSAGES/bug-buddy.mo
@@ -57,6 +112,7 @@ share/locale/ms/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
 share/locale/no/LC_MESSAGES/bug-buddy.mo
+share/locale/pa/LC_MESSAGES/bug-buddy.mo
 share/locale/pl/LC_MESSAGES/bug-buddy.mo
 share/locale/pt/LC_MESSAGES/bug-buddy.mo
 share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
@@ -77,4 +133,42 @@ share/locale/wa/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrm share/gnome/omf/bug-buddy
+@dirrm share/gnome/help/bug-buddy/zh_TW/figures
+@dirrm share/gnome/help/bug-buddy/zh_TW
+@dirrm share/gnome/help/bug-buddy/zh_HK/figures
+@dirrm share/gnome/help/bug-buddy/zh_HK
+@dirrm share/gnome/help/bug-buddy/zh_CN/figures
+@dirrm share/gnome/help/bug-buddy/zh_CN
+@dirrm share/gnome/help/bug-buddy/sv/figures
+@dirrm share/gnome/help/bug-buddy/sv
+@dirrm share/gnome/help/bug-buddy/ko/figures
+@dirrm share/gnome/help/bug-buddy/ko
+@dirrm share/gnome/help/bug-buddy/ja/figures
+@dirrm share/gnome/help/bug-buddy/ja
+@dirrm share/gnome/help/bug-buddy/it/figures
+@dirrm share/gnome/help/bug-buddy/it
+@dirrm share/gnome/help/bug-buddy/fr/figures
+@dirrm share/gnome/help/bug-buddy/fr
+@dirrm share/gnome/help/bug-buddy/es/figures
+@dirrm share/gnome/help/bug-buddy/es
+@dirrm share/gnome/help/bug-buddy/de/figures
+@dirrm share/gnome/help/bug-buddy/de
+@dirrm share/gnome/help/bug-buddy/C
+@dirrm share/gnome/help/bug-buddy
+@dirrm share/gnome/bug-buddy/bugzilla/ximian
+@dirrm share/gnome/bug-buddy/bugzilla/gnome
+@dirrm share/gnome/bug-buddy/bugzilla
+@dirrm share/gnome/bug-buddy
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/bug-buddy
+@dirrm etc/gconf/gconf.xml.defaults/apps/bug-buddy
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_HK.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-zh_TW.omf 2>/dev/null || /usr/bin/true
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 0683c72397e2..846df9bc8bc6 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	2.4.0.1
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/GConf/2.4
+MASTER_SITE_SUBDIR=	sources/GConf/2.6
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,17 +19,17 @@ COMMENT=	A configuration database system for GNOME
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehack gnomehier orbit2 gtk20 libxml2 linc
+USE_GNOME=	gnomehack lthack gnomehier orbit2 gtk20 libxml2 linc
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+MAN1=		gconftool-2.1
+
 post-install:
-	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps
-	@${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/schemas/apps
-	@${MKDIR} ${PREFIX}/etc/gconf/schemas
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index bc16309ebbcc..a49004abc172 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/GConf-2.4.0.1.tar.bz2) = 2f7548d0bad24d7c4beba54d0ec98a20
-SIZE (gnome2/GConf-2.4.0.1.tar.bz2) = 1288876
+MD5 (gnome2/GConf-2.6.0.tar.bz2) = 241ca25941e5bfa0f71725c30e17ab6e
+SIZE (gnome2/GConf-2.6.0.tar.bz2) = 1428714
diff --git a/devel/gconf2/files/patch-configure b/devel/gconf2/files/patch-configure
deleted file mode 100644
index b41b752d81f0..000000000000
--- a/devel/gconf2/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat May  3 13:11:21 2003
-+++ configure	Sun Jun 15 01:22:52 2003
-@@ -8029,6 +8029,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr
index 0658ef70fa28..010cc810ef32 100644
--- a/devel/gconf2/pkg-descr
+++ b/devel/gconf2/pkg-descr
@@ -1,22 +1,18 @@
-GConf attempts to leapfrog the registry concept. It's a library which provides
-a simple configuration data storage interface to applications, and also an
-architecture that tries to make things easy for system administrators.
+GConf extends the concept of a configuration registry.  It provides
+a simple way for applications and administrators to store data;
+often GConf is used to store preferences for applications.
 
-Here are some of the features of GConf:
+Some of the features of GConf are:
+GConf provides:
 
-    * Replaceable backend architecture.
+    * Documentation for each configuration key, so that administrators
+      can better modify the value.
 
-    * Configuration key documentation. Applications can install documentation
-      along with their configuration data, explaining the possible settings and
-      the effect of each configuration key.
+    * Notifications to interested applications when configuration data
+      is changed.  The notification service works across networks,
+      affecting all login sessions for a single user.
 
-    * Data change notification service. If configuration data is changed, all
-      interested applications are notified. The notification service works
-      across the network, affecting all login sessions for a single user.
-
-    * The client API is very abstract.
-
-    * GConf does proper locking so that the configuration data doesn't get
-      corrupted when multiple applications try to use it.
+    * Proper locking so that configuration data doesn't get corrupted
+      when accessed by multiple applications at the same time.
 
 WWW: http://www.gnome.org/projects/gconf/
diff --git a/devel/gconf2/pkg-install b/devel/gconf2/pkg-install
new file mode 100644
index 000000000000..13898d569f3a
--- /dev/null
+++ b/devel/gconf2/pkg-install
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+case $2 in
+POST-INSTALL)
+    dirs="etc/gconf/gconf.xml.defaults/apps \
+    	etc/gconf/gconf.xml.defaults/schemas/apps \
+	etc/gconf/schemas"
+    for i in ${dirs}; do
+	mkdir -p ${PKG_PREFIX}/${i}
+    done
+    ;;
+esac
+
+exit 0
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index cc70f2842c6a..adf99d563086 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -1,3 +1,4 @@
+bin/gconf-merge-tree
 bin/gconftool-2
 etc/gconf/2/path
 include/gconf/2/gconf/gconf-changeset.h
@@ -9,6 +10,7 @@ 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-oldxml.so
 lib/GConf/2/libgconfbackend-xml.so
 lib/libgconf-2.a
 lib/libgconf-2.so
@@ -17,6 +19,41 @@ libdata/pkgconfig/gconf-2.0.pc
 libexec/gconf-sanity-check-2
 libexec/gconfd-2
 share/aclocal/gconf-2.m4
+share/doc/gconf/GConfClient.html
+share/doc/gconf/ch01.html
+share/doc/gconf/ch01s02.html
+share/doc/gconf/ch02.html
+share/doc/gconf/ch02s02.html
+share/doc/gconf/ch02s03.html
+share/doc/gconf/ch02s04.html
+share/doc/gconf/ch06.html
+share/doc/gconf/ch06s02.html
+share/doc/gconf/ch06s03.html
+share/doc/gconf/ch07.html
+share/doc/gconf/conventions.html
+share/doc/gconf/gconf-client-reference.html
+share/doc/gconf/gconf-client.html
+share/doc/gconf/gconf-gconf-backend.html
+share/doc/gconf/gconf-gconf-changeset.html
+share/doc/gconf/gconf-gconf-engine.html
+share/doc/gconf/gconf-gconf-error.html
+share/doc/gconf/gconf-gconf-internals.html
+share/doc/gconf/gconf-gconf-listeners.html
+share/doc/gconf/gconf-gconf-locale.html
+share/doc/gconf/gconf-gconf-schema.html
+share/doc/gconf/gconf-gconf-sources.html
+share/doc/gconf/gconf-gconf-value.html
+share/doc/gconf/gconf-gconf.html
+share/doc/gconf/gconf-internals-reference.html
+share/doc/gconf/gconf-reference.html
+share/doc/gconf/gconf.devhelp
+share/doc/gconf/gconftool.html
+share/doc/gconf/home.png
+share/doc/gconf/index.html
+share/doc/gconf/index.sgml
+share/doc/gconf/left.png
+share/doc/gconf/right.png
+share/doc/gconf/up.png
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
@@ -29,6 +66,7 @@ share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
+share/locale/en_GB/LC_MESSAGES/GConf2.mo
 share/locale/es/LC_MESSAGES/GConf2.mo
 share/locale/eu/LC_MESSAGES/GConf2.mo
 share/locale/fa/LC_MESSAGES/GConf2.mo
@@ -37,11 +75,13 @@ share/locale/fr/LC_MESSAGES/GConf2.mo
 share/locale/ga/LC_MESSAGES/GConf2.mo
 share/locale/gl/LC_MESSAGES/GConf2.mo
 share/locale/hi/LC_MESSAGES/GConf2.mo
+share/locale/hr/LC_MESSAGES/GConf2.mo
 share/locale/hu/LC_MESSAGES/GConf2.mo
 share/locale/id/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/lt/LC_MESSAGES/GConf2.mo
 share/locale/lv/LC_MESSAGES/GConf2.mo
 share/locale/mk/LC_MESSAGES/GConf2.mo
 share/locale/ml/LC_MESSAGES/GConf2.mo
@@ -61,6 +101,7 @@ share/locale/sq/LC_MESSAGES/GConf2.mo
 share/locale/sr/LC_MESSAGES/GConf2.mo
 share/locale/sr@Latn/LC_MESSAGES/GConf2.mo
 share/locale/sv/LC_MESSAGES/GConf2.mo
+share/locale/ta/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
@@ -68,8 +109,8 @@ share/locale/yi/LC_MESSAGES/GConf2.mo
 share/locale/zh_CN/LC_MESSAGES/GConf2.mo
 share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/sgml/gconf/gconf-1.0.dtd
-@dirrm share/doc/gconf
 @dirrm share/sgml/gconf
+@dirrm share/doc/gconf
 @dirrm lib/GConf/2
 @dirrm include/gconf/2/gconf
 @dirrm include/gconf/2
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 398371d2fb96..0806087eb929 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \
-		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \
+		ftp://ftp.gtk.org/pub/gtk/v2.3/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -25,17 +24,31 @@ NO_LATEST_LINK=	yes
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_GMAKE=	yes
 USE_PERL5=	yes
-CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu
+CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
+		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
+		--disable-man --without-xml-catalog
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-MAN1=		glib-genmarshal.1 glib-mkenums.1
+pre-everything::
+	@${ECHO_CMD} '******************************************'
+	@${ECHO_CMD}
+	@${ECHO_CMD} If you have not updated your GNOME ports in the manner outlined in
+	@${ECHO_CMD} 	http://www.FreeBSD.org/gnome/docs/develfaq.html
+	@${ECHO_CMD} then you should abort this build immediately and follow the directions
+	@${ECHO_CMD} outlined in that document.
+	@${ECHO_CMD}
+	@${ECHO_CMD} Failure to follow the above directions will result in everything
+	@${ECHO_CMD} GNOME-related breaking.
+	@${ECHO_CMD}
+	@${ECHO_CMD} '******************************************'
 
 .include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index dc973c4e09b1..9ee62b116c18 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/glib-2.2.3.tar.bz2) = aa214a10d873b68ddd67cd9de2ccae55
-SIZE (gnome2/glib-2.2.3.tar.bz2) = 1636987
+MD5 (gnome2/glib-2.4.0.tar.bz2) = 0f5f4896782ec7ab6ea8c7c1d9958114
+SIZE (gnome2/glib-2.4.0.tar.bz2) = 2034272
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
index afb4544d268b..c339b76e2477 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/reference/Makefile.in	2000/11/20 09:49:25	1.1
-+++ docs/reference/Makefile.in	2000/11/20 09:50:55
-@@ -106,7 +106,7 @@
- STRIP_END = @STRIP_END@
- VERSION = @VERSION@
- 
+--- docs/reference/Makefile.in.orig	Fri Oct 24 18:05:32 2003
++++ docs/reference/Makefile.in	Fri Oct 24 18:06:00 2003
+@@ -226,7 +226,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = glib gobject
 +SUBDIRS = #glib gobject
+ subdir = docs/reference
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
+ CONFIG_HEADER = $(top_builddir)/config.h
diff --git a/devel/glib20/files/patch-glib::libcharset::Makefile.in b/devel/glib20/files/patch-glib::libcharset::Makefile.in
index 0ef01e926f44..2d0f82ab2263 100644
--- a/devel/glib20/files/patch-glib::libcharset::Makefile.in
+++ b/devel/glib20/files/patch-glib::libcharset::Makefile.in
@@ -1,18 +1,15 @@
-
-$FreeBSD$
-
---- glib/libcharset/Makefile.in.orig	Tue Jun  4 01:47:05 2002
-+++ glib/libcharset/Makefile.in	Tue Jun  4 03:41:15 2002
-@@ -148,7 +148,7 @@
- ms_librarian = @ms_librarian@
+--- glib/libcharset/Makefile.in.orig	Fri Oct 24 18:07:07 2003
++++ glib/libcharset/Makefile.in	Fri Oct 24 18:09:20 2003
+@@ -228,7 +228,7 @@
+ target_alias = @target_alias@
  
  INCLUDES = \
 -	-DLIBDIR=\"$(libdir)\"
-+	-DLIBDIR=\"$(prefix)/libdata\"
++	   -DLIBDIR=\"$(prefix)/libdata\"
  
  
  noinst_LTLIBRARIES = libcharset.la
-@@ -171,8 +171,8 @@
+@@ -249,8 +249,8 @@
  	make-patch.sh
  
  
@@ -23,12 +20,12 @@ $FreeBSD$
  
  SUFFIXES = .sed .sin
  
-@@ -326,7 +326,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
+@@ -492,7 +492,7 @@
+ 
+ install-data-am:
+ 
 -install-exec-am: install-exec-local
 +install-exec-am: # install-exec-local
- install-exec: install-exec-am
  
- install-data-am:
+ install-info: install-info-am
+ 
diff --git a/devel/glib20/pkg-descr b/devel/glib20/pkg-descr
index d762ed2f440d..3b305903069d 100644
--- a/devel/glib20/pkg-descr
+++ b/devel/glib20/pkg-descr
@@ -1,13 +1,5 @@
-This is GLib version 2.0.  GLib, is a library which includes support
-routines for C such as lists, trees, hashes, memory allocation, and
-many other things.
+GLib provides a simple, abstract, and highly portable set of C support
+routines such as lists, trees, hashes, memory allocation, and much, much
+more.  It is a foundation for writing portable applications.
 
 WWW: http://www.gtk.org/
-ftp://ftp.gtk.org/pub/gtk
-
-A mailing list is located at gtk-list@redhat.com for discussion.
-
-GLib-2.0 is a stable release that forms the basis of GTK+-2.0.
-
-- Vanilla
-vanilla@FreeBSD.ORG
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 958f40c5aac4..fcaad2e8d4e3 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -7,6 +7,7 @@ include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
+include/glib-2.0/glib/gatomic.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
@@ -18,6 +19,8 @@ include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
 include/glib-2.0/glib/ghook.h
+include/glib-2.0/glib/gi18n-lib.h
+include/glib-2.0/glib/gi18n.h
 include/glib-2.0/glib/giochannel.h
 include/glib-2.0/glib/glist.h
 include/glib-2.0/glib/gmacros.h
@@ -69,16 +72,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-2.0.a
 lib/libglib-2.0.so
-lib/libglib-2.0.so.200
+lib/libglib-2.0.so.400
 lib/libgmodule-2.0.a
 lib/libgmodule-2.0.so
-lib/libgmodule-2.0.so.200
+lib/libgmodule-2.0.so.400
 lib/libgobject-2.0.a
 lib/libgobject-2.0.so
-lib/libgobject-2.0.so.200
+lib/libgobject-2.0.so.400
 lib/libgthread-2.0.a
 lib/libgthread-2.0.so
-lib/libgthread-2.0.so.200
+lib/libgthread-2.0.so.400
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -87,6 +90,7 @@ share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/po/Makefile.in.in
 share/locale/am/LC_MESSAGES/glib20.mo
+share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
@@ -104,23 +108,25 @@ share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fa/LC_MESSAGES/glib20.mo
 share/locale/fi/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
+share/locale/ga/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo
 share/locale/he/LC_MESSAGES/glib20.mo
 share/locale/hi/LC_MESSAGES/glib20.mo
+share/locale/hr/LC_MESSAGES/glib20.mo
 share/locale/id/LC_MESSAGES/glib20.mo
 share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
-share/locale/li/LC_MESSAGES/glib20.mo
+share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
-share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
 share/locale/ms/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
 share/locale/pt/LC_MESSAGES/glib20.mo
 share/locale/pt_BR/LC_MESSAGES/glib20.mo
@@ -131,6 +137,7 @@ share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sq/LC_MESSAGES/glib20.mo
 share/locale/sr/LC_MESSAGES/glib20.mo
 share/locale/sr@Latn/LC_MESSAGES/glib20.mo
+share/locale/sr@ije/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 8d0347ede42d..bcaf1722a6b7 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -6,38 +6,58 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.4.3
+PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
+		libbonobo
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-openssl \
+		--disable-gnutls \
+		--with-gtk=no
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_CDPARANOIA
+.undef WITHOUT_SAMBA
+WITH_CDPARANOIA=	yes
+WITH_SAMBA=		yes
+.endif
+
 .if !defined(WITHOUT_KDE_MENUS)
 EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+PLIST_SUB+=	KDEMENUS=""
+.else
+PLIST_SUB+=	KDEMENUS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
+
+.if exists(${LOCALBASE}/lib/libsmbclient.so)
+WITH_SAMBA=		yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
@@ -46,16 +66,29 @@ PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
-.if defined(WITH_FAM)
+
+.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
+		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+.if !defined(WITHOUT_KDE_MENUS)
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+.endif
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
 		${WRKSRC}/Makefile.in
 
@@ -65,4 +98,10 @@ pre-configure:
 		${FALSE}; \
 	fi
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/vfolders
+.if !defined(WITHOUT_KDE_MENUS)
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo
index 0c0b4d2460cf..31ff3374ec64 100644
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.4.3.tar.bz2) = d217b3c241852ccb9e9147b63f8eb6d4
-SIZE (gnome2/gnome-vfs-2.4.3.tar.bz2) = 1072724
+MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420
+SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274
diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory
new file mode 100644
index 000000000000..032126bb99db
--- /dev/null
+++ b/devel/gnome-vfs/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
index 13ce7838798d..120a8906411f 100644
--- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
@@ -1,11 +1,285 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig	Sat Oct 18 19:04:37 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in	Sat Oct 18 19:05:18 2003
-@@ -19,7 +19,7 @@
+--- modules/vfolder/applications-all-users.vfolder-info.in.orig	Fri Oct 17 10:11:22 2003
++++ modules/vfolder/applications-all-users.vfolder-info.in	Thu Feb 12 15:15:40 2004
+@@ -19,7 +19,14 @@
    <MergeDir>/usr/share/gnome/apps/</MergeDir>
  
    <!-- Merge dirs optional -->
 -  <MergeDir>/etc/X11/applnk/</MergeDir>
-+  <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
  
    <!-- Root folder -->
    <Folder>
+@@ -34,10 +41,12 @@
+     <Query>
+       <And>
+         <Keyword>Core</Keyword>
+-	<!-- FIXME: Seth, why would this be wanted? -->
+-	<!--<Not>
+-	  <Keyword>Merged</Keyword>
+-        </Not>-->
++	<Not>
++          <Or>
++            <Keyword>Qt</Keyword>
++            <Keyword>KDE</Keyword>
++          </Or>
++	</Not>
+       </And>
+     </Query>
+ 
+@@ -47,6 +56,12 @@
+       <Desktop>Accessories.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Keyword>Utility</Keyword>
+ 	  <Not>
+@@ -63,6 +78,12 @@
+       <Desktop>Accessibility.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Keyword>Accessibility</Keyword>
+ 	  <Not>
+@@ -80,6 +101,12 @@
+       <OnlyUnallocated/>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+           <Not>
+             <Keyword>Settings</Keyword>
+@@ -101,6 +128,12 @@
+       <Desktop>Development.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Development</Keyword>
+         </And>
+@@ -114,6 +147,12 @@
+       <Desktop>Games.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Game</Keyword>
+         </And>
+@@ -127,6 +166,12 @@
+       <Desktop>Graphics.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Graphics</Keyword>
+         </And>
+@@ -140,6 +185,12 @@
+       <Desktop>Internet.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Network</Keyword>
+         </And>
+@@ -153,6 +204,12 @@
+       <Desktop>Multimedia.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>AudioVideo</Keyword>
+         </And>
+@@ -170,6 +227,12 @@
+       <Desktop>Office.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Or>
+ 	    <Keyword>Office</Keyword>
+@@ -195,6 +258,12 @@
+       <Desktop>System.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+           <Not>
+             <Keyword>Settings</Keyword>
+@@ -204,6 +273,118 @@
+       </Query>
+       <DontShowIfEmpty/>
+     </Folder>
+-    
++
++    <!-- KDE -->
++    <Folder>
++      <Name>KDE</Name>
++      <Desktop>KDE.directory</Desktop>
++
++      <!-- KAccessories -->
++      <Folder>
++        <Name>Accessories</Name>
++        <Desktop>Accessories.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Utility</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KDevelopment Tools -->
++      <Folder>
++        <Name>Programming</Name>
++        <Desktop>Development.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Development</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KGraphics -->
++      <Folder>
++        <Name>Graphics</Name>
++        <Desktop>Graphics.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Graphics</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KInternet -->
++      <Folder>
++        <Name>Internet</Name>
++        <Desktop>Internet.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Network</Keyword>
++          </And>
++        </Query>
++
++        <Include>/usr/local/share/applnk/konqueror.desktop</Include>
++
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KMultimedia -->
++      <Folder>
++        <Name>Multimedia</Name>
++        <Desktop>Multimedia.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>AudioVideo</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KOffice -->
++      <Folder>
++        <Name>Office</Name>
++        <Desktop>Office.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Or>
++              <Keyword>Office</Keyword>
++              <Keyword>Spreadsheet</Keyword>
++              <Keyword>WordProcessor</Keyword>
++              <Keyword>Calendar</Keyword>
++              <Keyword>ProjectManagement</Keyword>
++            </Or>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++      <DontShowIfEmpty/>
++    </Folder> <!-- KDE -->
++
+   </Folder>
+ </VFolderInfo>
diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa
index 303b8e8c5b40..8273ab3fee00 100644
--- a/devel/gnome-vfs/files/patch-aa
+++ b/devel/gnome-vfs/files/patch-aa
@@ -1,62 +1,31 @@
---- configure.orig	Tue Mar  9 14:55:35 2004
-+++ configure	Tue Mar  9 16:41:53 2004
-@@ -19711,6 +19711,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -24792,6 +24793,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24844,6 +24846,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24918,6 +24921,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24970,6 +24974,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25044,6 +25049,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-@@ -25104,6 +25110,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26099,8 +26106,8 @@
+--- configure.orig	Sun Feb  8 16:04:02 2004
++++ configure	Sun Feb  8 16:04:36 2004
+@@ -22816,6 +22816,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22898,6 +22900,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22908,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26400,8 @@
    done
  fi
  
@@ -67,7 +36,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26119,11 +26126,11 @@
+@@ -26416,11 +26420,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -81,28 +50,16 @@
    ;
    return 0;
  }
-@@ -26917,7 +26924,7 @@
+@@ -27547,7 +27551,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"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26982,9 +26989,9 @@
- 
- 		msg_openssl="yes"
-                 if test x$with_openssl_libs != x/usr/lib; then
--                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
-                 else
--                	OPENSSL_LIBS="-lssl -lcrypto"
-+                	OPENSSL_LIBS="-lssl -lcryptofoo"
-                 fi
- 
- 
-@@ -29285,6 +29292,7 @@
+@@ -30543,6 +30547,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-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
index 764a5a6f218a..063376961823 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Mon Oct 13 10:31:12 2003
-+++ libgnomevfs/Makefile.in	Mon Oct 13 10:31:37 2003
-@@ -234,7 +234,7 @@
+--- libgnomevfs/Makefile.in.orig	Wed Oct 22 01:11:11 2003
++++ libgnomevfs/Makefile.in	Wed Oct 22 01:12:00 2003
+@@ -429,7 +429,7 @@
  # CLEANFILES = $(BUILT_SOURCES)
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
new file mode 100644
index 000000000000..21912f46e0ec
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
@@ -0,0 +1,13 @@
+--- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Mon Mar  8 22:29:57 2004
++++ libgnomevfs/gnome-vfs-unix-mounts.c	Mon Mar  8 22:33:35 2004
+@@ -857,8 +857,9 @@
+ 
+ #ifdef HAVE_SYS_SYSCTL_H
+ 		if (usermnt != 0) {
++			uid_t uid = getuid ();
+ 			if (stat (fstab->fs_file, &sb) == 0) {
+-				if (sb.st_uid != 0) {
++				if (uid == 0 || sb.st_uid == uid) {
+ 					mount_entry->is_user_mountable = TRUE;
+ 				}
+ 			}
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
index 8f8f15be3918..ab74eb9324fd 100644
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,14 +1,26 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 25 06:52:18 2003
-+++ libgnomevfs/gnome-vfs-utils.c	Tue May  6 15:44:27 2003
-@@ -42,6 +42,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -840,7 +841,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sat Mar 13 18:57:02 2004
++++ libgnomevfs/gnome-vfs-utils.c	Sat Mar 13 18:51:21 2004
+@@ -797,8 +797,10 @@
+ 	
+ #if HAVE_STATVFS
+ 	statfs_result = statvfs (unescaped_path, &statfs_buffer);
++#define statfs_bsize f_frsize
+ #else
+ 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
++#define statfs_bsize f_bsize
+ #endif  
+ 
+ 	if (statfs_result != 0) {
+@@ -831,7 +833,7 @@
+ 		}
+ 	}
+ 
+-	block_size = statfs_buffer.f_bsize; 
++	block_size = statfs_buffer.statfs_bsize; 
+ 	free_blocks = statfs_buffer.f_bavail;
+ 
+ 	*size = block_size * free_blocks;
+@@ -859,7 +861,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
new file mode 100644
index 000000000000..58384ee38d2e
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
++++ ltmain.sh	Tue Dec  9 14:09:01 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gnome-vfs/files/patch-modules_cdda-method.c b/devel/gnome-vfs/files/patch-modules_cdda-method.c
deleted file mode 100644
index 97250842b916..000000000000
--- a/devel/gnome-vfs/files/patch-modules_cdda-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/cdda-method.c.orig	Tue Jan 27 06:19:01 2004
-+++ modules/cdda-method.c	Wed Jan 28 00:21:01 2004
-@@ -623,7 +623,11 @@
- 	/* Check and see if we already have opened and stashed this drive */
- 	if (!use_base) {
- 		if (global_context != NULL) {
-+#ifdef Linux
- 			if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#elif defined(__FreeBSD__)
-+			if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#endif
- 				use_cache = TRUE;
- 				cdda_close (drive);
- 				gnome_vfs_file_info_copy (file_info, global_context->file_info);
-@@ -709,7 +713,11 @@
- 	if (!use_base) {
- 		/* Check for cache */
- 		if (global_context != NULL) {
-+#ifdef Linux
- 				if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#elif defined(__FreeBSD__)
-+				if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#endif
- 					/*	Clear old cache */
- 					cdda_context_free (global_context);
- 					global_context = cdda_context_new (drive, uri);
diff --git a/devel/gnome-vfs/files/patch-modules_pty-open.c b/devel/gnome-vfs/files/patch-modules_pty-open.c
new file mode 100644
index 000000000000..2ee23b086f16
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_pty-open.c
@@ -0,0 +1,13 @@
+--- modules/pty-open.c.orig	Sun Apr  4 12:58:08 2004
++++ modules/pty-open.c	Sun Apr  4 12:59:30 2004
+@@ -613,6 +613,10 @@
+ 	if ((fd == -1) && (errno == ENOENT)) {
+ 		fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
+ 	}
++
++	if ((fd == -1) && (errno == ENOENT)) {
++		fd = posix_openpt(O_RDWR);
++	}
+ #endif
+ 	/* Set it to blocking. */
+ 	flags = fcntl(fd, F_GETFL);
diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c
new file mode 100644
index 000000000000..bd08ae0b45f1
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-modules_sftp-method.c
@@ -0,0 +1,26 @@
+--- modules/sftp-method.c.orig	Mon Mar  8 13:52:39 2004
++++ modules/sftp-method.c	Sun Apr  4 13:50:21 2004
+@@ -175,6 +175,15 @@
+ 
+ typedef ssize_t (*read_write_fn) (int, void *, size_t);
+ 
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression)				\
++	(__extension__						\
++	 ({ long int __result;					\
++	  	do __result = (long int) (expression);		\
++		while (__result == -1L && errno == EINTR);	\
++		__result; }))
++#endif
++
+ static gsize
+ atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) 
+ {
+@@ -1072,6 +1081,7 @@
+ 		if (io_status == G_IO_STATUS_NORMAL) {
+ 			buffer[len] = 0;
+ 			if (g_str_has_suffix (buffer, "password: ") ||
++			    g_str_has_suffix (buffer, "Password:")  ||
+ 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
+ 				if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
+ 					g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnome-vfs/files/patch-modules_ssh-method.c b/devel/gnome-vfs/files/patch-modules_ssh-method.c
deleted file mode 100644
index 14b2cf886863..000000000000
--- a/devel/gnome-vfs/files/patch-modules_ssh-method.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr
index 81cfcd5dd856..03cbc07f6699 100644
--- a/devel/gnome-vfs/pkg-descr
+++ b/devel/gnome-vfs/pkg-descr
@@ -1,14 +1,7 @@
-This is the GNOME Virtual File System.
-
-GnomeVFS is a filesystem abstraction library allowing applications
-plugable transparent access to a variety of "real" filesystems, from
-WebDAV to digital cameras, to the local filesystem. It also contains a
-number of other convenient file utilities such as a comphrehensive MIME
-database / Application registry, and a copy engine. Use of GnomeVFS
-ensures that an application or component will be usable by Nautilus or
-other GnomeVFS applications for handling the display of data from
-various URIs, as well.
-
-This is the GnomeVFS for the GNOME 2 architecture.
+The GNOME Virtual File System allows applications and users to treat
+any number of file system concepts as a part of the local filesystem.
+With GnomeVFS, filesystems across the internet, on connected devices,
+and in multiple formats are as simple to access (and write code for)
+as any directory on the local machine.
 
 WWW: http://www.gnome.org/
diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist
index 0d945ad47a0b..03548442eea8 100644
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@@ -3,27 +3,52 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
-etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
+etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gconf/schemas/system_http_proxy.schemas
+etc/gconf/schemas/system_smb.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
+%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
 etc/gnome-vfs-2.0/vfolders/network.vfolder-info
@@ -37,6 +62,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
@@ -54,6 +81,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
@@ -72,12 +101,16 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
 %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
+lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
 lib/gnome-vfs-2.0/modules/libgzip.so
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.so
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.so
+%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
 lib/gnome-vfs-2.0/modules/libssh.so
 lib/gnome-vfs-2.0/modules/libtar.so
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
@@ -86,7 +119,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.400
+lib/libgnomevfs-2.so.600
 lib/vfs/2.0/extfs/README
 lib/vfs/2.0/extfs/a
 lib/vfs/2.0/extfs/ar
@@ -104,13 +137,16 @@ 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_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
+libexec/gnome-vfs-daemon
 share/doc/gnome-vfs-2.0/about.html
 share/doc/gnome-vfs-2.0/advanced-operations.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
@@ -150,10 +186,16 @@ share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
 share/doc/gnome-vfs-2.0/index.html
 share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/up.png
+@exec mkdir -p %D/share/gnome/vfolders
+%%KDEMENUS%%share/gnome/vfolders/KDE.directory
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -167,6 +209,7 @@ share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -178,6 +221,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -196,6 +240,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -206,8 +251,10 @@ share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -216,6 +263,7 @@ share/locale/yi/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-2.0
+@dirrm share/gnome/vfolders
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0
 @dirrm include/gnome-vfs-module-2.0/libgnomevfs
@@ -224,17 +272,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm include/gnome-vfs-2.0/include
 @dirrm include/gnome-vfs-2.0
 @dirrm etc/gnome-vfs-2.0/vfolders
+@dirrm etc/gconf/gconf.xml.defaults/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
index be02a51bfec4..c4443bb97f2e 100644
--- a/devel/gnome2-hacker-tools/Makefile
+++ b/devel/gnome2-hacker-tools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome2-hacker-tools
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -21,14 +20,20 @@ RUN_DEPENDS=	mlv:${PORTSDIR}/editors/mlview \
 		glade-2:${PORTSDIR}/devel/glade2 \
 		ghex2:${PORTSDIR}/editors/ghex2 \
 		gob2:${PORTSDIR}/devel/gob2 \
-		regexxer:${PORTSDIR}/devel/regexxer \
 		conglomerate:${PORTSDIR}/editors/conglomerate \
-		anjuta:${PORTSDIR}/devel/anjuta \
 		meld:${PORTSDIR}/textproc/meld \
 		gtranslator:${PORTSDIR}/devel/gtranslator
+# not yet buildable under GNOME 2.5
+#		regexxer:${PORTSDIR}/devel/regexxer
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	anjuta:${PORTSDIR}/devel/anjuta
+.endif
 
 NO_BUILD=	yes
 
 do-install:	# empty
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 8d0347ede42d..bcaf1722a6b7 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,38 +6,58 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.4.3
+PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.6
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
+RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier gnomemimedata gconf2 libbonobo
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
+		libbonobo
 USE_REINPLACE=	yes
-USE_LIBTOOL_VER=	13
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-openssl \
+		--disable-gnutls \
+		--with-gtk=no
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
 
+OPTIONS=	KDE_MENUS "Integrated KDE menu picks" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_CDPARANOIA
+.undef WITHOUT_SAMBA
+WITH_CDPARANOIA=	yes
+WITH_SAMBA=		yes
+.endif
+
 .if !defined(WITHOUT_KDE_MENUS)
 EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+PLIST_SUB+=	KDEMENUS=""
+.else
+PLIST_SUB+=	KDEMENUS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
 WITH_CDPARANOIA=	yes
 .endif
-.if exists(${LOCALBASE}/lib/libfam.a)
-WITH_FAM=	yes
+
+.if exists(${LOCALBASE}/lib/libsmbclient.so)
+WITH_SAMBA=		yes
 .endif
 
 .if defined(WITH_CDPARANOIA)
@@ -46,16 +66,29 @@ PLIST_SUB+=	CDPARANOIA=""
 .else
 PLIST_SUB+=	CDPARANOIA="@comment "
 .endif
-.if defined(WITH_FAM)
+
+.if exists(${LOCALBASE}/lib/libfam) || !defined(WITHOUT_FAM)
 LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
 .endif
 
+.if defined(WITH_SAMBA)
+LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+PLIST_SUB+=	SAMBA=""
+.else
+PLIST_SUB+=	SAMBA="@comment "
+.endif
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/Makefile.in \
+		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+.if !defined(WITHOUT_KDE_MENUS)
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+.endif
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
 		${WRKSRC}/Makefile.in
 
@@ -65,4 +98,10 @@ pre-configure:
 		${FALSE}; \
 	fi
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/vfolders
+.if !defined(WITHOUT_KDE_MENUS)
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
index 0c0b4d2460cf..31ff3374ec64 100644
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-vfs-2.4.3.tar.bz2) = d217b3c241852ccb9e9147b63f8eb6d4
-SIZE (gnome2/gnome-vfs-2.4.3.tar.bz2) = 1072724
+MD5 (gnome2/gnome-vfs-2.6.0.tar.bz2) = 4d0323cf015dd006210fcacd4bfe7420
+SIZE (gnome2/gnome-vfs-2.6.0.tar.bz2) = 1431274
diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory
new file mode 100644
index 000000000000..032126bb99db
--- /dev/null
+++ b/devel/gnomevfs2/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
index 13ce7838798d..120a8906411f 100644
--- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
@@ -1,11 +1,285 @@
---- modules/vfolder/applications-all-users.vfolder-info.in.orig	Sat Oct 18 19:04:37 2003
-+++ modules/vfolder/applications-all-users.vfolder-info.in	Sat Oct 18 19:05:18 2003
-@@ -19,7 +19,7 @@
+--- modules/vfolder/applications-all-users.vfolder-info.in.orig	Fri Oct 17 10:11:22 2003
++++ modules/vfolder/applications-all-users.vfolder-info.in	Thu Feb 12 15:15:40 2004
+@@ -19,7 +19,14 @@
    <MergeDir>/usr/share/gnome/apps/</MergeDir>
  
    <!-- Merge dirs optional -->
 -  <MergeDir>/etc/X11/applnk/</MergeDir>
-+  <MergeDir>%%LOCALBASE%%/share/applnk/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Toys/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Internet/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Office/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Applications/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Development/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Games/</MergeDir>
++  <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir>
  
    <!-- Root folder -->
    <Folder>
+@@ -34,10 +41,12 @@
+     <Query>
+       <And>
+         <Keyword>Core</Keyword>
+-	<!-- FIXME: Seth, why would this be wanted? -->
+-	<!--<Not>
+-	  <Keyword>Merged</Keyword>
+-        </Not>-->
++	<Not>
++          <Or>
++            <Keyword>Qt</Keyword>
++            <Keyword>KDE</Keyword>
++          </Or>
++	</Not>
+       </And>
+     </Query>
+ 
+@@ -47,6 +56,12 @@
+       <Desktop>Accessories.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Keyword>Utility</Keyword>
+ 	  <Not>
+@@ -63,6 +78,12 @@
+       <Desktop>Accessibility.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Keyword>Accessibility</Keyword>
+ 	  <Not>
+@@ -80,6 +101,12 @@
+       <OnlyUnallocated/>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+           <Not>
+             <Keyword>Settings</Keyword>
+@@ -101,6 +128,12 @@
+       <Desktop>Development.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Development</Keyword>
+         </And>
+@@ -114,6 +147,12 @@
+       <Desktop>Games.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Game</Keyword>
+         </And>
+@@ -127,6 +166,12 @@
+       <Desktop>Graphics.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Graphics</Keyword>
+         </And>
+@@ -140,6 +185,12 @@
+       <Desktop>Internet.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>Network</Keyword>
+         </And>
+@@ -153,6 +204,12 @@
+       <Desktop>Multimedia.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+ 	  <Keyword>AudioVideo</Keyword>
+         </And>
+@@ -170,6 +227,12 @@
+       <Desktop>Office.directory</Desktop>
+       <Query>
+ 	<And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+ 	  <Keyword>Application</Keyword>
+ 	  <Or>
+ 	    <Keyword>Office</Keyword>
+@@ -195,6 +258,12 @@
+       <Desktop>System.directory</Desktop>
+       <Query>
+         <And>
++	  <Not>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++	  </Not>
+           <Keyword>Application</Keyword>
+           <Not>
+             <Keyword>Settings</Keyword>
+@@ -204,6 +273,118 @@
+       </Query>
+       <DontShowIfEmpty/>
+     </Folder>
+-    
++
++    <!-- KDE -->
++    <Folder>
++      <Name>KDE</Name>
++      <Desktop>KDE.directory</Desktop>
++
++      <!-- KAccessories -->
++      <Folder>
++        <Name>Accessories</Name>
++        <Desktop>Accessories.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Utility</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KDevelopment Tools -->
++      <Folder>
++        <Name>Programming</Name>
++        <Desktop>Development.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Development</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KGraphics -->
++      <Folder>
++        <Name>Graphics</Name>
++        <Desktop>Graphics.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Graphics</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KInternet -->
++      <Folder>
++        <Name>Internet</Name>
++        <Desktop>Internet.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>Network</Keyword>
++          </And>
++        </Query>
++
++        <Include>/usr/local/share/applnk/konqueror.desktop</Include>
++
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KMultimedia -->
++      <Folder>
++        <Name>Multimedia</Name>
++        <Desktop>Multimedia.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Keyword>AudioVideo</Keyword>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++
++      <!-- KOffice -->
++      <Folder>
++        <Name>Office</Name>
++        <Desktop>Office.directory</Desktop>
++        <Query>
++          <And>
++            <Or>
++              <Keyword>Qt</Keyword>
++              <Keyword>KDE</Keyword>
++            </Or>
++            <Or>
++              <Keyword>Office</Keyword>
++              <Keyword>Spreadsheet</Keyword>
++              <Keyword>WordProcessor</Keyword>
++              <Keyword>Calendar</Keyword>
++              <Keyword>ProjectManagement</Keyword>
++            </Or>
++          </And>
++        </Query>
++        <DontShowIfEmpty/>
++      </Folder>
++      <DontShowIfEmpty/>
++    </Folder> <!-- KDE -->
++
+   </Folder>
+ </VFolderInfo>
diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa
index 303b8e8c5b40..8273ab3fee00 100644
--- a/devel/gnomevfs2/files/patch-aa
+++ b/devel/gnomevfs2/files/patch-aa
@@ -1,62 +1,31 @@
---- configure.orig	Tue Mar  9 14:55:35 2004
-+++ configure	Tue Mar  9 16:41:53 2004
-@@ -19711,6 +19711,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -24792,6 +24793,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24844,6 +24846,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24918,6 +24921,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -24970,6 +24974,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -25044,6 +25049,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <sys/param.h>
- #include <unistd.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-@@ -25104,6 +25110,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <unistd.h>
-+#include <sys/param.h>
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
-@@ -26099,8 +26106,8 @@
+--- configure.orig	Sun Feb  8 16:04:02 2004
++++ configure	Sun Feb  8 16:04:36 2004
+@@ -22816,6 +22816,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl  $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -22898,6 +22900,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -22905,6 +22908,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++ LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -26396,8 +26400,8 @@
    done
  fi
  
@@ -67,7 +36,7 @@
  if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26119,11 +26126,11 @@
+@@ -26416,11 +26420,11 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -81,28 +50,16 @@
    ;
    return 0;
  }
-@@ -26917,7 +26924,7 @@
+@@ -27547,7 +27551,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"
++		LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto"
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26982,9 +26989,9 @@
- 
- 		msg_openssl="yes"
-                 if test x$with_openssl_libs != x/usr/lib; then
--                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcrypto"
-+                        OPENSSL_LIBS="-L$with_openssl_libs -lssl -lcryptofoo"
-                 else
--                	OPENSSL_LIBS="-lssl -lcrypto"
-+                	OPENSSL_LIBS="-lssl -lcryptofoo"
-                 fi
- 
- 
-@@ -29285,6 +29292,7 @@
+@@ -30543,6 +30547,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-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
index 764a5a6f218a..063376961823 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@@ -1,11 +1,11 @@
---- libgnomevfs/Makefile.in.orig	Mon Oct 13 10:31:12 2003
-+++ libgnomevfs/Makefile.in	Mon Oct 13 10:31:37 2003
-@@ -234,7 +234,7 @@
+--- libgnomevfs/Makefile.in.orig	Wed Oct 22 01:11:11 2003
++++ libgnomevfs/Makefile.in	Wed Oct 22 01:12:00 2003
+@@ -429,7 +429,7 @@
  # CLEANFILES = $(BUILT_SOURCES)
  
  # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
  
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
new file mode 100644
index 000000000000..21912f46e0ec
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
@@ -0,0 +1,13 @@
+--- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Mon Mar  8 22:29:57 2004
++++ libgnomevfs/gnome-vfs-unix-mounts.c	Mon Mar  8 22:33:35 2004
+@@ -857,8 +857,9 @@
+ 
+ #ifdef HAVE_SYS_SYSCTL_H
+ 		if (usermnt != 0) {
++			uid_t uid = getuid ();
+ 			if (stat (fstab->fs_file, &sb) == 0) {
+-				if (sb.st_uid != 0) {
++				if (uid == 0 || sb.st_uid == uid) {
+ 					mount_entry->is_user_mountable = TRUE;
+ 				}
+ 			}
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
index 8f8f15be3918..ab74eb9324fd 100644
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@@ -1,14 +1,26 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 25 06:52:18 2003
-+++ libgnomevfs/gnome-vfs-utils.c	Tue May  6 15:44:27 2003
-@@ -42,6 +42,7 @@
- #include <pwd.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -840,7 +841,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Sat Mar 13 18:57:02 2004
++++ libgnomevfs/gnome-vfs-utils.c	Sat Mar 13 18:51:21 2004
+@@ -797,8 +797,10 @@
+ 	
+ #if HAVE_STATVFS
+ 	statfs_result = statvfs (unescaped_path, &statfs_buffer);
++#define statfs_bsize f_frsize
+ #else
+ 	statfs_result = statfs (unescaped_path, &statfs_buffer);   
++#define statfs_bsize f_bsize
+ #endif  
+ 
+ 	if (statfs_result != 0) {
+@@ -831,7 +833,7 @@
+ 		}
+ 	}
+ 
+-	block_size = statfs_buffer.f_bsize; 
++	block_size = statfs_buffer.statfs_bsize; 
+ 	free_blocks = statfs_buffer.f_bavail;
+ 
+ 	*size = block_size * free_blocks;
+@@ -859,7 +861,7 @@
  	paths = g_strsplit (gnome_var, ":", 0); 
  
  	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..58384ee38d2e
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Sat Dec  6 14:47:45 2003
++++ ltmain.sh	Tue Dec  9 14:09:01 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/gnomevfs2/files/patch-modules_cdda-method.c b/devel/gnomevfs2/files/patch-modules_cdda-method.c
deleted file mode 100644
index 97250842b916..000000000000
--- a/devel/gnomevfs2/files/patch-modules_cdda-method.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- modules/cdda-method.c.orig	Tue Jan 27 06:19:01 2004
-+++ modules/cdda-method.c	Wed Jan 28 00:21:01 2004
-@@ -623,7 +623,11 @@
- 	/* Check and see if we already have opened and stashed this drive */
- 	if (!use_base) {
- 		if (global_context != NULL) {
-+#ifdef Linux
- 			if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) == 0) {
-+#elif defined(__FreeBSD__)
-+			if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) == 0) {
-+#endif
- 				use_cache = TRUE;
- 				cdda_close (drive);
- 				gnome_vfs_file_info_copy (file_info, global_context->file_info);
-@@ -709,7 +713,11 @@
- 	if (!use_base) {
- 		/* Check for cache */
- 		if (global_context != NULL) {
-+#ifdef Linux
- 				if (strcmp (drive->cdda_device_name, global_context->drive->cdda_device_name) != 0) {
-+#elif defined(__FreeBSD__)
-+				if (strcmp (drive->dev->device_path, global_context->drive->dev->device_path) != 0) {
-+#endif
- 					/*	Clear old cache */
- 					cdda_context_free (global_context);
- 					global_context = cdda_context_new (drive, uri);
diff --git a/devel/gnomevfs2/files/patch-modules_pty-open.c b/devel/gnomevfs2/files/patch-modules_pty-open.c
new file mode 100644
index 000000000000..2ee23b086f16
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_pty-open.c
@@ -0,0 +1,13 @@
+--- modules/pty-open.c.orig	Sun Apr  4 12:58:08 2004
++++ modules/pty-open.c	Sun Apr  4 12:59:30 2004
+@@ -613,6 +613,10 @@
+ 	if ((fd == -1) && (errno == ENOENT)) {
+ 		fd = open("/dev/ptc", O_RDWR | O_NOCTTY); /* AIX */
+ 	}
++
++	if ((fd == -1) && (errno == ENOENT)) {
++		fd = posix_openpt(O_RDWR);
++	}
+ #endif
+ 	/* Set it to blocking. */
+ 	flags = fcntl(fd, F_GETFL);
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
new file mode 100644
index 000000000000..bd08ae0b45f1
--- /dev/null
+++ b/devel/gnomevfs2/files/patch-modules_sftp-method.c
@@ -0,0 +1,26 @@
+--- modules/sftp-method.c.orig	Mon Mar  8 13:52:39 2004
++++ modules/sftp-method.c	Sun Apr  4 13:50:21 2004
+@@ -175,6 +175,15 @@
+ 
+ typedef ssize_t (*read_write_fn) (int, void *, size_t);
+ 
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression)				\
++	(__extension__						\
++	 ({ long int __result;					\
++	  	do __result = (long int) (expression);		\
++		while (__result == -1L && errno == EINTR);	\
++		__result; }))
++#endif
++
+ static gsize
+ atomic_io (read_write_fn f, gint fd, gpointer buffer_in, gsize size) 
+ {
+@@ -1072,6 +1081,7 @@
+ 		if (io_status == G_IO_STATUS_NORMAL) {
+ 			buffer[len] = 0;
+ 			if (g_str_has_suffix (buffer, "password: ") ||
++			    g_str_has_suffix (buffer, "Password:")  ||
+ 			    g_str_has_prefix (buffer, "Enter passphrase for key")) {
+ 				if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) {
+ 					g_io_channel_write_chars (tty_channel, password, -1, &len, NULL);
diff --git a/devel/gnomevfs2/files/patch-modules_ssh-method.c b/devel/gnomevfs2/files/patch-modules_ssh-method.c
deleted file mode 100644
index 14b2cf886863..000000000000
--- a/devel/gnomevfs2/files/patch-modules_ssh-method.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/pkg-descr b/devel/gnomevfs2/pkg-descr
index 81cfcd5dd856..03cbc07f6699 100644
--- a/devel/gnomevfs2/pkg-descr
+++ b/devel/gnomevfs2/pkg-descr
@@ -1,14 +1,7 @@
-This is the GNOME Virtual File System.
-
-GnomeVFS is a filesystem abstraction library allowing applications
-plugable transparent access to a variety of "real" filesystems, from
-WebDAV to digital cameras, to the local filesystem. It also contains a
-number of other convenient file utilities such as a comphrehensive MIME
-database / Application registry, and a copy engine. Use of GnomeVFS
-ensures that an application or component will be usable by Nautilus or
-other GnomeVFS applications for handling the display of data from
-various URIs, as well.
-
-This is the GnomeVFS for the GNOME 2 architecture.
+The GNOME Virtual File System allows applications and users to treat
+any number of file system concepts as a part of the local filesystem.
+With GnomeVFS, filesystems across the internet, on connected devices,
+and in multiple formats are as simple to access (and write code for)
+as any directory on the local machine.
 
 WWW: http://www.gnome.org/
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
index 0d945ad47a0b..03548442eea8 100644
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@@ -3,27 +3,52 @@ bin/gnomevfs-copy
 bin/gnomevfs-info
 bin/gnomevfs-ls
 bin/gnomevfs-mkdir
-etc/gconf/gconf.xml.defaults/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/system/smb/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/proxy/%gconf.xml
+etc/gconf/gconf.xml.defaults/system/smb/%gconf.xml
 etc/gconf/schemas/desktop_default_applications.schemas
+etc/gconf/schemas/desktop_gnome_url_handlers.schemas
 etc/gconf/schemas/system_http_proxy.schemas
+etc/gconf/schemas/system_smb.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
+%%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf
 etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
 etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info
 etc/gnome-vfs-2.0/vfolders/network.vfolder-info
@@ -37,6 +62,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-drive.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-enum-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
@@ -54,6 +81,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume-monitor.h
+include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-volume.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
 include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
 include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
@@ -72,12 +101,16 @@ include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
 lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
 lib/gnome-vfs-2.0/modules/libbzip2.so
 %%CDPARANOIA%%lib/gnome-vfs-2.0/modules/libcdda.so
+lib/gnome-vfs-2.0/modules/libcomputer.so
 lib/gnome-vfs-2.0/modules/libextfs.so
 lib/gnome-vfs-2.0/modules/libfile.so
 lib/gnome-vfs-2.0/modules/libftp.so
 lib/gnome-vfs-2.0/modules/libgzip.so
 lib/gnome-vfs-2.0/modules/libhttp.so
+lib/gnome-vfs-2.0/modules/libnetwork.so
 lib/gnome-vfs-2.0/modules/libnntp.so
+lib/gnome-vfs-2.0/modules/libsftp.so
+%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
 lib/gnome-vfs-2.0/modules/libssh.so
 lib/gnome-vfs-2.0/modules/libtar.so
 lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
@@ -86,7 +119,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.400
+lib/libgnomevfs-2.so.600
 lib/vfs/2.0/extfs/README
 lib/vfs/2.0/extfs/a
 lib/vfs/2.0/extfs/ar
@@ -104,13 +137,16 @@ 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_Daemon.server
 libdata/bonobo/servers/GNOME_VFS_Moniker_std.server
 libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
+libexec/gnome-vfs-daemon
 share/doc/gnome-vfs-2.0/about.html
 share/doc/gnome-vfs-2.0/advanced-operations.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-2.0.devhelp
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
@@ -150,10 +186,16 @@ share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
 share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/home.png
 share/doc/gnome-vfs-2.0/index.html
 share/doc/gnome-vfs-2.0/index.sgml
+share/doc/gnome-vfs-2.0/left.png
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/right.png
+share/doc/gnome-vfs-2.0/up.png
+@exec mkdir -p %D/share/gnome/vfolders
+%%KDEMENUS%%share/gnome/vfolders/KDE.directory
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -167,6 +209,7 @@ share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -178,6 +221,7 @@ share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -196,6 +240,7 @@ share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -206,8 +251,10 @@ share/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -216,6 +263,7 @@ share/locale/yi/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-2.0
+@dirrm share/gnome/vfolders
 @dirrm lib/vfs/2.0/extfs
 @dirrm lib/vfs/2.0
 @dirrm include/gnome-vfs-module-2.0/libgnomevfs
@@ -224,17 +272,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
 @dirrm include/gnome-vfs-2.0/include
 @dirrm include/gnome-vfs-2.0
 @dirrm etc/gnome-vfs-2.0/vfolders
+@dirrm etc/gconf/gconf.xml.defaults/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/system/smb
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
 @dirrm etc/gconf/gconf.xml.defaults/schemas/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/callto
+@unexec /bin/rmdir %D/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers 2>/dev/null || true
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 48afbfed39e7..8e7dbae1c125 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libbonobo
-PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,7 +21,7 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-USE_GNOME=	gnomehack libxml2 orbit2
+USE_GNOME=	gnomehack intlhack libxml2 orbit2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
index 5297ec4a9796..63bb6c5afbed 100644
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libbonobo-2.4.3.tar.bz2) = 420148e96773e6f27a49f1bbebb28fdd
-SIZE (gnome2/libbonobo-2.4.3.tar.bz2) = 1381949
+MD5 (gnome2/libbonobo-2.6.0.tar.bz2) = 078942cb9c6a1a31f93958e993353f45
+SIZE (gnome2/libbonobo-2.6.0.tar.bz2) = 1059444
diff --git a/devel/libbonobo/pkg-descr b/devel/libbonobo/pkg-descr
index 19f9323f3690..c555fab9ae5c 100644
--- a/devel/libbonobo/pkg-descr
+++ b/devel/libbonobo/pkg-descr
@@ -1,5 +1,5 @@
-Bonobo is a set of language and system independant CORBA interfaces
-for creating reusable components, controls and creating compound
-documents.
+Bonobo is a set of language- and system-independant CORBA interfaces
+for creating reusable components and controls, and for creating
+compound documents.
 
 WWW: http://www.gnome.org/
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index bf4ee86824d7..dbaabad55b86 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -15,6 +15,8 @@ include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
 include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
 include/libbonobo-2.0/bonobo/Bonobo.h
 include/libbonobo-2.0/bonobo/bonobo-arg.h
+include/libbonobo-2.0/bonobo/bonobo-app-client.h
+include/libbonobo-2.0/bonobo/bonobo-application.h
 include/libbonobo-2.0/bonobo/bonobo-context.h
 include/libbonobo-2.0/bonobo/bonobo-event-source.h
 include/libbonobo-2.0/bonobo/bonobo-exception.h
@@ -62,92 +64,8 @@ libdata/pkgconfig/bonobo-activation-2.0.pc
 libdata/pkgconfig/libbonobo-2.0.pc
 libexec/bonobo-activation-server
 sbin/bonobo-activation-sysconf
-share/doc/bonobo-activation/api-reference.html
-share/doc/bonobo-activation/architecture.html
-share/doc/bonobo-activation/async-activation.html
-share/doc/bonobo-activation/attribute-tag.html
-share/doc/bonobo-activation/bonobo-activation-Debugging.html
-share/doc/bonobo-activation/bonobo-activation-Initialization.html
-share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html
-share/doc/bonobo-activation/bonobo-activation-Registration.html
-share/doc/bonobo-activation/bonobo-activation-Utilities.html
-share/doc/bonobo-activation/bonobo-activation.devhelp
-share/doc/bonobo-activation/bonobo-activation.png
-share/doc/bonobo-activation/checklist.html
-share/doc/bonobo-activation/configuring.html
-share/doc/bonobo-activation/home.png
-share/doc/bonobo-activation/index.html
-share/doc/bonobo-activation/index.sgml
-share/doc/bonobo-activation/left.png
-share/doc/bonobo-activation/lgpl.html
-share/doc/bonobo-activation/migrating.html
-share/doc/bonobo-activation/query-langage.html
-share/doc/bonobo-activation/query-syntax.html
-share/doc/bonobo-activation/right.png
-share/doc/bonobo-activation/server-arch.html
-share/doc/bonobo-activation/server-xml-reference.html
-share/doc/bonobo-activation/terms.html
-share/doc/bonobo-activation/tutorial.html
-share/doc/bonobo-activation/up.png
-share/doc/libbonobo/debugging.html
-share/doc/libbonobo/factories.html
-share/doc/libbonobo/general.html
-share/doc/libbonobo/home.png
-share/doc/libbonobo/index.html
-share/doc/libbonobo/index.sgml
-share/doc/libbonobo/left.png
-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-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-types.html
-share/doc/libbonobo/libbonobo-faq.html
-share/doc/libbonobo/libbonobo.devhelp
-share/doc/libbonobo/misc.html
-share/doc/libbonobo/monikers-overview.html
-share/doc/libbonobo/monikers.html
-share/doc/libbonobo/persist-file.png
-share/doc/libbonobo/persist-storage.png
-share/doc/libbonobo/persist-stream.png
-share/doc/libbonobo/persist.html
-share/doc/libbonobo/persist.png
-share/doc/libbonobo/properties.html
-share/doc/libbonobo/property-bags.html
-share/doc/libbonobo/refcounting.html
-share/doc/libbonobo/right.png
-share/doc/libbonobo/running-context.png
-share/doc/libbonobo/storage.png
-share/doc/libbonobo/stream.png
-share/doc/libbonobo/streams.html
-share/doc/libbonobo/unknown.png
-share/doc/libbonobo/up.png
 share/idl/bonobo-2.0/Bonobo.idl
+share/idl/bonobo-2.0/Bonobo_Application.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
 share/idl/bonobo-2.0/Bonobo_Context.idl
@@ -191,6 +109,7 @@ share/locale/ga/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/he/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/hr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/id/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index e2fc89e81c56..5fe9635d584f 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libglade2
-PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTVERSION=	2.3.6
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.3
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -18,16 +17,23 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME glade library
 
 BUILD_DEPENDS=	${PYEXPAT}
-RUN_DEPENDS=	${PYEXPAT}
+RUN_DEPENDS=	${PYEXPAT} \
+		xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack libxml2 gtk20
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
+		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
 
 .include <bsd.port.mk>
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index ea59e843802f..1ac601a8efbc 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libglade-2.0.1.tar.bz2) = 4d93f6b01510013ae429e91af432cfe2
-SIZE (gnome2/libglade-2.0.1.tar.bz2) = 264646
+MD5 (gnome2/libglade-2.3.6.tar.bz2) = f579c881b95e6dee0f55f82940eb2004
+SIZE (gnome2/libglade-2.3.6.tar.bz2) = 343224
diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab
index a7875449633e..a09056d333f5 100644
--- a/devel/libglade2/files/patch-ab
+++ b/devel/libglade2/files/patch-ab
@@ -1,20 +1,29 @@
---- 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
+--- Makefile.in.orig	Wed Jan 14 17:20:11 2004
++++ Makefile.in	Wed Jan 14 17:23:52 2004
+@@ -18,7 +18,7 @@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
 +pkglibdir = $(prefix)/libdata/pkgconfig
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
  
-@@ -104,7 +104,7 @@
- am__include = @am__include@
- am__quote = @am__quote@
- install_sh = @install_sh@
+@@ -169,7 +169,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = glade doc tests
 +SUBDIRS = glade doc
  
  INCLUDES = $(LIBGLADE_CFLAGS)
  
+@@ -188,7 +188,7 @@
+ 
+ 
+ # handling of the XML catalog
+-XMLCATALOG = /etc/xml/catalog
++XMLCATALOG = $(LOCALBASE)/share/xml/catalog.ports
+ 
+ xmldir = $(datadir)/xml/libglade
+ xml_DATA = glade-2.0.dtd
diff --git a/devel/libglade2/files/patch-doc::Makefile.in b/devel/libglade2/files/patch-doc::Makefile.in
deleted file mode 100644
index 4a5b4b671943..000000000000
--- a/devel/libglade2/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in	2002/02/14 10:10:45	1.1
-+++ doc/Makefile.in	2002/02/14 10:11:18
-@@ -110,7 +110,7 @@
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ../glade
- 
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(datadir)/doc
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
diff --git a/devel/libglade2/pkg-descr b/devel/libglade2/pkg-descr
index dd6a386e94cd..7335dd1ea972 100644
--- a/devel/libglade2/pkg-descr
+++ b/devel/libglade2/pkg-descr
@@ -1,5 +1,3 @@
-A library that allows you to load GLADE interfaces at runtime (you don't
-have to generate stubs with GLADE before hand). This way you can change
-the look of your application without recompiling. This way you can write
-the logic behind the interface separately from the code to build the
-interface, so changing the interface is not so much of a problem. 
+LibGlade allows GLADE interfaces to be handled at runtime, freeing
+GUI development from code development.  This allows an interface to
+be changed without requiring a re-compilation.
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index 9581dd4b3a3a..f1b4720d65ef 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -8,20 +8,28 @@ lib/libglade-2.0.a
 lib/libglade-2.0.so
 lib/libglade-2.0.so.0
 libdata/pkgconfig/libglade-2.0.pc
-share/doc/libglade/gladexml.html
+share/doc/libglade/GladeXML.html
+share/doc/libglade/home.png
+share/doc/libglade/index.html
+share/doc/libglade/index.sgml
+share/doc/libglade/left.png
+share/doc/libglade/libglade-Libglade-Build.html
+share/doc/libglade/libglade-Libglade-Initialisation.html
+share/doc/libglade/libglade-Libglade-SAX-Parser.html
 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-i18n.html
 share/doc/libglade/libglade-lib.html
-share/doc/libglade/libglade-libglade-build.html
-share/doc/libglade/libglade-libglade-initialisation.html
-share/doc/libglade/libglade-libglade-sax-parser.html
 share/doc/libglade/libglade-modules.html
 share/doc/libglade/libglade-notes.html
-share/doc/libglade/libglade.html
+share/doc/libglade/libglade.devhelp
+share/doc/libglade/right.png
+share/doc/libglade/up.png
 share/xml/libglade/glade-2.0.dtd
+@unexec %%XMLCATALOG%% --noout --del %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
+@exec %%XMLCATALOG%% --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" %D/share/xml/libglade/glade-2.0.dtd %%CATALOG_PORTS_XML%% || /usr/bin/true
 @dirrm share/xml/libglade
 @dirrm share/doc/libglade
 @dirrm include/libglade-2.0/glade
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index bb4066490d7c..6bb388973510 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgtop2
-PORTVERSION=	2.0.8
-PORTREVISION=	1
+PORTVERSION=	2.5.2
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.0
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
 DISTNAME=	libgtop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,11 +20,12 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-x
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
index 410d31fa3170..7614d6251656 100644
--- a/devel/libgtop2/distinfo
+++ b/devel/libgtop2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgtop-2.0.8.tar.bz2) = 9e5b728a8639fd7c7f86ddf2cb726435
-SIZE (gnome2/libgtop-2.0.8.tar.bz2) = 916084
+MD5 (gnome2/libgtop-2.5.2.tar.bz2) = 92b9665293df3b54a00ddfda40c9d04e
+SIZE (gnome2/libgtop-2.5.2.tar.bz2) = 935545
diff --git a/devel/libgtop2/files/patch-ab b/devel/libgtop2/files/patch-ab
deleted file mode 100644
index 9c88c62bc771..000000000000
--- a/devel/libgtop2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Apr 29 12:00:07 2002
-+++ Makefile.in	Mon Apr 29 12:00:24 2002
-@@ -503,7 +503,7 @@
- $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
- 
- libgtopConf.sh: libgtopConf.sh.in Makefile
--	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(sysconfdir)#g' \
- 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
- 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
- 	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
index c01ec4e1826b..bbffe4a0c430 100644
--- a/devel/libgtop2/files/patch-ah
+++ b/devel/libgtop2/files/patch-ah
@@ -1,67 +1,27 @@
---- sysdeps/freebsd/procmap.c.orig	Fri May 28 03:56:48 1999
-+++ sysdeps/freebsd/procmap.c	Tue Sep  9 11:38:18 2003
-@@ -33,7 +33,11 @@
- #include <sys/proc.h>
- #include <sys/resource.h>
- #include <vm/vm_object.h>
-+#if (__FreeBSD_version >= 400011)
-+#include <vm/vm.h>
-+#else
- #include <vm/vm_prot.h>
-+#endif
- #include <vm/vm_map.h>
- 
- #include <sys/vnode.h>
-@@ -91,8 +95,9 @@
+--- sysdeps/freebsd/procmap.c.orig	Wed Mar 10 21:23:52 2004
++++ sysdeps/freebsd/procmap.c	Thu Mar 11 21:45:33 2004
+@@ -104,7 +104,7 @@
  	glibtop_map_entry *maps;
  #if defined __FreeBSD__
  	struct vnode vnode;
+-#if __FreeBSD_version >= 500039
 +#if __FreeBSD_version < 500039
  	struct inode inode;
--	struct mount mount;
-+#endif
  #endif
- 	int count, i = 0;
- 	int update = 0;
-@@ -108,13 +113,19 @@
+ #endif
+@@ -122,8 +122,10 @@
  
  	/* Get the process data */
  	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
 -	if ((pinfo == NULL) || (count < 1))
--		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
 +	if ((pinfo == NULL) || (count < 1)) {
-+		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
+ 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
 +		return NULL;
 +	}
  
  	/* Now we get the memory maps. */
  
- 	if (kvm_read (server->machine.kd,
-+#if (__FreeBSD_version >= 500013)
-+		      (unsigned long) pinfo [0].ki_vmspace,
-+#else
- 		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
-+#endif
- 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace))
- 		glibtop_error_io_r (server, "kvm_read (vmspace)");
- 
-@@ -244,6 +255,15 @@
- 			      &vnode, sizeof (vnode)) != sizeof (vnode))
- 			glibtop_error_io_r (server, "kvm_read (vnode)");
- 
-+#if __FreeBSD_version >= 500039
-+		switch (vnode.v_type) {
-+		    case VREG:
-+		    	maps [i-1].inode = vnode.v_cachedid;
-+			maps [i-1].device = vnode.v_cachedfs;
-+		    default:
-+		    	continue;
-+		}
-+#else
- 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
- 		    !vnode.v_data) continue;
- 
-@@ -252,13 +272,9 @@
+@@ -280,13 +282,9 @@
  			      &inode, sizeof (inode)) != sizeof (inode))
  			glibtop_error_io_r (server, "kvm_read (inode)");
  
@@ -69,7 +29,7 @@
 -			      (unsigned long) vnode.v_mount,
 -			      &mount, sizeof (mount)) != sizeof (mount))
 -			glibtop_error_io_r (server, "kvm_read (mount)");
--
+-#endif
  		maps [i-1].inode  = inode.i_number;
  		maps [i-1].device = inode.i_dev;
 +#endif
diff --git a/devel/libgtop2/files/patch-aj b/devel/libgtop2/files/patch-aj
deleted file mode 100644
index b7ea24ebab8e..000000000000
--- a/devel/libgtop2/files/patch-aj
+++ /dev/null
@@ -1,243 +0,0 @@
---- sysdeps/freebsd/proclist.c.orig	Thu May 27 23:04:05 1999
-+++ sysdeps/freebsd/proclist.c	Sun Sep  7 20:37:30 2003
-@@ -86,13 +86,24 @@
- 	pids = glibtop_realloc_r (server, pids, count * sizeof (unsigned));
- 	/* Copy the pids over to this chain */
- 	for (i=j=0; i < count; i++) {
-+#if __FreeBSD_version >= 500013
-+#define XXX_P_STAT	ki_stat
-+#define XXX_P_RUID	ki_ruid
-+#define XXX_P_PID	ki_pid
-+
-+#else
-+#define XXX_P_STAT	kp_proc.p_stat
-+#define XXX_P_RUID	kp_eproc.e_pcred.p_ruid
-+#define XXX_P_PID	kp_proc.p_pid
-+
-+#endif
- 		if ((real_which & GLIBTOP_EXCLUDE_IDLE) &&
--		    (pinfo[i].kp_proc.p_stat != SRUN))
-+		    (pinfo[i].XXX_P_STAT != SRUN))
- 			continue;
- 		else if ((real_which & GLIBTOP_EXCLUDE_SYSTEM) &&
--			 (pinfo[i].kp_eproc.e_pcred.p_ruid == 0))
-+			 (pinfo[i].XXX_P_RUID == 0))
- 			continue;
--		pids [j++] = (unsigned) pinfo[i].kp_proc.p_pid;
-+		pids [j++] = (unsigned) pinfo[i].XXX_P_PID;
- 	} /* end for */
- 	/* Set the fields in buf */
- 	buf->number = j;
---- sysdeps/freebsd/procstate.c.orig	Sun Oct 17 03:01:39 1999
-+++ sysdeps/freebsd/procstate.c	Sun Sep  7 20:37:30 2003
-@@ -28,7 +28,7 @@
- #include <glibtop_suid.h>
- 
- #if !defined(__OpenBSD__) 
--//&& (!defined __bsdi__)
-+/*&& (!defined __bsdi__)*/
- #include <sys/user.h>
- #endif
- 
-@@ -37,11 +37,7 @@
- (1L << GLIBTOP_PROC_STATE_GID);
- 
- static const unsigned long _glibtop_sysdeps_proc_state_new =
--#if LIBGTOP_VERSION_CODE >= 1001000
--(1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID);
--#else
- 0;
--#endif
- 
- /* Init function. */
- 
-@@ -76,43 +72,35 @@
- 		return;
- 	}
- 
--	strncpy (buf->cmd, pinfo [0].kp_proc.p_comm, sizeof (buf->cmd)-1);
--	buf->cmd [sizeof (buf->cmd)-1] = 0;
-+#if __FreeBSD_version >= 500013
-+#define	XXX_P_COMM	ki_comm
-+#define	XXX_P_SVUID	ki_svuid
-+#define	XXX_P_SVGID	ki_svgid
-+#define	XXX_P_RUID	ki_ruid
-+#define	XXX_P_RGID	ki_rgid
-+#define XXX_P_STAT	ki_stat
- 
--	buf->uid = pinfo [0].kp_eproc.e_pcred.p_svuid;
--	buf->gid = pinfo [0].kp_eproc.e_pcred.p_svgid;
-+#else
-+#define	XXX_P_COMM	kp_proc.p_comm
-+#define	XXX_P_SVUID	kp_eproc.e_pcred.p_svuid
-+#define	XXX_P_SVGID	kp_eproc.e_pcred.p_svgid
-+#define	XXX_P_RUID	kp_eproc.e_pcred.p_ruid
-+#define	XXX_P_RGID	kp_eproc.e_pcred.p_rgid
-+#define	XXX_P_STAT	kp_proc.p_stat
- 
--#if LIBGTOP_VERSION_CODE >= 1001000
--	buf->ruid = pinfo [0].kp_eproc.e_pcred.p_ruid;
--	buf->rgid = pinfo [0].kp_eproc.e_pcred.p_rgid;
- #endif
- 
-+	strncpy (buf->cmd, pinfo [0].XXX_P_COMM, sizeof (buf->cmd)-1);
-+	buf->cmd [sizeof (buf->cmd)-1] = 0;
-+
-+	buf->uid = pinfo [0].XXX_P_SVUID;
-+	buf->gid = pinfo [0].XXX_P_SVGID;
-+
- 	/* Set the flags for the data we're about to return*/
- 	buf->flags = _glibtop_sysdeps_proc_state |
- 		_glibtop_sysdeps_proc_state_new;
- 
--#if LIBGTOP_VERSION_CODE >= 1001000
--	switch (pinfo [0].kp_proc.p_stat) {
--	case SIDL:
--		buf->state = 0;
--		break;
--	case SRUN:
--		buf->state = GLIBTOP_PROCESS_RUNNING;
--		break;
--	case SSLEEP:
--		buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
--		break;
--	case SSTOP:
--		buf->state = GLIBTOP_PROCESS_STOPPED;
--		break;
--	case SZOMB:
--		buf->state = GLIBTOP_PROCESS_ZOMBIE;
--		break;
--	default:
--		return;
--	}
--#else
--	switch (pinfo [0].kp_proc.p_stat) {
-+	switch (pinfo [0].XXX_P_STAT) {
- 	case SIDL:
- 		buf->state = 'S';
- 		break;
-@@ -131,7 +119,6 @@
- 	default:
- 		return;
- 	}
--#endif
- 
- 	buf->flags |= (1L << GLIBTOP_PROC_STATE_STATE);
- }
---- sysdeps/freebsd/procuid.c.orig	Fri Sep 17 06:08:07 1999
-+++ sysdeps/freebsd/procuid.c	Sun Sep  7 20:37:30 2003
-@@ -84,17 +84,46 @@
- 		return;
- 	}
- 
--	buf->uid  = pinfo [0].kp_eproc.e_pcred.p_ruid;
--	buf->euid = pinfo [0].kp_eproc.e_pcred.p_svuid;
--	buf->gid  = pinfo [0].kp_eproc.e_pcred.p_rgid;
--	buf->egid = pinfo [0].kp_eproc.e_pcred.p_svgid;
--
--	buf->ppid  = pinfo [0].kp_eproc.e_ppid;
--	buf->pgrp  = pinfo [0].kp_eproc.e_pgid;
--	buf->tpgid = pinfo [0].kp_eproc.e_tpgid;
-+#if __FreeBSD_version >= 500013
- 
--	buf->nice     = pinfo [0].kp_proc.p_nice;
--	buf->priority = pinfo [0].kp_proc.p_priority;
-+#define	XXX_P_RUID	ki_ruid
-+#define	XXX_P_SVUID	ki_svuid
-+#define	XXX_P_RGID	ki_rgid
-+#define	XXX_P_SVGID	ki_svgid
-+#define	XXX_E_PPID	ki_ppid
-+#define	XXX_E_PGID	ki_pgid
-+#define	XXX_E_TPGID	ki_tpgid
-+#define	XXX_P_NICE	ki_nice
-+#if __FreeBSD_version >= 500013
-+#define	XXX_P_PRIORITY	ki_pri.pri_user
-+#else
-+#define	XXX_P_PRIORITY	ki_priority
-+#endif
-+#else
-+
-+#define	XXX_P_RUID	kp_eproc.e_pcred.p_ruid
-+#define	XXX_P_SVUID	kp_eproc.e_pcred.p_svuid
-+#define	XXX_P_RGID	kp_eproc.e_pcred.p_rgid
-+#define	XXX_P_SVGID	kp_eproc.e_pcred.p_svgid
-+#define	XXX_E_PPID	kp_eproc.e_ppid
-+#define	XXX_E_PGID	kp_eproc.e_pgid
-+#define	XXX_E_TPGID	kp_eproc.e_tpgid
-+#define	XXX_P_NICE	kp_proc.p_nice
-+#define	XXX_P_PRIORITY	kp_proc.p_priority
-+
-+#endif
-+
-+	buf->uid  = pinfo [0].XXX_P_RUID;
-+	buf->euid = pinfo [0].XXX_P_SVUID;
-+	buf->gid  = pinfo [0].XXX_P_RGID;
-+	buf->egid = pinfo [0].XXX_P_SVGID;
-+
-+	buf->ppid  = pinfo [0].XXX_E_PPID;
-+	buf->pgrp  = pinfo [0].XXX_E_PGID;
-+	buf->tpgid = pinfo [0].XXX_E_TPGID;
-+
-+	buf->nice     = pinfo [0].XXX_P_NICE;
-+	buf->priority = pinfo [0].XXX_P_PRIORITY;
- 
- 	/* Set the flags for the data we're about to return*/
- 	buf->flags = _glibtop_sysdeps_proc_uid;
---- sysdeps/freebsd/procsignal.c.orig	Mon Feb 14 06:31:39 2000
-+++ sysdeps/freebsd/procsignal.c	Sun Sep  7 20:37:30 2003
-@@ -67,11 +67,27 @@
- 		return;
- 	}
- 
-+#if __FreeBSD_version >= 500013
-+
-+#define	XXX_P_SIGLIST	ki_siglist
-+#define	XXX_P_SIGMASK	ki_sigmask
-+#define	XXX_P_SIGIGNORE	ki_sigignore
-+#define	XXX_P_SIGCATCH	ki_sigcatch
-+
-+#else
-+
-+#define	XXX_P_SIGLIST	kp_proc.p_siglist
-+#define	XXX_P_SIGMASK	kp_proc.p_sigmask
-+#define	XXX_P_SIGIGNORE	kp_proc.p_sigignore
-+#define	XXX_P_SIGCATCH	kp_proc.p_sigcatch
-+
-+#endif
-+
- 	/* signal: mask of pending signals.
- 	 *         pinfo [0].kp_proc.p_siglist
- 	 */
- #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--	buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
-+	buf->signal [0] = pinfo [0].XXX_P_SIGLIST.__bits[0];
- #else
- 	buf->signal [0] = pinfo [0].kp_proc.p_siglist;
- #endif
-@@ -80,7 +96,7 @@
- 	 *          pinfo [0].kp_proc.p_sigmask
- 	 */
- #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
-+	buf->blocked [0] = pinfo [0].XXX_P_SIGMASK.__bits[0];
- #else
- 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
- #endif
-@@ -89,7 +105,7 @@
- 	 *            pinfo [0].kp_proc.p_sigignore
- 	*/
- #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
-+	buf->sigignore [0] = pinfo [0].XXX_P_SIGIGNORE.__bits[0];
- #else
- 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
- #endif
-@@ -98,7 +114,7 @@
- 	 *           pinfo [0].kp_proc.p_sigcatch
- 	*/
- #if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
--	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
-+	buf->sigcatch [0] = pinfo [0].XXX_P_SIGCATCH.__bits[0];
- #else
- 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
- #endif
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
index e451557e7674..662f75ac3671 100644
--- a/devel/libgtop2/files/patch-configure
+++ b/devel/libgtop2/files/patch-configure
@@ -1,69 +1,15 @@
---- configure.orig	Tue Nov  4 14:55:15 2003
-+++ configure	Tue Nov  4 15:10:15 2003
-@@ -1580,10 +1580,10 @@
- 
- # The aliases save the names the user supplied, while $host etc.
- # will get canonicalized.
--test -n "$target_alias" &&
--  test "$program_prefix$program_suffix$program_transform_name" = \
--    NONENONEs,x,x, &&
--  program_prefix=${target_alias}-
-+#test -n "$target_alias" &&
-+#  test "$program_prefix$program_suffix$program_transform_name" = \
-+#    NONENONEs,x,x, &&
-+#  program_prefix=${target_alias}-
- # Making releases:
- #   LIBGTOP_MICRO_VERSION += 1;
- #   LIBGTOP_INTERFACE_AGE += 1;
-@@ -1886,9 +1886,9 @@
+--- configure.orig	Thu Mar 11 15:38:00 2004
++++ configure	Thu Mar 11 15:38:00 2004
+@@ -1917,9 +1917,9 @@
  
  # libtool versioning
  LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
--LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
--LT_REVISION=$LIBGTOP_INTERFACE_AGE
--LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
+-LT_CURRENT=$LIBGTOP_CURRENT
+-LT_REVISION=$LIBGTOP_REVISION
+-LT_AGE=$LIBGTOP_AGE
 +LT_CURRENT=2
 +LT_REVISION=0
 +LT_AGE=0
- LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
- 
- 
-@@ -20821,7 +20821,7 @@
- 
- 
-   # this should go away soon
--  need_gnome_support=yes
-+  need_gnome_support=no
- 
- 
- for ac_func in getopt_long
-@@ -30052,13 +30052,13 @@
- 
- fi;
- 
--if test "x$gnome_found" = xyes ; then
--  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
--  SUPPORTINCS="$GNOME_INCLUDEDIR"
--else
--  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
--  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
--fi
-+#if test "x$gnome_found" = xyes ; then
-+#  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
-+#  SUPPORTINCS="$GNOME_INCLUDEDIR"
-+#else
-+#  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
-+#  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
-+#fi
- 
- case "$GNOME_LIBS" in
- 	'*-lgnomesupport*' )
-@@ -30160,7 +30160,7 @@
+ LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
  
  
- if test x$libgtop_need_server = xyes ; then
--   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la"
-+   sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la \$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la"
-    server_programs='libgtop_server2'
- else
-    sysdeps_suid_lib=
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
index 0190c885d713..38583f8766a9 100644
--- a/devel/libgtop2/files/patch-lib::read.c
+++ b/devel/libgtop2/files/patch-lib::read.c
@@ -1,14 +1,14 @@
---- lib/read.c.orig	Fri May  7 07:09:24 1999
-+++ lib/read.c	Tue Sep  9 10:02:54 2003
-@@ -21,6 +21,7 @@
-    Boston, MA 02111-1307, USA.
+--- lib/read.c.orig	Mon Oct 20 11:19:41 2003
++++ lib/read.c	Fri Nov 14 14:37:00 2003
+@@ -22,6 +22,7 @@
  */
  
+ #include <config.h>
 +#include <errno.h>
  #include <glibtop/read.h>
+ #include <libgnome/gnome-i18n.h>
  
- /* Reads some data from server. */
-@@ -65,12 +66,16 @@
+@@ -68,12 +69,16 @@
  	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
  #endif
  
diff --git a/devel/libgtop2/files/patch-src::daemon::gnuserv.c b/devel/libgtop2/files/patch-src::daemon::gnuserv.c
deleted file mode 100644
index a398b2aca70d..000000000000
--- a/devel/libgtop2/files/patch-src::daemon::gnuserv.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/daemon/gnuserv.c.orig	Mon Oct 20 01:54:32 2003
-+++ src/daemon/gnuserv.c	Tue Nov  4 15:22:38 2003
-@@ -42,7 +42,7 @@
- #include <glibtop/gnuserv.h>
- 
- #include <errno.h>
--#include <popt-gnome.h>
-+#include <popt.h>
- 
- #include "daemon.h"
- 
-@@ -202,6 +202,12 @@
- 	
- 	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
- 	    syslog_message(LOG_WARNING, "Invalid data length supplied by client");
-+	    return FALSE;
-+	}
-+
-+	if (auth_data_len < 1 || auth_data_len > sizeof(buf)) {
-+	    syslog_message(LOG_WARNING,
-+			   "Invalid data length supplied by client");
- 	    return FALSE;
- 	}
- 
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c
index b4079dec132d..0a11649ced4d 100644
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ b/devel/libgtop2/files/patch-src::daemon::io.c
@@ -1,5 +1,5 @@
---- src/daemon/io.c.orig	Tue Sep  9 09:51:15 2003
-+++ src/daemon/io.c	Tue Sep  9 10:07:10 2003
+--- src/daemon/io.c.orig	Sun Oct 19 12:54:32 2003
++++ src/daemon/io.c	Mon Dec  1 13:50:25 2003
 @@ -21,6 +21,7 @@
     Boston, MA 02111-1307, USA.
  */
diff --git a/devel/libgtop2/files/patch-src_daemon_Makefile.in b/devel/libgtop2/files/patch-src_daemon_Makefile.in
deleted file mode 100644
index 04aa141eb588..000000000000
--- a/devel/libgtop2/files/patch-src_daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/daemon/Makefile.in.orig	Mon Apr 29 12:05:45 2002
-+++ src/daemon/Makefile.in	Mon Apr 29 12:12:14 2002
-@@ -92,7 +92,7 @@
- LIBGTOP_GUILE_NAMES_LIBS = @LIBGTOP_GUILE_NAMES_LIBS@
- LIBGTOP_INCS = @LIBGTOP_INCS@
- LIBGTOP_INTERFACE_AGE = @LIBGTOP_INTERFACE_AGE@
--LIBGTOP_LIBS = @LIBGTOP_LIBS@
-+LIBGTOP_LIBS =
- LIBGTOP_MAJOR_VERSION = @LIBGTOP_MAJOR_VERSION@
- LIBGTOP_MICRO_VERSION = @LIBGTOP_MICRO_VERSION@
- LIBGTOP_MINOR_VERSION = @LIBGTOP_MINOR_VERSION@
diff --git a/devel/libgtop2/files/patch-support_Makefile.in b/devel/libgtop2/files/patch-support_Makefile.in
deleted file mode 100644
index e7cf9ec0ab23..000000000000
--- a/devel/libgtop2/files/patch-support_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- support/Makefile.in.orig	Mon Apr 29 13:02:18 2002
-+++ support/Makefile.in	Mon Apr 29 13:03:33 2002
-@@ -146,7 +146,7 @@
- sysdeps_dir = @sysdeps_dir@
- sysdeps_suid_lib = @sysdeps_suid_lib@
- 
--supportexecincludedir = $(includedir)/gnome/$(GNOME_INTERFACE_VERSION)
-+supportexecincludedir = $(includedir)/libgtop-2.0
- 
- INCLUDES = -D_GNU_SOURCE
- 
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c b/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c
deleted file mode 100644
index 396ae9c8d7b6..000000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::prockernel.c
+++ /dev/null
@@ -1,145 +0,0 @@
---- sysdeps/freebsd/prockernel.c.orig	Sun Oct 17 03:31:43 1999
-+++ sysdeps/freebsd/prockernel.c	Tue Sep  9 11:36:35 2003
-@@ -34,12 +34,6 @@
- #if (!defined __OpenBSD__) && (!defined __bsdi__)
- #include <sys/user.h>
- #endif
--#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__))
--#include <machine/pcb.h>
--#endif
--#if defined(__FreeBSD__) && !defined(__alpha__)
--#include <machine/tss.h>
--#endif
- 
- #include <unistd.h>
- #include <fcntl.h>
-@@ -78,14 +72,8 @@
- 			   pid_t pid)
- {
- 	struct kinfo_proc *pinfo;
--	struct user *u_addr = (struct user *)USRSTACK;
--	struct pstats pstats;
--	struct pcb pcb;
- 	int count;
- 
--	char filename [BUFSIZ];
--	struct stat statb;
--
- 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_KERNEL), 0);
- 	
- 	memset (buf, 0, sizeof (glibtop_proc_kernel));
-@@ -98,14 +86,30 @@
- 	
- 	/* Get the process information */
- 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
--	if ((pinfo == NULL) || (count != 1))
--		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+	if ((pinfo == NULL) || (count != 1)) {
-+		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
-+		return;
-+	}
-+
-+#if __FreeBSD_version >= 500013
-+
-+#define	XXX_P_WCHAN	ki_wchan
-+#define	XXX_P_WMESG	ki_wmesg
-+#define	XXX_E_WMESG	ki_wmesg
- 
--	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
-+#else
-+
-+#define	XXX_P_WCHAN	kp_proc.p_wchan
-+#define	XXX_P_WMESG	kp_proc.p_wmesg
-+#define	XXX_E_WMESG	kp_eproc.e_wmesg
-+
-+#endif
-+
-+	buf->nwchan = (unsigned long) pinfo [0].XXX_P_WCHAN &~ KERNBASE;
- 	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
- 
--	if (pinfo [0].kp_proc.p_wchan && pinfo [0].kp_proc.p_wmesg) {
--		strncpy (buf->wchan, pinfo [0].kp_eproc.e_wmesg,
-+	if (pinfo [0].XXX_P_WCHAN && pinfo [0].XXX_P_WMESG) {
-+		strncpy (buf->wchan, pinfo [0].XXX_E_WMESG,
- 			 sizeof (buf->wchan) - 1);
- 		buf->wchan [sizeof (buf->wchan) - 1] = 0;
- 		buf->flags |= (1L << GLIBTOP_PROC_KERNEL_WCHAN);
-@@ -113,72 +117,10 @@
- 		buf->wchan [0] = 0;
- 	}
- 
--	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
--
--	/* [FIXME]: /usr/include/sys/user.h tells me that the user area
--	 *          may or may not be at the same kernel address in all
--	 *          processes, but I don't see any way to get that address.
--	 *          Since `ps' simply uses its own address, I think it's
--	 *          safe to do this here, too. */
--
--	/* NOTE: You need to mount the /proc filesystem to make
--	 *       `kvm_uread' work. */
--
--	sprintf (filename, "/proc/%d/mem", (int) pid);
--	if (stat (filename, &statb)) return;
--
--	glibtop_suid_enter (server);
--
--	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
--	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
--		       (unsigned long) &u_addr->u_stats,
--		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
--		{
--			/*
--			 * The u-area might be swapped out, and we can't get
--			 * at it because we have a crashdump and no swap.
--			 * If it's here fill in these fields, otherwise, just
--			 * leave them 0.
--			 */
--
--			buf->min_flt = (u_int64_t) pstats.p_ru.ru_minflt;
--			buf->maj_flt = (u_int64_t) pstats.p_ru.ru_majflt;
--			buf->cmin_flt = (u_int64_t) pstats.p_cru.ru_minflt;
--			buf->cmaj_flt = (u_int64_t) pstats.p_cru.ru_majflt;
--			
--			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
--		}
--
--	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
--	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
--		       (unsigned long) &u_addr->u_pcb,
--		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
--		{
--#ifdef __FreeBSD__
--#ifndef __alpha__
--#if (__FreeBSD_version >= 300003)
--			buf->kstk_esp = (u_int64_t) pcb.pcb_esp;
--			buf->kstk_eip = (u_int64_t) pcb.pcb_eip;
--#else
--			buf->kstk_esp = (u_int64_t) pcb.pcb_ksp;
--			buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
--#endif
--#else
--			/*xxx FreeBSD/Alpha? */
--#endif
--#else
--			buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0;
--#ifdef __bsdi__
--			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip;
--#else
--			buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip;
--#endif
--
--			buf->flags |= _glibtop_sysdeps_proc_kernel_pcb;
--#endif
--		}
--
--	/* Taken from `wchan ()' in `/usr/src/bin/ps/print.c'. */
--
--	glibtop_suid_leave (server);
-+	/* XXX: the code here was, quite frankly, junk, and almost
-+	 * certainly wrong - remove it all, leave these fields
-+	 * unpopulated, and give up until such time as the right
-+	 * code is produced for both FreeBSD 4.x and 5.x
-+	 */
-+	return;
- }
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
index 83e5080548ab..e61274b13864 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
@@ -1,6 +1,6 @@
---- sysdeps/freebsd/procmem.c.orig	Sun Oct 19 12:55:32 2003
-+++ sysdeps/freebsd/procmem.c	Sat Feb  7 22:48:12 2004
-@@ -117,7 +117,7 @@
+--- sysdeps/freebsd/procmem.c.orig	Wed Mar 10 21:23:52 2004
++++ sysdeps/freebsd/procmem.c	Thu Mar 11 15:46:05 2004
+@@ -125,7 +125,7 @@
  #else
  	struct vm_object object;
  #endif
@@ -9,53 +9,22 @@
  	int count;
  
  	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -137,15 +137,29 @@
- 		return;
- 	}
+@@ -160,15 +160,12 @@
+ 
+ #define        PROC_VMSPACE   kp_proc.p_vmspace
  
 -	if (kvm_read (server->machine.kd,
--		      (unsigned long) pinfo [0].kp_proc.p_limit,
+-		      (unsigned long) pinfo [0].PROC_VMSPACE,
 -		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
 -		glibtop_warn_io_r (server, "kvm_read (plimit)");
-+#if __FreeBSD_version >= 500013
-+
-+#define	XXX_P_VMSPACE	ki_vmspace
-+
-+	buf->rss_rlim = pinfo [0].ki_rssize;
-+
-+	buf->vsize = (u_int64_t) pinfo [0].ki_size;
-+	buf->size = (u_int64_t) pagetok
-+		(pinfo [0].ki_tsize + pinfo [0].ki_dsize + pinfo[0].ki_ssize)
-+			<< LOG1024;
-+	buf->resident = buf->rss = (u_int64_t) pagetok
-+		(pinfo [0].ki_rssize) << LOG1024;
-+
-+#else
-+
-+#define	XXX_P_VMSPACE	kp_proc.p_vmspace
-+
 +	if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+	    	glibtop_warn_io_r (server, "getrlimit");
++		glibtop_warn_io_r (server, "getrlimit");
  		return;
  	}
  
--	buf->rss_rlim = (u_int64_t) 
+-	buf->rss_rlim = (guint64) 
 -		(plimit.pl_rlimit [RLIMIT_RSS].rlim_cur);
 +	buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur);
  	
  	vms = &pinfo [0].kp_eproc.e_vm;
  
-@@ -154,11 +168,12 @@
- 	
- 	buf->resident = buf->rss = (u_int64_t) pagetok
- 		(vms->vm_rssize) << LOG1024;
-+#endif
- 
- 	/* Now we get the shared memory. */
- 
- 	if (kvm_read (server->machine.kd,
--		      (unsigned long) pinfo [0].kp_proc.p_vmspace,
-+		      (unsigned long) pinfo [0].XXX_P_VMSPACE,
- 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) {
- 		glibtop_warn_io_r (server, "kvm_read (vmspace)");
- 		return;
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
index 8905fd21ba83..37b5b56df49a 100644
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
@@ -1,30 +1,20 @@
---- sysdeps/freebsd/proctime.c.orig	Thu Feb 15 06:36:42 2001
-+++ sysdeps/freebsd/proctime.c	Tue Sep  9 11:17:56 2003
-@@ -57,6 +57,7 @@
-  * system, and interrupt time usage.
-  */
+--- sysdeps/freebsd/proctime.c.orig	Wed Mar 10 21:23:52 2004
++++ sysdeps/freebsd/proctime.c	Thu Mar 11 15:47:35 2004
+@@ -59,6 +59,7 @@
+ 
+ #ifndef __FreeBSD__
  
 +#ifndef __FreeBSD__
  static void
  calcru(p, up, sp, ip)
       struct proc *p;
-@@ -66,9 +67,6 @@
- {
- 	quad_t totusec;
- 	u_quad_t u, st, ut, it, tot;
--#if (__FreeBSD_version < 300003)
--        long sec, usec;
--#endif
-         struct timeval tv;
- 
- 	st = p->p_sticks;
-@@ -81,19 +79,10 @@
+@@ -81,19 +82,10 @@
  		tot = 1;
  	}
  
 -#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
 -
--	/* This was changed from a `struct timeval' into a `u_int64_t'
+-	/* This was changed from a `struct timeval' into a `guint64'
 -	 * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
 -	 */
 -
@@ -38,116 +28,21 @@
  
  	if (totusec < 0) {
  		/* XXX no %qd in kernel.  Truncate. */
-@@ -116,6 +105,7 @@
+@@ -116,6 +108,7 @@
  		ip->tv_usec = it % 1000000;
  	}
  }
 +#endif
  
- /* Provides detailed information about a process. */
+ #endif /* !__FreeBSD__ */
  
-@@ -132,9 +122,6 @@
+@@ -133,9 +126,6 @@
+ #endif
  	struct pstats pstats;
  	int count;
- 
+-
 -	char filename [BUFSIZ];
 -	struct stat statb;
--
+ 
  	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0);
  	
- 	memset (buf, 0, sizeof (glibtop_proc_time));
-@@ -142,25 +129,23 @@
- 	/* It does not work for the swapper task. */
- 	if (pid == 0) return;
- 	
--#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
-+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
- 	if (server->sysdeps.proc_time == 0)
- 		return;
- 
--#ifndef __bsdi__
--	sprintf (filename, "/proc/%d/mem", (int) pid);
--	if (stat (filename, &statb)) return;
--#endif
- #endif
- 
- 	/* Get the process information */
- 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
--	if ((pinfo == NULL) || (count != 1))
--		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+	if ((pinfo == NULL) || (count != 1)) {
-+		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
-+		return;
-+	}
- 
--#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
--	buf->rtime = pinfo [0].kp_proc.p_runtime;
-+#if (defined __FreeBSD__) && (__FreeBSD_version >= 500013)
-+	buf->rtime = pinfo [0].ki_runtime;
- #else
--	buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
-+	buf->rtime = pinfo [0].kp_proc.p_runtime;
- #endif
- 
- 	buf->frequency = 1000000;
-@@ -192,6 +177,21 @@
- 
- 	buf->flags |= _glibtop_sysdeps_proc_time_user;
- #else
-+#if __FreeBSD_version >= 500013
-+#if __FreeBSD_version >= 500016
-+	if ((pinfo [0].ki_sflag & PS_INMEM)) {
-+#else
-+	if ((pinfo [0].ki_flag & P_INMEM)) {
-+#endif
-+	    buf->utime = pinfo [0].ki_runtime;
-+	    buf->stime = 0; /* XXX */
-+	    buf->cutime = tv2sec (pinfo [0].ki_childtime);
-+	    buf->cstime = 0; /* XXX */
-+	    buf->start_time = tv2sec (pinfo [0].ki_start);
-+	    buf->flags |= _glibtop_sysdeps_proc_time_user;
-+	}
-+
-+#else
- 	glibtop_suid_enter (server);
- 
- 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-@@ -199,31 +199,17 @@
- 		       (unsigned long) &u_addr->u_stats,
- 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
- 		{
--			/* This is taken form the kernel source code of
--			 * FreeBSD 2.2.6. */
--
--			/* Well, we just do the same getrusage () does ... */
--
--			register struct rusage *rup;
- 
-+			buf->utime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_utime);
-+			buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
-+			buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
-+			buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
-+			buf->start_time = tv2sec (pinfo[0].kp_eproc.e_stats.p_start);
-+			buf->flags |= _glibtop_sysdeps_proc_time_user;
- 			glibtop_suid_leave (server);
--
--			rup = &pstats.p_ru;
--			calcru(&(pinfo [0]).kp_proc,
--			       &rup->ru_utime, &rup->ru_stime, NULL);
--
--			buf->utime = tv2sec (pstats.p_ru.ru_utime);
--			buf->stime = tv2sec (pstats.p_ru.ru_stime);
--			
--			buf->cutime = tv2sec (pstats.p_cru.ru_utime);
--			buf->cstime = tv2sec (pstats.p_cru.ru_stime);
--
--			buf->start_time = tv2sec (pstats.p_start);
--
--			buf->flags = _glibtop_sysdeps_proc_time_user;
- 		}
--
- 	glibtop_suid_leave (server);
-+#endif
- #endif
- }
- 
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
new file mode 100644
index 000000000000..b64ec49863bf
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
@@ -0,0 +1,29 @@
+--- sysdeps/common/fsusage.c.orig	Thu Mar 11 15:53:36 2004
++++ sysdeps/common/fsusage.c	Thu Mar 11 15:56:37 2004
+@@ -28,7 +28,7 @@
+ # endif
+ #endif
+ #ifndef UINTMAX_MAX
+-# define UINTMAX_MAX ((uintmax_t) -1)
++# define UINTMAX_MAX ((uint64_t) -1)
+ #endif
+ 
+ #include <sys/types.h>
+@@ -84,7 +84,7 @@
+    a uintmax_t value that is all 1 bits if X is all 1 bits, even if X
+    is unsigned and narrower than uintmax_t.  */
+ #define PROPAGATE_ALL_ONES(x) \
+-  ((sizeof (x) < sizeof (uintmax_t) \
++  ((sizeof (x) < sizeof (uint64_t) \
+     && (~ (x) == (sizeof (x) < sizeof (int) \
+ 		  ? - (1 << (sizeof (x) * CHAR_BIT)) \
+ 		  : 0))) \
+@@ -92,7 +92,7 @@
+ 
+ /* Extract the top bit of X as an uintmax_t value.  */
+ #define EXTRACT_TOP_BIT(x) ((x) \
+-			    & ((uintmax_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
++			    & ((uint64_t) 1 << (sizeof (x) * CHAR_BIT - 1)))
+ 
+ /* If a value is negative, many space usage primitives store it into an
+    integer variable by assignment, even if the variable's type is unsigned.
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.h b/devel/libgtop2/files/patch-sysdeps_common_fsusage.h
new file mode 100644
index 000000000000..bca23d9aea9d
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_common_fsusage.h
@@ -0,0 +1,25 @@
+--- sysdeps/common/fsusage.h.orig	Thu Mar 11 15:54:03 2004
++++ sysdeps/common/fsusage.h	Thu Mar 11 15:56:12 2004
+@@ -20,15 +20,17 @@
+ #if !defined FSUSAGE_H_
+ # define FSUSAGE_H_
+ 
++#include <sys/types.h>
++
+ struct fs_usage
+ {
+   int fsu_blocksize;		/* Size of a block.  */
+-  uintmax_t fsu_blocks;		/* Total blocks. */
+-  uintmax_t fsu_bfree;		/* Free blocks available to superuser. */
+-  uintmax_t fsu_bavail;		/* Free blocks available to non-superuser. */
++  uint64_t fsu_blocks;		/* Total blocks. */
++  uint64_t fsu_bfree;		/* Free blocks available to superuser. */
++  uint64_t fsu_bavail;		/* Free blocks available to non-superuser. */
+   int fsu_bavail_top_bit_set;	/* 1 if fsu_bavail represents a value < 0.  */
+-  uintmax_t fsu_files;		/* Total file nodes. */
+-  uintmax_t fsu_ffree;		/* Free file nodes. */
++  uint64_t fsu_files;		/* Total file nodes. */
++  uint64_t fsu_ffree;		/* Free file nodes. */
+ };
+ 
+ # ifndef PARAMS
diff --git a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c
index 31b0d3288347..62269380b46b 100644
--- a/devel/libgtop2/files/patch-sysdeps_common_mountlist.c
+++ b/devel/libgtop2/files/patch-sysdeps_common_mountlist.c
@@ -1,6 +1,6 @@
---- sysdeps/common/mountlist.c.orig	Fri Dec 19 12:23:02 2003
-+++ sysdeps/common/mountlist.c	Fri Dec 19 12:23:41 2003
-@@ -136,7 +136,7 @@
+--- sysdeps/common/mountlist.c.orig	Mon Dec  1 13:59:28 2003
++++ sysdeps/common/mountlist.c	Mon Dec  1 16:13:15 2003
+@@ -127,7 +127,7 @@
  }
  #endif /* MOUNTED_GETMNTENT1.  */
  
@@ -9,12 +9,12 @@
  static char *
  fstype_to_string (t)
       short t;
-@@ -354,7 +354,7 @@
- 	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
- 	me->me_devname = xstrdup (fsp->f_mntfromname);
- 	me->me_mountdir = xstrdup (fsp->f_mntonname);
+@@ -345,7 +345,7 @@
+ 	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+ 	me->me_devname = g_strdup (fsp->f_mntfromname);
+ 	me->me_mountdir = g_strdup (fsp->f_mntonname);
 -#if defined(__NetBSD__) || defined(__OpenBSD__)
 +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- 	me->me_type = xstrdup (fsp->f_fstypename);
+ 	me->me_type = g_strdup (fsp->f_fstypename);
  #else
- 	me->me_type = xstrdup (fstype_to_string (fsp->f_type));
+ 	me->me_type = g_strdup (fstype_to_string (fsp->f_type));
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
new file mode 100644
index 000000000000..16bcbb055472
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
@@ -0,0 +1,20 @@
+--- sysdeps/freebsd/Makefile.in.orig	Sun Feb 15 16:13:22 2004
++++ sysdeps/freebsd/Makefile.in	Sun Feb 15 16:16:05 2004
+@@ -138,7 +138,7 @@
+ 
+ noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
+ 
+-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c
+ 
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ 
+@@ -172,7 +172,7 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libgtop_sysdeps_2_0_la_LIBADD = 
+-libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo
++libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo
+ libgtop_sysdeps_suid_2_0_la_LIBADD = 
+ libgtop_sysdeps_suid_2_0_la_OBJECTS =  open.lo close.lo siglist.lo \
+ cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c b/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c
deleted file mode 100644
index 2aa4b753479f..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_mem.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysdeps/freebsd/mem.c.orig	Tue Jan 14 17:22:18 2003
-+++ sysdeps/freebsd/mem.c	Tue Jan 14 17:22:28 2003
-@@ -75,7 +75,7 @@
- 
- /* MIB array for sysctl */
- static int mib_length=2;
--#ifdef __bsdi__
-+#ifndef VM_METER
- static int mib [] = { CTL_VM, VM_TOTAL };
- #else
- static int mib [] = { CTL_VM, VM_METER };
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c b/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
deleted file mode 100644
index 0e72ddb7853c..000000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_netload.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- sysdeps/freebsd/netload.c.orig	Mon Oct 20 01:55:32 2003
-+++ sysdeps/freebsd/netload.c	Fri Nov 14 23:09:15 2003
-@@ -83,6 +83,7 @@
-     u_long ifnetaddr, ifnetfound, ifaddraddr;
-     struct sockaddr *sa;
-     char tname [16];
-+    char temp [16];
- 
-     union {
- 	struct ifaddr ifa;
-@@ -109,10 +110,13 @@
- 			  sizeof (ifnet)) != sizeof (ifnet))
- 		    glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
- 
--#if defined(__FreeBSD__) || defined(__bsdi__)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__)
- 	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
- 			  tname, 16) != 16)
- 		    glibtop_error_io_r (server, "kvm_read (if_name)");
-+	    snprintf(temp, (15 - strlen(tname)), "%d", ifnet.if_unit);
-+	    strcat(tname, temp);
-+	    tname [15] = 0;
- #else
- 	    strncpy (tname, ifnet.if_xname, 16);
- 	    tname [15] = 0;
-@@ -140,39 +144,39 @@
- 		sin = (struct sockaddr_in *)sa;
- 
- 		if (ifnet.if_flags & IFF_UP)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_UP;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_UP);
- 		if (ifnet.if_flags & IFF_BROADCAST)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_BROADCAST;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_BROADCAST);
- 		if (ifnet.if_flags & IFF_DEBUG)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_DEBUG;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_DEBUG);
- 		if (ifnet.if_flags & IFF_LOOPBACK)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_LOOPBACK;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LOOPBACK);
- 		if (ifnet.if_flags & IFF_POINTOPOINT)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_POINTOPOINT;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_POINTOPOINT);
- 		if (ifnet.if_flags & IFF_RUNNING)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_RUNNING;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_RUNNING);
- 		if (ifnet.if_flags & IFF_NOARP)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_NOARP;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_NOARP);
- 		if (ifnet.if_flags & IFF_PROMISC)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_PROMISC;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_PROMISC);
- 		if (ifnet.if_flags & IFF_ALLMULTI)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_ALLMULTI;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALLMULTI);
- 		if (ifnet.if_flags & IFF_OACTIVE)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_OACTIVE;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_OACTIVE);
- 		if (ifnet.if_flags & IFF_SIMPLEX)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_SIMPLEX;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_SIMPLEX);
- 		if (ifnet.if_flags & IFF_LINK0)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK0;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK0);
- 		if (ifnet.if_flags & IFF_LINK1)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK1;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK1);
- 		if (ifnet.if_flags & IFF_LINK2)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_LINK2;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_LINK2);
- #ifdef __FreeBSD__
- 		if (ifnet.if_flags & IFF_ALTPHYS)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_ALTPHYS;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_ALTPHYS);
- #endif
- 		if (ifnet.if_flags & IFF_MULTICAST)
--			buf->if_flags |= GLIBTOP_IF_FLAGS_MULTICAST;
-+			buf->if_flags |= (1L << GLIBTOP_IF_FLAGS_MULTICAST);
- 
- #if !defined(__bsdi__)
- 		/* Commenting out to "fix" #13345. */
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c
new file mode 100644
index 000000000000..7dbba8c37ab1
--- /dev/null
+++ b/devel/libgtop2/files/patch-sysdeps_freebsd_uptime.c
@@ -0,0 +1,13 @@
+--- sysdeps/freebsd/uptime.c.orig	Thu Mar 11 15:59:16 2004
++++ sysdeps/freebsd/uptime.c	Thu Mar 11 15:59:38 2004
+@@ -68,9 +68,8 @@
+ 		buf->flags = _glibtop_sysdeps_uptime;
+ 	}
+ #else
+-	buf->flags = _glibtop_sysdeps_uptime;
+-
+ 	glibtop_cpu cpu;
++	buf->flags = _glibtop_sysdeps_uptime;
+ 
+ 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0);
+ 	
diff --git a/devel/libgtop2/pkg-descr b/devel/libgtop2/pkg-descr
index be81b3b48135..f263f1127244 100644
--- a/devel/libgtop2/pkg-descr
+++ b/devel/libgtop2/pkg-descr
@@ -1,3 +1,3 @@
-This is library for the gtop2, the GNOME 2.0 version of top command.
-The top command is a tool to display  and  update information about the
-top cpu processes.
+This library provides the backend for gtop2, a GNOME 2.0 version
+of top(1) that allows display and manipulation of running
+processes.
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index bb6b1079e8c4..e7d4a4b74b93 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -40,28 +40,12 @@ include/libgtop-2.0/glibtop/union.h
 include/libgtop-2.0/glibtop/uptime.h
 include/libgtop-2.0/glibtop/version.h
 include/libgtop-2.0/glibtop/write.h
-include/libgtop-2.0/glibtop/xmalloc.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 include/libgtop-2.0/glibtop_suid.h
 lib/libgtop-2.0.a
 lib/libgtop-2.0.so
 lib/libgtop-2.0.so.2
-lib/libgtop_common-2.0.a
-lib/libgtop_common-2.0.so
-lib/libgtop_common-2.0.so.2
-lib/libgtop_names-2.0.a
-lib/libgtop_names-2.0.so
-lib/libgtop_names-2.0.so.2
-lib/libgtop_suid_common-2.0.a
-lib/libgtop_suid_common-2.0.so
-lib/libgtop_suid_common-2.0.so.2
-lib/libgtop_sysdeps-2.0.a
-lib/libgtop_sysdeps-2.0.so
-lib/libgtop_sysdeps-2.0.so.2
-lib/libgtop_sysdeps_suid-2.0.a
-lib/libgtop_sysdeps_suid-2.0.so
-lib/libgtop_sysdeps_suid-2.0.so.2
 libdata/pkgconfig/libgtop-2.0.pc
 share/locale/am/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
@@ -84,6 +68,7 @@ share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
 share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/he/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hi/LC_MESSAGES/libgtop-2.0.mo
+share/locale/hr/LC_MESSAGES/libgtop-2.0.mo
 share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
 share/locale/id/LC_MESSAGES/libgtop-2.0.mo
 share/locale/it/LC_MESSAGES/libgtop-2.0.mo