diff options
author | Marcus von Appen <mva@FreeBSD.org> | 2013-08-17 19:10:59 +0000 |
---|---|---|
committer | Marcus von Appen <mva@FreeBSD.org> | 2013-08-17 19:10:59 +0000 |
commit | 7452555915d18a48268c714a4a4b2510a9fa721c (patch) | |
tree | 5fb4dff170d638784a5c9228ee0855dbe6de4641 /lang/python26 | |
parent | Update to 1.1.2. (diff) |
- Move the symlink magic for the default python version into lang/python
and lang/python2 and lang/python3. This change brings us closer to the goal
of making Python ports usable with different Python versions at the same
time.
- Add a new lang/python2 port to handle the symlinks for bin/python2,
bin/idle2, bin/pydoc2 and so on.
- Add a new lang/python3 port to handle the symlinks for bin/python3,
bin/idle3, bin/pydoc3 and so on.
- Bump the PORTREVISION on all lang/python* ports.
Notes
Notes:
svn path=/head/; revision=324864
Diffstat (limited to 'lang/python26')
-rw-r--r-- | lang/python26/Makefile | 19 | ||||
-rw-r--r-- | lang/python26/pkg-plist | 16 |
2 files changed, 1 insertions, 34 deletions
diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 90f003be3936..24ff81cb93d2 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -3,7 +3,7 @@ PORTNAME= python26 PORTVERSION= 2.6.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -50,7 +50,6 @@ BINLINKS_SUB_TMPL= -e 's,smtpd,smtpd%%VERSION%%,' \ -e 's,2to3,2to3-%%VERSION%%,' \ -e 's,(idle|pydoc|python-shared|python),\1%%VERSION%%,' BINLINKS_SUB_PYTHON_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_VER}/g} -BINLINKS_SUB_PYTHON_MAJOR_VER= ${BINLINKS_SUB_TMPL:S/%%VERSION%%/${PYTHON_MAJOR_VER}/g} OPTIONS_DEFINE= THREADS SEM PTH PYMALLOC IPV6 FPECTL EXAMPLES NLS OPTIONS_DEFAULT= THREADS UCS4 PYMALLOC IPV6 @@ -86,13 +85,6 @@ SEM_MSG= "@comment " SUB_FILES= pkg-message SUB_LIST= SEM=${SEM_MSG} -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} -MLINKS= ${PYTHON_VERSION}.1 python.1 -PLIST_SUB+= IF_DEFAULT="" -.else -PLIST_SUB+= IF_DEFAULT="@comment " -.endif - .if ${PORT_OPTIONS:MTHREADS} PLIST_SUB+= THREADS="" .if ${PORT_OPTIONS:MPTH} @@ -267,15 +259,6 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} - for f in ${BIN_FILES}; do \ - TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_VER}`; \ - TARGET_MAJOR=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB_PYTHON_MAJOR_VER}`; \ - cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$TARGET_MAJOR; \ - cd ${PREFIX}/bin && ${LN} -sf $$TARGET_MAJOR $$f; \ - done -.endif - .if !defined(NOPORTDATA) @${MKDIR} ${DATADIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index d44b076734c0..de185c964864 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -1,26 +1,10 @@ -%%IF_DEFAULT%%bin/2to3 -%%IF_DEFAULT%%bin/2to3-%%PYMAJOR%% bin/2to3-%%PYVER%% -%%IF_DEFAULT%%bin/idle -%%IF_DEFAULT%%bin/idle%%PYMAJOR%% bin/idle%%PYVER%% -%%IF_DEFAULT%%bin/pydoc -%%IF_DEFAULT%%bin/pydoc%%PYMAJOR%% bin/pydoc%%PYVER%% -%%IF_DEFAULT%%bin/python -%%IF_DEFAULT%%bin/python%%PYMAJOR%% bin/python%%PYVER%% -%%IF_DEFAULT%%bin/python-config -%%IF_DEFAULT%%bin/python%%PYMAJOR%%-config bin/python%%PYVER%%-config -%%IF_DEFAULT%%bin/python-shared -%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%% bin/python-shared%%PYVER%% -%%IF_DEFAULT%%bin/python-shared-config -%%IF_DEFAULT%%bin/python-shared%%PYMAJOR%%-config bin/python-shared%%PYVER%%-config -%%IF_DEFAULT%%bin/smtpd.py -%%IF_DEFAULT%%bin/smtpd%%PYMAJOR%%.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h |