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/python33 | |
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/python33')
-rw-r--r-- | lang/python33/Makefile | 28 | ||||
-rw-r--r-- | lang/python33/pkg-plist | 9 |
2 files changed, 1 insertions, 36 deletions
diff --git a/lang/python33/Makefile b/lang/python33/Makefile index 630e93e77b95..d8d7269a00d3 100644 --- a/lang/python33/Makefile +++ b/lang/python33/Makefile @@ -2,7 +2,7 @@ PORTNAME= python33 PORTVERSION= 3.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -66,19 +66,6 @@ CONFIGURE_ENV+= ac_cv_lib_intl_textdomain=no ac_cv_header_libintl_h=no .include <bsd.port.pre.mk> -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} -MLINKS= ${PYTHON_VERSION}.1 python.1 -PLIST_SUB+= IF_DEFAULT="" -.else -PLIST_SUB+= IF_DEFAULT="@comment " -.endif - -.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION} -PLIST_SUB+= IF_DEFAULT_MAJOR="" -.else -PLIST_SUB+= IF_DEFAULT_MAJOR="@comment " -.endif - .if ${PORT_OPTIONS:MTHREADS} PLIST_SUB+= THREADS="" CONFIGURE_ARGS+= --with-threads @@ -208,19 +195,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}`; \ - cd ${PREFIX}/bin && ${LN} -sf $$TARGET $$f; \ - done -.endif - -.if ${PYTHON_VERSION} == ${PYTHON3_DEFAULT_VERSION} -.for file in python python-config - cd ${LOCALBASE}/bin && ${LN} -sf ${file:S/python/${PYTHON_VERSION}/} ${file:S/python/python${PYTHON_MAJOR_VER}/} -.endfor -.endif - .if !defined(NOPORTDATA) @${MKDIR} ${DATADIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist index 240b24851fb2..0f0726b92ce3 100644 --- a/lang/python33/pkg-plist +++ b/lang/python33/pkg-plist @@ -1,18 +1,9 @@ -%%IF_DEFAULT%%bin/2to3 bin/2to3-%%PYVER%% -%%IF_DEFAULT%%bin/idle3 bin/idle3-%%PYVER%% -%%IF_DEFAULT%%bin/pydoc3 bin/pydoc3-%%PYVER%% -%%IF_DEFAULT%%bin/python -%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%% bin/python%%PYVER%% -%%IF_DEFAULT%%bin/python-config -%%IF_DEFAULT_MAJOR%%bin/python%%PYMAJOR%%-config bin/python%%PYVER%%-config -%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% -%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config bin/python%%PYVER%%%%PYABIVER%% bin/python%%PYVER%%%%PYABIVER%%-config |