Remove these ports now that they have been merged into the ports tree.

Next stop, GNOME 2.9!


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3045 df743ca5-7f9a-e211-a948-0013205c9059

114 files changed, 0 insertions, 3773 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
deleted file mode 100644
index a801a0e9e..000000000
--- a/devel/ORBit2/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:   orbit2
-# Date Created:			16 Aug 1998
-# Whom:				Chia-liang Kao <clkao@CirX.ORG>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ORBit2
-PORTVERSION=	2.12.0
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	High-performance CORBA ORB with support for the C language
-
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-USE_GNOME=	gnomehack libidl
-CONFIGURE_ARGS=	--disable-indent \
-		--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/src/idl-compiler/orbit-idl-backend.c \
-		${WRKSRC}/src/orb/orb-core/orbit-typelib.c
-
-post-install:
-	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbit2rc.default
-	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbit2rc.default
-	@if [ ! -f ${PREFIX}/etc/orbit2rc ]; then \
-		${CP} -p ${PREFIX}/etc/orbit2rc.default ${PREFIX}/etc/orbit2rc ; \
-	fi
-
-.include <bsd.port.mk>
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
deleted file mode 100644
index d71eaba0c..000000000
--- a/devel/ORBit2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/ORBit2-2.12.0.tar.bz2) = d7f0c2b9bee73b89978a9968c10f81fe
-SIZE (gnome2/ORBit2-2.12.0.tar.bz2) = 666898
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
deleted file mode 100644
index 281d27bbf..000000000
--- a/devel/ORBit2/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 = .
- 
-@@ -125,7 +125,7 @@
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- 
--SUBDIRS = linc2 src include test docs
-+SUBDIRS = linc2 src include docs
- 
- bin_SCRIPTS = orbit2-config
- 
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
deleted file mode 100644
index e048ca634..000000000
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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			\
--	-DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\"	\
-+	-DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\"	\
- 	-DORBIT2_INTERNAL_API				\
- 	$(WARN_CFLAGS)					\
- 	$(ORBIT_DEBUG_CFLAGS)				\
diff --git a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
deleted file mode 100644
index 8ae3c7644..000000000
--- a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/idl-compiler/orbit-idl-backend.c.orig	Tue Oct  1 23:32:46 2002
-+++ src/idl-compiler/orbit-idl-backend.c	Sun May 11 20:51:19 2003
-@@ -38,6 +38,8 @@
- 	char **strv;
- 	int    i;
- 
-+	paths = g_slist_prepend (paths, "%%X11BASE%%/lib/orbit-2.0/idl-backends");
-+
- 	if (!(val = getenv ("GNOME2_PATH")))
- 		return paths;
- 
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
deleted file mode 100644
index 44dfb3fb0..000000000
--- a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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));
-+	add_if_unique(paths, "%%X11BASE%%", TRUE);
-+	add_if_unique(paths, "%%LOCALBASE%%", TRUE);
- 
- 	if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) {
- 		char **strv;
diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr
deleted file mode 100644
index 57ee9653d..000000000
--- a/devel/ORBit2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-ORBit is a high-performance CORBA ORB with support for the C language.
-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
deleted file mode 100644
index 41bfc92d7..000000000
--- a/devel/ORBit2/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-bin/linc-cleanup-sockets
-bin/orbit-idl-2
-bin/orbit2-config
-@unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi
-etc/orbit2rc.default
-@exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi
-include/orbit-2.0/ORBitservices/CosNaming.h
-include/orbit-2.0/ORBitservices/CosNaming_impl.h
-include/orbit-2.0/ORBitservices/orbit-imodule.h
-include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/dynamic/dynamic-defs.h
-include/orbit-2.0/orbit/dynamic/dynamic.h
-include/orbit-2.0/orbit/orb-core/allocators.h
-include/orbit-2.0/orbit/orb-core/corba-any-type.h
-include/orbit-2.0/orbit/orb-core/corba-any.h
-include/orbit-2.0/orbit/orb-core/corba-context-type.h
-include/orbit-2.0/orbit/orb-core/corba-context.h
-include/orbit-2.0/orbit/orb-core/corba-defs.h
-include/orbit-2.0/orbit/orb-core/corba-environment-type.h
-include/orbit-2.0/orbit/orb-core/corba-environment.h
-include/orbit-2.0/orbit/orb-core/corba-nvlist.h
-include/orbit-2.0/orbit/orb-core/corba-object-type.h
-include/orbit-2.0/orbit/orb-core/corba-object.h
-include/orbit-2.0/orbit/orb-core/corba-orb-type.h
-include/orbit-2.0/orbit/orb-core/corba-orb.h
-include/orbit-2.0/orbit/orb-core/corba-pobj.h
-include/orbit-2.0/orbit/orb-core/corba-policy-type.h
-include/orbit-2.0/orbit/orb-core/corba-string.h
-include/orbit-2.0/orbit/orb-core/corba-typecode-type.h
-include/orbit-2.0/orbit/orb-core/corba-typecode.h
-include/orbit-2.0/orbit/orb-core/iop-defs.h
-include/orbit-2.0/orbit/orb-core/orb-core-types.h
-include/orbit-2.0/orbit/orb-core/orb-core.h
-include/orbit-2.0/orbit/orb-core/orb-types.h
-include/orbit-2.0/orbit/orb-core/orbit-interface.h
-include/orbit-2.0/orbit/orb-core/orbit-object.h
-include/orbit-2.0/orbit/orb-core/orbit-small.h
-include/orbit-2.0/orbit/orbit-config.h
-include/orbit-2.0/orbit/orbit-types.h
-include/orbit-2.0/orbit/orbit.h
-include/orbit-2.0/orbit/poa/orbit-adaptor.h
-include/orbit-2.0/orbit/poa/poa-basics.h
-include/orbit-2.0/orbit/poa/poa-defs.h
-include/orbit-2.0/orbit/poa/poa-policy.h
-include/orbit-2.0/orbit/poa/poa-types.h
-include/orbit-2.0/orbit/poa/poa.h
-include/orbit-2.0/orbit/poa/portableserver-current-type.h
-include/orbit-2.0/orbit/poa/portableserver-poa-type.h
-include/orbit-2.0/orbit/util/basic_types.h
-include/orbit-2.0/orbit/util/orbit-genrand.h
-include/orbit-2.0/orbit/util/orbit-util.h
-lib/libORBit-2.a
-lib/libORBit-2.so
-lib/libORBit-2.so.0
-lib/libORBit-imodule-2.a
-lib/libORBit-imodule-2.so
-lib/libORBit-imodule-2.so.0
-lib/libORBitCosNaming-2.a
-lib/libORBitCosNaming-2.so
-lib/libORBitCosNaming-2.so.0
-lib/libname-server-2.a
-libdata/pkgconfig/ORBit-2.0.pc
-libdata/pkgconfig/ORBit-CosNaming-2.0.pc
-libdata/pkgconfig/ORBit-idl-2.0.pc
-libdata/pkgconfig/ORBit-imodule-2.0.pc
-share/aclocal/ORBit2.m4
-share/idl/orbit-2.0/CosNaming.idl
-@dirrm share/idl/orbit-2.0
-@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
-@dirrm include/orbit-2.0/orbit/poa
-@dirrm include/orbit-2.0/orbit/orb-core
-@dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit
-@dirrm include/orbit-2.0/orbit-idl
-@dirrm include/orbit-2.0/ORBitservices
-@dirrm include/orbit-2.0
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
deleted file mode 100644
index 83f0bfc08..000000000
--- a/devel/bugbuddy2/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	bugbuddy2
-# Date created:				14 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	bugbuddy2
-PORTVERSION=	2.8.0
-PORTREVISION=	1
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.8
-DISTNAME=	bug-buddy-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A bug reporting tool for GNOME 2
-
-USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_REINPLACE=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL_VER=15
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
-GNOME_DESKTOP_VERSION=2
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-MAN1=		bug-buddy.1
-GCONF_SCHEMAS=	bug-buddy.schemas
-
-.include <bsd.port.mk>
diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo
deleted file mode 100644
index 0b776637f..000000000
--- a/devel/bugbuddy2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea
-SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303
diff --git a/devel/bugbuddy2/pkg-descr b/devel/bugbuddy2/pkg-descr
deleted file mode 100644
index 7268130ab..000000000
--- a/devel/bugbuddy2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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>
-
-WWW: http://www.gnome.org/
diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist
deleted file mode 100644
index 5e430bc98..000000000
--- a/devel/bugbuddy2/pkg-plist
+++ /dev/null
@@ -1,95 +0,0 @@
-bin/bug-buddy
-share/gnome/application-registry/bug-buddy.applications
-share/gnome/applications/bug-buddy-core.desktop
-share/gnome/applications/bug-buddy.desktop
-share/gnome/bug-buddy/bug-buddy.glade
-share/gnome/bug-buddy/bug-buddy.png
-share/gnome/bug-buddy/bugzilla/gnome.bugzilla
-share/gnome/bug-buddy/bugzilla/gnome/config
-share/gnome/bug-buddy/bugzilla/gnome/mostfreq
-share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/bugzilla/ximian.bugzilla
-share/gnome/bug-buddy/bugzilla/ximian/config
-share/gnome/bug-buddy/bugzilla/ximian/mostfreq
-share/gnome/bug-buddy/bugzilla/ximian/products
-share/gnome/bug-buddy/gdb-cmd
-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/mime-info/bug-buddy.keys
-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/pixmaps/bug-buddy.png
-share/locale/am/LC_MESSAGES/bug-buddy.mo
-share/locale/ar/LC_MESSAGES/bug-buddy.mo
-share/locale/az/LC_MESSAGES/bug-buddy.mo
-share/locale/be/LC_MESSAGES/bug-buddy.mo
-share/locale/bg/LC_MESSAGES/bug-buddy.mo
-share/locale/bn/LC_MESSAGES/bug-buddy.mo
-share/locale/bs/LC_MESSAGES/bug-buddy.mo
-share/locale/ca/LC_MESSAGES/bug-buddy.mo
-share/locale/cs/LC_MESSAGES/bug-buddy.mo
-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
-share/locale/fa/LC_MESSAGES/bug-buddy.mo
-share/locale/fi/LC_MESSAGES/bug-buddy.mo
-share/locale/fr/LC_MESSAGES/bug-buddy.mo
-share/locale/ga/LC_MESSAGES/bug-buddy.mo
-share/locale/gl/LC_MESSAGES/bug-buddy.mo
-share/locale/gu/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/is/LC_MESSAGES/bug-buddy.mo
-share/locale/it/LC_MESSAGES/bug-buddy.mo
-share/locale/ja/LC_MESSAGES/bug-buddy.mo
-share/locale/ko/LC_MESSAGES/bug-buddy.mo
-share/locale/lt/LC_MESSAGES/bug-buddy.mo
-share/locale/lv/LC_MESSAGES/bug-buddy.mo
-share/locale/mk/LC_MESSAGES/bug-buddy.mo
-share/locale/ml/LC_MESSAGES/bug-buddy.mo
-share/locale/mn/LC_MESSAGES/bug-buddy.mo
-share/locale/ms/LC_MESSAGES/bug-buddy.mo
-share/locale/nb/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/or/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
-share/locale/ro/LC_MESSAGES/bug-buddy.mo
-share/locale/ru/LC_MESSAGES/bug-buddy.mo
-share/locale/sk/LC_MESSAGES/bug-buddy.mo
-share/locale/sl/LC_MESSAGES/bug-buddy.mo
-share/locale/sq/LC_MESSAGES/bug-buddy.mo
-share/locale/sr/LC_MESSAGES/bug-buddy.mo
-share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
-share/locale/sv/LC_MESSAGES/bug-buddy.mo
-share/locale/ta/LC_MESSAGES/bug-buddy.mo
-share/locale/th/LC_MESSAGES/bug-buddy.mo
-share/locale/tr/LC_MESSAGES/bug-buddy.mo
-share/locale/uk/LC_MESSAGES/bug-buddy.mo
-share/locale/vi/LC_MESSAGES/bug-buddy.mo
-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/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
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
deleted file mode 100644
index 708aee02b..000000000
--- a/devel/desktop-file-utils/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for:	desktop-file-utils
-# Date created:			11 Jun 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		desktop-file-utils
-PORTVERSION=		0.9
-CATEGORIES=		devel
-MASTER_SITES=		http://freedesktop.org/Software/desktop-file-utils/releases/
-
-MAINTAINER=		jylefort@brutele.be
-COMMENT=		A couple of command line utilities for working with desktop entries
-
-LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt
-
-# This port contains no X program but it might install a GnomeVFS
-# module and thus we need to use the same prefix as GnomeVFS.
-USE_X_PREFIX=		yes
-
-USE_GNOME=		glib20
-WANT_GNOME=		yes
-USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	15
-
-CONFIGURE_ARGS=		--with-lispdir=${PREFIX}/share/emacs/site-lisp
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mgnomevfs2} != ""
-USE_GNOME+=		gnomevfs2
-PLIST_SUB+=		GNOME_VFS=""
-.else
-PLIST_SUB+=		GNOME_VFS="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/eggdirfuncs.c
-
-post-install:
-.if !defined(PACKAGE_BUILDING)
-	-@${PREFIX}/bin/update-desktop-database -q
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/desktop-file-utils/distinfo b/devel/desktop-file-utils/distinfo
deleted file mode 100644
index a68f8fb01..000000000
--- a/devel/desktop-file-utils/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (desktop-file-utils-0.9.tar.gz) = d1f3e0ff6681dba1624b3c57a2d60d38
-SIZE (desktop-file-utils-0.9.tar.gz) = 424432
diff --git a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c b/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c
deleted file mode 100644
index 291b9ecef..000000000
--- a/devel/desktop-file-utils/files/patch-src::eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/eggdirfuncs.c.orig	Thu Sep  2 15:44:39 2004
-+++ src/eggdirfuncs.c	Tue Sep 21 01:24:07 2004
-@@ -106,7 +106,7 @@
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "%%X11BASE%%/share/:/usr/local/share/:/usr/share/:%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:/usr/share/gnome/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
diff --git a/devel/desktop-file-utils/files/patch-src::menu-method.c b/devel/desktop-file-utils/files/patch-src::menu-method.c
deleted file mode 100644
index 5b16fe8a6..000000000
--- a/devel/desktop-file-utils/files/patch-src::menu-method.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/menu-method.c.orig	Fri Jun 11 00:39:02 2004
-+++ src/menu-method.c	Fri Jun 11 00:39:43 2004
-@@ -117,7 +117,7 @@
- 					    GnomeVFSOpenMode          mode,
- 					    FileHandle              **handle,
- 					    gboolean                  exclusive,
--					    unsigned int              perms);
-+					    mode_t                    perms);
- static void           file_handle_unref    (FileHandle               *handle);
- static GnomeVFSResult file_handle_read     (FileHandle               *handle,
- 					    gpointer                  buffer,
diff --git a/devel/desktop-file-utils/files/patch-src::update-desktop-database.c b/devel/desktop-file-utils/files/patch-src::update-desktop-database.c
deleted file mode 100644
index 68de9906d..000000000
--- a/devel/desktop-file-utils/files/patch-src::update-desktop-database.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/update-desktop-database.c.orig	Fri Aug  6 17:36:29 2004
-+++ src/update-desktop-database.c	Fri Aug  6 17:35:41 2004
-@@ -381,7 +381,7 @@
- 
-   for (i = 0; data_dirs[i] != NULL; i++);
- 
--  args = g_new (char *, i + 1);
-+  args = g_new0 (char *, i + 1);
- 
-   for (i = 0; data_dirs[i] != NULL; i++)
-     args[i] = g_build_filename (data_dirs[i], "applications", NULL);
diff --git a/devel/desktop-file-utils/pkg-descr b/devel/desktop-file-utils/pkg-descr
deleted file mode 100644
index 23e223758..000000000
--- a/devel/desktop-file-utils/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-desktop-file-utils contains a couple of command line utilities for
-working with desktop entries, aswell as a menu module for GnomeVFS.
-
-WWW: http://www.freedesktop.org/Software/desktop-file-utils
-
-- Jean-Yves Lefort
-jylefort@brutele.be
diff --git a/devel/desktop-file-utils/pkg-plist b/devel/desktop-file-utils/pkg-plist
deleted file mode 100644
index e941c49fa..000000000
--- a/devel/desktop-file-utils/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-bin/desktop-file-install
-bin/desktop-file-validate
-bin/desktop-menu-tool
-bin/update-desktop-database
-%%GNOME_VFS%%etc/gnome-vfs-2.0/modules/menu-modules.conf
-%%GNOME_VFS%%lib/gnome-vfs-2.0/modules/libmenu.a
-%%GNOME_VFS%%lib/gnome-vfs-2.0/modules/libmenu.so
-share/emacs/site-lisp/desktop-entry-mode.el
-@exec %D/bin/update-desktop-database -q || /usr/bin/true
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
deleted file mode 100644
index 23495787a..000000000
--- a/devel/gconf2/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for:	gconf2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gconf2
-PORTVERSION=	2.8.1
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/GConf/2.8
-DISTNAME=	GConf-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-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
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-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:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.mk>
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
deleted file mode 100644
index aca3f01b6..000000000
--- a/devel/gconf2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67
-SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab
deleted file mode 100644
index 6f25900e7..000000000
--- a/devel/gconf2/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Sun Aug  4 22:38:39 2002
-+++ Makefile.in	Sun Aug  4 22:39:52 2002
-@@ -35,7 +35,7 @@
- DESTDIR =
- 
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
- 
- top_builddir = .
diff --git a/devel/gconf2/pkg-descr b/devel/gconf2/pkg-descr
deleted file mode 100644
index 010cc810e..000000000
--- a/devel/gconf2/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
-
-Some of the features of GConf are:
-GConf provides:
-
-    * Documentation for each configuration key, so that administrators
-      can better modify the value.
-
-    * Notifications to interested applications when configuration data
-      is changed.  The notification service works across networks,
-      affecting all login sessions for a single user.
-
-    * 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
deleted file mode 100644
index 13898d569..000000000
--- a/devel/gconf2/pkg-install
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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
deleted file mode 100644
index eb4b1a71a..000000000
--- a/devel/gconf2/pkg-plist
+++ /dev/null
@@ -1,110 +0,0 @@
-bin/gconf-merge-tree
-bin/gconftool-2
-etc/gconf/2/path
-include/gconf/2/gconf/gconf-changeset.h
-include/gconf/2/gconf/gconf-client.h
-include/gconf/2/gconf/gconf-engine.h
-include/gconf/2/gconf/gconf-enum-types.h
-include/gconf/2/gconf/gconf-error.h
-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
-lib/libgconf-2.so.5
-libdata/pkgconfig/gconf-2.0.pc
-libexec/gconf-sanity-check-2
-libexec/gconfd-2
-share/aclocal/gconf-2.m4
-share/doc/gconf/ch01.html
-share/doc/gconf/gconf-GConfClient.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.devhelp
-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/style.css
-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
-share/locale/be/LC_MESSAGES/GConf2.mo
-share/locale/bg/LC_MESSAGES/GConf2.mo
-share/locale/bn/LC_MESSAGES/GConf2.mo
-share/locale/bs/LC_MESSAGES/GConf2.mo
-share/locale/ca/LC_MESSAGES/GConf2.mo
-share/locale/cs/LC_MESSAGES/GConf2.mo
-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_CA/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
-share/locale/fi/LC_MESSAGES/GConf2.mo
-share/locale/fr/LC_MESSAGES/GConf2.mo
-share/locale/ga/LC_MESSAGES/GConf2.mo
-share/locale/gl/LC_MESSAGES/GConf2.mo
-share/locale/gu/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
-share/locale/mn/LC_MESSAGES/GConf2.mo
-share/locale/ms/LC_MESSAGES/GConf2.mo
-share/locale/nb/LC_MESSAGES/GConf2.mo
-share/locale/ne/LC_MESSAGES/GConf2.mo
-share/locale/nl/LC_MESSAGES/GConf2.mo
-share/locale/nn/LC_MESSAGES/GConf2.mo
-share/locale/no/LC_MESSAGES/GConf2.mo
-share/locale/pa/LC_MESSAGES/GConf2.mo
-share/locale/pl/LC_MESSAGES/GConf2.mo
-share/locale/pt/LC_MESSAGES/GConf2.mo
-share/locale/pt_BR/LC_MESSAGES/GConf2.mo
-share/locale/ro/LC_MESSAGES/GConf2.mo
-share/locale/ru/LC_MESSAGES/GConf2.mo
-share/locale/sk/LC_MESSAGES/GConf2.mo
-share/locale/sl/LC_MESSAGES/GConf2.mo
-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
-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/sgml/gconf
-@dirrm share/doc/gconf
-@dirrm lib/GConf/2
-@dirrm include/gconf/2/gconf
-@dirrm include/gconf/2
-@dirrm etc/gconf/2
-@unexec /bin/rmdir %D/share/sgml 2>/dev/null || /usr/bin/true
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
deleted file mode 100644
index dddfaa261..000000000
--- a/devel/gnome-common/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	gnomecommon
-# Date created:				04 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomecommon
-PORTVERSION=	2.8.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-common/2.8
-DISTNAME=	gnome-common-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Common automake macros for GNOME and GNOME 2
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gnometarget
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
deleted file mode 100644
index a3fa6f30a..000000000
--- a/devel/gnome-common/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f
-SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694
diff --git a/devel/gnome-common/pkg-descr b/devel/gnome-common/pkg-descr
deleted file mode 100644
index 4cf03f1e9..000000000
--- a/devel/gnome-common/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a collection of automake macros used for developing new GNOME
-or GNOME 2.0 applications.
-
-WWW: http://www.gnome.org/
diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist
deleted file mode 100644
index 2882fbd2a..000000000
--- a/devel/gnome-common/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/gnome-autogen.sh
-bin/gnome-doc-common
-share/aclocal/gnome-common.m4
-share/aclocal/gnome-compiler-flags.m4
-share/gnome-common/data/omf.make
-share/gnome-common/data/xmldocs.make
-@dirrm share/gnome-common/data
-@dirrm share/gnome-common
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
deleted file mode 100644
index bbdac7cff..000000000
--- a/devel/gnome-vfs/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-# New ports collection makefile for:	gnomevfs2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomevfs2
-PORTVERSION=	2.8.3
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.8
-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 gnomehier intlhack gnomemimedata gconf2 \
-		libbonobo
-USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-openssl \
-		--disable-gnutls \
-		--with-gtk=no
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-
-GCONF_SCHEMAS=	desktop_default_applications.schemas \
-		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
-		system_http_proxy.schemas system_smb.schemas
-
-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
-.undef WITHOUT_MDNS
-WITH_MDNS=		yes
-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
-
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libsmbclient.so)
-WITH_SAMBA=		yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libhowl.so)
-WITH_MDNS=		yes
-.endif
-
-.if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=	CDPARANOIA=""
-.else
-PLIST_SUB+=	CDPARANOIA="@comment "
-.endif
-
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif
-
-.if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-.endif
-
-.if defined(WITH_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-PLIST_SUB+=	SAMBA=""
-.else
-PLIST_SUB+=	SAMBA="@comment "
-.endif
-
-.if defined(WITH_MDNS)
-LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/libgnomevfs/Makefile.in \
-		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/libgnomevfs/xdgmime.c \
-		${WRKSRC}/libgnomevfs/eggdirfuncs.c \
-		${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
-.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
-
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${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
deleted file mode 100644
index 026296e07..000000000
--- a/devel/gnome-vfs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3
-SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154
diff --git a/devel/gnome-vfs/files/KDE.directory b/devel/gnome-vfs/files/KDE.directory
deleted file mode 100644
index 032126bb9..000000000
--- a/devel/gnome-vfs/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[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
deleted file mode 100644
index 120a89064..000000000
--- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,285 +0,0 @@
---- 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>/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
deleted file mode 100644
index caf6411ff..000000000
--- a/devel/gnome-vfs/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig	Tue Jun  1 03:53:13 2004
-+++ configure	Tue Jun  1 03:53:13 2004
-@@ -22815,6 +22815,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
-@@ -22897,6 +22899,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
-@@ -22904,6 +22907,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+ LIBS="-lintl $LIBS"
-  have_ngettext=yes
- else
-   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26876,8 +26880,8 @@
-   done
- fi
- 
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5
-+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
- if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26896,11 +26900,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char bzCompressInit ();
-+char BZ2_bzCompressInit ();
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
-   ;
-   return 0;
- }
-@@ -28031,7 +28035,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 -lcrypto"
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -29660,6 +29664,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -29700,6 +29707,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
-@@ -31338,6 +31348,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
deleted file mode 100644
index 9362cac17..000000000
--- a/devel/gnome-vfs/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
-+++ modules/Makefile.in	Tue May  6 15:41:28 2003
-@@ -210,7 +210,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- modules_LTLIBRARIES = \
diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index b02290aa2..000000000
--- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- devel-docs/Makefile.in	2002/02/16 16:44:53	1.1
-+++ devel-docs/Makefile.in	2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES =  	gnome-vfs-mime-type-handling.txt
- 
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA = 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
deleted file mode 100644
index 4acd9a1bc..000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-2.0.pc.in.orig	Thu Oct 28 13:25:35 2004
-+++ gnome-vfs-2.0.pc.in	Thu Oct 28 13:25:51 2004
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system libraries
- Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
-
diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
deleted file mode 100644
index f9b09d46b..000000000
--- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:42	1.1
-+++ gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:51
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system module include info
- Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index 063376961..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
deleted file mode 100644
index bd679de03..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 07:31:15	1.1
-+++ libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 08:25:24
-@@ -940,6 +940,8 @@
- static void
- gnome_vfs_application_registry_init (void)
- {
-+	gchar *tmp;
-+
- 	if (gnome_vfs_application_registry_initialized)
- 		return;
- 
-@@ -961,6 +963,14 @@
- 	gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry");
- 	gnome_registry_dir.system_dir = TRUE;
- 	
-+	tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL);
-+	if (mkdir (tmp, 0700) &&
-+	    errno != EEXIST) {
-+		g_warning("Could not create per-user Gnome configuration directory: %s",
-+			  tmp);
-+	}
-+	g_free(tmp);
-+
- 	user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL);
- 	user_registry_dir.system_dir = FALSE;
- 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
deleted file mode 100644
index 82e0e5f61..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/eggdirfuncs.c.orig	Sat Jul 24 03:08:10 2004
-+++ libgnomevfs/eggdirfuncs.c	Sat Jul 24 03:08:50 2004
-@@ -106,7 +106,7 @@
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
deleted file mode 100644
index a61e83417..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-mime-info.c.orig	Wed Aug  4 13:41:52 2004
-+++ libgnomevfs/gnome-vfs-mime-info.c	Wed Aug  4 13:42:10 2004
-@@ -149,7 +149,7 @@
- 
- 	xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
- 	if (!xdg_data_dirs) {
--		xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+		xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- 	}
- 	
- 	split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index c58be91fa..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomevfs/gnome-vfs-resolve.c.orig	Sat Jul 31 17:52:23 2004
-+++ libgnomevfs/gnome-vfs-resolve.c	Sat Jul 31 17:52:45 2004
-@@ -171,8 +171,10 @@
- 	   switch (error) {
- 			 
- 	   case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
-+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA)
- 	   case EAI_ADDRFAMILY:		
- 	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#endif
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- 	   case EAI_FAIL:
- 	   case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
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
deleted file mode 100644
index 5d37cc768..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Sun Sep  5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c	Sun Sep  5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 9788a89f0..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Mon Aug 16 11:11:09 2004
-+++ libgnomevfs/gnome-vfs-utils.c	Mon Aug 16 11:11:16 2004
-@@ -871,7 +871,7 @@
- 	paths = g_strsplit (gnome_var, ":", 0); 
- 
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
--		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
- 			g_strfreev (paths);
- 			return full_filename;
diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 472a4b5f6..000000000
--- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/xdgmime.c.orig	Thu Jul 22 11:20:13 2004
-+++ libgnomevfs/xdgmime.c	Thu Jul 22 11:20:52 2004
-@@ -189,7 +189,7 @@
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c
deleted file mode 100644
index e1255db17..000000000
--- a/devel/gnome-vfs/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/sftp-method.c.orig	Tue May 11 01:53:30 2004
-+++ modules/sftp-method.c	Tue May 11 01:54:07 2004
-@@ -1081,7 +1081,9 @@
- 		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_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_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
deleted file mode 100644
index a07d0bc81..000000000
--- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/vfolder-info.c.orig	Fri Nov 29 13:40:11 2002
-+++ modules/vfolder/vfolder-info.c	Fri Nov 29 13:40:19 2002
-@@ -1721,7 +1721,7 @@
- 
- 			for (i = 0; ppath[i] != NULL; i++) {
- 				dir = g_build_filename (ppath[i], 
--							"/share/applications/",
-+							"/share/gnome/applications/",
- 							NULL);
- 				id = itemdir_new (info, 
- 						  dir, 
diff --git a/devel/gnome-vfs/pkg-descr b/devel/gnome-vfs/pkg-descr
deleted file mode 100644
index 03cbc07f6..000000000
--- a/devel/gnome-vfs/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 7bec57259..000000000
--- a/devel/gnome-vfs/pkg-plist
+++ /dev/null
@@ -1,228 +0,0 @@
-bin/gnomevfs-cat
-bin/gnomevfs-copy
-bin/gnomevfs-info
-bin/gnomevfs-ls
-bin/gnomevfs-mkdir
-bin/gnomevfs-rm
-%%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/modules/ssl-modules.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
-etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
-include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
-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-dns-sd.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
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
-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
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
-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/libdns-sd.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/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
-lib/gnome-vfs-2.0/modules/libvfs-pipe.so
-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.800
-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/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
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.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/networking.html
-share/doc/gnome-vfs-2.0/right.png
-share/doc/gnome-vfs-2.0/style.css
-share/doc/gnome-vfs-2.0/up.png
-share/doc/gnome-vfs-2.0/volumes.html
-@exec mkdir -p %D/share/gnome/vfolders
-%%KDEMENUS%%share/gnome/vfolders/KDE.directory
-share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
-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_CA/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
-share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/gu/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
-share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
-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/gnome/vfolders
-@dirrm share/doc/gnome-vfs-2.0
-@dirrm include/gnome-vfs-module-2.0/libgnomevfs
-@dirrm include/gnome-vfs-module-2.0
-@dirrm include/gnome-vfs-2.0/libgnomevfs
-@dirrm include/gnome-vfs-2.0/include
-@dirrm include/gnome-vfs-2.0
-@dirrm etc/gnome-vfs-2.0/vfolders
diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile
deleted file mode 100644
index 6d1c83529..000000000
--- a/devel/gnome2-hacker-tools/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for:	gnome2-hacker-tools
-# Date created:				07 January 2004
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnome2-hacker-tools
-PORTVERSION=	2.8.1
-CATEGORIES=	devel gnome
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 development tools
-
-RUN_DEPENDS=	mlv:${PORTSDIR}/editors/mlview \
-		gnome-autogen.sh:${PORTSDIR}/devel/gnomecommon \
-		glade-2:${PORTSDIR}/devel/glade2 \
-		ghex2:${PORTSDIR}/editors/ghex2 \
-		gob2:${PORTSDIR}/devel/gob2 \
-		conglomerate:${PORTSDIR}/editors/conglomerate \
-		meld:${PORTSDIR}/textproc/meld \
-		gtranslator:${PORTSDIR}/devel/gtranslator \
-		regexxer:${PORTSDIR}/devel/regexxer \
-		anjuta:${PORTSDIR}/devel/anjuta
-
-NO_BUILD=	yes
-
-do-install:	# empty
-
-.include <bsd.port.mk>
diff --git a/devel/gnome2-hacker-tools/pkg-descr b/devel/gnome2-hacker-tools/pkg-descr
deleted file mode 100644
index 4c88310c8..000000000
--- a/devel/gnome2-hacker-tools/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-GNOME 2 Hacker Tools
-
-The Hackers Tools are a collection of GNOME development applications.
-This suite includes IDEs, interface builders, "hacker" editors, and other
-applications to build and maintain GNOME (and other) code.
-
-WWW: http://www.FreeBSD.org/gnome/
diff --git a/devel/gnome2-hacker-tools/pkg-plist b/devel/gnome2-hacker-tools/pkg-plist
deleted file mode 100644
index 549a621fe..000000000
--- a/devel/gnome2-hacker-tools/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment this plist intentionally left empty
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
deleted file mode 100644
index dddfaa261..000000000
--- a/devel/gnomecommon/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:	gnomecommon
-# Date created:				04 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomecommon
-PORTVERSION=	2.8.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-common/2.8
-DISTNAME=	gnome-common-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Common automake macros for GNOME and GNOME 2
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gnometarget
-GNU_CONFIGURE=	yes
-
-.include <bsd.port.mk>
diff --git a/devel/gnomecommon/distinfo b/devel/gnomecommon/distinfo
deleted file mode 100644
index a3fa6f30a..000000000
--- a/devel/gnomecommon/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-common-2.8.0.tar.bz2) = 4630d4cf2b83499c89211b3ae76b662f
-SIZE (gnome2/gnome-common-2.8.0.tar.bz2) = 58694
diff --git a/devel/gnomecommon/pkg-descr b/devel/gnomecommon/pkg-descr
deleted file mode 100644
index 4cf03f1e9..000000000
--- a/devel/gnomecommon/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a collection of automake macros used for developing new GNOME
-or GNOME 2.0 applications.
-
-WWW: http://www.gnome.org/
diff --git a/devel/gnomecommon/pkg-plist b/devel/gnomecommon/pkg-plist
deleted file mode 100644
index 2882fbd2a..000000000
--- a/devel/gnomecommon/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/gnome-autogen.sh
-bin/gnome-doc-common
-share/aclocal/gnome-common.m4
-share/aclocal/gnome-compiler-flags.m4
-share/gnome-common/data/omf.make
-share/gnome-common/data/xmldocs.make
-@dirrm share/gnome-common/data
-@dirrm share/gnome-common
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
deleted file mode 100644
index bbdac7cff..000000000
--- a/devel/gnomevfs2/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-# New ports collection makefile for:	gnomevfs2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	gnomevfs2
-PORTVERSION=	2.8.3
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.8
-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 gnomehier intlhack gnomemimedata gconf2 \
-		libbonobo
-USE_REINPLACE=	yes
-USE_LIBTOOL_VER=15
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-openssl \
-		--disable-gnutls \
-		--with-gtk=no
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-
-GCONF_SCHEMAS=	desktop_default_applications.schemas \
-		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
-		system_http_proxy.schemas system_smb.schemas
-
-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
-.undef WITHOUT_MDNS
-WITH_MDNS=		yes
-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
-
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libsmbclient.so)
-WITH_SAMBA=		yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libhowl.so)
-WITH_MDNS=		yes
-.endif
-
-.if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-PLIST_SUB+=	CDPARANOIA=""
-.else
-PLIST_SUB+=	CDPARANOIA="@comment "
-.endif
-
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif
-
-.if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-.endif
-
-.if defined(WITH_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-PLIST_SUB+=	SAMBA=""
-.else
-PLIST_SUB+=	SAMBA="@comment "
-.endif
-
-.if defined(WITH_MDNS)
-LIB_DEPENDS+=	howl:${PORTSDIR}/net/howl
-.endif
-
-post-patch:
-	@${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\@datadir\@/gnome|\@datadir\@|g'
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/libgnomevfs/Makefile.in \
-		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/libgnomevfs/xdgmime.c \
-		${WRKSRC}/libgnomevfs/eggdirfuncs.c \
-		${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c
-.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
-
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${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
deleted file mode 100644
index 026296e07..000000000
--- a/devel/gnomevfs2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/gnome-vfs-2.8.3.tar.bz2) = 5484694e7250c80a231cfc525d924cc3
-SIZE (gnome2/gnome-vfs-2.8.3.tar.bz2) = 1907154
diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory
deleted file mode 100644
index 032126bb9..000000000
--- a/devel/gnomevfs2/files/KDE.directory
+++ /dev/null
@@ -1,5 +0,0 @@
-[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
deleted file mode 100644
index 120a89064..000000000
--- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in
+++ /dev/null
@@ -1,285 +0,0 @@
---- 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>/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
deleted file mode 100644
index caf6411ff..000000000
--- a/devel/gnomevfs2/files/patch-aa
+++ /dev/null
@@ -1,89 +0,0 @@
---- configure.orig	Tue Jun  1 03:53:13 2004
-+++ configure	Tue Jun  1 03:53:13 2004
-@@ -22815,6 +22815,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
-@@ -22897,6 +22899,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
-@@ -22904,6 +22907,7 @@
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-+ LIBS="-lintl $LIBS"
-  have_ngettext=yes
- else
-   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -26876,8 +26880,8 @@
-   done
- fi
- 
--echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5
--echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5
-+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6
- if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -26896,11 +26900,11 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char bzCompressInit ();
-+char BZ2_bzCompressInit ();
- int
- main ()
- {
--bzCompressInit ();
-+BZ2_bzCompressInit ();
-   ;
-   return 0;
- }
-@@ -28031,7 +28035,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 -lcrypto"
- 		cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -29660,6 +29664,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -29700,6 +29707,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
-@@ -31338,6 +31348,7 @@
- s,@ORBIT_IDL@,$ORBIT_IDL,;t t
- s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t
- s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
-+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t
- s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@USE_NLS@,$USE_NLS,;t t
- s,@MSGFMT@,$MSGFMT,;t t
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
deleted file mode 100644
index 9362cac17..000000000
--- a/devel/gnomevfs2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
-+++ modules/Makefile.in	Tue May  6 15:41:28 2003
-@@ -210,7 +210,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
- @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
- 
--module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- 
- modules_LTLIBRARIES = \
diff --git a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in b/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
deleted file mode 100644
index b02290aa2..000000000
--- a/devel/gnomevfs2/files/patch-devel-docs::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- devel-docs/Makefile.in	2002/02/16 16:44:53	1.1
-+++ devel-docs/Makefile.in	2002/02/16 16:45:47
-@@ -168,7 +168,7 @@
- TEXT_FILES =  	gnome-vfs-mime-type-handling.txt
- 
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- doc_DATA = 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
deleted file mode 100644
index 4acd9a1bc..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-2.0.pc.in.orig	Thu Oct 28 13:25:35 2004
-+++ gnome-vfs-2.0.pc.in	Thu Oct 28 13:25:51 2004
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system libraries
- Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include
-
diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
deleted file mode 100644
index f9b09d46b..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-
-$FreeBSD$
-
---- gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:42	1.1
-+++ gnome-vfs-module-2.0.pc.in	2002/02/16 13:07:51
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system module include info
- Version: @VERSION@
- Requires: bonobo-activation-2.0,gthread-2.0,gmodule-2.0
--Libs: -L${libdir} -lgnomevfs-2
-+Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@
- Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
deleted file mode 100644
index 063376961..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
- 
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c
deleted file mode 100644
index bd679de03..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 07:31:15	1.1
-+++ libgnomevfs/gnome-vfs-application-registry.c	2002/06/13 08:25:24
-@@ -940,6 +940,8 @@
- static void
- gnome_vfs_application_registry_init (void)
- {
-+	gchar *tmp;
-+
- 	if (gnome_vfs_application_registry_initialized)
- 		return;
- 
-@@ -961,6 +963,14 @@
- 	gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry");
- 	gnome_registry_dir.system_dir = TRUE;
- 	
-+	tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL);
-+	if (mkdir (tmp, 0700) &&
-+	    errno != EEXIST) {
-+		g_warning("Could not create per-user Gnome configuration directory: %s",
-+			  tmp);
-+	}
-+	g_free(tmp);
-+
- 	user_registry_dir.dirname = g_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL);
- 	user_registry_dir.system_dir = FALSE;
- 
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
deleted file mode 100644
index 82e0e5f61..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/eggdirfuncs.c.orig	Sat Jul 24 03:08:10 2004
-+++ libgnomevfs/eggdirfuncs.c	Sat Jul 24 03:08:50 2004
-@@ -106,7 +106,7 @@
-   data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS");
- 
-   if (!data_dirs || !data_dirs[0])
--    data_dirs = "/usr/local/share/:/usr/share/";
-+    data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/";
- 
-   data_dir_vector = g_strsplit (data_dirs, ":", 0);
- 
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
deleted file mode 100644
index a61e83417..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-mime-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-mime-info.c.orig	Wed Aug  4 13:41:52 2004
-+++ libgnomevfs/gnome-vfs-mime-info.c	Wed Aug  4 13:42:10 2004
-@@ -149,7 +149,7 @@
- 
- 	xdg_data_dirs = g_getenv ("XDG_DATA_DIRS");
- 	if (!xdg_data_dirs) {
--		xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+		xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- 	}
- 	
- 	split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0);
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
deleted file mode 100644
index c58be91fa..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-resolve.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libgnomevfs/gnome-vfs-resolve.c.orig	Sat Jul 31 17:52:23 2004
-+++ libgnomevfs/gnome-vfs-resolve.c	Sat Jul 31 17:52:45 2004
-@@ -171,8 +171,10 @@
- 	   switch (error) {
- 			 
- 	   case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND;
-+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA)
- 	   case EAI_ADDRFAMILY:		
- 	   case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS;
-+#endif
- 	   case EAI_SYSTEM: return gnome_vfs_result_from_errno ();
- 	   case EAI_FAIL:
- 	   case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
deleted file mode 100644
index 5d37cc768..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-unix-mounts.c.orig	Sun Sep  5 02:34:30 2004
-+++ libgnomevfs/gnome-vfs-unix-mounts.c	Sun Sep  5 02:35:08 2004
-@@ -43,6 +43,7 @@
- #include <errno.h>
- #include <string.h>
- #include <signal.h>
-+#include <poll.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
- #include "gnome-vfs-unix-mounts.h"
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
deleted file mode 100644
index 9788a89f0..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Mon Aug 16 11:11:09 2004
-+++ libgnomevfs/gnome-vfs-utils.c	Mon Aug 16 11:11:16 2004
-@@ -871,7 +871,7 @@
- 	paths = g_strsplit (gnome_var, ":", 0); 
- 
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
--		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
-+		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
- 			g_strfreev (paths);
- 			return full_filename;
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 472a4b5f6..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/xdgmime.c.orig	Thu Jul 22 11:20:13 2004
-+++ libgnomevfs/xdgmime.c	Thu Jul 22 11:20:52 2004
-@@ -189,7 +189,7 @@
- 
-   xdg_data_dirs = getenv ("XDG_DATA_DIRS");
-   if (xdg_data_dirs == NULL)
--    xdg_data_dirs = "/usr/local/share/:/usr/share/";
-+    xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- 
-   ptr = xdg_data_dirs;
- 
diff --git a/devel/gnomevfs2/files/patch-modules_sftp-method.c b/devel/gnomevfs2/files/patch-modules_sftp-method.c
deleted file mode 100644
index e1255db17..000000000
--- a/devel/gnomevfs2/files/patch-modules_sftp-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/sftp-method.c.orig	Tue May 11 01:53:30 2004
-+++ modules/sftp-method.c	Tue May 11 01:54:07 2004
-@@ -1081,7 +1081,9 @@
- 		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_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_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
deleted file mode 100644
index a07d0bc81..000000000
--- a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/vfolder/vfolder-info.c.orig	Fri Nov 29 13:40:11 2002
-+++ modules/vfolder/vfolder-info.c	Fri Nov 29 13:40:19 2002
-@@ -1721,7 +1721,7 @@
- 
- 			for (i = 0; ppath[i] != NULL; i++) {
- 				dir = g_build_filename (ppath[i], 
--							"/share/applications/",
-+							"/share/gnome/applications/",
- 							NULL);
- 				id = itemdir_new (info, 
- 						  dir, 
diff --git a/devel/gnomevfs2/pkg-descr b/devel/gnomevfs2/pkg-descr
deleted file mode 100644
index 03cbc07f6..000000000
--- a/devel/gnomevfs2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 7bec57259..000000000
--- a/devel/gnomevfs2/pkg-plist
+++ /dev/null
@@ -1,228 +0,0 @@
-bin/gnomevfs-cat
-bin/gnomevfs-copy
-bin/gnomevfs-info
-bin/gnomevfs-ls
-bin/gnomevfs-mkdir
-bin/gnomevfs-rm
-%%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/modules/ssl-modules.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
-etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
-include/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-address.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
-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-dns-sd.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
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-resolve.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
-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
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
-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/libdns-sd.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/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
-lib/gnome-vfs-2.0/modules/libvfs-pipe.so
-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.800
-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/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
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-dns-sd.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-drive.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-resolve.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume-monitor.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-volume.html
-share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
-share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/gnome-vfs-2.0/gnome-vfs-file-and-dirs-ops.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/networking.html
-share/doc/gnome-vfs-2.0/right.png
-share/doc/gnome-vfs-2.0/style.css
-share/doc/gnome-vfs-2.0/up.png
-share/doc/gnome-vfs-2.0/volumes.html
-@exec mkdir -p %D/share/gnome/vfolders
-%%KDEMENUS%%share/gnome/vfolders/KDE.directory
-share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
-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_CA/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
-share/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/gu/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
-share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
-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
-share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
-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/gnome/vfolders
-@dirrm share/doc/gnome-vfs-2.0
-@dirrm include/gnome-vfs-module-2.0/libgnomevfs
-@dirrm include/gnome-vfs-module-2.0
-@dirrm include/gnome-vfs-2.0/libgnomevfs
-@dirrm include/gnome-vfs-2.0/include
-@dirrm include/gnome-vfs-2.0
-@dirrm etc/gnome-vfs-2.0/vfolders
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
deleted file mode 100644
index 5d83c592f..000000000
--- a/devel/libbonobo/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for:   libbonobo
-# Date Created:			14 February 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libbonobo
-PORTVERSION=	2.8.0
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A component and compound document system for GNOME2
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_BISON=	yes
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-USE_PERL5=	yes
-USE_GNOME=	gnomehack intlhack libxml2 orbit2
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
-
-MAN1=		bonobo-activation-server.1
-
-.include <bsd.port.mk>
diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo
deleted file mode 100644
index d84072b69..000000000
--- a/devel/libbonobo/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/libbonobo-2.8.0.tar.bz2) = e3358680e50e69779535d126b1c56ee7
-SIZE (gnome2/libbonobo-2.8.0.tar.bz2) = 1460478
diff --git a/devel/libbonobo/files/patch-Makefile.in b/devel/libbonobo/files/patch-Makefile.in
deleted file mode 100644
index e8a60bd28..000000000
--- a/devel/libbonobo/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed May  7 13:42:52 2003
-+++ Makefile.in	Wed May  7 13:43:30 2003
-@@ -149,7 +149,7 @@
- SUBDIRS = \
- 	idl bonobo-activation bonobo \
- 	activation-server monikers \
--	utils samples tests doc po
-+	utils samples doc po
- 
- 
- libincludedir = $(includedir)/libbonobo-2.0
diff --git a/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c
deleted file mode 100644
index db8d816a8..000000000
--- a/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- bonobo-activation/bonobo-activation-fork-server.c.orig	Fri Oct 18 06:15:11 2002
-+++ bonobo-activation/bonobo-activation-fork-server.c	Sat Oct 19 15:35:03 2002
-@@ -364,6 +364,8 @@
- 	} else if ((childpid = fork ())) {
- 		_exit (0);	/* de-zombifier process, just exit */
- 	} else {
-+	    	sigprocmask (SIG_SETMASK, &omask, NULL);
-+
- 		setenv_activation_environment (environment);
- 
- 		if (od_iorstr != NULL) {
diff --git a/devel/libbonobo/files/patch-server::Makefile.in b/devel/libbonobo/files/patch-server::Makefile.in
deleted file mode 100644
index c821efc8e..000000000
--- a/devel/libbonobo/files/patch-server::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- activation-server/Makefile.in.orig	Wed May  7 16:36:09 2003
-+++ activation-server/Makefile.in	Wed May  7 16:36:51 2003
-@@ -159,7 +159,7 @@
- 	-I$(top_builddir) 			\
- 	-I$(top_builddir)/bonobo-activation	\
- 	-I$(top_srcdir)/bonobo-activation	\
--	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \
-+	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
-         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
- 	$(SERVER_CFLAGS)			\
- 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
diff --git a/devel/libbonobo/files/patch-server::activation-server-main.c b/devel/libbonobo/files/patch-server::activation-server-main.c
deleted file mode 100644
index f1a74a4a3..000000000
--- a/devel/libbonobo/files/patch-server::activation-server-main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- activation-server/activation-server-main.c.orig	Fri Oct 18 06:15:12 2002
-+++ activation-server/activation-server-main.c	Sat Nov  9 01:50:36 2002
-@@ -127,7 +127,7 @@
-                         g_string_append (gnome_od_source_dir,
-                                          gnome_dirs[i]);
-                         g_string_append (gnome_od_source_dir,
--                                         "/lib/bonobo/servers:");
-+                                         "/libdata/bonobo/servers:");
-                 }
-                 g_strfreev (gnome_dirs);
-                 g_string_append_c (real_od_source_dir, ':');
diff --git a/devel/libbonobo/files/patch-utils::bonobo-slay.in b/devel/libbonobo/files/patch-utils::bonobo-slay.in
deleted file mode 100644
index 44212a041..000000000
--- a/devel/libbonobo/files/patch-utils::bonobo-slay.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- utils/bonobo-slay.in.orig	Mon Mar 11 12:16:43 2002
-+++ utils/bonobo-slay.in	Tue Apr  2 18:30:30 2002
-@@ -56,15 +56,15 @@
- 
- # get Bonobo files
- #
--@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" );
-+@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" );
- foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) {
- 	if (-d $dir) {
- 		push @bonobo_dirs, $dir;
- 	}
- }
- foreach $dir (split(':', $ENV{'GNOME2_PATH'})) {
--	if (-d "$dir/lib/bonobo/servers") {
--		push @bonobo_dirs, "$dir/lib/bonobo/servers";
-+	if (-d "$dir/libdata/bonobo/servers") {
-+		push @bonobo_dirs, "$dir/libdata/bonobo/servers";
- 	}
- }
- 
diff --git a/devel/libbonobo/pkg-descr b/devel/libbonobo/pkg-descr
deleted file mode 100644
index c555fab9a..000000000
--- a/devel/libbonobo/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index a3d113f0d..000000000
--- a/devel/libbonobo/pkg-plist
+++ /dev/null
@@ -1,259 +0,0 @@
-bin/activation-client
-bin/bonobo-slay
-bin/echo-client-2
-etc/bonobo-activation/bonobo-activation-config.xml
-include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
-include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
-include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
-include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
-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
-include/libbonobo-2.0/bonobo/bonobo-foreign-object.h
-include/libbonobo-2.0/bonobo/bonobo-generic-factory.h
-include/libbonobo-2.0/bonobo/bonobo-i18n.h
-include/libbonobo-2.0/bonobo/bonobo-item-container.h
-include/libbonobo-2.0/bonobo/bonobo-item-handler.h
-include/libbonobo-2.0/bonobo/bonobo-listener.h
-include/libbonobo-2.0/bonobo/bonobo-macros.h
-include/libbonobo-2.0/bonobo/bonobo-main.h
-include/libbonobo-2.0/bonobo/bonobo-moniker-extender.h
-include/libbonobo-2.0/bonobo/bonobo-moniker-simple.h
-include/libbonobo-2.0/bonobo/bonobo-moniker-util.h
-include/libbonobo-2.0/bonobo/bonobo-moniker.h
-include/libbonobo-2.0/bonobo/bonobo-object.h
-include/libbonobo-2.0/bonobo/bonobo-persist-client.h
-include/libbonobo-2.0/bonobo/bonobo-persist-file.h
-include/libbonobo-2.0/bonobo/bonobo-persist-stream.h
-include/libbonobo-2.0/bonobo/bonobo-persist.h
-include/libbonobo-2.0/bonobo/bonobo-property-bag-client.h
-include/libbonobo-2.0/bonobo/bonobo-property-bag.h
-include/libbonobo-2.0/bonobo/bonobo-shlib-factory.h
-include/libbonobo-2.0/bonobo/bonobo-storage-memory.h
-include/libbonobo-2.0/bonobo/bonobo-storage.h
-include/libbonobo-2.0/bonobo/bonobo-stream-client.h
-include/libbonobo-2.0/bonobo/bonobo-stream-memory.h
-include/libbonobo-2.0/bonobo/bonobo-stream.h
-include/libbonobo-2.0/bonobo/bonobo-types.h
-include/libbonobo-2.0/bonobo/bonobo-xobject.h
-include/libbonobo-2.0/libbonobo.h
-lib/bonobo-2.0/samples/bonobo-echo-2
-lib/bonobo/monikers/libmoniker_std_2.so
-lib/libbonobo-2.a
-lib/libbonobo-2.so
-lib/libbonobo-2.so.0
-lib/libbonobo-activation.a
-lib/libbonobo-activation.so
-lib/libbonobo-activation.so.4
-lib/orbit-2.0/Bonobo_module.so
-libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server
-libdata/bonobo/servers/Bonobo_Moniker_std.server
-libdata/bonobo/servers/Bonobo_Sample_Echo.server
-libdata/pkgconfig/bonobo-activation-2.0.pc
-libdata/pkgconfig/libbonobo-2.0.pc
-libexec/bonobo-activation-server
-sbin/bonobo-activation-sysconf
-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
-share/idl/bonobo-2.0/Bonobo_Control.idl
-share/idl/bonobo-2.0/Bonobo_Embeddable.idl
-share/idl/bonobo-2.0/Bonobo_Exception.idl
-share/idl/bonobo-2.0/Bonobo_Gdk.idl
-share/idl/bonobo-2.0/Bonobo_ItemContainer.idl
-share/idl/bonobo-2.0/Bonobo_Listener.idl
-share/idl/bonobo-2.0/Bonobo_Moniker.idl
-share/idl/bonobo-2.0/Bonobo_Persist.idl
-share/idl/bonobo-2.0/Bonobo_Print.idl
-share/idl/bonobo-2.0/Bonobo_Property.idl
-share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl
-share/idl/bonobo-2.0/Bonobo_Storage.idl
-share/idl/bonobo-2.0/Bonobo_UI.idl
-share/idl/bonobo-2.0/Bonobo_Zoomable.idl
-share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
-share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
-share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
-share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
-share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
-share/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/style.css
-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-app-client.html
-share/doc/libbonobo/libbonobo-bonobo-application.html
-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/style.css
-share/doc/libbonobo/unknown.png
-share/doc/libbonobo/up.png
-share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/bs/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/da/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/de/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/el/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/en_CA/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/en_GB/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/eo/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/es/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/eu/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ga/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/gu/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
-share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/lt/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/mn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/nb/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ne/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/no/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/pa/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/pt/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ro/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sr/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
-@dirrm share/idl/bonobo-activation-2.0
-@dirrm share/idl/bonobo-2.0
-@dirrm share/doc/bonobo-activation
-@dirrm share/doc/libbonobo
-@dirrm libdata/bonobo/servers
-@dirrm libdata/bonobo
-@dirrm lib/bonobo-2.0/samples
-@dirrm lib/bonobo-2.0
-@dirrm include/libbonobo-2.0/bonobo
-@dirrm include/libbonobo-2.0
-@dirrm include/bonobo-activation-2.0/bonobo-activation
-@dirrm include/bonobo-activation-2.0
-@dirrm etc/bonobo-activation
-@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
-@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
deleted file mode 100644
index 4a3196dd9..000000000
--- a/devel/libgtop2/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# New ports collection makefile for:	libgtop2
-# Date Created:			29 April 2002
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libgtop2
-PORTVERSION=	2.8.1
-PORTREVISION=	1
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
-DISTNAME=	libgtop-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME 2 top library
-
-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
-USE_LIBTOOL_VER=15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-INFO=		libgtop2
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|int64_t|gint64|g' \
-		${WRKSRC}/include/glibtop/command.h \
-		${WRKSRC}/include/glibtop/proclist.h \
-		${WRKSRC}/lib/lib.pl
-
-post-install:
-	@${CHGRP} kmem ${PREFIX}/bin/libgtop_server2
-	@${CHMOD} 2555 ${PREFIX}/bin/libgtop_server2
-
-.include <bsd.port.mk>
diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo
deleted file mode 100644
index 50d3ac436..000000000
--- a/devel/libgtop2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/libgtop-2.8.1.tar.bz2) = 5d191cbf2b5b2a84dfee1972c99b1a78
-SIZE (gnome2/libgtop-2.8.1.tar.bz2) = 1046174
diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah
deleted file mode 100644
index 3728441be..000000000
--- a/devel/libgtop2/files/patch-ah
+++ /dev/null
@@ -1,52 +0,0 @@
---- sysdeps/freebsd/procmap.c.orig	Fri Sep 24 18:49:06 2004
-+++ sysdeps/freebsd/procmap.c	Thu Oct 28 15:42:58 2004
-@@ -47,7 +47,13 @@
- #endif
- #endif
- 
-+#ifdef __FreeBSD__
-+#define _KVM_VNODE
-+#endif
- #include <sys/vnode.h>
-+#ifdef __FreeBSD__
-+#undef _KVM_VNODE
-+#endif
- #include <sys/mount.h>
- #include <ufs/ufs/quota.h>
- #include <ufs/ufs/inode.h>
-@@ -104,7 +110,7 @@
- 	glibtop_map_entry *maps;
- #if defined __FreeBSD__
- 	struct vnode vnode;
--#if __FreeBSD_version >= 500039
-+#if __FreeBSD_version < 500039
- 	struct inode inode;
- #endif
- #endif
-@@ -122,8 +128,10 @@
- 
- 	/* Get the process data */
- 	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
--	if ((pinfo == NULL) || (count < 1))
-+	if ((pinfo == NULL) || (count < 1)) {
- 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-+		return NULL;
-+	}
- 
- 	/* Now we get the memory maps. */
- 
-@@ -278,13 +286,9 @@
- 			      &inode, sizeof (inode)) != sizeof (inode))
- 			glibtop_error_io_r (server, "kvm_read (inode)");
- 
--		if (kvm_read (server->machine.kd,
--			      (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
- #endif
- 	} while (entry.next != first);
- 
diff --git a/devel/libgtop2/files/patch-configure b/devel/libgtop2/files/patch-configure
deleted file mode 100644
index 662f75ac3..000000000
--- a/devel/libgtop2/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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=$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}"
- 
- 
diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl
deleted file mode 100644
index 6e08ba030..000000000
--- a/devel/libgtop2/files/patch-lib::lib.pl
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/lib.pl.orig	Mon Sep  1 20:17:45 2003
-+++ lib/lib.pl	Wed Sep  3 11:53:12 2003
-@@ -116,6 +116,8 @@
- 	$param_decl = '';
- 	$send_size = '';
- 	$send_ptr = '';
-+	$send_buf_decl = '';
-+	$send_buf = '';
- 	$nr_params = (@params = split(/:/, $param_def, 9999));
- 	for ($param = 1; $param <= $nr_params; $param++) {
- 	    $list = $params[$param];
-@@ -135,28 +137,37 @@
- 
- 		  $fields[$field];
- 		$call_param = $call_param . ', ' . $fields[$field];
--		if ($send_ptr eq '') {
--		    $send_ptr = "\n\tconst void *send_ptr = &" .
--
--		      $fields[$field] . ';';
--		}
--		if ($send_size eq '') {
--		    $send_size = "\n\tconst size_t send_size =\n\t\t";
-+		if ($send_buf eq '') {
-+		    $send_size = "\n\tconst size_t send_size = ";
-+		    $send_ptr = "\n\tconst void *send_ptr = &";
-+		    if ($nr_params == 1 && $count == 1) {
-+			$send_size = $send_size . 'sizeof (' . $fields[$field] . ');';
-+			$send_ptr = $send_ptr . $fields[$field] . ';';
-+			last;
-+		    }
-+		    $send_size = $send_size . 'sizeof (send_buf);';
-+		    $send_ptr = $send_ptr . 'send_buf;';
- 		}
- 		else {
--		    $send_size = $send_size . ' + ';
-+		    $send_buf_decl = $send_buf_decl . ' ';
-+		    $send_buf = $send_buf . ', ';
- 		}
--		$send_size = $send_size . 'sizeof (' . $fields[$field] . ')';
-+		$send_buf_decl = $send_buf_decl . '' .  $convert{$type} . ' ' .
-+
-+		  $fields[$field] . ';';
-+		$send_buf = $send_buf . '' . $fields[$field];
- 	    }
- 	}
--	if ($send_size ne '') {
--	    $send_size = $send_size . ';';
--	}
--	else {
-+	if ($send_size eq '') {
- 	    $send_size = "\n\tconst size_t send_size = 0;";
- 	}
- 	if ($send_ptr eq '') {
- 	    $send_ptr = "\n\tconst void *send_ptr = NULL;";
-+	}
-+	if ($send_buf ne '') {
-+	    $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" .
-+	      "\t\t{ " . $send_buf . ' };' .
-+	      $send_ptr;
- 	}
-     }
- 
diff --git a/devel/libgtop2/files/patch-lib::read.c b/devel/libgtop2/files/patch-lib::read.c
deleted file mode 100644
index 53d091a32..000000000
--- a/devel/libgtop2/files/patch-lib::read.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/read.c.orig	Fri Jun 18 04:03:55 2004
-+++ lib/read.c	Sat Aug  7 16:05:41 2004
-@@ -22,6 +22,7 @@
- */
- 
- #include <config.h>
-+#include <errno.h>
- #include <glibtop/read.h>
- #include "libgtop-i18n.h"
- 
-@@ -56,14 +57,18 @@
- 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
- #endif
- 
-+retry:
- 	if (server->socket) {
- 		do_read (server->socket, buf, size);
- 	} else {
--		if(read (server->input [0], buf, size) < 0)
-+		if(read (server->input [0], buf, size) < 0) {
-+			if (errno == EINTR)
-+				goto retry;
- 			glibtop_error_io_r (
- 				server,
- 				ngettext ("read %d byte",
- 					  "read %d bytes", size),
- 				size);
-+		}
- 	}
- }
diff --git a/devel/libgtop2/files/patch-lib::write.c b/devel/libgtop2/files/patch-lib::write.c
deleted file mode 100644
index 45c2434ea..000000000
--- a/devel/libgtop2/files/patch-lib::write.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- lib/write.c.orig	Mon Sep  8 23:05:01 2003
-+++ lib/write.c	Tue Sep  9 10:04:37 2003
-@@ -21,6 +21,7 @@
-    Boston, MA 02111-1307, USA.
- */
- 
-+#include <errno.h>
- #include <glibtop/write.h>
- 
- /* Writes some data to server. */
-@@ -38,12 +39,16 @@
- 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
- #endif
- 
-+retry:
- 	if (server->socket) {
- 		ret = send (server->socket, buf, size, 0);
- 	} else {
- 		ret = write (server->output [1], buf, size);
- 	}
- 
--	if (ret < 0)
-+	if (ret < 0) {
-+		if (errno == EINTR)
-+			goto retry;
- 		glibtop_error_io_r (server, _("write %d bytes"), size);
-+	}
- }
diff --git a/devel/libgtop2/files/patch-src::daemon::io.c b/devel/libgtop2/files/patch-src::daemon::io.c
deleted file mode 100644
index 0a11649ce..000000000
--- a/devel/libgtop2/files/patch-src::daemon::io.c
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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.
- */
- 
-+#include <errno.h>
- #include "daemon.h"
- 
- void
-@@ -35,9 +36,13 @@
- 	resp->offset = offset;
- 	resp->data_size = data_size;
- 
-+retry1:
- 	if (s == 0) {
--		if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
-+		if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) {
-+			if (errno == EINTR)
-+				goto retry1;
- 			glibtop_warn_io ("write");
-+		}
- 	} else {
- 		if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
- 			glibtop_warn_io ("send");
-@@ -47,10 +52,13 @@
- #ifdef REAL_DEBUG
- 		fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
- #endif
--
-+retry2:
- 		if (s == 0) {
--			if (write (1, data, resp->data_size) < 0)
-+			if (write (1, data, resp->data_size) < 0) {
-+				if (errno == EINTR)
-+					goto retry2;
- 				glibtop_warn_io ("write");
-+			}
- 		} else {
- 			if (send (s, data, resp->data_size, 0) , 0)
- 				glibtop_warn_io ("send");
-@@ -66,6 +74,7 @@
- 	size_t already_read = 0, remaining = total_size;
- 
- 	while (already_read < total_size) {
-+retry:
- 		if (s)
- 			nread = recv (s, ptr, remaining, 0);
- 		else
-@@ -77,6 +86,8 @@
- 		}
- 
- 		if (nread <= 0) {
-+			if (errno == EINTR)
-+				goto retry;
- 			glibtop_warn_io ("recv");
- 			return 0;
- 		}
diff --git a/devel/libgtop2/files/patch-src_daemon_server.c b/devel/libgtop2/files/patch-src_daemon_server.c
deleted file mode 100644
index bf0bba5c7..000000000
--- a/devel/libgtop2/files/patch-src_daemon_server.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/daemon/server.c.orig	Mon Feb 17 15:22:19 2003
-+++ src/daemon/server.c	Mon Feb 17 15:23:31 2003
-@@ -88,11 +88,12 @@
- 	if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
- 	    strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||
- 	    strcmp (uts.machine, LIBGTOP_COMPILE_MACHINE)) {
--		fprintf (stderr, "Can only run on %s %s %s\n",
-+	    	fprintf (stderr, "This libgtop was compiled on %s %s %s\n",
- 			 LIBGTOP_COMPILE_SYSTEM,
- 			 LIBGTOP_COMPILE_RELEASE,
- 			 LIBGTOP_COMPILE_MACHINE);
--		_exit (1);
-+		fprintf (stderr, "If you see strange problems caused by it,\n");
-+		fprintf (stderr, "you should recompile libgtop and dependent applications\n");
- 	}
- #endif
- 	
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
deleted file mode 100644
index 0713da619..000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- sysdeps/freebsd/procmem.c.orig	Mon Jul 19 02:07:03 2004
-+++ sysdeps/freebsd/procmem.c	Tue Jul 20 22:03:29 2004
-@@ -125,7 +125,7 @@
- #else
- 	struct vm_object object;
- #endif
--	struct plimit plimit;
-+	struct rlimit rlimit;
- 	int count;
- 
- 	glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0);
-@@ -160,15 +160,12 @@
- 
- #define        PROC_VMSPACE   kp_proc.p_vmspace
- 
--	if (kvm_read (server->machine.kd,
--		      (unsigned long) pinfo [0].PROC_VMSPACE,
--		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
--		glibtop_warn_io_r (server, "kvm_read (plimit)");
-+        if (getrlimit (RLIMIT_RSS, &rlimit) < 0) {
-+	        glibtop_warn_io_r (server, "getrlimit");
- 		return;
- 	}
- 
--	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;
- 
diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
deleted file mode 100644
index 37b5b56df..000000000
--- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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;
-@@ -81,19 +82,10 @@
- 		tot = 1;
- 	}
- 
--#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003)
--
--	/* This was changed from a `struct timeval' into a `guint64'
--	 * on FreeBSD 3.0 and renamed p_rtime -> p_runtime.
--	 */
--
--	totusec = (u_quad_t) p->p_runtime;
--#else
- 	sec = p->p_rtime.tv_sec;
- 	usec = p->p_rtime.tv_usec;
- 
- 	totusec = (quad_t)sec * 1000000 + usec;
--#endif
- 
- 	if (totusec < 0) {
- 		/* XXX no %qd in kernel.  Truncate. */
-@@ -116,6 +108,7 @@
- 		ip->tv_usec = it % 1000000;
- 	}
- }
-+#endif
- 
- #endif /* !__FreeBSD__ */
- 
-@@ -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);
- 	
diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
deleted file mode 100644
index de564dcfd..000000000
--- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sysdeps/common/fsusage.c.orig	Sun Oct 17 00:51:26 2004
-+++ sysdeps/common/fsusage.c	Sun Oct 17 00:52:07 2004
-@@ -253,8 +253,9 @@
-   if (statvfs (path, &fsd) < 0)
-     return;
- 
--#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
--  /* Solaris but not SunOS */
-+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \
-+	|| defined(__FreeBSD__)
-+  /* Solaris but not SunOS and FreeBSD */
-   buf->block_size = fsd.f_frsize;
- #else
-   /* else, including Linux */
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index 16bcbb055..000000000
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/pkg-descr b/devel/libgtop2/pkg-descr
deleted file mode 100644
index f263f1127..000000000
--- a/devel/libgtop2/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index cc1d2ecda..000000000
--- a/devel/libgtop2/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/libgtop_daemon2
-bin/libgtop_server2
-include/libgtop-2.0/glibtop.h
-include/libgtop-2.0/glibtop/close.h
-include/libgtop-2.0/glibtop/command.h
-include/libgtop-2.0/glibtop/cpu.h
-include/libgtop-2.0/glibtop/error.h
-include/libgtop-2.0/glibtop/fsusage.h
-include/libgtop-2.0/glibtop/global.h
-include/libgtop-2.0/glibtop/gnuserv.h
-include/libgtop-2.0/glibtop/inodedb.h
-include/libgtop-2.0/glibtop/loadavg.h
-include/libgtop-2.0/glibtop/mem.h
-include/libgtop-2.0/glibtop/mountlist.h
-include/libgtop-2.0/glibtop/msg_limits.h
-include/libgtop-2.0/glibtop/netload.h
-include/libgtop-2.0/glibtop/open.h
-include/libgtop-2.0/glibtop/parameter.h
-include/libgtop-2.0/glibtop/ppp.h
-include/libgtop-2.0/glibtop/procargs.h
-include/libgtop-2.0/glibtop/prockernel.h
-include/libgtop-2.0/glibtop/proclist.h
-include/libgtop-2.0/glibtop/procmap.h
-include/libgtop-2.0/glibtop/procmem.h
-include/libgtop-2.0/glibtop/procsegment.h
-include/libgtop-2.0/glibtop/procsignal.h
-include/libgtop-2.0/glibtop/procstate.h
-include/libgtop-2.0/glibtop/proctime.h
-include/libgtop-2.0/glibtop/procuid.h
-include/libgtop-2.0/glibtop/read.h
-include/libgtop-2.0/glibtop/read_data.h
-include/libgtop-2.0/glibtop/sem_limits.h
-include/libgtop-2.0/glibtop/shm_limits.h
-include/libgtop-2.0/glibtop/signal.h
-include/libgtop-2.0/glibtop/swap.h
-include/libgtop-2.0/glibtop/sysdeps.h
-include/libgtop-2.0/glibtop/sysinfo.h
-include/libgtop-2.0/glibtop/types.h
-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_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
-libdata/pkgconfig/libgtop-2.0.pc
-share/locale/am/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ar/LC_MESSAGES/libgtop-2.0.mo
-share/locale/az/LC_MESSAGES/libgtop-2.0.mo
-share/locale/be/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
-share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
-share/locale/cy/LC_MESSAGES/libgtop-2.0.mo
-share/locale/da/LC_MESSAGES/libgtop-2.0.mo
-share/locale/de/LC_MESSAGES/libgtop-2.0.mo
-share/locale/el/LC_MESSAGES/libgtop-2.0.mo
-share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
-share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
-share/locale/es/LC_MESSAGES/libgtop-2.0.mo
-share/locale/et/LC_MESSAGES/libgtop-2.0.mo
-share/locale/eu/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fa/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/fr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ga/LC_MESSAGES/libgtop-2.0.mo
-share/locale/gl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/gu/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
-share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
-share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
-share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
-share/locale/mn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ms/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/no/LC_MESSAGES/libgtop-2.0.mo
-share/locale/or/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pt/LC_MESSAGES/libgtop-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ro/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ru/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sl/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sq/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/sv/LC_MESSAGES/libgtop-2.0.mo
-share/locale/ta/LC_MESSAGES/libgtop-2.0.mo
-share/locale/tr/LC_MESSAGES/libgtop-2.0.mo
-share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
-share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
-@dirrm include/libgtop-2.0/glibtop
-@dirrm include/libgtop-2.0
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
deleted file mode 100644
index c4709713d..000000000
--- a/devel/libsoup/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	libsoup
-# Date created:				12 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libsoup
-PORTVERSION=	2.2.1
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A SOAP (Simple Object Access Protocol) implementation in C
-
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack glib20 libxml2
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PLIST_SUB=	VERSION="2.2"
-
-.if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "libsoup has the following configurable option(s):"
-	@${ECHO_MSG} "	WITHOUT_SSL	Disable GnuTLS SSL support"
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
deleted file mode 100644
index 902a0436e..000000000
--- a/devel/libsoup/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41
-SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907
diff --git a/devel/libsoup/pkg-descr b/devel/libsoup/pkg-descr
deleted file mode 100644
index 1ec2bfea4..000000000
--- a/devel/libsoup/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Soup is a SOAP (Simple Object Access Protocol) implementation in C. 
-
-It provides a queued asynchronous callback-based mechanism for sending and
-servicing SOAP requests, and a WSDL (Web Service Definition Language) for C
-compilers which generates client stubs and server skeletons for easily
-calling and implementing SOAP methods.  It uses GLib and is designed to work
-well with GTK applications.
-
-Features:
-  * Completely Asynchronous
-  * Connection cache
-  * HTTP chunked transfer and persistent connections
-  * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support
-  * SSL Support using OpenSSL
-  * Apache module server support
-  * Client digest authentication
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
deleted file mode 100644
index debbbf1a8..000000000
--- a/devel/libsoup/pkg-plist
+++ /dev/null
@@ -1,60 +0,0 @@
-include/libsoup-%%VERSION%%/libsoup/soup-address.h
-include/libsoup-%%VERSION%%/libsoup/soup-connection.h
-include/libsoup-%%VERSION%%/libsoup/soup-headers.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h
-include/libsoup-%%VERSION%%/libsoup/soup-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-method.h
-include/libsoup-%%VERSION%%/libsoup/soup-misc.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-server.h
-include/libsoup-%%VERSION%%/libsoup/soup-session-async.h
-include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h
-include/libsoup-%%VERSION%%/libsoup/soup-session.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h
-include/libsoup-%%VERSION%%/libsoup/soup-socket.h
-include/libsoup-%%VERSION%%/libsoup/soup-status.h
-include/libsoup-%%VERSION%%/libsoup/soup-types.h
-include/libsoup-%%VERSION%%/libsoup/soup-uri.h
-include/libsoup-%%VERSION%%/libsoup/soup.h
-lib/libsoup-%%VERSION%%.a
-lib/libsoup-%%VERSION%%.so
-lib/libsoup-%%VERSION%%.so.7
-libdata/pkgconfig/libsoup-%%VERSION%%.pc
-%%DOCSDIR%%/SoupAuth.html
-%%DOCSDIR%%/SoupAuthBasic.html
-%%DOCSDIR%%/SoupAuthDigest.html
-%%DOCSDIR%%/SoupConnection.html
-%%DOCSDIR%%/SoupConnectionNTLM.html
-%%DOCSDIR%%/SoupMessage.html
-%%DOCSDIR%%/SoupSoapMessage.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libsoup-SoupAddress.html
-%%DOCSDIR%%/libsoup-SoupServer.html
-%%DOCSDIR%%/libsoup-SoupServerMessage.html
-%%DOCSDIR%%/libsoup-SoupSession.html
-%%DOCSDIR%%/libsoup-SoupSocket.html
-%%DOCSDIR%%/libsoup-soup-dns.html
-%%DOCSDIR%%/libsoup-soup-headers.html
-%%DOCSDIR%%/libsoup-soup-md5-utils.html
-%%DOCSDIR%%/libsoup-soup-message-private.html
-%%DOCSDIR%%/libsoup-soup-message-queue.html
-%%DOCSDIR%%/libsoup-soup-method.html
-%%DOCSDIR%%/libsoup-soup-misc.html
-%%DOCSDIR%%/libsoup-soup-server-auth.html
-%%DOCSDIR%%/libsoup-soup-ssl.html
-%%DOCSDIR%%/libsoup-soup-status.html
-%%DOCSDIR%%/libsoup-soup-uri.html
-%%DOCSDIR%%/libsoup.devhelp
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
-@dirrm include/libsoup-%%VERSION%%/libsoup
-@dirrm include/libsoup-%%VERSION%%
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
deleted file mode 100644
index c4709713d..000000000
--- a/devel/libsoup22/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	libsoup
-# Date created:				12 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libsoup
-PORTVERSION=	2.2.1
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A SOAP (Simple Object Access Protocol) implementation in C
-
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
-
-USE_BZIP2=	yes
-USE_GNOME=	gnomehack glib20 libxml2
-INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
-USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-PLIST_SUB=	VERSION="2.2"
-
-.if !defined(WITHOUT_SSL)
-LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
-.else
-CONFIGURE_ARGS+=--disable-ssl
-.endif
-
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "libsoup has the following configurable option(s):"
-	@${ECHO_MSG} "	WITHOUT_SSL	Disable GnuTLS SSL support"
-	@${ECHO_MSG} ""
-
-.include <bsd.port.mk>
diff --git a/devel/libsoup22/distinfo b/devel/libsoup22/distinfo
deleted file mode 100644
index 902a0436e..000000000
--- a/devel/libsoup22/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/libsoup-2.2.1.tar.bz2) = 8132b0bce469affed688c4863702aa41
-SIZE (gnome2/libsoup-2.2.1.tar.bz2) = 403907
diff --git a/devel/libsoup22/pkg-descr b/devel/libsoup22/pkg-descr
deleted file mode 100644
index 1ec2bfea4..000000000
--- a/devel/libsoup22/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-Soup is a SOAP (Simple Object Access Protocol) implementation in C. 
-
-It provides a queued asynchronous callback-based mechanism for sending and
-servicing SOAP requests, and a WSDL (Web Service Definition Language) for C
-compilers which generates client stubs and server skeletons for easily
-calling and implementing SOAP methods.  It uses GLib and is designed to work
-well with GTK applications.
-
-Features:
-  * Completely Asynchronous
-  * Connection cache
-  * HTTP chunked transfer and persistent connections
-  * Authenticated HTTP, SOCKS4, and SOCKS5 proxy support
-  * SSL Support using OpenSSL
-  * Apache module server support
-  * Client digest authentication
diff --git a/devel/libsoup22/pkg-plist b/devel/libsoup22/pkg-plist
deleted file mode 100644
index debbbf1a8..000000000
--- a/devel/libsoup22/pkg-plist
+++ /dev/null
@@ -1,60 +0,0 @@
-include/libsoup-%%VERSION%%/libsoup/soup-address.h
-include/libsoup-%%VERSION%%/libsoup/soup-connection.h
-include/libsoup-%%VERSION%%/libsoup/soup-headers.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-filter.h
-include/libsoup-%%VERSION%%/libsoup/soup-message-queue.h
-include/libsoup-%%VERSION%%/libsoup/soup-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-method.h
-include/libsoup-%%VERSION%%/libsoup/soup-misc.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-auth.h
-include/libsoup-%%VERSION%%/libsoup/soup-server-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-server.h
-include/libsoup-%%VERSION%%/libsoup/soup-session-async.h
-include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h
-include/libsoup-%%VERSION%%/libsoup/soup-session.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-message.h
-include/libsoup-%%VERSION%%/libsoup/soup-soap-response.h
-include/libsoup-%%VERSION%%/libsoup/soup-socket.h
-include/libsoup-%%VERSION%%/libsoup/soup-status.h
-include/libsoup-%%VERSION%%/libsoup/soup-types.h
-include/libsoup-%%VERSION%%/libsoup/soup-uri.h
-include/libsoup-%%VERSION%%/libsoup/soup.h
-lib/libsoup-%%VERSION%%.a
-lib/libsoup-%%VERSION%%.so
-lib/libsoup-%%VERSION%%.so.7
-libdata/pkgconfig/libsoup-%%VERSION%%.pc
-%%DOCSDIR%%/SoupAuth.html
-%%DOCSDIR%%/SoupAuthBasic.html
-%%DOCSDIR%%/SoupAuthDigest.html
-%%DOCSDIR%%/SoupConnection.html
-%%DOCSDIR%%/SoupConnectionNTLM.html
-%%DOCSDIR%%/SoupMessage.html
-%%DOCSDIR%%/SoupSoapMessage.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libsoup-SoupAddress.html
-%%DOCSDIR%%/libsoup-SoupServer.html
-%%DOCSDIR%%/libsoup-SoupServerMessage.html
-%%DOCSDIR%%/libsoup-SoupSession.html
-%%DOCSDIR%%/libsoup-SoupSocket.html
-%%DOCSDIR%%/libsoup-soup-dns.html
-%%DOCSDIR%%/libsoup-soup-headers.html
-%%DOCSDIR%%/libsoup-soup-md5-utils.html
-%%DOCSDIR%%/libsoup-soup-message-private.html
-%%DOCSDIR%%/libsoup-soup-message-queue.html
-%%DOCSDIR%%/libsoup-soup-method.html
-%%DOCSDIR%%/libsoup-soup-misc.html
-%%DOCSDIR%%/libsoup-soup-server-auth.html
-%%DOCSDIR%%/libsoup-soup-ssl.html
-%%DOCSDIR%%/libsoup-soup-status.html
-%%DOCSDIR%%/libsoup-soup-uri.html
-%%DOCSDIR%%/libsoup.devhelp
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-@dirrm %%DOCSDIR%%
-@dirrm include/libsoup-%%VERSION%%/libsoup
-@dirrm include/libsoup-%%VERSION%%
diff --git a/devel/py-orbit2/Makefile b/devel/py-orbit2/Makefile
deleted file mode 100644
index e3ee475b4..000000000
--- a/devel/py-orbit2/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# New ports collection makefile for:	py-orbit2
-# Date created:				04 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-
-PORTNAME=	orbit
-PORTVERSION=	2.0.1
-CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/pyorbit/2.0
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	pyorbit-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python bindings for ORBit2
-
-CONFLICTS=	py*-omniorb-[0-9]*
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack orbit2
-USE_PYTHON=	yes
-USE_LIBTOOL_VER=15
-ORBIT_CONFIG=	${LOCALBASE}/bin/orbit2-config
-
-.include <bsd.port.mk>
diff --git a/devel/py-orbit2/distinfo b/devel/py-orbit2/distinfo
deleted file mode 100644
index 9fccc491d..000000000
--- a/devel/py-orbit2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gnome2/pyorbit-2.0.1.tar.bz2) = c39384f6257a386231d79db9e403d905
-SIZE (gnome2/pyorbit-2.0.1.tar.bz2) = 242959
diff --git a/devel/py-orbit2/pkg-descr b/devel/py-orbit2/pkg-descr
deleted file mode 100644
index e1f63d2fa..000000000
--- a/devel/py-orbit2/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-To paraphase the README:
-
-This is a Python language binding for the ORBit2 CORBA implementation.
-It aims to take advantage of new features found in ORBit2 to make
-language bindings more efficient.  This includes:
-  - Use of ORBit2 type libraries to generate stubs
-  - use of the ORBit_small_invoke_stub() call for operation
-    invocation, which allows for short circuited invocation on local
-    objects.
-
-WWW:    http://orbit-python.sault.org/
diff --git a/devel/py-orbit2/pkg-plist b/devel/py-orbit2/pkg-plist
deleted file mode 100644
index 973d70f31..000000000
--- a/devel/py-orbit2/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-include/pyorbit-2/pyorbit.h
-%%PYTHON_SITELIBDIR%%/CORBA.py
-%%PYTHON_SITELIBDIR%%/CORBA.pyc
-%%PYTHON_SITELIBDIR%%/CORBA.pyo
-%%PYTHON_SITELIBDIR%%/ORBit.so
-%%PYTHON_SITELIBDIR%%/PortableServer.py
-%%PYTHON_SITELIBDIR%%/PortableServer.pyc
-%%PYTHON_SITELIBDIR%%/PortableServer.pyo
-libdata/pkgconfig/pyorbit-2.pc
-@dirrm include/pyorbit-2