-update to 2.1.2 - except one method addition (socket.sendall()) this is a

 pure bugfix release
-install the "pydoc" script as "pydoc2.1" and make sure the corresponding
 python version is used
-disable the audioop, imageop and rgbimg extensions - these don't work on
 64-bit platforms anyway, I haven't seen a place where they are used yet,
 and in case a need shows up, we better make an own extension pkg from
 it which is marked FOR_PLATFORM_ONLY

5 files changed, 62 insertions, 12 deletions

diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 15b77a81424..f4d29a935e2 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2002/01/16 20:11:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/22 13:05:03 drochner Exp $
 #
 
-DISTNAME=	Python-2.1.1
-PKGNAME=	python21-2.1.1
-PKGREVISION=	1
+DISTNAME=	Python-2.1.2
+PKGNAME=	python21-2.1.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.python.org/pub/python/2.1.1/
+MASTER_SITES=	ftp://ftp.python.org/pub/python/2.1.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
@@ -17,4 +16,7 @@ CONFIGURE_ARGS+=	--without-threads
 
 INSTALL_TARGET=	altinstall
 
+post-extract:
+	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc2.1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python21/PLIST b/lang/python21/PLIST
index 5d209bdae84..96d2ed3b40f 100644
--- a/lang/python21/PLIST
+++ b/lang/python21/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:39 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/22 13:05:04 drochner Exp $
+bin/pydoc2.1
 bin/python2.1
 include/python2.1/Python.h
 include/python2.1/abstract.h
@@ -621,7 +622,6 @@ lib/python2.1/lib-dynload/_symtable.so
 lib/python2.1/lib-dynload/_testcapi.so
 lib/python2.1/lib-dynload/_weakref.so
 lib/python2.1/lib-dynload/array.so
-lib/python2.1/lib-dynload/audioop.so
 lib/python2.1/lib-dynload/binascii.so
 lib/python2.1/lib-dynload/bsddb.so
 lib/python2.1/lib-dynload/cPickle.so
@@ -633,7 +633,6 @@ lib/python2.1/lib-dynload/errno.so
 lib/python2.1/lib-dynload/fcntl.so
 lib/python2.1/lib-dynload/fpectl.so
 lib/python2.1/lib-dynload/grp.so
-lib/python2.1/lib-dynload/imageop.so
 lib/python2.1/lib-dynload/math.so
 lib/python2.1/lib-dynload/md5.so
 lib/python2.1/lib-dynload/mmap.so
@@ -645,7 +644,6 @@ lib/python2.1/lib-dynload/pcre.so
 lib/python2.1/lib-dynload/pwd.so
 lib/python2.1/lib-dynload/regex.so
 lib/python2.1/lib-dynload/resource.so
-lib/python2.1/lib-dynload/rgbimg.so
 lib/python2.1/lib-dynload/rotor.so
 lib/python2.1/lib-dynload/select.so
 lib/python2.1/lib-dynload/sha.so
@@ -1087,6 +1085,7 @@ lib/python2.1/test/output/test_poll
 lib/python2.1/test/output/test_popen2
 lib/python2.1/test/output/test_posixpath
 lib/python2.1/test/output/test_pow
+lib/python2.1/test/output/test_profile
 lib/python2.1/test/output/test_pty
 lib/python2.1/test/output/test_pwd
 lib/python2.1/test/output/test_pyexpat
@@ -1451,6 +1450,9 @@ lib/python2.1/test/test_posixpath.pyo
 lib/python2.1/test/test_pow.py
 lib/python2.1/test/test_pow.pyc
 lib/python2.1/test/test_pow.pyo
+lib/python2.1/test/test_profile.py
+lib/python2.1/test/test_profile.pyc
+lib/python2.1/test/test_profile.pyo
 lib/python2.1/test/test_pty.py
 lib/python2.1/test/test_pty.pyc
 lib/python2.1/test/test_pty.pyo
@@ -1610,6 +1612,9 @@ lib/python2.1/test/testrgb.uue
 lib/python2.1/test/tokenize_tests.py
 lib/python2.1/test/tokenize_tests.pyc
 lib/python2.1/test/tokenize_tests.pyo
+lib/python2.1/this.py
+lib/python2.1/this.pyc
+lib/python2.1/this.pyo
 lib/python2.1/threading.py
 lib/python2.1/threading.pyc
 lib/python2.1/threading.pyo
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index c32af4f5b4d..735736d34a4 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/01/16 19:50:36 drochner Exp $
+$NetBSD: distinfo,v 1.3 2002/01/22 13:05:04 drochner Exp $
 
-SHA1 (Python-2.1.1.tgz) = 4dde9f1668ee86d4104d8dcf727de22af7533ed7
-Size (Python-2.1.1.tgz) = 6187808 bytes
+SHA1 (Python-2.1.2.tgz) = f7279eaa43a6692948586279c5e85992093a70cc
+Size (Python-2.1.2.tgz) = 6189889 bytes
 SHA1 (patch-aa) = 8273acc49a9eedad6e09685098178f3b7fb8f1c6
+SHA1 (patch-ab) = f87a4d5c76182ab27ba79b42f00e8a2ff63bcf2b
+SHA1 (patch-ac) = b3b61b31daa5d2f5162d363265f0e17e31fb7d10
diff --git a/lang/python21/patches/patch-ab b/lang/python21/patches/patch-ab
new file mode 100644
index 00000000000..48415b59f49
--- /dev/null
+++ b/lang/python21/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1 2002/01/22 13:05:05 drochner Exp $
+
+--- Tools/scripts/pydoc2.1.orig	Tue Jan 22 11:16:24 2002
++++ Tools/scripts/pydoc2.1	Tue Jan 22 11:16:34 2002
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.1
+ 
+ import pydoc
+ pydoc.cli()
diff --git a/lang/python21/patches/patch-ac b/lang/python21/patches/patch-ac
new file mode 100644
index 00000000000..2790cba640d
--- /dev/null
+++ b/lang/python21/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1 2002/01/22 13:05:05 drochner Exp $
+
+--- setup.py.orig	Thu Dec 27 22:51:02 2001
++++ setup.py	Tue Jan 22 11:11:35 2002
+@@ -265,13 +265,13 @@
+         # These represent audio samples or images as strings:
+ 
+         # Disabled on 64-bit platforms
+-        if sys.maxint != 9223372036854775807L:
++#        if sys.maxint != 9223372036854775807L:
+             # Operations on audio samples
+-            exts.append( Extension('audioop', ['audioop.c']) )
++#            exts.append( Extension('audioop', ['audioop.c']) )
+             # Operations on images
+-            exts.append( Extension('imageop', ['imageop.c']) )
++#            exts.append( Extension('imageop', ['imageop.c']) )
+             # Read SGI RGB image files (but coded portably)
+-            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
++#            exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
+ 
+         # readline
+         if self.compiler.find_library_file(lib_dirs, 'readline'):
+@@ -609,7 +609,7 @@
+           ext_modules=[Extension('struct', ['structmodule.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc']
++          scripts = ['Tools/scripts/pydoc2.1']
+         )
+ 
+ # --install-platlib