diff options
| author | obache <obache@pkgsrc.org> | 2012-02-06 11:47:25 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-02-06 11:47:25 +0000 |
| commit | 9f9dc4fef8466f5625527080b11043ce45475c63 (patch) | |
| tree | d35c3ab27abec02c2276289e96d081ccbd57baeb | |
| parent | 12c3574cf9889367988d5a13263b6e8aae05cf92 (diff) | |
| download | pkgsrc-9f9dc4fef8466f5625527080b11043ce45475c63.tar.gz | |
Simplify PLIST handling with using python/distutils.mk
(but for this package, egg file will be installed even with python24)
| -rw-r--r-- | textproc/py-4Suite/Makefile | 10 | ||||
| -rw-r--r-- | textproc/py-4Suite/PLIST | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile index e4befff6070..51172b11214 100644 --- a/textproc/py-4Suite/Makefile +++ b/textproc/py-4Suite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/07/03 21:25:50 jym Exp $ +# $NetBSD: Makefile,v 1.4 2012/02/06 11:47:25 obache Exp $ # VER= 1.0.2 @@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -PYDISTUTILSPKG= yes +EGG_NAME= ${DISTNAME:S/-/_/} SUBST_CLASSES+= python SUBST_FILES.python= build/scripts.*/4xml @@ -29,14 +29,10 @@ SUBST_FILES.python+= test/test.py SUBST_STAGE.python= post-build SUBST_SED.python= -e 's,\#![^ ]* python,\#! ${PYTHONBIN},' -# lang/python/egg.mk can't be used because of setup.py -# Use this quirk instead for the egg file -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${PYTHONBIN} setup.py config --prefix=${PREFIX} -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-4Suite/PLIST b/textproc/py-4Suite/PLIST index 972fa9ac177..96dd8986c9a 100644 --- a/textproc/py-4Suite/PLIST +++ b/textproc/py-4Suite/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/16 22:31:04 pettai Exp $ +@comment $NetBSD: PLIST,v 1.2 2012/02/06 11:47:25 obache Exp $ bin/4xml bin/4xpath bin/4xslt @@ -349,7 +349,7 @@ lib/4Suite/tests/Xml/Xslt/__init__.py lib/4Suite/tests/Xml/Xslt/test_harness.py lib/4Suite/tests/Xml/__init__.py lib/4Suite/tests/test.py -${PYSITELIB}/4Suite_XML-1.0.2-py${PYVERSSUFFIX}.egg-info +${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/Ft/Lib/CommandLine/Arguments.py ${PYSITELIB}/Ft/Lib/CommandLine/Arguments.pyc ${PYSITELIB}/Ft/Lib/CommandLine/Arguments.pyo |