diff options
| -rw-r--r-- | lang/python/distutils.mk | 8 | ||||
| -rw-r--r-- | lang/python/pyversion.mk | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/lang/python/distutils.mk b/lang/python/distutils.mk index 308fef3e356..7a3cb0ead9e 100644 --- a/lang/python/distutils.mk +++ b/lang/python/distutils.mk @@ -1,4 +1,4 @@ -# $NetBSD: distutils.mk,v 1.2 2011/02/13 08:09:43 obache Exp $ +# $NetBSD: distutils.mk,v 1.3 2012/04/08 20:17:10 wiz Exp $ # # Common logic for python distributions that use distutils. # @@ -23,15 +23,9 @@ PYDISTUTILSPKG= yes EGG_NAME?= ${DISTNAME} PLIST_VARS+= eggfile -.if !empty(PYDISTUTILS_CREATES_EGGFILES:M[yY][eE][sS]) # Python distutils will create an eggfile. PLIST.eggfile= yes PY_NO_EGG?= no -.else -# Python distutils will not create an eggfile. -# (PLIST.eggfile being set to no is equivalent to being set to yes!) -PY_NO_EGG?= yes -.endif # Egg files have the version encoded, so generalize in PLIST, and provide # our conditional. diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 5396e770e59..520a5a3bef7 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.97 2012/04/08 19:08:59 wiz Exp $ +# $NetBSD: pyversion.mk,v 1.98 2012/04/08 20:17:10 wiz Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -139,31 +139,26 @@ PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python31}:${PYPKGSRCDIR} PYPACKAGE= python31 PYVERSSUFFIX= 3.1 PYPKGPREFIX= py31 -PYDISTUTILS_CREATES_EGGFILES= yes .elif ${_PYTHON_VERSION} == "27" PYPKGSRCDIR= ../../lang/python27 PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python27}:${PYPKGSRCDIR} PYPACKAGE= python27 PYVERSSUFFIX= 2.7 PYPKGPREFIX= py27 -PYDISTUTILS_CREATES_EGGFILES= yes .elif ${_PYTHON_VERSION} == "26" PYPKGSRCDIR= ../../lang/python26 PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python26}:${PYPKGSRCDIR} PYPACKAGE= python26 PYVERSSUFFIX= 2.6 PYPKGPREFIX= py26 -PYDISTUTILS_CREATES_EGGFILES= yes .elif ${_PYTHON_VERSION} == "25" PYPKGSRCDIR= ../../lang/python25 PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python25}:${PYPKGSRCDIR} PYPACKAGE= python25 PYVERSSUFFIX= 2.5 PYPKGPREFIX= py25 -PYDISTUTILS_CREATES_EGGFILES= yes .else PKG_FAIL_REASON+= "No valid Python version" -PYDISTUTILS_CREATES_EGGFILES= no PYPKGPREFIX= .endif |