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.

3 files changed, 33 insertions, 19 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 5712f112a5a5..41950ba0b095 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -6,12 +6,9 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.b2
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	http://www.python.org/%SUBDIR%/ \
-		http://python.mirrors.pair.com/%SUBDIR%/ \
-		http://mirrors.ccs.neu.edu/Python/pub/www.python.org/%SUBDIR%/ \
-		http://python.planetmirror.com/%SUBDIR%/ \
-		http://SunSITE.Informatik.RWTH-Aachen.DE/python/%SUBDIR%/
+MASTER_SITES=	${MASTER_SITE_PYTHON}
 MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION:S/.b2//}
 DISTFILES=	${PYTHON_DISTFILE}
 
@@ -23,8 +20,8 @@ WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
-INSTALL_TARGET=	install
-MAN1=		python.1
+INSTALL_TARGET=	altinstall
+MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.3
@@ -99,6 +96,12 @@ 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.3
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
@@ -109,8 +112,12 @@ pre-install:
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
-		${PREFIX}/share/emacs/site-lisp
+	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
+		${PREFIX}/bin
+	@${MKDIR} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
 	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py
index f3cef489fa8f..b325b8938e41 100644
--- a/lang/python26/files/patch-setup.py
+++ b/lang/python26/files/patch-setup.py
@@ -1,11 +1,20 @@
---- setup.py.orig	Fri Mar  2 07:24:14 2001
-+++ setup.py	Mon Mar  5 15:26:17 2001
-@@ -14,7 +14,7 @@
- from distutils.command.build_ext import build_ext
+--- setup.py.orig	Tue Jun 17 11:51:28 2003
++++ setup.py	Fri Jul  4 17:33:05 2003
+@@ -15,7 +15,7 @@
+ from distutils.command.install_lib import install_lib
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
- def find_file(filename, std_dirs, paths):
-     """Searches for the directory where a given file is located,
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+@@ -1127,7 +1127,7 @@
+           ext_modules=[Extension('struct', ['structmodule.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle']
++          scripts = []
+         )
+ 
+ # --install-platlib
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index f01cea612fe3..47c31cd65062 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -1,6 +1,5 @@
-bin/idle
-bin/pydoc
-bin/python
+bin/idle2.3
+bin/pydoc2.3
 bin/%%PYTHON_VERSION%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
@@ -2571,7 +2570,6 @@ lib/%%PYTHON_VERSION%%/xmlrpclib.pyo
 lib/%%PYTHON_VERSION%%/zipfile.py
 lib/%%PYTHON_VERSION%%/zipfile.pyc
 lib/%%PYTHON_VERSION%%/zipfile.pyo
-share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/README
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/README
 %%PORTDOCS%%share/examples/%%PYTHON_VERSION%%/cgi/cgi0.sh