Fri Dec 16 12:51:56 2011 UTC ()
Use egg.mk, not distutils.mk.

This package can use either setuptools (egg.mk) or distutils
(distutils.mk), but it prefers setuptools and thus should be built
with our egg.mk support.  Adjust PLIST for egg.mk (different)
variables and drop eggfile conditionalization, as eggs always have
egg-info directories.

Thanks to dholland@ and obache@ for noticing/suggesting.


(gdt)
diff -r1.6 -r1.7 pkgsrc/filesystems/py-fuse-bindings/Makefile
diff -r1.6 -r1.7 pkgsrc/filesystems/py-fuse-bindings/PLIST
cvs diff -r1.6 -r1.7 pkgsrc/filesystems/py-fuse-bindings/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/py-fuse-bindings/Makefile 2011/12/16 01:07:23 1.6
+++ pkgsrc/filesystems/py-fuse-bindings/Makefile 2011/12/16 12:51:56 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.6 2011/12/16 01:07:23 gdt Exp $ 1# $NetBSD: Makefile,v 1.7 2011/12/16 12:51:56 gdt Exp $
2# 2#
3 3
4VERSION= 0.2.1 4VERSION= 0.2.1
5DISTNAME= fuse-python-${VERSION} 5DISTNAME= fuse-python-${VERSION}
6PKGNAME= ${PYPKGPREFIX}-fuse-bindings-${VERSION} 6PKGNAME= ${PYPKGPREFIX}-fuse-bindings-${VERSION}
7CATEGORIES= filesystems python 7CATEGORIES= filesystems python
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse/fuse-python}/ 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse/fuse-python}/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://sourceforge.net/apps/mediawiki/fuse/index.php?title=FusePython 11HOMEPAGE= http://sourceforge.net/apps/mediawiki/fuse/index.php?title=FusePython
12COMMENT= Python bindings for FUSE and refuse 12COMMENT= Python bindings for FUSE and refuse
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
@@ -16,17 +16,17 @@ EGG_NAME= fuse_python-${VERSION} @@ -16,17 +16,17 @@ EGG_NAME= fuse_python-${VERSION}
16PYDISTUTILSPKG= yes 16PYDISTUTILSPKG= yes
17PY_PATCHLIST= yes 17PY_PATCHLIST= yes
18USE_TOOLS+= pkg-config 18USE_TOOLS+= pkg-config
19PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
20 20
21INSTALLATION_DIRS= share/examples/fuse-python 21INSTALLATION_DIRS= share/examples/fuse-python
22 22
23post-install: 23post-install:
24 ${INSTALL_SCRIPT} ${WRKSRC}/example/hello.py \ 24 ${INSTALL_SCRIPT} ${WRKSRC}/example/hello.py \
25 ${DESTDIR}${PREFIX}/share/examples/fuse-python/ 25 ${DESTDIR}${PREFIX}/share/examples/fuse-python/
26 ${INSTALL_SCRIPT} ${WRKSRC}/example/xmp.py \ 26 ${INSTALL_SCRIPT} ${WRKSRC}/example/xmp.py \
27 ${DESTDIR}${PREFIX}/share/examples/fuse-python/ 27 ${DESTDIR}${PREFIX}/share/examples/fuse-python/
28 28
29.include "../../lang/python/distutils.mk" 29.include "../../lang/python/egg.mk"
30 30
31.include "../../mk/fuse.buildlink3.mk" 31.include "../../mk/fuse.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/filesystems/py-fuse-bindings/PLIST (expand / switch to unified diff)

--- pkgsrc/filesystems/py-fuse-bindings/PLIST 2011/12/16 01:10:29 1.6
+++ pkgsrc/filesystems/py-fuse-bindings/PLIST 2011/12/16 12:51:56 1.7
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1@comment $NetBSD: PLIST,v 1.6 2011/12/16 01:10:29 gdt Exp $ 1@comment $NetBSD: PLIST,v 1.7 2011/12/16 12:51:56 gdt Exp $
2${PYSITELIB}/fuse.py 2${PYSITELIB}/fuse.py
3${PYSITELIB}/fuse.pyc 3${PYSITELIB}/fuse.pyc
4${PYSITELIB}/fuse.pyo 4${PYSITELIB}/fuse.pyo
5${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}/PKG-INFO 5${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
6${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}/SOURCES.txt 6${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
7${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}/dependency_links.txt 7${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
8${PLIST.eggfile}${PYSITELIB}/${EGG_FILE}/top_level.txt 8${PYSITELIB}/${EGG_INFODIR}/top_level.txt
9${PYSITELIB}/fuseparts/__init__.py 9${PYSITELIB}/fuseparts/__init__.py
10${PYSITELIB}/fuseparts/__init__.pyc 10${PYSITELIB}/fuseparts/__init__.pyc
11${PYSITELIB}/fuseparts/__init__.pyo 11${PYSITELIB}/fuseparts/__init__.pyo
12${PYSITELIB}/fuseparts/_fusemodule.so 12${PYSITELIB}/fuseparts/_fusemodule.so
13${PYSITELIB}/fuseparts/setcompatwrap.py 13${PYSITELIB}/fuseparts/setcompatwrap.py
14${PYSITELIB}/fuseparts/setcompatwrap.pyc 14${PYSITELIB}/fuseparts/setcompatwrap.pyc
15${PYSITELIB}/fuseparts/setcompatwrap.pyo 15${PYSITELIB}/fuseparts/setcompatwrap.pyo
16${PYSITELIB}/fuseparts/subbedopts.py 16${PYSITELIB}/fuseparts/subbedopts.py
17${PYSITELIB}/fuseparts/subbedopts.pyc 17${PYSITELIB}/fuseparts/subbedopts.pyc
18${PYSITELIB}/fuseparts/subbedopts.pyo 18${PYSITELIB}/fuseparts/subbedopts.pyo
19share/examples/fuse-python/hello.py 19share/examples/fuse-python/hello.py
20share/examples/fuse-python/xmp.py 20share/examples/fuse-python/xmp.py