diff options
| author | wiz <wiz@pkgsrc.org> | 2012-04-08 20:21:41 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-04-08 20:21:41 +0000 |
| commit | 4773e0d7e289f0cee86a191ca7701a3e0f128698 (patch) | |
| tree | ca85b0747dcbf59072dbf48eba4548d225e3970f /lang | |
| parent | f278f49046eda68ba5b685176f78b30baf399590 (diff) | |
| download | pkgsrc-4773e0d7e289f0cee86a191ca7701a3e0f128698.tar.gz | |
All supported python versions in pkgsrc support eggs, so remove
${PLIST.eggfile} from PLISTs and support code from lang/python.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/py-basicproperty/PLIST | 4 | ||||
| -rw-r--r-- | lang/py-psyco/PLIST | 4 | ||||
| -rw-r--r-- | lang/python/distutils.mk | 10 |
3 files changed, 6 insertions, 12 deletions
diff --git a/lang/py-basicproperty/PLIST b/lang/py-basicproperty/PLIST index ea7bab78403..a03f885336f 100644 --- a/lang/py-basicproperty/PLIST +++ b/lang/py-basicproperty/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2011/10/29 05:02:28 obache Exp $ -${PLIST.eggfile}${PYSITELIB}/${EGG_FILE} +@comment $NetBSD: PLIST,v 1.5 2012/04/08 20:21:50 wiz Exp $ +${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/basicproperty/__init__.py ${PYSITELIB}/basicproperty/__init__.pyc ${PYSITELIB}/basicproperty/__init__.pyo diff --git a/lang/py-psyco/PLIST b/lang/py-psyco/PLIST index cd3b01f4c5e..94b55395ed5 100644 --- a/lang/py-psyco/PLIST +++ b/lang/py-psyco/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2011/10/29 04:26:12 obache Exp $ -${PLIST.eggfile}${PYSITELIB}/${EGG_FILE} +@comment $NetBSD: PLIST,v 1.5 2012/04/08 20:21:50 wiz Exp $ +${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/psyco/__init__.py ${PYSITELIB}/psyco/__init__.pyc ${PYSITELIB}/psyco/__init__.pyo diff --git a/lang/python/distutils.mk b/lang/python/distutils.mk index 7a3cb0ead9e..7caa35fb49a 100644 --- a/lang/python/distutils.mk +++ b/lang/python/distutils.mk @@ -1,4 +1,4 @@ -# $NetBSD: distutils.mk,v 1.3 2012/04/08 20:17:10 wiz Exp $ +# $NetBSD: distutils.mk,v 1.4 2012/04/08 20:22:01 wiz Exp $ # # Common logic for python distributions that use distutils. # @@ -16,22 +16,16 @@ PYDISTUTILSPKG= yes # We expect distutils to create an egg-info file if Python distutils # can do so, and provide support for a PLIST entry that represents -# this norm and will work with all python versions. (If the package -# set PY_NO_EGG, respect that choice, but PLIST.eggfile is still set.) +# this norm and will work with all python versions. # Set the egg file basename. EGG_NAME?= ${DISTNAME} -PLIST_VARS+= eggfile # Python distutils will create an eggfile. -PLIST.eggfile= yes PY_NO_EGG?= no # Egg files have the version encoded, so generalize in PLIST, and provide # our conditional. PLIST_SUBST+= EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info -# PYSITELIB is already de-expanded -PRINT_PLIST_AWK+= { gsub("[$$]{PYSITELIB}/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info", \ - "$${PLIST.eggfile}$${PYSITELIB}/$${EGG_FILE}") } .include "../../lang/python/extension.mk" |