Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Dec 2012 15:45:30 +0000 (UTC)
From:      Dmitry Sivachenko <demon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309359 - in head/lang: python27 python33
Message-ID:  <201212211545.qBLFjUAA088987@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: demon
Date: Fri Dec 21 15:45:29 2012
New Revision: 309359
URL: http://svnweb.freebsd.org/changeset/ports/309359

Log:
  Create python2 symlink for the latest version of python2.X executable and
  python3 symlink for the latest version of python3.X executable.
  
  People who really want to use older python version for both python branches
  should specify explicit version number in interpreter invocation.
  
  Discussed on python@ long ago.

Modified:
  head/lang/python27/Makefile
  head/lang/python27/pkg-plist
  head/lang/python33/Makefile
  head/lang/python33/pkg-plist

Modified: head/lang/python27/Makefile
==============================================================================
--- head/lang/python27/Makefile	Fri Dec 21 15:41:24 2012	(r309358)
+++ head/lang/python27/Makefile	Fri Dec 21 15:45:29 2012	(r309359)
@@ -7,7 +7,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	2.7.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -37,6 +37,7 @@ SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.
 PLIST=		${WRKDIR}/PLIST
 PLIST_TEMPLATE?=${PKGDIR}/pkg-plist
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
+		PYMAJOR=${PYTHON_MAJOR_VER} \
 		PYVER_WITHPAT=${PORTVERSION:S/.c/c/}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 DATADIR=	${PREFIX}/share/${PYTHON_VERSION}
@@ -287,6 +288,10 @@ post-install:
 	done
 .endif
 
+.for file in python python-config
+	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
+.endfor
+
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

Modified: head/lang/python27/pkg-plist
==============================================================================
--- head/lang/python27/pkg-plist	Fri Dec 21 15:41:24 2012	(r309358)
+++ head/lang/python27/pkg-plist	Fri Dec 21 15:45:29 2012	(r309359)
@@ -6,8 +6,10 @@ bin/idle%%PYVER%%
 %%IF_DEFAULT%%bin/pydoc
 bin/pydoc%%PYVER%%
 %%IF_DEFAULT%%bin/python
+bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
 %%IF_DEFAULT%%bin/python-config
+bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
 %%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%

Modified: head/lang/python33/Makefile
==============================================================================
--- head/lang/python33/Makefile	Fri Dec 21 15:41:24 2012	(r309358)
+++ head/lang/python33/Makefile	Fri Dec 21 15:45:29 2012	(r309359)
@@ -7,6 +7,7 @@
 
 PORTNAME=	python33
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -36,6 +37,7 @@ PYABIVER=	# default empty, for after app
 
 SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
+		PYMAJOR=${PYTHON_MAJOR_VER} \
 		PYVER_WITHPAT=${PORTVERSION:S/.rc/rc/} \
 		PYABIVER=${PYABIVER} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX}
@@ -217,6 +219,10 @@ post-install:
 	done
 .endif
 
+.for file in python python-config
+	cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/}
+.endfor
+
 .if !defined(NOPORTDATA)
 	@${MKDIR} ${DATADIR}
 	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \

Modified: head/lang/python33/pkg-plist
==============================================================================
--- head/lang/python33/pkg-plist	Fri Dec 21 15:41:24 2012	(r309358)
+++ head/lang/python33/pkg-plist	Fri Dec 21 15:45:29 2012	(r309359)
@@ -5,8 +5,10 @@ bin/idle3-%%PYVER%%
 %%IF_DEFAULT%%bin/pydoc3
 bin/pydoc3-%%PYVER%%
 %%IF_DEFAULT%%bin/python
+bin/python%%PYMAJOR%%
 bin/python%%PYVER%%
 %%IF_DEFAULT%%bin/python-config
+bin/python%%PYMAJOR%%-config
 bin/python%%PYVER%%-config
 %%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%



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