From owner-freebsd-python@FreeBSD.ORG  Sat Apr 12 02:38:14 2014
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
Delivered-To: python@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EBB6FFC6
 for <python@freebsd.org>; Sat, 12 Apr 2014 02:38:14 +0000 (UTC)
Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214])
 by mx1.freebsd.org (Postfix) with ESMTP id A6B7E1AEB
 for <python@freebsd.org>; Sat, 12 Apr 2014 02:38:14 +0000 (UTC)
Received: from gromit.timing.com (gromit.timing.com [206.168.13.209])
 by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id s3C2cD89024608
 for <python@freebsd.org>; Fri, 11 Apr 2014 20:38:13 -0600 (MDT)
 (envelope-from jhein@symmetricom.com)
Received: from gromit.timing.com (localhost [127.0.0.1])
 by gromit.timing.com (8.14.7/8.14.5) with ESMTP id s3C2cALV021572;
 Fri, 11 Apr 2014 20:38:10 -0600 (MDT)
 (envelope-from jhein@gromit.timing.com)
Received: (from jhein@localhost)
 by gromit.timing.com (8.14.7/8.14.7/Submit) id s3C2cAK0021571;
 Fri, 11 Apr 2014 20:38:10 -0600 (MDT) (envelope-from jhein)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <21320.42770.726441.667849@gromit.timing.com>
Date: Fri, 11 Apr 2014 20:38:10 -0600
From: John Hein <john.hein@microsemi.com>
To: python@freebsd.org
Subject: [patch] fix PYTHON_VERSION in py-setuptoolsXX
X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3)
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-python>,
 <mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python/>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
 <mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Apr 2014 02:38:15 -0000

The current settings in py-setuptools{27,32,33,34}/Makefile for
PYTHON_VERSION are wrong (X.Y instead of pythonX.Y), but sort of work
by chance rather than design.  If it weren't for some unintended luck
from the way _PYTHON_VERSION is set and the .MAKEFLAGS line in
bsd.python.mk that forcibly sets
PYTHON_VERSION=python${_PYTHON_VERSION}, these ports would fail with
something like:

Makefile error: bad value for PYTHON_VERSION: 3.3.
Legal values are:
  python2.7 (default)
  python3.1
  python3.2
  python3.3
  python3.4


Please fix:

Index: py-setuptools27/Makefile
===================================================================
--- py-setuptools27/Makefile	(revision 350922)
+++ py-setuptools27/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 
-PYTHON_VERSION=	2.7
+PYTHON_VERSION=	python2.7
 
 MASTERDIR=	${.CURDIR}/../py-setuptools
 
Index: py-setuptools32/Makefile
===================================================================
--- py-setuptools32/Makefile	(revision 350922)
+++ py-setuptools32/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 
-PYTHON_VERSION=	3.2
+PYTHON_VERSION=	python3.2
 
 MASTERDIR=	${.CURDIR}/../py-setuptools
 
Index: py-setuptools33/Makefile
===================================================================
--- py-setuptools33/Makefile	(revision 350922)
+++ py-setuptools33/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 
-PYTHON_VERSION=	3.3
+PYTHON_VERSION=	python3.3
 
 MASTERDIR=	${.CURDIR}/../py-setuptools
 
Index: py-setuptools34/Makefile
===================================================================
--- py-setuptools34/Makefile	(revision 350922)
+++ py-setuptools34/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	${PYTHON_SUFFIX}
 
-PYTHON_VERSION=	3.4
+PYTHON_VERSION=	python3.4
 
 MASTERDIR=	${.CURDIR}/../py-setuptools