diff options
| author | Hye-Shik Chang <perky@FreeBSD.org> | 2006-10-13 07:16:45 +0000 |
|---|---|---|
| committer | Hye-Shik Chang <perky@FreeBSD.org> | 2006-10-13 07:16:45 +0000 |
| commit | e18b838fd903ca4a6c3dca6db8a75eedefd645e4 (patch) | |
| tree | 984ef244bb83f4a2bfc290e7cc31fd2928e81ef0 /lang/python25 | |
| parent | 30e47c7797fc9aab9ca16ce028586297aaa89225 (diff) | |
Revert the default version of Python to 2.4 for the ports freeze
period. Python 2.5 brought a vast range of incompatibility to a
large number of ports, so the python@ team will do more basic
compatibility work in a private repository and merge it later.
Sorry for the inconvenience.
Approved by: portmgr (kris)
Notes
Notes:
svn path=/head/; revision=175244
Diffstat (limited to 'lang/python25')
| -rw-r--r-- | lang/python25/Makefile | 10 | ||||
| -rw-r--r-- | lang/python25/files/patch-setup.py | 10 | ||||
| -rw-r--r-- | lang/python25/pkg-plist | 7 |
3 files changed, 13 insertions, 14 deletions
diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 04f73a152081..33f5cff93183 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -6,6 +6,7 @@ PORTNAME= python25 PORTVERSION= 2.5 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -23,13 +24,12 @@ CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" INSTALLS_SHLIB= yes -INSTALL_TARGET= install -MAN1= python.1 ${PYTHON_VERSION}.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.5 PYTHON_NO_DEPENDS= yes -LATEST_LINK= ${PYTHON_VERSION:S/.//} SHARED_WRKSRC= ${PYTHON_WRKSRC}/portbld.shared PLIST= ${WRKDIR}/PLIST @@ -203,10 +203,6 @@ post-install: ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${PREFIX}/bin - cd ${PREFIX}/bin; \ - ${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared; \ - ${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/}-config \ - python-shared-config; \ @# additional files installing by ports ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \ diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index 07708de2c558..4ed6f0f38c8e 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -27,3 +27,13 @@ curses_libs = ['ncursesw'] # Bug 1464056: If _curses.so links with ncursesw, # _curses_panel.so must link with panelw. +-@@ -1498,8 +1500,7 @@ +- ext_modules=[Extension('_struct', ['_struct.c'])], +- +- # Scripts to install +-- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +-- 'Lib/smtpd.py'] +-+ scripts = [] +- ) +- +- # --install-platlib diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 3fe55a543fbe..6526f34bc484 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -1,17 +1,10 @@ -bin/idle bin/idle%%PYVER%% -bin/pydoc bin/pydoc%%PYVER%% -bin/python bin/python%%PYVER%% bin/python%%PYVER%%-config -bin/python-config -bin/python-shared bin/python-shared%%PYVER%% bin/python-shared%%PYVER%%-config -bin/python-shared-config bin/smtpd%%PYVER%%.py -bin/smtpd.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h %%PYTHON_INCLUDEDIR%%/abstract.h |