From 6b9a7cf7782f06f68fe0bb60c29e0314090478a8 Mon Sep 17 00:00:00 2001
From: Hye-Shik Chang <perky@FreeBSD.org>
Date: Fri, 4 Jul 2003 11:57:54 +0000
Subject: 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.
---
 lang/python/Makefile  | 12 ++++++++----
 lang/python/pkg-plist |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'lang/python')

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 925b95221a30..9452e873bea3 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.3
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
-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
@@ -86,7 +85,12 @@ pre-install:
 .endfor
 .endfor
 
+post-extract:
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.2
+
 post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.2 ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
 		${PREFIX}/share/emacs/site-lisp
 	@${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index a9d86488e2d8..654d269f1cc3 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -1,4 +1,5 @@
 bin/pydoc
+bin/pydoc2.2
 bin/python
 bin/%%PYTHON_VERSION%%
 include/%%PYTHON_VERSION%%/Python.h
-- 
cgit v1.2.3