Update to 0.2.1. Note in DESCR that this is what GNU/Linux calls

"fuse-python".

Upstream does not provide NEWS.  Perusal of Changelog leads to the
conclusion that there are many bugfixes and minor enhancements, but no
major changes.

(Tested with "bup fuse" and ../fuse-wikipediafs on NetBSD 5.1_STABLE.)

6 files changed, 77 insertions, 69 deletions

diff --git a/filesystems/py-fuse-bindings/DESCR b/filesystems/py-fuse-bindings/DESCR
index 301c9dc049f..3040813d31c 100644
--- a/filesystems/py-fuse-bindings/DESCR
+++ b/filesystems/py-fuse-bindings/DESCR
@@ -1,11 +1,15 @@
-Python bindings for the FUSE and refuse interfaces.
+Python bindings for the FUSE (and hence refuse) interfaces.
 
 FUSE allows file sytsem operations to take place at user level, rather
 than in the kernel.  Refuse is a BSD-licensed re-implementation of
 fuse, running on top of the puffs functionality.  This package
 provides a python language interface to the FUSE interface.
 
-To achieve backwards compatibility with previous versions of the fuse
-bindings for python, set the environment variable
+To achieve backwards compatibility (unlikely to be needed in 2011+)
+with very old versions of the fuse bindings for python, set the
+environment variable
 
 	FUSE_PYTHON_COMPAT=0.1
+
+This software is called "fuse-python" by upstream (and hence at least
+some Linux distributions).
diff --git a/filesystems/py-fuse-bindings/Makefile b/filesystems/py-fuse-bindings/Makefile
index f920f620dd6..69921cc767e 100644
--- a/filesystems/py-fuse-bindings/Makefile
+++ b/filesystems/py-fuse-bindings/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.4 2011/03/11 11:29:42 zafer Exp $
+# $NetBSD: Makefile,v 1.5 2011/12/16 00:50:46 gdt Exp $
 #
 
-DISTNAME=		fuse-python-0.2pre1-20060720
-PKGNAME=		${PYPKGPREFIX}-fuse-bindings-0.2pre1
-PKGREVISION=		2
+DISTNAME=		fuse-python-0.2.1
+PKGNAME=		${PYPKGPREFIX}-fuse-bindings-0.2.1
 CATEGORIES=		filesystems python
-MASTER_SITES=		# http://bsd.cenkes.org/myports/
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse/fuse-python}/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://bsd.cenkes.org/myports/
+HOMEPAGE=		http://sourceforge.net/apps/mediawiki/fuse/index.php?title=FusePython
 COMMENT=		Python bindings for FUSE and refuse
 
+LICENSE=		gnu-lgpl-v2.1
+
 PYDISTUTILSPKG=		yes
 PY_PATCHLIST=		yes
 USE_TOOLS+=		pkg-config
@@ -25,8 +25,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/example/xmp.py \
 		${DESTDIR}${PREFIX}/share/examples/fuse-python/
 
-.include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/py-fuse-bindings/PLIST b/filesystems/py-fuse-bindings/PLIST
index 80f8cc51ee8..c9d8efc2993 100644
--- a/filesystems/py-fuse-bindings/PLIST
+++ b/filesystems/py-fuse-bindings/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:51:59 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/12/16 00:50:46 gdt Exp $
 ${PYSITELIB}/fuse.py
 ${PYSITELIB}/fuse.pyc
 ${PYSITELIB}/fuse.pyo
+${PYSITELIB}/fuse_python-${PKGVERSION}-py2.6.egg-info/PKG-INFO
+${PYSITELIB}/fuse_python-${PKGVERSION}-py2.6.egg-info/SOURCES.txt
+${PYSITELIB}/fuse_python-${PKGVERSION}-py2.6.egg-info/dependency_links.txt
+${PYSITELIB}/fuse_python-${PKGVERSION}-py2.6.egg-info/top_level.txt
 ${PYSITELIB}/fuseparts/__init__.py
 ${PYSITELIB}/fuseparts/__init__.pyc
 ${PYSITELIB}/fuseparts/__init__.pyo
diff --git a/filesystems/py-fuse-bindings/distinfo b/filesystems/py-fuse-bindings/distinfo
index 19713a7a81b..46d844d2990 100644
--- a/filesystems/py-fuse-bindings/distinfo
+++ b/filesystems/py-fuse-bindings/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/05/04 19:51:52 agc Exp $
+$NetBSD: distinfo,v 1.2 2011/12/16 00:50:46 gdt Exp $
 
