Better PLIST processing; won't fail if built as a dependency.diff -r1.10 -r1.11 pkgsrc/sysutils/py-psutil/Makefile
(adam)
@@ -1,26 +1,26 @@ | @@ -1,26 +1,26 @@ | |||
1 | # $NetBSD: Makefile,v 1.10 2015/01/24 23:01:29 adam Exp $ | 1 | # $NetBSD: Makefile,v 1.11 2015/01/24 23:23:48 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= psutil-2.1.3 | 3 | DISTNAME= psutil-2.1.3 | |
4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | 4 | PKGNAME= ${PYPKGPREFIX}-${DISTNAME} | |
5 | CATEGORIES= sysutils | 5 | CATEGORIES= sysutils | |
6 | MASTER_SITES= https://pypi.python.org/packages/source/p/psutil/ | 6 | MASTER_SITES= https://pypi.python.org/packages/source/p/psutil/ | |
7 | 7 | |||
8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
9 | HOMEPAGE= http://code.google.com/p/psutil/ | 9 | HOMEPAGE= http://code.google.com/p/psutil/ | |
10 | COMMENT= Cross-platform process and system utilities module for Python | 10 | COMMENT= Cross-platform process and system utilities module for Python | |
11 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
12 | 12 | |||
13 | REPLACE_PYTHON= psutil/*py | 13 | REPLACE_PYTHON= psutil/*py | |
14 | 14 | |||
15 | .include "../../mk/bsd.prefs.mk" | 15 | .include "../../mk/bsd.prefs.mk" | |
16 | 16 | |||
17 | # facilitate PLIST processing | 17 | # facilitate PLIST processing | |
18 | .if ${OPSYS} == "SunOS" | 18 | .if ${OPSYS} == "Darwin" | |
19 | LOWER_OPSYS= ${OPSYS:tl} | 19 | PLIST_SUBST+= SYSTEM=osx | |
20 | .elif ${OPSYS} == "Darwin" | 20 | .else | |
21 | LOWER_OPSYS= osx | 21 | PLIST_SUBST+= SYSTEM=${OPSYS:tl} | |
22 | .endif | 22 | .endif | |
23 | 23 | |||
24 | .include "../../lang/python/application.mk" | 24 | .include "../../lang/python/application.mk" | |
25 | .include "../../lang/python/egg.mk" | 25 | .include "../../lang/python/egg.mk" | |
26 | .include "../../mk/bsd.pkg.mk" | 26 | .include "../../mk/bsd.pkg.mk" |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.4 2015/01/24 23:01:29 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.5 2015/01/24 23:23:48 adam Exp $ | |
2 | ${PYSITELIB}/_psutil_${LOWER_OPSYS}.so | 2 | ${PYSITELIB}/_psutil_${SYSTEM}.so | |
3 | ${PYSITELIB}/_psutil_posix.so | 3 | ${PYSITELIB}/_psutil_posix.so | |
4 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | 4 | ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO | |
5 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | 5 | ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt | |
6 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | 6 | ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt | |
7 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | 7 | ${PYSITELIB}/${EGG_INFODIR}/top_level.txt | |
8 | ${PYSITELIB}/psutil/__init__.py | 8 | ${PYSITELIB}/psutil/__init__.py | |
9 | ${PYSITELIB}/psutil/__init__.pyc | 9 | ${PYSITELIB}/psutil/__init__.pyc | |
10 | ${PYSITELIB}/psutil/__init__.pyo | 10 | ${PYSITELIB}/psutil/__init__.pyo | |
11 | ${PYSITELIB}/psutil/_common.py | 11 | ${PYSITELIB}/psutil/_common.py | |
12 | ${PYSITELIB}/psutil/_common.pyc | 12 | ${PYSITELIB}/psutil/_common.pyc | |
13 | ${PYSITELIB}/psutil/_common.pyo | 13 | ${PYSITELIB}/psutil/_common.pyo | |
14 | ${PYSITELIB}/psutil/_compat.py | 14 | ${PYSITELIB}/psutil/_compat.py | |
15 | ${PYSITELIB}/psutil/_compat.pyc | 15 | ${PYSITELIB}/psutil/_compat.pyc |