diff options
author | perky <perky@FreeBSD.org> | 2003-07-04 11:57:54 +0000 |
---|---|---|
committer | perky <perky@FreeBSD.org> | 2003-07-04 11:57:54 +0000 |
commit | 7660b40c76ab90a99356a65af1b81f4893ab3e91 (patch) | |
tree | a34e659674a4a62db10b5882746a2247ea65ed25 /lang/python21 | |
parent | 68e5bf91d506792ab1e222e14445abad2f31438a (diff) | |
download | FreeBSD-ports-7660b40c76ab90a99356a65af1b81f4893ab3e91.zip FreeBSD-ports-7660b40c76ab90a99356a65af1b81f4893ab3e91.tar.gz |
o Utilize MASTER_SITE_PYTHON.
o Rename pydoc to pydoc${PORTVERSION} to avoid conflicts among these
ports. (lang/python port keeps both of bin/pydoc and bin/pydoc2.2)
o Set LATEST_LINK to ${PYTHON_VERSION:S/.//} except lang/python.
Now, we can install all of these python versions together cleanly.
Diffstat (limited to 'lang/python21')
-rw-r--r-- | lang/python21/Makefile | 14 | ||||
-rw-r--r-- | lang/python21/files/patch-setup.py | 13 | ||||
-rw-r--r-- | lang/python21/pkg-plist | 2 |
3 files changed, 21 insertions, 8 deletions
diff --git a/lang/python21/Makefile b/lang/python21/Makefile index f4d18d7..58278e4 100644 --- a/lang/python21/Makefile +++ b/lang/python21/Makefile @@ -7,12 +7,10 @@ PORTNAME= python PORTVERSION= 2.1.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang python -MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \ - ${MASTER_SITE_SOURCEFORGE} \ - http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/${PORTVERSION}/ -MASTER_SITE_SUBDIR= python +MASTER_SITES= ${MASTER_SITE_PYTHON} +MASTER_SITE_SUBDIR= ftp/python/${PORTVERSION} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org @@ -29,6 +27,7 @@ MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.1 PYTHON_NO_DEPENDS= yes +LATEST_LINK= ${PYTHON_VERSION:S/.//} # # If you don't want to use Python's thread module, you need to set @@ -70,6 +69,10 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif +post-extract: + ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ + ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.1 + pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} @@ -80,6 +83,7 @@ pre-install: .endfor post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.1 ${PREFIX}/bin @${MKDIR} ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 diff --git a/lang/python21/files/patch-setup.py b/lang/python21/files/patch-setup.py index f3cef48..a2ea556 100644 --- a/lang/python21/files/patch-setup.py +++ b/lang/python21/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Fri Mar 2 07:24:14 2001 -+++ setup.py Mon Mar 5 15:26:17 2001 +--- setup.py.orig Fri Dec 28 06:51:02 2001 ++++ setup.py Fri Jul 4 18:38:23 2003 @@ -14,7 +14,7 @@ from distutils.command.build_ext import build_ext @@ -9,3 +9,12 @@ def find_file(filename, std_dirs, paths): """Searches for the directory where a given file is located, +@@ -609,7 +609,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist index f2b5f8a..5a58a90 100644 --- a/lang/python21/pkg-plist +++ b/lang/python21/pkg-plist @@ -1,5 +1,5 @@ bin/%%PYTHON_VERSION%% -bin/pydoc +bin/pydoc2.1 include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h include/%%PYTHON_VERSION%%/bitset.h |