Skip site navigation (1)Skip section navigation (2)
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
Message-ID:  <21320.42770.726441.667849@gromit.timing.com>

next in thread | raw e-mail | index | archive | help
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
 




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21320.42770.726441.667849>