- Update the main python version to 2.5.

  - Now, lang/python is just a meta-port which depends on lang/python25.
  - And all versions of Python ports have short version identifier in its
    package name; python25-2.5, python24-2.4.3 and etc.
  - Also you must upgrade all python modules after lang/python updated,
     cd /usr/ports/lang/python && make upgrade-site-packages

- Give maintainership of Python ports to the new python@ group which
  includes me, alexbl@ and others.

4 files changed, 20 insertions, 94 deletions

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index f3598853adf7..089245f8b643 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,13 +1,13 @@
-# New ports collection makefile for:    python
+# New ports collection makefile for:    python24
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-PORTNAME=	python
+PORTNAME=	python24
 PORTVERSION=	2.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -16,7 +16,6 @@ DISTFILES=	${PYTHON_DISTFILE}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language
 
-CONFLICTS=	python-mode.el-1.*
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
@@ -24,8 +23,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 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.4
@@ -182,12 +181,11 @@ 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
+	@${MKDIR} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \
 		${WRKDIR}/smtpd2.4.py ${PREFIX}/bin
 
@@ -202,26 +200,4 @@ post-install:
 
 	@${CAT} ${PKGMESSAGE}
 
-PORTUPGRADE?=	${LOCALBASE}/sbin/portupgrade
-PKG_WHICH?=	${LOCALBASE}/sbin/pkg_which
-upgrade-site-packages:
-	@if [ -x ${PORTUPGRADE} ]; then \
-		for ver in 2.1 2.2 2.3; do \
-			if [ -d ${PREFIX}/lib/python$$ver ]; then \
-				UPD=`${FIND} ${PREFIX}/lib/python$$ver \
-						-type f -print0 | \
-					${XARGS} -0 ${PKG_WHICH} | \
-					${GREP} -Fv '?' | \
-					${GREP} -v '^python-2' | \
-					${SORT} -u`; \
-				if [ "$$UPD" ]; then \
-					${PORTUPGRADE} -f $$UPD; \
-				fi; \
-			fi; \
-		done; \
-	 else \
-		${ECHO_MSG} "Please install sysutils/portupgrade."; \
-		${FALSE}; \
-	 fi
-
 .include <bsd.port.post.mk>
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index 68c189ebe532..4d9d0d154805 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,57 +1,3 @@
-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.1.tgz) = 2ba2baeccd6100a4be80e6368a975054
-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.2.tgz) = 87febf0780c8e18454022d34b2ca70a0
-MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae
-MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479
-MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
-MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
-MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
-MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8
-MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
-MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
 MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
-MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
-MD5 (python/Python-2.5c2.tgz) = 32b56940c90844eba605d5d2dad683d2
-SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f
-SHA256 (python/Python-2.1.2.tgz) = 389c7badc61f9bdc50788b54dd3ffeaa4b559baf6a4de1425bf90b9c6b4ac66e
-SHA256 (python/Python-2.1.3.tgz) = 1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9
-SHA256 (python/Python-2.1.tgz) = c6b8498bc18b854d841d1383042860c68a3f194291f4249c4511a2c708917eb5
-SHA256 (python/Python-2.2.1.tgz) = 797b73553562dcd95ed74ac280091965324a7784c6ee6cafb64812549d48e6ae
-SHA256 (python/Python-2.2.2.tgz) = 58ffa02cd34cb0d7a04c3a34db60cea3d7d7d1f46a4684621e84873d64c3ff11
-SHA256 (python/Python-2.2.3.tgz) = a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188
-SHA256 (python/Python-2.2.tgz) = 0b9e29c77d405eb7ce7a263c1ce2fc8c006cd9391790120ebfb83310a83f1fd3
-SHA256 (python/Python-2.3.1.tgz) = 17b74f63177aac95d37088a6e9a627eed296dca6f3028c4affdee184e303b350
-SHA256 (python/Python-2.3.2.tgz) = daf11ff034eddaca6288d652bf6137df91e731189f7cb35972ba607e441628f9
-SHA256 (python/Python-2.3.3.tgz) = 5f43aa519f337616b7d4f86c79c075d2409f6b38569824aef52bec169e22c3d1
-SHA256 (python/Python-2.3.4.tgz) = 5a667e58cbbe20bcd3897be3e2051530ec2589734402ceaaca8cdf2f337dba46
-SHA256 (python/Python-2.3.5.tgz) = 7c122deff7700f04fb9daa5b5b3a885b19a73da05c2a264403666817c7631977
-SHA256 (python/Python-2.3.tgz) = 20ea7faad43e1993f5c9292c5864671cf9de68eda1a0579e6be7dc5428b3ff1e
-SHA256 (python/Python-2.4.1.tgz) = f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00
-SHA256 (python/Python-2.4.2.tgz) = 2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf
 SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5
-SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9
-SHA256 (python/Python-2.5c2.tgz) = d11d9fbab8db33f3f0862de51bbd1ff36b67f9cf29874c6481be26a33c36a503
-SIZE (python/Python-2.1.1.tgz) = 6187808
-SIZE (python/Python-2.1.2.tgz) = 6189889
-SIZE (python/Python-2.1.3.tgz) = 6194432
-SIZE (python/Python-2.1.tgz) = 4275323
-SIZE (python/Python-2.2.1.tgz) = 6535104
-SIZE (python/Python-2.2.2.tgz) = 6669400
-SIZE (python/Python-2.2.3.tgz) = 6709556
-SIZE (python/Python-2.2.tgz) = 6542443
-SIZE (python/Python-2.3.1.tgz) = 8558611
-SIZE (python/Python-2.3.2.tgz) = 8459427
-SIZE (python/Python-2.3.3.tgz) = 8491380
-SIZE (python/Python-2.3.4.tgz) = 8502738
-SIZE (python/Python-2.3.5.tgz) = 8535749
-SIZE (python/Python-2.3.tgz) = 8436880
-SIZE (python/Python-2.4.1.tgz) = 9219882
-SIZE (python/Python-2.4.2.tgz) = 9239975
 SIZE (python/Python-2.4.3.tgz) = 9348239
-SIZE (python/Python-2.4.tgz) = 9198035
-SIZE (python/Python-2.5c2.tgz) = 11021626
diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py
index 0211a6b3556d..09ac786be1a6 100644
--- a/lang/python24/files/patch-setup.py
+++ b/lang/python24/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Sat Aug 12 12:46:21 2006
-+++ setup.py	Sat Aug 12 12:47:00 2006
+--- setup.py.orig	Mon Oct  9 22:08:07 2006
++++ setup.py	Mon Oct  9 22:08:42 2006
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -27,3 +27,13 @@
              curses_libs = ['ncursesw']
              exts.append( Extension('_curses', ['_cursesmodule.c'],
                                     libraries = curses_libs) )
+@@ -1187,8 +1187,7 @@
+           ext_modules=[Extension('struct', ['structmodule.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Lib/smtpd.py']
++          scripts = []
+         )
+ 
+ # --install-platlib
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 4327ba0a1495..ec0051d4c9bb 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -1,13 +1,8 @@
-bin/idle
 bin/idle%%PYVER%%
-bin/pydoc
 bin/pydoc%%PYVER%%
-bin/python
 bin/python%%PYVER%%
-bin/python-shared
 bin/python-shared%%PYVER%%
 bin/smtpd%%PYVER%%.py
-bin/smtpd.py
 %%PYTHON_INCLUDEDIR%%/Python.h
 %%PYTHON_INCLUDEDIR%%/abstract.h
 %%PYTHON_INCLUDEDIR%%/bitset.h
@@ -1183,7 +1178,6 @@ lib/lib%%PYTHON_VERSION%%.so.1
 %%PYTHON_LIBDIR%%/xmllib.py
 %%PYTHON_LIBDIR%%/xmlrpclib.py
 %%PYTHON_LIBDIR%%/zipfile.py
-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