Update gnome-vfs to 1.0. Changes include performance improvements through

a revamped pthread backend, several API cleanups, and numerous bug fixes.

7 files changed, 126 insertions, 49 deletions

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 1b7d067cb10..63704f10073 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,24 +1,24 @@
-# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/04/06 22:03:07 rh Exp $
 #
 
-DISTNAME=	gnome-vfs-0.4.1
-CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gnome-vfs/}
+DISTNAME=		gnome-vfs-1.0
+CATEGORIES=		sysutils gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gnome-vfs/}
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
-COMMENT=	GNOME Virtual File System
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		GNOME Virtual File System
 
-BUILD_DEPENDS+=	autoconf-2.13:../../devel/autoconf
-BUILD_DEPENDS+=	automake-1.4:../../devel/automake
-DEPENDS+=	GConf>=0.11:../../devel/GConf
+BUILD_DEPENDS+=		autoconf-2.13:../../devel/autoconf
+BUILD_DEPENDS+=		automake-1.4:../../devel/automake
+DEPENDS+=		GConf>=1.0.0:../../devel/GConf
 
-USE_X11BASE=	YES
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=		YES
 
 pre-configure:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/automake
diff --git a/sysutils/gnome-vfs/files/md5 b/sysutils/gnome-vfs/files/md5
index 5afbfadc4cf..f3ebfa94601 100644
--- a/sysutils/gnome-vfs/files/md5
+++ b/sysutils/gnome-vfs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
+$NetBSD: md5,v 1.2 2001/04/06 22:03:07 rh Exp $
 
-MD5 (gnome-vfs-0.4.1.tar.gz) = 512fab72e824e08894e2cd48178616d8
+SHA1 (gnome-vfs-1.0.tar.gz) = 51667a7137399b9e0a47143a2b51a31d01462426
diff --git a/sysutils/gnome-vfs/files/patch-sum b/sysutils/gnome-vfs/files/patch-sum
index 19da60f4fff..01751b1aafc 100644
--- a/sysutils/gnome-vfs/files/patch-sum
+++ b/sysutils/gnome-vfs/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.3 2000/11/30 04:07:18 mycroft Exp $
+$NetBSD: patch-sum,v 1.4 2001/04/06 22:03:08 rh Exp $
 
-MD5 (patch-aa) = 39f88c67972f3330d8210208f7f09bdc
-MD5 (patch-ab) = 9245ee772db13e1d80b726378b76e2c3
-MD5 (patch-ac) = cbd2a4c2b0df4ff4a3918a7a273db7fe
-MD5 (patch-ad) = 66bbb2bb5450aadc565be8b4975f8d0f
+SHA1 (patch-aa) = 5a86a14df10278920af3df0340353c8fa1e978ca
+SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
+SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
+SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
+SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
+SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
diff --git a/sysutils/gnome-vfs/patches/patch-ab b/sysutils/gnome-vfs/patches/patch-ab
deleted file mode 100644
index 69a3b3bc6c0..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
-
---- modules/nfs-method.c.orig	Wed Nov 15 13:41:58 2000
-+++ modules/nfs-method.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <limits.h>
- #include <sys/stat.h>
-+#include <sys/socket.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <utime.h>
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
new file mode 100644
index 00000000000..7559aca8569
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-ae
@@ -0,0 +1,74 @@
+$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
new file mode 100644
index 00000000000..e76cd2ff8ce
--- /dev/null
+++ b/sysutils/gnome-vfs/patches/patch-af
@@ -0,0 +1,27 @@
+$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/pkg/PLIST b/sysutils/gnome-vfs/pkg/PLIST
index 67f64dfe8c8..96cf11f7a86 100644
--- a/sysutils/gnome-vfs/pkg/PLIST
+++ b/sysutils/gnome-vfs/pkg/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:56 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/04/06 22:03:09 rh Exp $
 bin/gnome-vfs-config
-bin/gnome-vfs-gen-mimedb
 bin/gnome-vfs-slave
-bin/nautilus-mime-type-capplet
 etc/gnome-vfs-mime-magic
 etc/vfs/modules/default-modules.conf
 include/libgnomevfs/gnome-vfs-application-registry.h
@@ -14,7 +12,6 @@ include/libgnomevfs/gnome-vfs-configuration.h
 include/libgnomevfs/gnome-vfs-constants.h
 include/libgnomevfs/gnome-vfs-context.h
 include/libgnomevfs/gnome-vfs-directory-filter.h
-include/libgnomevfs/gnome-vfs-directory-list.h
 include/libgnomevfs/gnome-vfs-directory.h
 include/libgnomevfs/gnome-vfs-file-info.h
 include/libgnomevfs/gnome-vfs-file-size.h
@@ -29,7 +26,7 @@ include/libgnomevfs/gnome-vfs-method.h
 include/libgnomevfs/gnome-vfs-mime-handlers.h
 include/libgnomevfs/gnome-vfs-mime-info.h
 include/libgnomevfs/gnome-vfs-mime-magic.h
-include/libgnomevfs/gnome-vfs-mime-sniff-buffer-private.h
+include/libgnomevfs/gnome-vfs-mime-monitor.h
 include/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
 include/libgnomevfs/gnome-vfs-mime.h
 include/libgnomevfs/gnome-vfs-module-shared.h
@@ -39,7 +36,6 @@ include/libgnomevfs/gnome-vfs-parse-ls.h
 include/libgnomevfs/gnome-vfs-private-types.h
 include/libgnomevfs/gnome-vfs-private-utils.h
 include/libgnomevfs/gnome-vfs-private.h
-include/libgnomevfs/gnome-vfs-process.h
 include/libgnomevfs/gnome-vfs-regexp-filter.h
 include/libgnomevfs/gnome-vfs-result.h
 include/libgnomevfs/gnome-vfs-seekable.h
@@ -103,9 +99,6 @@ lib/vfs/modules/libgzip.so
 lib/vfs/modules/libhttp.a
 lib/vfs/modules/libhttp.la
 lib/vfs/modules/libhttp.so
-lib/vfs/modules/libnfs.a
-lib/vfs/modules/libnfs.la
-lib/vfs/modules/libnfs.so
 lib/vfs/modules/libvfs-pipe.a
 lib/vfs/modules/libvfs-pipe.la
 lib/vfs/modules/libvfs-pipe.so
@@ -120,15 +113,8 @@ lib/vfscorbaConf.sh
 lib/vfspthreadConf.sh
 man/man5/gnome-vfs-mime.5
 share/application-registry/gnome-vfs.applications
-share/control-center/nautilus-mime-type.desktop
-share/gnome/apps/Settings/nautilus-mime-type.desktop
 share/gnome/html/gnome-vfs-decl.txt
 share/gnome/html/gnome-vfs-sections.txt
-share/gnome/html/gnome-vfs.html
-share/gnome/html/gnome-vfs/book1.html
-share/gnome/html/gnome-vfs/gnome-vfs-gnome-vfs-mime-info.html
-share/gnome/html/gnome-vfs/gnome-vfs-gnome-vfs-mime.html
-share/gnome/html/gnome-vfs/libgnome.html
 share/mime-info/gnome-vfs.keys
 share/mime-info/gnome-vfs.mime
 @dirrm share/gnome/html/gnome-vfs