Remove remaining gnome1-libs dependencies from pkgsrc.

20 files changed, 1 insertions, 529 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4e05666c7a3..85580e4919c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.399 2007/05/13 14:39:16 wiz Exp $
+# $NetBSD: Makefile,v 1.400 2007/05/20 15:48:07 wiz Exp $
 #
 
 COMMENT=	System utilities
@@ -105,7 +105,6 @@ SUBDIR+=	gkrellm-server
 SUBDIR+=	gkrellm-share
 SUBDIR+=	gnome-menus
 SUBDIR+=	gnome-pkgview
-SUBDIR+=	gnome-vfs
 SUBDIR+=	gnome-vfs-monikers
 SUBDIR+=	gnome-vfs2
 SUBDIR+=	gnome-vfsmm
diff --git a/sysutils/gnome-vfs/DESCR b/sysutils/gnome-vfs/DESCR
deleted file mode 100644
index 71e6426e85b..00000000000
--- a/sysutils/gnome-vfs/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This is the GNOME Virtual File System.
-
-This is still a development version, the APIs are still undergoing
-incompatible changes.
-
-GNOME VFS is currently used as one of the foundations of the Nautilus
-file manager.
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
deleted file mode 100644
index 99ff282f0d5..00000000000
--- a/sysutils/gnome-vfs/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.60 2007/01/30 23:38:22 joerg Exp $
-
-DISTNAME=		gnome-vfs-1.0.5
-PKGREVISION=		13
-CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
-
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		GNOME Virtual File System
-
-BROKEN_GETTEXT_DETECTION=	yes
-BUILDLINK_API_DEPENDS.gnome-mime-data+=	gnome-mime-data>=2.0.1
-
-USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
-USE_TOOLS+=		gmake msgfmt pkg-config perl:run
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
-
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
-
-CONFIGURE_ARGS.gnu-iconv=	--with-libiconv=yes
-
-REPLACE_PERL.extfs=	a deb.in mailfs rpms tar
-REPLACE_PERL+=		${REPLACE_PERL.extfs:S,^,modules/extfs/,}
-
-BUILDLINK_DEPMETHOD.libSM?=	build
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/gnome-mime-data/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
deleted file mode 100644
index ea92ecd8c05..00000000000
--- a/sysutils/gnome-vfs/PLIST
+++ /dev/null
@@ -1,122 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2006/04/17 07:07:34 jlam Exp $
-bin/gnome-vfs-config
-etc/vfs/modules/default-modules.conf
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-backend.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellable-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellation.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-configuration.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-context.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-size.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-find-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-iobuf.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-messages.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-magic.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-regexp-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-result.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-seekable.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-shellpattern-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-standard-callbacks.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-transform.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-types.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
-lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
-lib/libgnomevfs-pthread.la
-lib/libgnomevfs.la
-lib/vfs/extfs/README
-lib/vfs/extfs/a
-lib/vfs/extfs/ar
-lib/vfs/extfs/arj
-lib/vfs/extfs/cpio
-lib/vfs/extfs/deb
-lib/vfs/extfs/hp48
-lib/vfs/extfs/lha
-lib/vfs/extfs/mailfs
-lib/vfs/extfs/patchfs
-lib/vfs/extfs/rar
-lib/vfs/extfs/rpm
-lib/vfs/extfs/rpms
-lib/vfs/extfs/tar
-lib/vfs/extfs/trpm
-lib/vfs/extfs/zip
-lib/vfs/extfs/zoo
-lib/vfs/modules/libbzip2.la
-lib/vfs/modules/libdesktop.la
-lib/vfs/modules/libextfs.la
-lib/vfs/modules/libfile.la
-lib/vfs/modules/libftp.la
-lib/vfs/modules/libgzip.la
-lib/vfs/modules/libhttp.la
-lib/vfs/modules/libnntp.la
-lib/vfs/modules/libvfs-pipe.la
-lib/vfs/modules/libvfs-test.la
-lib/vfs/modules/libvfs-translate.la
-lib/vfsConf.sh
-share/locale/az/LC_MESSAGES/gnome-vfs.mo
-share/locale/ca/LC_MESSAGES/gnome-vfs.mo
-share/locale/da/LC_MESSAGES/gnome-vfs.mo
-share/locale/de/LC_MESSAGES/gnome-vfs.mo
-share/locale/el/LC_MESSAGES/gnome-vfs.mo
-share/locale/es/LC_MESSAGES/gnome-vfs.mo
-share/locale/eu/LC_MESSAGES/gnome-vfs.mo
-share/locale/fi/LC_MESSAGES/gnome-vfs.mo
-share/locale/fr/LC_MESSAGES/gnome-vfs.mo
-share/locale/ga/LC_MESSAGES/gnome-vfs.mo
-share/locale/gl/LC_MESSAGES/gnome-vfs.mo
-share/locale/hu/LC_MESSAGES/gnome-vfs.mo
-share/locale/it/LC_MESSAGES/gnome-vfs.mo
-share/locale/ja/LC_MESSAGES/gnome-vfs.mo
-share/locale/ko/LC_MESSAGES/gnome-vfs.mo
-share/locale/lt/LC_MESSAGES/gnome-vfs.mo
-share/locale/nl/LC_MESSAGES/gnome-vfs.mo
-share/locale/nn/LC_MESSAGES/gnome-vfs.mo
-share/locale/no/LC_MESSAGES/gnome-vfs.mo
-share/locale/pl/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt/LC_MESSAGES/gnome-vfs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
-share/locale/ro/LC_MESSAGES/gnome-vfs.mo
-share/locale/ru/LC_MESSAGES/gnome-vfs.mo
-share/locale/sk/LC_MESSAGES/gnome-vfs.mo
-share/locale/sl/LC_MESSAGES/gnome-vfs.mo
-share/locale/sv/LC_MESSAGES/gnome-vfs.mo
-share/locale/tr/LC_MESSAGES/gnome-vfs.mo
-share/locale/uk/LC_MESSAGES/gnome-vfs.mo
-share/locale/wa/LC_MESSAGES/gnome-vfs.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
-@dirrm lib/vfs/modules
-@dirrm lib/vfs/extfs
-@unexec ${RMDIR} %D/lib/vfs 2>/dev/null || ${TRUE}
-@dirrm lib/gnome-vfs-1.0/include
-@dirrm lib/gnome-vfs-1.0
-@dirrm include/gnome-vfs-1.0/libgnomevfs
-@dirrm include/gnome-vfs-1.0
-@dirrm etc/vfs/modules
-@dirrm etc/vfs
diff --git a/sysutils/gnome-vfs/buildlink3.mk b/sysutils/gnome-vfs/buildlink3.mk
deleted file mode 100644
index 632793141a4..00000000000
--- a/sysutils/gnome-vfs/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/07/08 23:11:09 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GNOME_VFS_BUILDLINK3_MK:=	${GNOME_VFS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gnome-vfs
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-vfs}
-BUILDLINK_PACKAGES+=	gnome-vfs
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-vfs
-
-.if !empty(GNOME_VFS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=1.0.5nb7
-BUILDLINK_ABI_DEPENDS.gnome-vfs+=	gnome-vfs>=1.0.5nb11
-BUILDLINK_PKGSRCDIR.gnome-vfs?=	../../sysutils/gnome-vfs
-.endif	# GNOME_VFS_BUILDLINK3_MK
-
-.include "../../archivers/bzip2/buildlink3.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/gnome-mime-data/buildlink3.mk"
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
deleted file mode 100644
index 128f846a99a..00000000000
--- a/sysutils/gnome-vfs/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.18 2005/11/04 22:30:34 dbj Exp $
-
-SHA1 (gnome-vfs-1.0.5.tar.gz) = 41156323969d44e3f14ce481b81bfdb5d1deba49
-RMD160 (gnome-vfs-1.0.5.tar.gz) = 76fbf8e590e41d2cac39faef9edc85e2df02c21a
-Size (gnome-vfs-1.0.5.tar.gz) = 1048954 bytes
-SHA1 (patch-aa) = 9bb8ed4b9fbab1ff21d86b3d1e297cb89544137b
-SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
-SHA1 (patch-ac) = c7c05745228aba1b4db343155e8ac0c53e84bf32
-SHA1 (patch-ad) = fedec3138430a91d96e15fcc6fc60f64b13ef50d
-SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
-SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = a9560b6a284abaafd6793a899da15c7fcdf4dd95
-SHA1 (patch-ah) = dfc086dd0bb5123179317b873fc616d20c53f9bb
-SHA1 (patch-ai) = 43c4bf209541816e804b628c9a1cba68327c3b7b
-SHA1 (patch-aj) = 0adb274d6deae3522e5f194ceae08aab452ca3f1
-SHA1 (patch-ak) = 1c99154076a6e69a5951348449e49ede797345d7
-SHA1 (patch-al) = b4346af92d7b69b05f142c67213b3c7623431f2d
-SHA1 (patch-am) = 9d101ad4efdcfd7ce999e9d696db2bec76efaec2
-SHA1 (patch-an) = 5d0a875d23d8fd54b29bba19aacd341fbb2bdf37
diff --git a/sysutils/gnome-vfs/patches/patch-aa b/sysutils/gnome-vfs/patches/patch-aa
deleted file mode 100644
index ca019a2387e..00000000000
--- a/sysutils/gnome-vfs/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/04/15 02:09:27 rh Exp $
-
---- modules/cdda-cddb.c.orig	2001-03-16 12:44:25.000000000 +1000
-+++ modules/cdda-cddb.c
-@@ -339,7 +339,7 @@ CDDBDoQuery (cdrom_drive *cd_desc, CDDBS
-     query->query_match=MATCH_INEXACT;
-     query->query_matches=0;
- 
--    while(!CDDBReadLine(socket,inbuffer,256)) {
-+    while(query->query_matches < MAX_INEXACT_MATCHES && !CDDBReadLine(socket,inbuffer,256)) {
-       query->query_list[query->query_matches].list_genre=
- 	CDDBGenreValue(ChopWhite(strtok(inbuffer," ")));
-       
diff --git a/sysutils/gnome-vfs/patches/patch-ab b/sysutils/gnome-vfs/patches/patch-ab
deleted file mode 100644
index 476c9af14e6..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/04/07 19:00:21 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job.h.orig	Thu Apr  5 17:03:26 2001
-+++ libgnomevfs-pthread/gnome-vfs-job.h
-@@ -28,7 +28,11 @@
- 
- #include "gnome-vfs.h"
- #include "gnome-vfs-private.h"
-+#ifdef HAVE_SEMAPHORE_H
- #include <semaphore.h>
-+#else
-+#include <pthread.h>
-+#endif
- 
- typedef struct GnomeVFSJob GnomeVFSJob;
- 
-@@ -327,7 +331,11 @@
- 	gboolean failed;
- 	
- 	/* Global lock for accessing data.  */
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_t access_lock;
-+#else
-+	pthread_mutex_t access_lock;
-+#endif
- 
- 	/* This condition is signalled when the master thread gets a
-            notification and wants to acknowledge it.  */
diff --git a/sysutils/gnome-vfs/patches/patch-ac b/sysutils/gnome-vfs/patches/patch-ac
deleted file mode 100644
index 05375cef89d..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/11/04 22:30:34 dbj Exp $
-
---- modules/file-method.c.orig	2002-03-14 22:33:01.000000000 -0500
-+++ modules/file-method.c
-@@ -35,9 +35,12 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <limits.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <utime.h>
-@@ -767,9 +770,15 @@ read_directory (DirectoryHandle *handle,
- 		filter_needs = GNOME_VFS_DIRECTORY_FILTER_NEEDS_NOTHING;
- 	}
- 
-+#if (defined(BSD) && BSD >= 199306)
-+	if ((result = readdir (handle->dir)) != NULL) {
-+		*handle->current_entry = *result;
-+	}
-+#else
- 	if (readdir_r (handle->dir, handle->current_entry, &result) != 0) {
- 		return gnome_vfs_result_from_errno ();
- 	}
-+#endif
- 	
- 	if (result == NULL) {
- 		return GNOME_VFS_ERROR_EOF;
-@@ -1099,9 +1108,15 @@ find_trash_in_one_hierarchy_level (const
- 
- 	item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
- 	for (;;) {
-+#if (defined(BSD) && BSD >= 199306)
-+		if ((item = readdir (directory)) != NULL) {
-+			*item_buffer = *item;
-+		}
-+#else
- 		if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) {
- 			break;
- 		}
-+#endif
- 
- 		if (gnome_vfs_context_check_cancellation (context))
- 			break;
diff --git a/sysutils/gnome-vfs/patches/patch-ad b/sysutils/gnome-vfs/patches/patch-ad
deleted file mode 100644
index 9aae6f860a4..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/05/26 11:32:25 wiz Exp $
-
---- doc/Makefile.in.orig	2002-03-15 21:51:28.000000000 +0100
-+++ doc/Makefile.in
-@@ -420,6 +420,7 @@ maintainer-clean-local: clean
- 	cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
- 
- install-data-local:
-+noinstall-data-local:
- 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
- 	(installfiles=`echo $(srcdir)/html/*.html`; \
- 	if test "$$installfiles" = '$(srcdir)/html/*.html'; \
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
deleted file mode 100644
index 7559aca8569..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/04/06 22:03:09 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job.c.orig	Thu Apr  5 17:46:13 2001
-+++ libgnomevfs-pthread/gnome-vfs-job.c
-@@ -166,13 +166,21 @@
- 	 * access lock at all in the case of synch operations like xfer.
- 	 * Unlocking here is perfectly OK, even though it's a hack.
- 	 */
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_post (&job->access_lock);
-+#else
-+	pthread_mutex_unlock (&job->access_lock);
-+#endif
- 
- 	JOB_DEBUG (("Wait notify condition %u", GPOINTER_TO_UINT (notify_result->job_handle)));
- 	/* Wait for the notify condition.  */
- 	g_cond_wait (job->notify_ack_condition, job->notify_ack_lock);
- 
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_wait (&job->access_lock);
-+#else
-+	pthread_mutex_lock (&job->access_lock);
-+#endif
- 
- 	JOB_DEBUG (("Unlock notify ack lock %u", GPOINTER_TO_UINT (notify_result->job_handle)));
- 	/* Acknowledgment got: unlock the mutex.  */
-@@ -564,7 +572,11 @@
- 	GnomeVFSOp *op;
- 
- 	JOB_DEBUG (("locking access lock %u, op %d", GPOINTER_TO_UINT (job->job_handle), type));
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_wait (&job->access_lock);
-+#else
-+	pthread_mutex_lock (&job->access_lock);
-+#endif
- 
- 	op = g_new (GnomeVFSOp, 1);
- 	op->type = type;
-@@ -588,7 +600,11 @@
- 	
- 	new_job = g_new0 (GnomeVFSJob, 1);
- 	
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_init (&new_job->access_lock, 0, 1);
-+#else
-+	pthread_mutex_init (&new_job->access_lock, NULL);
-+#endif
- 	new_job->notify_ack_condition = g_cond_new ();
- 	new_job->notify_ack_lock = g_mutex_new ();
- 
-@@ -610,7 +626,11 @@
- 
- 	gnome_vfs_op_destroy (job->op);
- 
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_destroy (&job->access_lock);
-+#else
-+	pthread_mutex_destroy (&job->access_lock);
-+#endif
- 
- 	g_cond_free (job->notify_ack_condition);
- 	g_mutex_free (job->notify_ack_lock);
-@@ -705,7 +725,11 @@
- 	JOB_DEBUG (("new job %u, op %d, unlocking access lock",
- 		GPOINTER_TO_UINT (job->job_handle), job->op->type));
- 
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_post (&job->access_lock);
-+#else
-+	pthread_mutex_unlock (&job->access_lock);
-+#endif
- }
- 
- #define DEFAULT_BUFFER_SIZE 16384
diff --git a/sysutils/gnome-vfs/patches/patch-af b/sysutils/gnome-vfs/patches/patch-af
deleted file mode 100644
index e76cd2ff8ce..00000000000
--- a/sysutils/gnome-vfs/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/04/06 22:03:09 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job-slave.c.orig	Thu Apr  5 17:55:16 2001
-+++ libgnomevfs-pthread/gnome-vfs-job-slave.c
-@@ -60,14 +60,22 @@
- 	}
- 	
- 	JOB_DEBUG (("locking access_lock %u", GPOINTER_TO_UINT (job->job_handle)));
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_wait (&job->access_lock);
-+#else
-+	pthread_mutex_lock (&job->access_lock);
-+#endif
- 	gnome_vfs_async_job_map_unlock ();
- 
- 	gnome_vfs_job_execute (job);
- 	complete = gnome_vfs_job_complete (job);
- 	
- 	JOB_DEBUG (("Unlocking access lock %u", GPOINTER_TO_UINT (job->job_handle)));
-+#ifdef HAVE_SEMAPHORE_H
- 	sem_post (&job->access_lock);
-+#else
-+	pthread_mutex_unlock (&job->access_lock);
-+#endif
- 
- 	if (complete) {
- 		JOB_DEBUG (("job %u done, removing from map and destroying",
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
deleted file mode 100644
index cc0a90fb723..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2003/04/17 23:09:53 nathanw Exp $
-
---- libgnomevfs/gnome-vfs-init.c.orig	2003-04-17 18:42:59.000000000 -0400
-+++ libgnomevfs/gnome-vfs-init.c	2003-04-17 18:46:06.000000000 -0400
-@@ -46,6 +46,9 @@
- 	gboolean retval;
- 	char *bogus_argv[2] = { "dummy", NULL };
- 
-+	if (!g_thread_supported ())
-+		g_thread_init (NULL);
-+
- 	G_LOCK (vfs_already_initialized);
- 
- 	if (!vfs_already_initialized) {
diff --git a/sysutils/gnome-vfs/patches/patch-ah b/sysutils/gnome-vfs/patches/patch-ah
deleted file mode 100644
index c6668b6056c..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/12/30 12:18:56 gavan Exp $
-
---- libgnomevfs/gnome-vfs-cancellable-ops.c.orig	2001-07-16 19:21:06.000000000 +0100
-+++ libgnomevfs/gnome-vfs-cancellable-ops.c
-@@ -32,6 +32,8 @@
- #include "gnome-vfs.h"
- #include "gnome-vfs-private.h"
- 
-+#undef truncate
-+
- GnomeVFSResult
- gnome_vfs_open_uri_cancellable (GnomeVFSHandle **handle,
- 				GnomeVFSURI *uri,
diff --git a/sysutils/gnome-vfs/patches/patch-ai b/sysutils/gnome-vfs/patches/patch-ai
deleted file mode 100644
index 7181124ed23..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/12/30 12:18:56 gavan Exp $
-
---- libgnomevfs/gnome-vfs-handle.c.orig	2001-07-16 19:21:06.000000000 +0100
-+++ libgnomevfs/gnome-vfs-handle.c
-@@ -27,6 +27,8 @@
- #include "gnome-vfs.h"
- #include "gnome-vfs-private.h"
- 
-+#undef tell
-+
- 
- struct GnomeVFSHandle {
- 	/* URI of the file being accessed through the handle.  */
diff --git a/sysutils/gnome-vfs/patches/patch-aj b/sysutils/gnome-vfs/patches/patch-aj
deleted file mode 100644
index a967baedc5f..00000000000
--- a/sysutils/gnome-vfs/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/01/01 00:00:02 gavan Exp $
-
---- libgnomevfs/gnome-vfs-method.c.orig	2001-09-04 23:24:22.000000000 +0100
-+++ libgnomevfs/gnome-vfs-method.c
-@@ -36,6 +36,8 @@
- #include <libgnomevfs/gnome-vfs-module.h>
- #include <libgnomevfs/gnome-vfs-private.h>
- 
-+#undef tell
-+
- 
- struct _ModuleElement {
- 	char *name;
diff --git a/sysutils/gnome-vfs/patches/patch-ak b/sysutils/gnome-vfs/patches/patch-ak
deleted file mode 100644
index 999038671e9..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/12/30 12:18:56 gavan Exp $
-
---- libgnomevfs/gnome-vfs-seekable.c.orig	2002-03-15 03:33:01.000000000 +0000
-+++ libgnomevfs/gnome-vfs-seekable.c
-@@ -34,6 +34,8 @@
- #include <string.h>
- #include <unistd.h> /* for close */
- 
-+#undef tell
-+
- static GnomeVFSResult	do_open		(GnomeVFSMethod *method,
- 					 GnomeVFSMethodHandle **method_handle,
- 					 GnomeVFSURI *uri,
diff --git a/sysutils/gnome-vfs/patches/patch-al b/sysutils/gnome-vfs/patches/patch-al
deleted file mode 100644
index f93636a0b67..00000000000
--- a/sysutils/gnome-vfs/patches/patch-al
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/12/30 12:18:56 gavan Exp $
-
---- libgnomevfs/gnome-vfs-parse-ls.c.orig	2003-12-23 18:41:32.816550000 +0000
-+++ libgnomevfs/gnome-vfs-parse-ls.c
-@@ -26,7 +26,6 @@
-    finduid, findgid are from GNU tar.  */
- 
- #include <config.h>
--#include "gnome-vfs-parse-ls.h"
- 
- #include "gnome-vfs-private.h"
- #include "gnome-vfs.h"
-@@ -42,6 +41,8 @@
- #include <time.h>
- #include <unistd.h>
- 
-+#include "gnome-vfs-parse-ls.h"
-+
- #ifndef TUNMLEN 
- #define TUNMLEN 256
- #endif
diff --git a/sysutils/gnome-vfs/patches/patch-am b/sysutils/gnome-vfs/patches/patch-am
deleted file mode 100644
index 8b269031808..00000000000
--- a/sysutils/gnome-vfs/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/05/19 10:27:26 jmmv Exp $
-
---- libgnomevfs/gnome-vfs-private-utils.c.orig	2001-07-16 20:21:07.000000000 +0200
-+++ libgnomevfs/gnome-vfs-private-utils.c
-@@ -263,7 +263,7 @@ gnome_vfs_forkexec (const gchar *file_na
-  * 
-  * Return value: 
-  **/
--GnomeVFSProcessResult
-+GnomeVFSProcessRunResult
- gnome_vfs_process_run_cancellable (const gchar *file_name,
- 				   const gchar * const argv[],
- 				   GnomeVFSProcessOptions options,
diff --git a/sysutils/gnome-vfs/patches/patch-an b/sysutils/gnome-vfs/patches/patch-an
deleted file mode 100644
index 6cee69df538..00000000000
--- a/sysutils/gnome-vfs/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/05/19 10:27:26 jmmv Exp $
-
---- libgnomevfs/gnome-vfs-process.c.orig	2001-07-16 20:21:07.000000000 +0200
-+++ libgnomevfs/gnome-vfs-process.c
-@@ -258,7 +258,7 @@ gnome_vfs_process_free (GnomeVFSProcess 
-  * 
-  * Return value: A numeric value reporting the result of the operation.
-  **/
--GnomeVFSProcessRunResult
-+GnomeVFSProcessResult
- gnome_vfs_process_signal (GnomeVFSProcess *process,
- 			  guint signal_number)
- {