summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2012-12-21 15:45:29 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2012-12-21 15:45:29 +0000
commit10277be714285a829695087454af943a5c114cb7 (patch)
tree1ce0a1d9c78a5f204de6da3d283e7d4286e31882 /lang
parent- Update to 0.9.4 (diff)
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.
Notes
Notes: svn path=/head/; revision=309359
Diffstat (limited to 'lang')
-rw-r--r--lang/python27/Makefile7
-rw-r--r--lang/python27/pkg-plist2
-rw-r--r--lang/python33/Makefile6
-rw-r--r--lang/python33/pkg-plist2
4 files changed, 16 insertions, 1 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index cc09a246266c..346383dbba97 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -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.shared
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 | \
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index ce9a979f2105..28e2f38fd799 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -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%%
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 6f4a436a57d8..5cfcbb2fc190 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -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 appending
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 | \
diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist
index 5dacb2970960..69b4f7adbaad 100644
--- a/lang/python33/pkg-plist
+++ b/lang/python33/pkg-plist
@@ -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%%