diff options
| author | wiz <wiz> | 2012-10-03 22:14:00 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2012-10-03 22:14:00 +0000 |
| commit | 87f13eccbca0e1334b8494bf6ef04411b6cf0bf5 (patch) | |
| tree | a6e0112f1c7655fad080d88eaa928420d1b0af8b /pkgtools | |
| parent | 3b980a4a44c341bc8fe11d23babd6f32cf476968 (diff) | |
| download | pkgsrc-87f13eccbca0e1334b8494bf6ef04411b6cf0bf5.tar.gz | |
Update for python25 removal.
Diffstat (limited to 'pkgtools')
| -rwxr-xr-x | pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 6 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 7ea0b97df07..b907436cda3 100755 --- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh +++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_rolling-replace.sh,v 1.32 2012/04/30 13:59:39 gdt Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.33 2012/10/03 22:14:03 wiz Exp $ #<license> # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -451,8 +451,8 @@ while [ -n "$REPLACE_TODO" ]; do # Set PKGNAME_REQD to give underlying make processes a chance to # set options derived from the package name. For example, # the appropriate version of Python can be derived from the - # package name (so, when building py25-foo, use python-2.5, - # not python-2.6). + # package name (so, when building py26-foo, use python-2.6, + # not python-2.7). MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*" if ! is_member $pkg $DEPENDS_CHECKED; then diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index a25550de9bb..dc42dfe9af7 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.226 2012/09/16 20:03:50 cheusov Exp $ +# $NetBSD: makevars.map,v 1.227 2012/10/03 22:14:03 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -631,7 +631,7 @@ PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a] PTHREAD_TYPE Identifier [$system] # ^^ or "native" or "none". PY_PATCHLIST Yes [$package] -PYPKGPREFIX { py24 py25 py26 py27 py31 } [*:pu, pyversion.mk:s, *:] +PYPKGPREFIX { py26 py27 py31 py32 } [*:pu, pyversion.mk:s, *:] PYTHON_FOR_BUILD_ONLY Yes [$package] PYTHON_PATCH_SCRIPTS List of Pathmask [$package_list] PYTHON_VERSIONS_ACCEPTED List of Version [$package] |