diff options
author | reed <reed> | 2006-04-06 06:21:32 +0000 |
---|---|---|
committer | reed <reed> | 2006-04-06 06:21:32 +0000 |
commit | 3b50716541c42bd031d14157665a74004901cade (patch) | |
tree | b6b5d2edfcc0b5a529e9754c567a2a58025e05f8 /lang/python | |
parent | 87fa6a3117eca2724176d2d7eb11a42a1a99df66 (diff) | |
download | pkgsrc-3b50716541c42bd031d14157665a74004901cade.tar.gz |
Over 1200 files touched but no revisions bumped :)
RECOMMENDED is removed. It becomes ABI_DEPENDS.
BUILDLINK_RECOMMENDED.foo becomes BUILDLINK_ABI_DEPENDS.foo.
BUILDLINK_DEPENDS.foo becomes BUILDLINK_API_DEPENDS.foo.
BUILDLINK_DEPENDS does not change.
IGNORE_RECOMMENDED (which defaulted to "no") becomes USE_ABI_DEPENDS
which defaults to "yes".
Added to obsolete.mk checking for IGNORE_RECOMMENDED.
I did not manually go through and fix any aesthetic tab/spacing issues.
I have tested the above patch on DragonFly building and packaging
subversion and pkglint and their many dependencies.
I have also tested USE_ABI_DEPENDS=no on my NetBSD workstation (where I
have used IGNORE_RECOMMENDED for a long time). I have been an active user
of IGNORE_RECOMMENDED since it was available.
As suggested, I removed the documentation sentences suggesting bumping for
"security" issues.
As discussed on tech-pkg.
I will commit to revbump, pkglint, pkg_install, createbuildlink separately.
Note that if you use wip, it will fail! I will commit to pkgsrc-wip
later (within day).
Diffstat (limited to 'lang/python')
-rw-r--r-- | lang/python/pyversion.mk | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index a54453b8c4d..0d9cddedafb 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.38 2005/11/04 18:24:37 rillig Exp $ +# $NetBSD: pyversion.mk,v 1.39 2006/04/06 06:22:13 reed Exp $ .if !defined(PYTHON_PYVERSION_MK) PYTHON_PYVERSION_MK= defined @@ -12,12 +12,12 @@ PYTHON_VERSIONS_INCOMPATIBLE+= 22 21 20 15 PYTHON_VERSIONS_ACCEPTED?= 24 23 22 21 20 PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default -BUILDLINK_DEPENDS.python15?= python15>=1.5 -BUILDLINK_DEPENDS.python20?= python20>=2.0 -BUILDLINK_DEPENDS.python21?= python21>=2.1 -BUILDLINK_DEPENDS.python22?= python22>=2.2 -BUILDLINK_DEPENDS.python23?= python23>=2.3 -BUILDLINK_DEPENDS.python24?= python24>=2.4 +BUILDLINK_API_DEPENDS.python15?= python15>=1.5 +BUILDLINK_API_DEPENDS.python20?= python20>=2.0 +BUILDLINK_API_DEPENDS.python21?= python21>=2.1 +BUILDLINK_API_DEPENDS.python22?= python22>=2.2 +BUILDLINK_API_DEPENDS.python23?= python23>=2.3 +BUILDLINK_API_DEPENDS.python24?= python24>=2.4 # transform the list into individual variables .for pv in ${PYTHON_VERSIONS_ACCEPTED} @@ -95,38 +95,38 @@ _PYTHON_VERSION= ${_PYTHON_VERSION_FIRSTACCEPTED} # .if ${_PYTHON_VERSION} == "24" PYPKGSRCDIR= ../../lang/python24 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python24}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python24}:${PYPKGSRCDIR} PYPACKAGE= python24 PYVERSSUFFIX= 2.4 PYPKGPREFIX= py24 .elif ${_PYTHON_VERSION} == "23" PYPKGSRCDIR= ../../lang/python23 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python23}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python23}:${PYPKGSRCDIR} PYPACKAGE= python23 PYVERSSUFFIX= 2.3 PYPKGPREFIX= py23 .elif ${_PYTHON_VERSION} == "22" PYPKGSRCDIR= ../../lang/python22 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python22}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python22}:${PYPKGSRCDIR} PYPACKAGE= python22 PYVERSSUFFIX= 2.2 PYPKGPREFIX= py22 .elif ${_PYTHON_VERSION} == "21" PYPKGSRCDIR= ../../lang/python21 PYPACKAGE= python21 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python21}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python21}:${PYPKGSRCDIR} PYVERSSUFFIX= 2.1 PYPKGPREFIX= py21 .elif ${_PYTHON_VERSION} == "20" PYPKGSRCDIR= ../../lang/python20 PYPACKAGE= python20 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python20}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python20}:${PYPKGSRCDIR} PYVERSSUFFIX= 2.0 PYPKGPREFIX= py20 .elif ${_PYTHON_VERSION} == "15" PYPKGSRCDIR= ../../lang/python15 PYPACKAGE= python15 -PYDEPENDENCY= ${BUILDLINK_DEPENDS.python15}:${PYPKGSRCDIR} +PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.python15}:${PYPKGSRCDIR} PYVERSSUFFIX= 1.5 PYPKGPREFIX= py15 .if !defined(PYTHON_DISTUTILS_BOOTSTRAP) |