From b1cd877e088d17fdc4d1fdba58c64b38add3c11f Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 14 Apr 2015 11:40:31 +0000 Subject: Remove more references to python-2.6. --- pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh | 4 ++-- pkgtools/pkglint/files/makevars.map | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgtools') diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index 896bf2d8c64..af27ee65707 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.34 2015/02/12 08:22:16 abs Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.35 2015/04/14 11:40:31 wiz Exp $ # # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -453,7 +453,7 @@ 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 py26-foo, use python-2.6, + # package name (so, when building py34-foo, use python-3.4, # not python-2.7). MAKE_SET_VARS="PKGNAME_REQD=${pkg}-*" diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index d9b4656e683..aba0310e278 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.262 2015/03/11 19:05:58 rillig Exp $ +# $NetBSD: makevars.map,v 1.263 2015/04/14 11:40:31 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -657,7 +657,7 @@ PTHREAD_OPTS List of { native optional require } [m:as,c:a,b:a] PTHREAD_TYPE Identifier [$system] # ^^ or "native" or "none". PY_PATCHPLIST Yes [$package] -PYPKGPREFIX { py26 py27 py33 } [*:pu, pyversion.mk:s, *:] +PYPKGPREFIX { py27 py33 py34 } [*:pu, pyversion.mk:s, *:] PYTHON_FOR_BUILD_ONLY Yes [$package] REPLACE_PYTHON List of Pathmask [$package_list] PYTHON_VERSIONS_ACCEPTED List of Version [$package] -- cgit v1.2.3