- Rename port devel/gnomevfs2 -> devel/gnome-vfs

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

22 files changed, 2 insertions, 717 deletions

diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index fb6eb70a1..c37a39786 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.139 2006/05/18 01:55:59 ahze Exp $
 #
 
-PORTNAME=	gnomevfs2
+PORTNAME=	gnome-vfs
 PORTVERSION=	2.15.1
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
deleted file mode 100644
index fb6eb70a1..000000000
--- a/devel/gnomevfs2/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-# New ports collection makefile for:	gnomevfs2
-# Date created:				28th June 2000
-# Whom:					Ade Lovett <ade@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/Makefile,v 1.137 2006/04/20 14:00:03 marcus Exp $
-#
-
-PORTNAME=	gnomevfs2
-PORTVERSION=	2.15.1
-PORTREVISION?=	0
-CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-vfs-${PORTVERSION}
-DIST_SUBDIR=	gnome2
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME Virtual File System
-
-USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
-
-.if !defined(REFERENCE_PORT)
-
-RUN_DEPENDS=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info
-
-USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_XLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomemimedata gconf2 \
-		libbonobo ltverhack referencehack
-USE_AUTOTOOLS=	libtool:15
-USE_OPENSSL=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-openssl \
-		--disable-gnutls \
-		--disable-howl
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-
-GCONF_SCHEMAS=	desktop_default_applications.schemas \
-		desktop_gnome_url_handlers.schemas system_dns_sd.schemas \
-		system_http_proxy.schemas system_smb.schemas
-
-OPTIONS=	SAMBA "Enable SMB volume support" on \
-		MDNS "Enable Bonjour/Rendezvous support" on
-
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libfam.so) || !defined(WITHOUT_FAM)
-USE_FAM=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libkrb5.so)
-LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
-.endif
-
-.if !defined(WITHOUT_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-PLIST_SUB+=	SAMBA=""
-.else
-PLIST_SUB+=	SAMBA="@comment "
-CONFIGURE_ARGS+=--disable-samba
-.endif
-
-.if !defined(WITHOUT_MDNS)
-LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi
-.else
-CONFIGURE_ARGS+=--disable-avahi
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/libgnomevfs/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/libgnomevfs/xdgmime.c
-	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]' 2> /dev/null`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.post.mk>
-
-.endif
diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo
deleted file mode 100644
index 2aee557fb..000000000
--- a/devel/gnomevfs2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gnome2/gnome-vfs-2.15.1.tar.bz2) = 1c38e19011530fbc28b52d2cfcab8e62
-SHA256 (gnome2/gnome-vfs-2.15.1.tar.bz2) = e42b7821f03ee53532b0e1334c12e3cc11e07ea20b7e7ebc9e467d597a58fc4f
-SIZE (gnome2/gnome-vfs-2.15.1.tar.bz2) = 1817350
diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in
deleted file mode 100644
index 8c0d2a131..000000000
--- a/devel/gnomevfs2/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Tue Nov 30 02:05:26 2004
-+++ Makefile.in	Tue Nov 30 02:05:34 2004
-@@ -230,7 +230,6 @@
- 	devel-docs				\
- 	doc					\
- 	programs				\
--	test					\
- 	monikers				\
- 	po
- 
diff --git a/devel/gnomevfs2/files/patch-ac b/devel/gnomevfs2/files/patch-ac
deleted file mode 100644
index 383987654..000000000
--- a/devel/gnomevfs2/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
-+++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
-@@ -465,7 +465,7 @@
- @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
- @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
- @OS_WIN32_TRUE@PLATFROM_SPECIFIC_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 = \
- 	$(CDDA_LTLIBS)				\
diff --git a/devel/gnomevfs2/files/patch-config.h.in b/devel/gnomevfs2/files/patch-config.h.in
deleted file mode 100644
index 70edbcd45..000000000
--- a/devel/gnomevfs2/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig	Sun May  7 00:54:09 2006
-+++ config.h.in	Sun May  7 00:54:46 2006
-@@ -121,6 +121,9 @@
- /* Define to 1 if you have the <fnmatch.h> header file. */
- #undef HAVE_FNMATCH_H
- 
-+/* Define to 1 if you have the <sys/sysmacros.h> header file. */
-+#undef HAVE_SYS_SYSMACROS_H
-+
- /* Define to 1 if you have the <fstab.h> header file. */
- #undef HAVE_FSTAB_H
- 
diff --git a/devel/gnomevfs2/files/patch-configure b/devel/gnomevfs2/files/patch-configure
deleted file mode 100644
index 8835cb06b..000000000
--- a/devel/gnomevfs2/files/patch-configure
+++ /dev/null
@@ -1,82 +0,0 @@
---- configure.orig	Wed May 17 11:33:28 2006
-+++ configure	Wed May 17 21:44:26 2006
-@@ -23540,6 +23540,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
-@@ -23622,6 +23624,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
-@@ -23629,6 +23632,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
-@@ -25026,7 +25030,7 @@
- 
- 
- 
--for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
-+for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -33396,7 +33400,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
-@@ -33694,7 +33698,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
-@@ -37536,6 +37540,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
-@@ -37577,6 +37584,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
-@@ -39016,6 +39026,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-gnome-vfs-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
deleted file mode 100644
index 088433c51..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-2.0.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-vfs-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-2.0.pc.in	Mon Oct  3 12:00:02 2005
-@@ -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-no-export-2.0 gobject-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 c3f0d2c30..000000000
--- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-vfs-module-2.0.pc.in.orig	Wed Sep 14 05:30:25 2005
-+++ gnome-vfs-module-2.0.pc.in	Mon Oct  3 12:01:04 2005
-@@ -8,5 +8,5 @@
- Description: The GNOME virtual file-system module include info
- Version: @VERSION@
- Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-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 2747466f7..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs::gnome-vfs-application-registry.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- libgnomevfs/gnome-vfs-application-registry.c.orig	Sun May 22 23:09:39 2005
-+++ libgnomevfs/gnome-vfs-application-registry.c	Sun May 22 23:14:22 2005
-@@ -943,6 +943,8 @@ load_application_info (void)
- static void
- gnome_vfs_application_registry_init (void)
- {
-+	gchar *tmp;
-+
- 	if (gnome_vfs_application_registry_initialized)
- 		return;
- 
-@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi
- 						       "application-registry",
- 						       NULL);
- 	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_build_filename (g_get_home_dir(),
- 						      ".gnome",
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
deleted file mode 100644
index 1636ca99d..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-address.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-address.c.orig	Wed Apr 12 10:16:28 2006
-+++ libgnomevfs/gnome-vfs-address.c	Thu Apr 20 09:52:12 2006
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- 
- #ifndef G_OS_WIN32
-+#include <sys/socket.h>
- #include <sys/select.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
deleted file mode 100644
index 05dd579ba..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgnomevfs/gnome-vfs-hal-mounts.c.orig	Sun May  7 01:07:27 2006
-+++ libgnomevfs/gnome-vfs-hal-mounts.c	Sun May  7 01:07:42 2006
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- #include <limits.h>
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-monitor.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-monitor.c
deleted file mode 100644
index 11d73973b..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-monitor.c
+++ /dev/null
@@ -1,131 +0,0 @@
---- libgnomevfs/gnome-vfs-monitor.c.orig	Fri May 12 20:46:39 2006
-+++ libgnomevfs/gnome-vfs-monitor.c	Fri May 12 22:29:57 2006
-@@ -48,9 +48,6 @@
- 	
- 	GList *pending_callbacks; /* protected by handle_hash */
- 	guint pending_timeout; /* protected by handle_hash */
--	guint timeout_count; /* count up each time pending_timeout is changed
--				to avoid timeout remove race.
--				protected by handle_hash */
- };
- 
- struct GnomeVFSMonitorCallbackData {
-@@ -69,6 +66,9 @@
- static GHashTable *handle_hash = NULL;
- G_LOCK_DEFINE_STATIC (handle_hash);
- 
-+static gint actually_dispatch_callback (gpointer data);
-+static guint32 get_min_delay  (GList *list, gint32 now);
-+
- static void 
- init_hash_table (void)
- {
-@@ -202,17 +202,25 @@
- 	return result;
- }
- 
-+static void
-+install_timeout (GnomeVFSMonitorHandle *monitor_handle, time_t now)
-+{
-+	guint32 delay;
- 
--typedef struct {
--	guint timeout_count;
--	GnomeVFSMonitorHandle *monitor_handle;
--} DispatchData;
-+	if (monitor_handle->pending_timeout) 
-+		g_source_remove (monitor_handle->pending_timeout);
-+
-+	delay = get_min_delay (monitor_handle->pending_callbacks, now);
-+	if (delay == 0)
-+		monitor_handle->pending_timeout = g_idle_add (actually_dispatch_callback, monitor_handle);
-+	else
-+		monitor_handle->pending_timeout = g_timeout_add (delay * 1000, actually_dispatch_callback, monitor_handle);
-+}
- 
- static gint
- actually_dispatch_callback (gpointer data)
- {
--	DispatchData *ddata = data;
--	GnomeVFSMonitorHandle *monitor_handle = ddata->monitor_handle;
-+	GnomeVFSMonitorHandle *monitor_handle = data;
- 	GnomeVFSMonitorCallbackData *callback_data;
- 	gchar *uri;
- 	GList *l, *next;
-@@ -228,13 +236,6 @@
- 
- 	G_LOCK (handle_hash);
- 
--	/* Don't clear pending_timeout if we started another timeout
--	 * (and removed this)
--	 */
--	if (monitor_handle->timeout_count == ddata->timeout_count) {
--		monitor_handle->pending_timeout = 0;
--	}
--
- 	if (!monitor_handle->cancelled) {
- 		/* Find all callbacks that needs to be dispatched */
- 		dispatch = NULL;
-@@ -305,13 +306,17 @@
- 
- 	}
- 
--	/* if we were waiting for this callback to be dispatched to free
--	 * this monitor, then do it now.
--	 */
--	if (monitor_handle->cancelled &&
--	    no_live_callbacks (monitor_handle)) {
--		destroy_monitor_handle (monitor_handle);
--	}
-+	if (no_live_callbacks (monitor_handle)) {
-+		/* if we were waiting for this callback to be dispatched
-+		 * to free this monitor, then do it now.
-+		 */
-+		if (monitor_handle->cancelled)
-+			destroy_monitor_handle (monitor_handle);
-+		else
-+			monitor_handle->pending_timeout = 0;
-+	} else
-+		/* pending callbacks left, install another timeout */
-+		install_timeout (monitor_handle, now);
- 
- 	G_UNLOCK (handle_hash);
- 
-@@ -375,9 +380,7 @@
- 	GnomeVFSMonitorHandle *monitor_handle;
- 	char *uri;
- 	time_t now;
--	guint32 delay;
- 	GList *l;
--	DispatchData *ddata;
- 	
- 	g_return_if_fail (info_uri != NULL);
- 
-@@ -435,26 +438,7 @@
- 		monitor_handle->pending_callbacks = 
- 			g_list_append(monitor_handle->pending_callbacks, callback_data);
- 		
--		delay = get_min_delay (monitor_handle->pending_callbacks, now);
--
--		if (monitor_handle->pending_timeout) {
--			g_source_remove (monitor_handle->pending_timeout);
--		}
--		
--		ddata = g_new (DispatchData, 1);
--		ddata->monitor_handle = monitor_handle;
--		ddata->timeout_count = ++monitor_handle->timeout_count;
--		
--		if (delay == 0) {
--			monitor_handle->pending_timeout = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
--									   actually_dispatch_callback,
--									   ddata, (GDestroyNotify)g_free);
--		} else {
--			monitor_handle->pending_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT,
--									      delay * 1000,
--									      actually_dispatch_callback,
--									      ddata, (GDestroyNotify)g_free);
--		}
-+		install_timeout (monitor_handle, now);
- 	}
- 	
- 	g_free (uri);
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 068d1773a..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-utils.c.orig	Thu Sep 15 07:02:53 2005
-+++ libgnomevfs/gnome-vfs-utils.c	Sat Oct 22 02:12:32 2005
-@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const
- 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
- 		full_filename = g_build_filename (*temp_paths,
- 						  "share",
-+						  "gnome",
- 						  "pixmaps",
- 						  relative_filename,
- 						  NULL);
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
deleted file mode 100644
index dc1259ac4..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-volume-ops.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomevfs/gnome-vfs-volume-ops.c.orig	Wed Dec 14 22:20:23 2005
-+++ libgnomevfs/gnome-vfs-volume-ops.c	Wed Dec 14 22:20:43 2005
-@@ -25,6 +25,7 @@
- 
- #include <sys/types.h>
- #include <errno.h>
-+#include <signal.h>
- #include <string.h>
- #include <stdlib.h>
- #include <glib.h>
diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c b/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
deleted file mode 100644
index 37cc69f1e..000000000
--- a/devel/gnomevfs2/files/patch-libgnomevfs_xdgmime.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomevfs/xdgmime.c.orig	Wed Aug 24 16:52:03 2005
-+++ libgnomevfs/xdgmime.c	Wed Aug 24 16:52:47 2005
-@@ -234,7 +234,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_file-method.c b/devel/gnomevfs2/files/patch-modules_file-method.c
deleted file mode 100644
index dbb237226..000000000
--- a/devel/gnomevfs2/files/patch-modules_file-method.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/file-method.c.orig	Sun May 22 23:30:16 2005
-+++ modules/file-method.c	Sun May 22 23:31:08 2005
-@@ -66,6 +66,9 @@
- #if HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #elif HAVE_SYS_MOUNT_H
-+#if HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h>
- #endif
- 
diff --git a/devel/gnomevfs2/pkg-deinstall.in b/devel/gnomevfs2/pkg-deinstall.in
deleted file mode 100644
index f1b405661..000000000
--- a/devel/gnomevfs2/pkg-deinstall.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/pkg-deinstall.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
-#
-# Restore gconf keys of libgnome.
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
-
-if [ -f ${SCHEMAS} ]; then
-	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
-	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
-		> /dev/null || /usr/bin/true
-fi
-
-exit 0
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-install.in b/devel/gnomevfs2/pkg-install.in
deleted file mode 100644
index 0b792521a..000000000
--- a/devel/gnomevfs2/pkg-install.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#   $MCom: ports/devel/gnomevfs2/pkg-install.in,v 1.7 2005/11/15 06:12:28 marcus Exp $
-#
-# Restore gconf keys of libgnome.
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-SCHEMAS=%%X11BASE%%/etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
-
-if [ -f ${SCHEMAS} ]; then
-	env GCONF_CONFIG_SOURCE=xml::%%X11BASE%%/etc/gconf/gconf.xml.defaults \
-	%%X11BASE%%/bin/gconftool-2 --makefile-install-rule ${SCHEMAS} \
-		> /dev/null || /usr/bin/true
-fi
-
-exit 0
diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist
deleted file mode 100644
index 5e66ee7b8..000000000
--- a/devel/gnomevfs2/pkg-plist
+++ /dev/null
@@ -1,200 +0,0 @@
-bin/gnomevfs-cat
-bin/gnomevfs-copy
-bin/gnomevfs-df
-bin/gnomevfs-info
-bin/gnomevfs-ls
-bin/gnomevfs-mkdir
-bin/gnomevfs-monitor
-bin/gnomevfs-mv
-bin/gnomevfs-rm
-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
-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-deprecated.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-pty.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.a
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
-lib/gnome-vfs-2.0/modules/libbzip2.a
-lib/gnome-vfs-2.0/modules/libbzip2.la
-lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libcomputer.a
-lib/gnome-vfs-2.0/modules/libcomputer.la
-lib/gnome-vfs-2.0/modules/libcomputer.so
-lib/gnome-vfs-2.0/modules/libdns-sd.a
-lib/gnome-vfs-2.0/modules/libdns-sd.la
-lib/gnome-vfs-2.0/modules/libdns-sd.so
-lib/gnome-vfs-2.0/modules/libfile.a
-lib/gnome-vfs-2.0/modules/libfile.la
-lib/gnome-vfs-2.0/modules/libfile.so
-lib/gnome-vfs-2.0/modules/libftp.a
-lib/gnome-vfs-2.0/modules/libftp.la
-lib/gnome-vfs-2.0/modules/libftp.so
-lib/gnome-vfs-2.0/modules/libgzip.a
-lib/gnome-vfs-2.0/modules/libgzip.la
-lib/gnome-vfs-2.0/modules/libgzip.so
-lib/gnome-vfs-2.0/modules/libhttp.a
-lib/gnome-vfs-2.0/modules/libhttp.la
-lib/gnome-vfs-2.0/modules/libhttp.so
-lib/gnome-vfs-2.0/modules/libnetwork.a
-lib/gnome-vfs-2.0/modules/libnetwork.la
-lib/gnome-vfs-2.0/modules/libnetwork.so
-lib/gnome-vfs-2.0/modules/libnntp.a
-lib/gnome-vfs-2.0/modules/libnntp.la
-lib/gnome-vfs-2.0/modules/libnntp.so
-lib/gnome-vfs-2.0/modules/libsftp.a
-lib/gnome-vfs-2.0/modules/libsftp.la
-lib/gnome-vfs-2.0/modules/libsftp.so
-%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.a
-%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.la
-%%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so
-lib/gnome-vfs-2.0/modules/libtar.a
-lib/gnome-vfs-2.0/modules/libtar.la
-lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfs-test.a
-lib/gnome-vfs-2.0/modules/libvfs-test.la
-lib/gnome-vfs-2.0/modules/libvfs-test.so
-lib/libgnomevfs-2.a
-lib/libgnomevfs-2.la
-lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.0
-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/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/ka/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/nso/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/or/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/rw/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/xh/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_HK/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
-@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
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw