diff options
| author | perky <perky@FreeBSD.org> | 2008-10-13 16:23:00 +0800 |
|---|---|---|
| committer | perky <perky@FreeBSD.org> | 2008-10-13 16:23:00 +0800 |
| commit | 6399415d369e388f3b8c41a3deb8dd2c3f4aafca (patch) | |
| tree | 05c248f8c37ae70dd9fb5d16d2b1a6ec9ed5b196 /Mk | |
| parent | de19304246371de043c04035fb18cde1679a6eb9 (diff) | |
| download | freebsd-ports-gnome-6399415d369e388f3b8c41a3deb8dd2c3f4aafca.tar.gz freebsd-ports-gnome-6399415d369e388f3b8c41a3deb8dd2c3f4aafca.tar.zst freebsd-ports-gnome-6399415d369e388f3b8c41a3deb8dd2c3f4aafca.zip | |
Introduce two new versions of Python: 2.6 and 3.0rc1 (finally!)
Python 2.6 will be the next default python version when enough
testings of consumer ports are done. The new "2to3" program is
renamed to 2to3-2.6 and 2to3-3.0 for each version, respectively.
Repo-copied by: marcus
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.python.mk | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index ea73267a6612..5f5602b04e83 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -215,7 +215,7 @@ Python_Include_MAINTAINER= python@FreeBSD.org # _PYTHON_PORTBRANCH= 2.5 -_PYTHON_ALLBRANCHES= 2.5 2.4 2.3 # preferred first +_PYTHON_ALLBRANCHES= 2.5 2.6 2.4 2.3 3.0 # preferred first _ZOPE_PORTBRANCH= 2.7 _ZOPE_ALLBRANCHES= 2.7 2.8 2.9 2.10 3.2 @@ -374,8 +374,24 @@ PYTHON_PORTVERSION= ${PYTHON_DEFAULT_PORTVERSION} # Propagate the chosen python version to submakes. .MAKEFLAGS: PYTHON_VERSION=python${_PYTHON_VERSION} +# Python-3.0 +.if ${PYTHON_VERSION} == "python3.0" +PYTHON_PORTVERSION?=3.0.rc1 +PYTHON_PORTSDIR= ${PORTSDIR}/lang/python30 +PYTHON_REL= 300 +PYTHON_SUFFIX= 30 +PYTHON_VER= 3.0 + +# Python-2.6 +.elif ${PYTHON_VERSION} == "python2.6" +PYTHON_PORTVERSION?=2.6 +PYTHON_PORTSDIR= ${PORTSDIR}/lang/python26 +PYTHON_REL= 260 +PYTHON_SUFFIX= 26 +PYTHON_VER= 2.6 + # Python-2.5 -.if ${PYTHON_VERSION} == "python2.5" +.elif ${PYTHON_VERSION} == "python2.5" PYTHON_PORTVERSION?=2.5.2 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python25 PYTHON_REL= 252 @@ -415,13 +431,15 @@ check-makevars:: @${ECHO} " python2.3" @${ECHO} " python2.4" @${ECHO} " python2.5 (default)" + @${ECHO} " python2.6" + @${ECHO} " python3.0" @${FALSE} .endif PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON} -PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION} -PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz -PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION} +PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION:C/.rc[0-9]//} +PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/.rc/rc/}.tgz +PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/.rc/rc/} PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} |