- Update lang/python to 2.4 final release.

- Finish repocopy lang/python -> lang/python23 for Python 2.3.4

4 files changed, 18 insertions, 35 deletions

diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 504bdc966737..d27ce95f103e 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -25,13 +25,14 @@ CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
 INSTALLS_SHLIB=	yes
-INSTALL_TARGET=	install
-MAN1=		python.1
+INSTALL_TARGET=	altinstall
+MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 USE_REINPLACE=	yes
+LATEST_LINK=	${PYTHON_VERSION:S/.//}
 
 SHARED_WRKSRC=	${WRKSRC}/build.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
@@ -160,6 +161,9 @@ post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
 		${PREFIX}/lib
+	@${MKDIR} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
 		lib${PYTHON_VERSION}.so
 	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so \
@@ -167,12 +171,8 @@ 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
 
 	@# additional files installing by ports
-	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \
-		${PREFIX}/share/emacs/site-lisp
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \
 		${PREFIX}/bin
 
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index ecafbcf9c5ae..bff74d31dc32 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,23 +1,2 @@
-MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
-MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
-MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
-MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79
-MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
-MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4
-MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9
-MD5 (python/Python-2.1.3.tgz) = a8b04cdc822a6fc833ed9b99c7fba589
-MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
-MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
-MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229
-MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8
-MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae
-MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479
-MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
-SIZE (python/Python-2.3.3.tgz) = 8491380
 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
 SIZE (python/Python-2.3.4.tgz) = 8502738
-MD5 (python/Python-2.4b2.tgz) = 25b99930080ff5f4072c0229f93382fc
-SIZE (python/Python-2.4b2.tgz) = 9190198
-MD5 (python/Python-2.4c1.tgz) = deea93a91518314ffe9a7c5cd8144eac
-SIZE (python/Python-2.4c1.tgz) = 9198160
diff --git a/lang/python23/files/patch-setup.py b/lang/python23/files/patch-setup.py
index 42d6b9a68984..c97c8ad2cadf 100644
--- a/lang/python23/files/patch-setup.py
+++ b/lang/python23/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Sat Aug 21 08:12:35 2004
-+++ setup.py	Sat Aug 21 08:12:48 2004
+--- setup.py.orig	Wed Oct 22 05:01:21 2003
++++ setup.py	Wed Dec  1 23:07:00 2004
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -18,3 +18,12 @@
              exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
  
          if platform == 'sunos5':
+@@ -1140,7 +1140,7 @@
+           ext_modules=[Extension('struct', ['structmodule.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle']
++          scripts = []
+         )
+ 
+ # --install-platlib
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index a8d752d69a4b..028ff26be75d 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -1,10 +1,6 @@
-bin/idle
 bin/idle%%PYVER%%
-bin/pydoc
 bin/pydoc%%PYVER%%
-bin/python
 bin/python%%PYVER%%
-bin/python-shared
 bin/python-shared%%PYVER%%
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
@@ -2583,7 +2579,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