diff options
| author | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-30 09:42:28 +0000 |
|---|---|---|
| committer | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-30 09:42:28 +0000 |
| commit | 4942ce5a7d8a3d0cbebaf4d202011850d1f7569f (patch) | |
| tree | db1f21912f461000d609ddcd5d130946bcfe9e09 /lang/python23 | |
| parent | In ATLAS/INSTALL.txt it is said that gcc42 is superior to both gcc3 and gcc41 (diff) | |
- Make Python 2.5.1 the default Python version
- Add significantly better support in bsd.python.mk for working with
Python Eggs and the easy_install system
Tested by: pointyhat runs
Approved by: pav (portmgr)
Most work by: perky
Thanks to: pav
Notes
Notes:
svn path=/head/; revision=196700
Diffstat (limited to 'lang/python23')
| -rw-r--r-- | lang/python23/Makefile | 20 | ||||
| -rw-r--r-- | lang/python23/pkg-plist | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 33d646e8aaad..fa4fe11865bb 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -7,7 +7,7 @@ PORTNAME= python23 PORTVERSION= 2.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -16,7 +16,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= python@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -38,6 +37,9 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} +BIN_SCRIPTS= idle pydoc python python-shared +BINLINKS_SUB= -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' + OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ UCS4 "Use UCS4 for unicode support" on \ @@ -46,6 +48,13 @@ OPTIONS= THREADS "Enable thread support" on \ .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 !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} @@ -171,6 +180,13 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index d8b1b3638233..53fa3b4e59f3 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -1,6 +1,10 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h |