Use the python infrastructure.

Installs compiled python objects, so add them to PLIST and bump
PKGREVISION.

Replace patch-aa with better SUBST framework usage.

4 files changed, 17 insertions, 27 deletions

diff --git a/filesystems/fuse-wikipediafs/Makefile b/filesystems/fuse-wikipediafs/Makefile
index acdeb069516..ca46e0aa3f7 100644
--- a/filesystems/fuse-wikipediafs/Makefile
+++ b/filesystems/fuse-wikipediafs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2008/04/25 20:39:09 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2008/07/04 14:27:26 wiz Exp $
 #
 
 DISTNAME=	wikipediafs-0.3
 PKGNAME=	fuse-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wikipediafs/}
 
@@ -12,24 +13,17 @@ COMMENT=	FUSE filesystem for accessing the wikipedia
 
 PYTHON_VERSIONS_ACCEPTED=	25 24
 
-PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
+PYDISTUTILSPKG=		yes
+PY_PATCHLIST=		yes
 
 SUBST_CLASSES+=		config
 SUBST_STAGE.config=	post-patch
 SUBST_FILES.config=	setup.py
-SUBST_SED.config+=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.config+=	-e "s|@PKGMANDIR@|${PKGMANDIR}|g"
-SUBST_SED.config+=	-e "s|@PYSITELIB@|${PREFIX}/${PYSITELIB}|g"
+SUBST_SED.config+=	-e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g"
 SUBST_MESSAGE.config=   Fixing paths.
 
-do-build:
-	cd ${WRKSRC} && ${PYTHONBIN} setup.py build
-
-do-install:
-	cd ${WRKSRC} && ${PYTHONBIN} setup.py install
-
 .include "../../filesystems/py-fuse-bindings/buildlink3.mk"
 
-.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/fuse-wikipediafs/PLIST b/filesystems/fuse-wikipediafs/PLIST
index 2a15bf4ecc0..58e8567baf7 100644
--- a/filesystems/fuse-wikipediafs/PLIST
+++ b/filesystems/fuse-wikipediafs/PLIST
@@ -1,22 +1,31 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/08/09 21:42:52 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/07/04 14:27:26 wiz Exp $
 bin/mount.wikipediafs
 ${PYSITELIB}/wikipediafs/__init__.py
 ${PYSITELIB}/wikipediafs/__init__.pyc
+${PYSITELIB}/wikipediafs/__init__.pyo
 ${PYSITELIB}/wikipediafs/article.py
 ${PYSITELIB}/wikipediafs/article.pyc
+${PYSITELIB}/wikipediafs/article.pyo
 ${PYSITELIB}/wikipediafs/config.py
 ${PYSITELIB}/wikipediafs/config.pyc
+${PYSITELIB}/wikipediafs/config.pyo
 ${PYSITELIB}/wikipediafs/fs.py
 ${PYSITELIB}/wikipediafs/fs.pyc
+${PYSITELIB}/wikipediafs/fs.pyo
 ${PYSITELIB}/wikipediafs/http.py
 ${PYSITELIB}/wikipediafs/http.pyc
+${PYSITELIB}/wikipediafs/http.pyo
 ${PYSITELIB}/wikipediafs/logger.py
 ${PYSITELIB}/wikipediafs/logger.pyc
+${PYSITELIB}/wikipediafs/logger.pyo
 ${PYSITELIB}/wikipediafs/metadir.py
 ${PYSITELIB}/wikipediafs/metadir.pyc
+${PYSITELIB}/wikipediafs/metadir.pyo
 ${PYSITELIB}/wikipediafs/user.py
 ${PYSITELIB}/wikipediafs/user.pyc
+${PYSITELIB}/wikipediafs/user.pyo
 ${PYSITELIB}/wikipediafs/version.py
 ${PYSITELIB}/wikipediafs/version.pyc
+${PYSITELIB}/wikipediafs/version.pyo
 man/man1/mount.wikipediafs.1
 @dirrm ${PYSITELIB}/wikipediafs
diff --git a/filesystems/fuse-wikipediafs/distinfo b/filesystems/fuse-wikipediafs/distinfo
index a2d1885836f..48af5d0d993 100644
--- a/filesystems/fuse-wikipediafs/distinfo
+++ b/filesystems/fuse-wikipediafs/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/08/09 21:42:52 agc Exp $
+$NetBSD: distinfo,v 1.2 2008/07/04 14:27:26 wiz Exp $
 
 SHA1 (wikipediafs-0.3.tar.gz) = 8814afbb18f122492857a06a9f7a949b16e7b714
 RMD160 (wikipediafs-0.3.tar.gz) = 16377047749665082328421ffcb108f363db3dab
 Size (wikipediafs-0.3.tar.gz) = 25409 bytes
-SHA1 (patch-aa) = 35bb8db6d74022fef921ff60fe2f4afa6340eade
diff --git a/filesystems/fuse-wikipediafs/patches/patch-aa b/filesystems/fuse-wikipediafs/patches/patch-aa
deleted file mode 100644
index 69eb294ef09..00000000000
--- a/filesystems/fuse-wikipediafs/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/08/09 21:42:52 agc Exp $
-
---- setup.py	2007/08/09 20:52:33	1.1
-+++ setup.py	2007/08/09 20:52:59
-@@ -12,5 +12,5 @@
-     packages = ['wikipediafs'],
-     package_dir = {'wikipediafs':'src/wikipediafs/'},
-     scripts = ['src/mount.wikipediafs'],
--    data_files = [('/usr/share/man/man1/', ['doc/mount.wikipediafs.1.gz'])],
-+    data_files = [('@PKGMANDIR@/man1/', ['doc/mount.wikipediafs.1.gz'])],
- )
-\ No newline at end of file