-SHA1 (fuse-python-0.2pre1-20060720.tar.bz2) = ba96a05d23fe878d42af632bbc359a046e2e1190
-RMD160 (fuse-python-0.2pre1-20060720.tar.bz2) = b87ba3ef4859964524c8b5a3573b4549770cf2a4
-Size (fuse-python-0.2pre1-20060720.tar.bz2) = 34199 bytes
-SHA1 (patch-aa) = e1e6fcd47efcb2965627657f377d78d484294a61
+SHA1 (fuse-python-0.2.1.tar.gz) = b2abccfa43447eb095e4998faae42fd5ae35f351
+RMD160 (fuse-python-0.2.1.tar.gz) = 91b0b0f727842b7128232fc46db7063047e61ef9
+Size (fuse-python-0.2.1.tar.gz) = 57833 bytes
+SHA1 (patch-fuseparts___fusemodule.c) = 67edc36988220f7c366ea6fdf0f48e90b9706cc1
diff --git a/filesystems/py-fuse-bindings/patches/patch-aa b/filesystems/py-fuse-bindings/patches/patch-aa
deleted file mode 100644
index eb988b59176..00000000000
--- a/filesystems/py-fuse-bindings/patches/patch-aa
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/05/04 19:51:52 agc Exp $
-
---- fuseparts/_fusemodule.c	2007/04/29 20:39:47	1.1
-+++ fuseparts/_fusemodule.c	2007/04/29 20:42:20
-@@ -149,9 +149,15 @@
- 	 * and we don't use autotools so we just dare to throw these in as is. 
- 	 */
- 
--	fetchattr_soft(st, st_rdev);
-+#ifdef __NetBSD__
-+	st->st_blocks = (st->st_size + 511) / 512;
-+	st->st_blksize = 4096;
-+	st->st_rdev = st->st_dev;
-+#else
- 	fetchattr_soft_d(st, st_blksize, 4096);
- 	fetchattr_soft_d(st, st_blocks, (st->st_size + 511)/512);
-+	fetchattr_soft(st, st_rdev);
-+#endif
- 
- #undef fetchattr_soft
- #undef fetchattr_soft_d
-@@ -707,6 +713,9 @@
- static int
- pyfuse_loop_mt(struct fuse *f)
- {
-+#ifdef __NetBSD__
-+	return fuse_loop(f);
-+#else
- 	PyInterpreterState *interp;
- 	PyThreadState *save;
- 	int err;
-@@ -723,6 +732,7 @@
- 	PyEval_RestoreThread(save);
- 
- 	return(err);
-+#endif
- }
- 
- static struct fuse *fuse=NULL;
-@@ -916,7 +926,11 @@
- 
- 	path = PyString_AsString(arg1);
- 
-+#ifdef __NetBSD__
-+	err = 0;
-+#else
- 	err = fuse_invalidate(fuse, path);
-+#endif
- 
- 	ret = PyInt_FromLong(err);
- 
diff --git a/filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c b/filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c
new file mode 100644
index 00000000000..e376c9c9193
--- /dev/null
+++ b/filesystems/py-fuse-bindings/patches/patch-fuseparts___fusemodule.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-fuseparts___fusemodule.c,v 1.1 2011/12/16 00:50:47 gdt Exp $
+
+/*
+ * This patch is not known to be filed upstream.
+ * 
+ * It adapts for NetBSD's (re)fuse implementation, specifically
+ *   the lack of an attribute (rdev)
+ *   [something about loop that I don't understand]
+ *   stubbing out fuse_invalidate calls (because refuse doesn't support them?)
+ */
+
+--- fuseparts/_fusemodule.c.orig	2010-04-14 22:29:21.000000000 +0000
++++ fuseparts/_fusemodule.c
+@@ -213,7 +213,7 @@ fi_to_py(struct fuse_file_info *fi)
+ 	 * autotools so we just dare to throw these in as is.		\
+ 	 */								\
+ 									\
+-	fetchattr_soft(st, st_rdev);					\
++	fetchattr_soft_d(st, st_rdev, st->st_dev);			\
+ 	fetchattr_soft_d(st, st_blksize, 4096);				\
+ 	fetchattr_soft_d(st, st_blocks, (st->st_size + 511)/512)
+ 
+@@ -903,6 +903,9 @@ bmap_func(const char *path, size_t block
+ static int
+ pyfuse_loop_mt(struct fuse *f)
+ {
++#ifdef __NetBSD__
++	return fuse_loop(f);
++#else /* __NetBSD__ */
+ 	int err = -1;
+ #ifdef WITH_THREAD
+ 	PyThreadState *save;
+@@ -916,6 +919,7 @@ pyfuse_loop_mt(struct fuse *f)
+ #endif
+ 
+ 	return(err);
++#endif /* __NetBSD__ */
+ }
+ 
+ static struct fuse *fuse=NULL;
+@@ -1137,7 +1141,11 @@ FuseInvalidate(PyObject *self, PyObject 
+ 
+ 	path = PyString_AsString(arg1);
+ 
++#ifdef __NetBSD__
++	err = 0;
++#else
+ 	err = fuse_invalidate(fuse, path);
++#endif
+ 
+ 	ret = PyInt_FromLong(err);
+