Update python to version 1.5.1 using package by Jaromir Dolecek.

Fixes PR pkg/5361.

17 files changed, 925 insertions, 128 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index e783a6fe3a2..7f8a99f17de 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.3 1998/04/15 10:38:29 agc Exp $
+# $NetBSD: Makefile,v 1.4 1998/05/04 19:29:17 tron Exp $
 #
 
-DISTNAME=	python1.5
-PKGNAME=	python-1.5
+DISTNAME=	pyth151
+PKGNAME=	python-1.5.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.python.org/pub/python/src/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@endicor.com
 
-WRKSRC=		${WRKDIR}/Python-1.5
+WRKSRC=		${WRKDIR}/Python-1.5.1
 GNU_CONFIGURE=	yes
 MAKE_FLAGS+=	'OPT=${CFLAGS}'
 MAN1=		python.1
@@ -26,6 +27,8 @@ NOSHARED=\#
 
 post-configure:
 	${SED} -e 's/@NO64BIT@/${NO64BIT}/' -e 's/@NOSHARED@/${NOSHARED}/' \
+		-e 's/@NOREADLINE@/${NOREADLINE}/' -e 's/@NOTK@/${NOTK}/'  \
+		-e 's^@PREFIX@^${PREFIX}^g' -e 's^@X11BASE@^${X11BASE}^g'  \
 		${FILESDIR}/Setup >${WRKSRC}/Modules/Setup
 
 post-install:
diff --git a/lang/python/files/Setup b/lang/python/files/Setup
index 5707aab9c05..b0e5233355a 100644
--- a/lang/python/files/Setup
+++ b/lang/python/files/Setup
@@ -86,7 +86,6 @@ PYTHONPATH=$(COREPYTHONPATH)
 # Some modules that are normally always on:
 
 regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style
-reop reopmodule.c		# Additional RE support (for re1.py)
 pcre pcremodule.c pypcre.c	# Regular expressions, Perl style (for re.py)
 posix posixmodule.c		# posix (UNIX) system calls
 signal signalmodule.c		# signal(2)
@@ -147,7 +146,7 @@ errno errnomodule.c	# posix (UNIX) errno values
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
-crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
+crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
 # Some more UNIX dependent modules -- off by default, since these
@@ -166,6 +165,7 @@ resource resource.c	# Jeremy Hylton's rlimit interface
 @NO64BIT@imageop imageop.c	# Operations on images
 @NO64BIT@rgbimg rgbimgmodule.c   # Read SGI RGB image files (but coded portably)
 
+
 # The stdwin module provides a simple, portable (between X11 and Mac)
 # windowing interface.  You need to ftp the STDWIN library, e.g. from
 # ftp://ftp.cwi.nl/pub/stdwin.  (If you get it elsewhere, be sure to
@@ -291,6 +291,8 @@ TKPATH=:lib-tk
 #	-L/usr/openwin/lib \
 # *** Uncomment these for TOGL extension only:
 #	-lGL -lGLU -lXext -lXmu \
+# *** Uncomment for AIX:
+#	-lld \
 # *** Always uncomment this; X11 libraries to link with:
 #	-lX11
 
@@ -355,7 +357,7 @@ bsddb bsddbmodule.c # -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a
 
 
 
-# David Wayne Williams' soundex module
+# David Wayne Williams' soundex module (obsolete -- this will disappear!)
 soundex soundex.c
 
 # Helper module for various ascii-encoders
@@ -388,7 +390,8 @@ cPickle cPickle.c
 
 # Andrew Kuchling's zlib module.
 # This require zlib 1.0.4 (or later).  See http://quest.jpl.nasa.gov/zlib/
-zlib zlibmodule.c -lz #-I$(prefix)/include -L$(exec_prefix)/lib -lz
+# See http://www.cdrom.com/pub/infozip/zlib/
+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
 
 # Example -- included for reference only:
diff --git a/lang/python/files/md5 b/lang/python/files/md5
index c311d933aad..63166bf98ac 100644
--- a/lang/python/files/md5
+++ b/lang/python/files/md5
@@ -1 +1 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (pyth151.tgz) = eb8ef6e37e543058a2d47996ecf62427
diff --git a/lang/python/patches/patch-aa b/lang/python/patches/patch-aa
index ce13a6ff125..535ff66f062 100644
--- a/lang/python/patches/patch-aa
+++ b/lang/python/patches/patch-aa
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.1 1998/02/01 01:48:52 tron Exp $
-
-(This is the re.1.txt patch from www.python.org)
-
---- Lib/re.py	1997/12/31 21:40:43
-+++ Lib/re.py	1997/12/31 21:55:49
-@@ -203,6 +203,7 @@
- 		if type(g)==type( "" ): g = [g]
- 		results[len(results):] = list(g)
- 	    pos = lastmatch = j
-+	    n = n + 1
- 	results.append(source[lastmatch:])
- 	return results
+Index: Tools/freeze/freeze.py
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Tools/freeze/freeze.py,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -c -r1.25 -r1.26
+*** freeze.py	1998/03/20 17:37:18	1.25
+--- freeze.py	1998/04/20 17:53:19	1.26
+***************
+*** 72,78 ****
+  import os
+  import string
+  import sys
+- import addpack
+  
+  
+  # Import the freeze-private modules
+--- 72,77 ----
diff --git a/lang/python/patches/patch-ab b/lang/python/patches/patch-ab
index dc4f3247142..72377f139f9 100644
--- a/lang/python/patches/patch-ab
+++ b/lang/python/patches/patch-ab
@@ -1,39 +1,19 @@
-$NetBSD: patch-ab,v 1.1 1998/02/01 01:48:52 tron Exp $
-
-Patches submitted to Guido, comitted for next release.
-
-	-- tsarna@endicor.com, 21 January, 1998
-
---- Python/importdl.c.orig	Sun Jan 11 12:53:01 1998
-+++ Python/importdl.c	Sun Jan 11 12:54:01 1998
-@@ -53,7 +53,7 @@
-    SHORT_EXT	-- short extension for dynamic module, e.g. ".so"
-    LONG_EXT	-- long extension, e.g. "module.so"
-    hpux		-- HP-UX Dynamic Linking - defined by the compiler
--   __NetBSD__	-- NetBSD shared libraries (not quite SVR4 compatible)
-+   __NetBSD__	-- NetBSD shared libraries
-    __FreeBSD__	-- FreeBSD shared libraries
- 
-    (The other WITH_* symbols are used only once, to set the
-@@ -88,7 +88,11 @@
- #define LONG_EXT ".dll"
- #endif
- 
--#if defined(__NetBSD__)
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
-+
-+#if defined(__NetBSD__) && (NetBSD < 199712)
- #define DYNAMIC_LINK
- #define USE_SHLIB
- 
-@@ -157,7 +161,7 @@
- #ifdef USE_SHLIB
- #include <sys/types.h>
- #include <sys/stat.h>
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) && (NetBSD < 199712)
- #include <nlist.h>
- #include <link.h>
- #else
+Index: Modules/_tkinter.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/_tkinter.c,v
+retrieving revision 1.62
+diff -c -r1.62 _tkinter.c
+*** _tkinter.c	1998/04/10 22:27:26	1.62
+--- _tkinter.c	1998/04/20 18:19:51
+***************
+*** 1548,1554 ****
+--- 1548,1556 ----
+  	if (PyErr_Occurred())
+  		return;
+  
++ #if TKMAJORMINOR >= 8000
+  	Py_AtExit(Tcl_Finalize);
++ #endif
+  
+  #ifdef macintosh
+  	/*
diff --git a/lang/python/patches/patch-ac b/lang/python/patches/patch-ac
index f57f391bec5..af99bd641e4 100644
--- a/lang/python/patches/patch-ac
+++ b/lang/python/patches/patch-ac
@@ -1,35 +1,50 @@
---- Parser/tokenizer.c.orig	Tue Apr 29 23:03:03 1997
-+++ Parser/tokenizer.c	Mon Feb  9 13:05:34 1998
-@@ -46,6 +46,14 @@
- /* Don't ever change this -- it would break the portability of Python code */
- #define TABSIZE 8
- 
-+/* Convert a possibly signed character to a nonnegative int */
-+/* XXX This assumes characters are 8 bits wide */
-+#ifdef __CHAR_UNSIGNED__
-+#define Py_CHARMASK(c)		(c)
-+#else
-+#define Py_CHARMASK(c)		((c) & 0xff)
-+#endif
-+
- /* Forward */
- static struct tok_state *tok_new Py_PROTO((void));
- static int tok_nextc Py_PROTO((struct tok_state *tok));
-@@ -178,7 +186,7 @@
- {
- 	for (;;) {
- 		if (tok->cur != tok->inp) {
--			return *tok->cur++; /* Fast path */
-+			return Py_CHARMASK(*tok->cur++); /* Fast path */
- 		}
- 		if (tok->done != E_OK)
- 			return EOF;
-@@ -197,7 +205,7 @@
- 				tok->buf = tok->cur;
- 			tok->lineno++;
- 			tok->inp = end;
--			return *tok->cur++;
-+			return Py_CHARMASK(*tok->cur++);
- 		}
- 		if (tok->prompt != NULL) {
- 			char *new = PyOS_Readline(tok->prompt);
+Index: configure.in
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/configure.in,v
+retrieving revision 1.83
+retrieving revision 1.84
+diff -c -r1.83 -r1.84
+*** configure.in	1998/04/13 15:27:01	1.83
+--- configure.in	1998/04/20 18:51:54	1.84
+***************
+*** 314,320 ****
+  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+  	IRIX*/6*)  case $CC in
+  		   *gcc*) CCSHARED="-shared";;
+! 		   *) CCSHARED="-shared -all";;
+  		   esac;;
+  	esac
+  fi
+--- 314,320 ----
+  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+  	IRIX*/6*)  case $CC in
+  		   *gcc*) CCSHARED="-shared";;
+! 		   *) CCSHARED="";;
+  		   esac;;
+  	esac
+  fi
+Index: configure
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/configure,v
+retrieving revision 1.76
+retrieving revision 1.77
+diff -c -r1.76 -r1.77
+*** configure	1998/04/13 15:26:57	1.76
+--- configure	1998/04/20 18:51:49	1.77
+***************
+*** 1865,1871 ****
+  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+  	IRIX*/6*)  case $CC in
+  		   *gcc*) CCSHARED="-shared";;
+! 		   *) CCSHARED="-shared -all";;
+  		   esac;;
+  	esac
+  fi
+--- 1865,1871 ----
+  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
+  	IRIX*/6*)  case $CC in
+  		   *gcc*) CCSHARED="-shared";;
+! 		   *) CCSHARED="";;
+  		   esac;;
+  	esac
+  fi
diff --git a/lang/python/patches/patch-ad b/lang/python/patches/patch-ad
new file mode 100644
index 00000000000..fd125b4be72
--- /dev/null
+++ b/lang/python/patches/patch-ad
@@ -0,0 +1,27 @@
+Index: Objects/object.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Objects/object.c,v
+retrieving revision 2.55
+retrieving revision 2.56
+diff -c -r2.55 -r2.56
+*** object.c	1998/04/11 15:17:34	2.55
+--- object.c	1998/04/21 22:25:01	2.56
+***************
+*** 188,195 ****
+  					ret = -1;
+  				}
+  				else {
+! 					fprintf(fp, "%s",
+! 						PyString_AsString(s));
+  				}
+  				Py_XDECREF(s);
+  			}
+--- 188,195 ----
+  					ret = -1;
+  				}
+  				else {
+! 					ret = PyObject_Print(s, fp,
+! 							     Py_PRINT_RAW);
+  				}
+  				Py_XDECREF(s);
+  			}
diff --git a/lang/python/patches/patch-ae b/lang/python/patches/patch-ae
new file mode 100644
index 00000000000..67195edc461
--- /dev/null
+++ b/lang/python/patches/patch-ae
@@ -0,0 +1,112 @@
+Index: Modules/parsermodule.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/parsermodule.c,v
+retrieving revision 2.25
+retrieving revision 2.26
+diff -c -r2.25 -r2.26
+*** parsermodule.c	1998/04/13 18:45:18	2.25
+--- parsermodule.c	1998/04/21 22:31:45	2.26
+***************
+*** 473,483 ****
+  
+  static PyMethodDef
+  parser_methods[] = {
+!     {"compile",		parser_compileast,	METH_VARARGS},
+!     {"isexpr",		parser_isexpr,		METH_VARARGS},
+!     {"issuite",		parser_issuite,		METH_VARARGS},
+!     {"tolist",		parser_ast2list,	METH_VARARGS},
+!     {"totuple",		parser_ast2tuple,	METH_VARARGS},
+  
+      {NULL}
+  };
+--- 473,488 ----
+  
+  static PyMethodDef
+  parser_methods[] = {
+!     {"compile",		(PyCFunction)parser_compileast,	METH_VARARGS,
+! 	"Compile this AST object into a code object."},
+!     {"isexpr",		(PyCFunction)parser_isexpr,	METH_VARARGS,
+! 	"Determines if this AST object was created from an expression."},
+!     {"issuite",		(PyCFunction)parser_issuite,	METH_VARARGS,
+! 	"Determines if this AST object was created from a suite."},
+!     {"tolist",		(PyCFunction)parser_ast2list,	METH_VARARGS,
+! 	"Creates a list-tree representation of this AST."},
+!     {"totuple",		(PyCFunction)parser_ast2tuple,	METH_VARARGS,
+! 	"Creates a tuple-tree representation of this AST."},
+  
+      {NULL}
+  };
+***************
+*** 2685,2711 ****
+   *  inheritance.
+   */
+  static PyMethodDef parser_functions[] =  {
+!     {"ast2tuple",	parser_ast2tuple,	METH_VARARGS,
+  	"Creates a tuple-tree representation of an AST."},
+!     {"ast2list",	parser_ast2list,	METH_VARARGS,
+  	"Creates a list-tree representation of an AST."},
+!     {"compileast",	parser_compileast,	METH_VARARGS,
+  	"Compiles an AST object into a code object."},
+!     {"expr",		parser_expr,		METH_VARARGS,
+  	"Creates an AST object from an expression."},
+!     {"isexpr",		parser_isexpr,		METH_VARARGS,
+  	"Determines if an AST object was created from an expression."},
+!     {"issuite",		parser_issuite,		METH_VARARGS,
+  	"Determines if an AST object was created from a suite."},
+!     {"suite",		parser_suite,		METH_VARARGS,
+  	"Creates an AST object from a suite."},
+!     {"sequence2ast",	parser_tuple2ast,	METH_VARARGS,
+  	"Creates an AST object from a tree representation."},
+!     {"tuple2ast",	parser_tuple2ast,	METH_VARARGS,
+  	"Creates an AST object from a tree representation."},
+  
+      /* private stuff: support pickle module */
+!     {"_pickler",	parser__pickler,	METH_VARARGS,
+          "Returns the pickle magic to allow ast objects to be pickled."},
+  
+      {0, 0, 0}
+--- 2690,2716 ----
+   *  inheritance.
+   */
+  static PyMethodDef parser_functions[] =  {
+!     {"ast2tuple",	(PyCFunction)parser_ast2tuple,	METH_VARARGS,
+  	"Creates a tuple-tree representation of an AST."},
+!     {"ast2list",	(PyCFunction)parser_ast2list,	METH_VARARGS,
+  	"Creates a list-tree representation of an AST."},
+!     {"compileast",	(PyCFunction)parser_compileast,	METH_VARARGS,
+  	"Compiles an AST object into a code object."},
+!     {"expr",		(PyCFunction)parser_expr,	METH_VARARGS,
+  	"Creates an AST object from an expression."},
+!     {"isexpr",		(PyCFunction)parser_isexpr,	METH_VARARGS,
+  	"Determines if an AST object was created from an expression."},
+!     {"issuite",		(PyCFunction)parser_issuite,	METH_VARARGS,
+  	"Determines if an AST object was created from a suite."},
+!     {"suite",		(PyCFunction)parser_suite,	METH_VARARGS,
+  	"Creates an AST object from a suite."},
+!     {"sequence2ast",	(PyCFunction)parser_tuple2ast,	METH_VARARGS,
+  	"Creates an AST object from a tree representation."},
+!     {"tuple2ast",	(PyCFunction)parser_tuple2ast,	METH_VARARGS,
+  	"Creates an AST object from a tree representation."},
+  
+      /* private stuff: support pickle module */
+!     {"_pickler",	(PyCFunction)parser__pickler,	METH_VARARGS,
+          "Returns the pickle magic to allow ast objects to be pickled."},
+  
+      {0, 0, 0}
+***************
+*** 2761,2767 ****
+      /* register to support pickling */
+      module = PyImport_ImportModule("copy_reg");
+      if (module != NULL) {
+! 	PyObject *func, *constructor, *pickler;
+  
+  	func = PyObject_GetAttrString(module, "pickle");
+  	pickle_constructor = PyDict_GetItemString(dict, "sequence2ast");
+--- 2766,2772 ----
+      /* register to support pickling */
+      module = PyImport_ImportModule("copy_reg");
+      if (module != NULL) {
+! 	PyObject *func, *pickler;
+  
+  	func = PyObject_GetAttrString(module, "pickle");
+  	pickle_constructor = PyDict_GetItemString(dict, "sequence2ast");
diff --git a/lang/python/patches/patch-af b/lang/python/patches/patch-af
new file mode 100644
index 00000000000..3e9f9673398
--- /dev/null
+++ b/lang/python/patches/patch-af
@@ -0,0 +1,17 @@
+Index: Modules/zlibmodule.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/zlibmodule.c,v
+retrieving revision 2.12
+diff -c -r2.12 zlibmodule.c
+*** zlibmodule.c	1997/12/18 05:21:29	2.12
+--- zlibmodule.c	1998/04/22 21:32:04
+***************
+*** 217,222 ****
+--- 217,223 ----
+          {
+          case(Z_STREAM_END):
+  	    break;
++ 	case(Z_BUF_ERROR):
+          case(Z_OK):
+  	    /* need more memory */
+  	    if (_PyString_Resize(&result_str, r_strlen << 1) == -1)
diff --git a/lang/python/patches/patch-ag b/lang/python/patches/patch-ag
new file mode 100644
index 00000000000..d6dff2946ab
--- /dev/null
+++ b/lang/python/patches/patch-ag
@@ -0,0 +1,116 @@
+Index: Lib/string.py
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Lib/string.py,v
+retrieving revision 1.41
+retrieving revision 1.42
+diff -c -r1.41 -r1.42
+*** string.py	1998/03/30 17:22:30	1.41
+--- string.py	1998/04/20 14:01:00	1.42
+***************
+*** 326,348 ****
+  	return r
+  
+  # "Safe" environment for eval()
+! safe_env = {"__builtins__": {}}
+  
+  # Convert string to float
+! re = None
+  def atof(str):
+  	"""atof(s) -> float
+  
+  	Return the floating point number represented by the string s.
+  
+  	"""
+! 	global re
+! 	if re is None:
+  		# Don't fail if re doesn't exist -- just skip the syntax check
+  		try:
+  			import re
+  		except ImportError:
+! 			re = 0
+  	sign = ''
+  	s = strip(str)
+  	if s and s[0] in '+-':
+--- 326,350 ----
+  	return r
+  
+  # "Safe" environment for eval()
+! _safe_env = {"__builtins__": {}}
+  
+  # Convert string to float
+! _re = None
+  def atof(str):
+  	"""atof(s) -> float
+  
+  	Return the floating point number represented by the string s.
+  
+  	"""
+! 	global _re
+! 	if _re is None:
+  		# Don't fail if re doesn't exist -- just skip the syntax check
+  		try:
+  			import re
+  		except ImportError:
+! 			_re = 0
+! 		else:
+! 			_re = re
+  	sign = ''
+  	s = strip(str)
+  	if s and s[0] in '+-':
+***************
+*** 351,360 ****
+  	if not s:
+  		raise ValueError, 'non-float argument to string.atof'
+  	while s[0] == '0' and len(s) > 1 and s[1] in digits: s = s[1:]
+! 	if re and not re.match('[0-9]*(\.[0-9]*)?([eE][-+]?[0-9]+)?$', s):
+  		raise ValueError, 'non-float argument to string.atof'
+  	try:
+! 		return float(eval(sign + s, safe_env))
+  	except SyntaxError:
+  		raise ValueError, 'non-float argument to string.atof'
+  
+--- 353,362 ----
+  	if not s:
+  		raise ValueError, 'non-float argument to string.atof'
+  	while s[0] == '0' and len(s) > 1 and s[1] in digits: s = s[1:]
+! 	if _re and not _re.match('[0-9]*(\.[0-9]*)?([eE][-+]?[0-9]+)?$', s):
+  		raise ValueError, 'non-float argument to string.atof'
+  	try:
+! 		return float(eval(sign + s, _safe_env))
+  	except SyntaxError:
+  		raise ValueError, 'non-float argument to string.atof'
+  
+***************
+*** 384,390 ****
+  	for c in s:
+  		if c not in digits:
+  			raise ValueError, 'non-integer argument to string.atoi'
+! 	return eval(sign + s, safe_env)
+  
+  # Convert string to long integer
+  def atol(str, base=10):
+--- 386,392 ----
+  	for c in s:
+  		if c not in digits:
+  			raise ValueError, 'non-integer argument to string.atoi'
+! 	return eval(sign + s, _safe_env)
+  
+  # Convert string to long integer
+  def atol(str, base=10):
+***************
+*** 413,419 ****
+  	for c in s:
+  		if c not in digits:
+  			raise ValueError, 'non-integer argument to string.atol'
+! 	return eval(sign + s + 'L', safe_env)
+  
+  # Left-justify a string
+  def ljust(s, width):
+--- 415,421 ----
+  	for c in s:
+  		if c not in digits:
+  			raise ValueError, 'non-integer argument to string.atol'
+! 	return eval(sign + s + 'L', _safe_env)
+  
+  # Left-justify a string
+  def ljust(s, width):
diff --git a/lang/python/patches/patch-ah b/lang/python/patches/patch-ah
new file mode 100644
index 00000000000..5f78c315e69
--- /dev/null
+++ b/lang/python/patches/patch-ah
@@ -0,0 +1,25 @@
+Index: Python/bltinmodule.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Python/bltinmodule.c,v
+retrieving revision 2.115
+retrieving revision 2.116
+diff -c -r2.115 -r2.116
+*** bltinmodule.c	1998/04/10 22:25:25	2.115
+--- bltinmodule.c	1998/04/23 21:46:19	2.116
+***************
+*** 1282,1288 ****
+  			Py_DECREF(v);
+  			return NULL;
+  		}
+! 		PyList_SetItem(v, i, w);
+  		ilow += istep;
+  	}
+  	return v;
+--- 1282,1288 ----
+  			Py_DECREF(v);
+  			return NULL;
+  		}
+! 		PyList_GET_ITEM(v, i) = w;
+  		ilow += istep;
+  	}
+  	return v;
diff --git a/lang/python/patches/patch-ai b/lang/python/patches/patch-ai
new file mode 100644
index 00000000000..d35ef1c0b08
--- /dev/null
+++ b/lang/python/patches/patch-ai
@@ -0,0 +1,33 @@
+Index: Modules/timemodule.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/timemodule.c,v
+retrieving revision 2.58
+diff -c -r2.58 timemodule.c
+*** timemodule.c	1998/03/06 17:16:21	2.58
+--- timemodule.c	1998/04/27 18:47:53
+***************
+*** 304,309 ****
+--- 304,311 ----
+  	char *outbuf = 0;
+  	int i;
+  
++ 	memset((ANY *) &buf, '\0', sizeof(buf));
++ 
+  	if (!PyArg_ParseTuple(args, "s(iiiiiiiii)",
+  			      &fmt,
+  			      &(buf.tm_year),
+***************
+*** 321,332 ****
+  	buf.tm_mon--;
+  	buf.tm_wday = (buf.tm_wday + 1) % 7;
+  	buf.tm_yday--;
+- #ifdef HAVE_MKTIME
+- 	/* This call is only there to adjust the numbers to be within
+- 	   bounds.  When we don't have mktime(), we say the caller is
+- 	   responsible for that... */
+- 	(void) mktime(&buf);
+- #endif
+  	/* I hate these functions that presume you know how big the output
+  	 * will be ahead of time...
+  	 */
+--- 323,328 ----
diff --git a/lang/python/patches/patch-aj b/lang/python/patches/patch-aj
new file mode 100644
index 00000000000..dc7acbd886f
--- /dev/null
+++ b/lang/python/patches/patch-aj
@@ -0,0 +1,18 @@
+Index: Objects/fileobject.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Objects/fileobject.c,v
+retrieving revision 2.58
+diff -c -r2.58 fileobject.c
+*** fileobject.c	1998/04/10 22:16:34	2.58
+--- fileobject.c	1998/04/27 18:52:40
+***************
+*** 416,421 ****
+--- 416,423 ----
+  	if (fstat(fileno(f->f_fp), &st) == 0) {
+  		end = st.st_size;
+  		pos = ftell(f->f_fp);
++ 		if (pos < 0)
++ 			clearerr(f->f_fp);
+  		if (end > pos && pos >= 0)
+  			return end - pos + 1;
+  		/* Add 1 so if the file were to grow we'd notice. */
diff --git a/lang/python/patches/patch-ak b/lang/python/patches/patch-ak
new file mode 100644
index 00000000000..076996ca62a
--- /dev/null
+++ b/lang/python/patches/patch-ak
@@ -0,0 +1,50 @@
+Index: Lib/urllib.py
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
+retrieving revision 1.64
+retrieving revision 1.65
+diff -c -r1.64 -r1.65
+*** urllib.py	1998/04/11 01:18:35	1.64
+--- urllib.py	1998/04/27 15:19:17	1.65
+***************
+*** 214,222 ****
+  	# Use HTTP protocol
+  	def open_http(self, url, data=None):
+  		import httplib
+  		if type(url) is type(""):
+  			host, selector = splithost(url)
+! 			user_passwd, host = splituser(host)
+  			realhost = host
+  		else:
+  			host, selector = url
+--- 214,224 ----
+  	# Use HTTP protocol
+  	def open_http(self, url, data=None):
+  		import httplib
++ 		user_passwd = None
+  		if type(url) is type(""):
+  			host, selector = splithost(url)
+! 			if host:
+! 				user_passwd, host = splituser(host)
+  			realhost = host
+  		else:
+  			host, selector = url
+***************
+*** 226,232 ****
+  				realhost = None
+  			else:
+  				realhost, rest = splithost(rest)
+! 				user_passwd, realhost = splituser(realhost)
+  				if user_passwd:
+  					selector = "%s://%s%s" % (urltype,
+  								  realhost,
+--- 228,236 ----
+  				realhost = None
+  			else:
+  				realhost, rest = splithost(rest)
+! 				if realhost:
+! 					user_passwd, realhost = \
+! 						     splituser(realhost)
+  				if user_passwd:
+  					selector = "%s://%s%s" % (urltype,
+  								  realhost,
diff --git a/lang/python/patches/patch-al b/lang/python/patches/patch-al
new file mode 100644
index 00000000000..3e6d40d16f6
--- /dev/null
+++ b/lang/python/patches/patch-al
@@ -0,0 +1,257 @@
+Index: Modules/pcre-int.h
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/pcre-int.h,v
+retrieving revision 2.3
+diff -c -r2.3 pcre-int.h
+*** pcre-int.h	1998/04/03 21:13:23	2.3
+--- pcre-int.h	1998/05/01 14:52:20
+***************
+*** 3,9 ****
+  *************************************************/
+  
+  
+! #define PCRE_VERSION       "1.07 16-Feb-1998"
+  
+  
+  /* This is a library of functions to support regular expressions whose syntax
+--- 3,9 ----
+  *************************************************/
+  
+  
+! #define PCRE_VERSION       "1.09 28-Apr-1998"
+  
+  
+  /* This is a library of functions to support regular expressions whose syntax
+***************
+*** 80,90 ****
+  #ifdef FOR_PYTHON
+  #define PUBLIC_OPTIONS \
+    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
+!    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_LOCALE)
+  #else
+  #define PUBLIC_OPTIONS \
+    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
+!    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA)
+  #endif
+  #define PUBLIC_EXEC_OPTIONS \
+    (PCRE_CASELESS|PCRE_ANCHORED|PCRE_MULTILINE|PCRE_NOTBOL|PCRE_NOTEOL| \
+--- 80,91 ----
+  #ifdef FOR_PYTHON
+  #define PUBLIC_OPTIONS \
+    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
+!    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY| \
+!    PCRE_LOCALE)
+  #else
+  #define PUBLIC_OPTIONS \
+    (PCRE_CASELESS|PCRE_EXTENDED|PCRE_ANCHORED|PCRE_MULTILINE| \
+!    PCRE_DOTALL|PCRE_DOLLAR_ENDONLY|PCRE_EXTRA|PCRE_UNGREEDY)
+  #endif
+  #define PUBLIC_EXEC_OPTIONS \
+    (PCRE_CASELESS|PCRE_ANCHORED|PCRE_MULTILINE|PCRE_NOTBOL|PCRE_NOTEOL| \
+Index: Modules/pcre.h
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/pcre.h,v
+retrieving revision 2.6
+diff -c -r2.6 pcre.h
+*** pcre.h	1998/04/03 21:13:25	2.6
+--- pcre.h	1998/05/01 14:52:20
+***************
+*** 34,39 ****
+--- 34,40 ----
+  #define PCRE_EXTRA           0x0040
+  #define PCRE_NOTBOL          0x0080
+  #define PCRE_NOTEOL          0x0100
++ #define PCRE_UNGREEDY        0x0400
+  #ifdef FOR_PYTHON
+  #define PCRE_LOCALE          0x0200
+  #endif
+Index: Modules/pypcre.c
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/Modules/pypcre.c,v
+retrieving revision 2.12
+diff -c -r2.12 pypcre.c
+*** pypcre.c	1998/04/10 21:50:23	2.12
+--- pypcre.c	1998/05/01 14:52:21
+***************
+*** 1216,1221 ****
+--- 1216,1222 ----
+  int repeat_type, op_type;
+  int repeat_min, repeat_max;
+  int bravalue, length;
++ int greedy_default, greedy_non_default;
+  register int c;
+  register uschar *code = *codeptr;
+  const uschar *ptr = *ptrptr;
+***************
+*** 1224,1229 ****
+--- 1225,1235 ----
+  uschar class[32];
+  uschar *class_flag;  /* Pointer to the single-byte flag for OP_CLASS_L */
+  
++ /* Set up the default and non-default settings for greediness */
++  
++ greedy_default = ((options & PCRE_UNGREEDY) != 0);
++ greedy_non_default = greedy_default ^ 1;
++  
+  /* Switch on next character until the end of the branch */
+  
+  for (;; ptr++)
+***************
+*** 1536,1545 ****
+        goto FAILED;
+        }
+  
+!     /* If the next character is '?' this is a minimizing repeat. Advance to the
+      next character. */
+  
+!     if (ptr[1] == '?') { repeat_type = 1; ptr++; } else repeat_type = 0;
+  
+      /* If the maximum is zero then the minimum must also be zero; Perl allows
+      this case, so we do too - by simply omitting the item altogether. */
+--- 1542,1554 ----
+        goto FAILED;
+        }
+  
+!     /* If the next character is '?' this is a minimizing repeat, by default,
+!     but if PCRE_UNGREEDY is set, it works the other way round. Advance to the
+      next character. */
+  
+!     if (ptr[1] == '?')
+!       { repeat_type = greedy_non_default; ptr++; }
+!     else repeat_type = greedy_default;
+  
+      /* If the maximum is zero then the minimum must also be zero; Perl allows
+      this case, so we do too - by simply omitting the item altogether. */
+***************
+*** 1628,1641 ****
+          /* If the mininum is 1 and the previous item was a character string,
+          we either have to put back the item that got cancelled if the string
+          length was 1, or add the character back onto the end of a longer
+!         string. For a character type nothing need be done; it will just get put
+!         back naturally. */
+  
+          else if (*previous == OP_CHARS)
+            {
+            if (code == previous) code += 2; else previous[1]++;
+            }
+  
+          /* If the maximum is unlimited, insert an OP_STAR. */
+  
+          if (repeat_max < 0)
+--- 1637,1656 ----
+          /* If the mininum is 1 and the previous item was a character string,
+          we either have to put back the item that got cancelled if the string
+          length was 1, or add the character back onto the end of a longer
+!         string. For a character type nothing need be done; it will just get
+!         put back naturally. Note that the final character is always going to
+!         get added below. */
+  
+          else if (*previous == OP_CHARS)
+            {
+            if (code == previous) code += 2; else previous[1]++;
+            }
+  
++         /*  For a single negated character we also have to put back the
++         item that got cancelled. */
++ 
++         else if (*previous == OP_NOT) code++;
++ 
+          /* If the maximum is unlimited, insert an OP_STAR. */
+  
+          if (repeat_max < 0)
+***************
+*** 1779,1784 ****
+--- 1794,1801 ----
+          case 'm':
+          case 's':
+          case 'x':
++         case 'U':
++         case 'X':
+          ptr++;
+          while (*ptr != ')') ptr++;
+          previous = NULL;
+***************
+*** 2484,2490 ****
+          ptr += 2;
+          break;
+          }
+!       /* Else fall thourh */
+  
+        /* Else loop setting valid options until ) is met. Anything else is an
+        error. */
+--- 2501,2507 ----
+          ptr += 2;
+          break;
+          }
+!       /* Else fall through */
+  
+        /* Else loop setting valid options until ) is met. Anything else is an
+        error. */
+***************
+*** 2519,2524 ****
+--- 2536,2551 ----
+            length -= spaces;          /* Already counted spaces */
+            continue;
+            }
++         else if (c == 'X')
++           {
++           options |= PCRE_EXTRA;
++           continue;
++           }
++         else if (c == 'U')
++           {
++           options |= PCRE_UNGREEDY;
++           continue;
++           }
+          else if (c == ')') break;
+  
+          *errorptr = ERR12;
+***************
+*** 2725,2738 ****
+  
+  if (re->options != 0)
+    {
+!   printf("%s%s%s%s%s%s%s\n",
+      ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",
+      ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",
+      ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",
+      ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",
+      ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",
+      ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",
+!     ((re->options & PCRE_EXTRA) != 0)? "extra " : "");
+    }
+  
+  if ((re->options & PCRE_FIRSTSET) != 0)
+--- 2752,2766 ----
+  
+  if (re->options != 0)
+    {
+!   printf("%s%s%s%s%s%s%s%s\n",
+      ((re->options & PCRE_ANCHORED) != 0)? "anchored " : "",
+      ((re->options & PCRE_CASELESS) != 0)? "caseless " : "",
+      ((re->options & PCRE_EXTENDED) != 0)? "extended " : "",
+      ((re->options & PCRE_MULTILINE) != 0)? "multiline " : "",
+      ((re->options & PCRE_DOTALL) != 0)? "dotall " : "",
+      ((re->options & PCRE_DOLLAR_ENDONLY) != 0)? "endonly " : "",
+!     ((re->options & PCRE_EXTRA) != 0)? "extra " : "",
+!     ((re->options & PCRE_UNGREEDY) != 0)? "ungreedy " : "");  
+    }
+  
+  if ((re->options & PCRE_FIRSTSET) != 0)
+***************
+*** 3070,3076 ****
+    if (md->offset_top == NULL || md->eptr == NULL || md->ecode == NULL ||
+        md->off_num == NULL || md->r1 == NULL || md->r2 == NULL) 
+      {
+!       PyErr_SetString(PyExc_MemoryError, "Can't increase failure stack for re operation");
+        longjmp(md->error_env, 1);
+      }
+    return 0;
+--- 3098,3104 ----
+    if (md->offset_top == NULL || md->eptr == NULL || md->ecode == NULL ||
+        md->off_num == NULL || md->r1 == NULL || md->r2 == NULL) 
+      {
+!       PyErr_NoMemory();
+        longjmp(md->error_env, 1);
+      }
+    return 0;
diff --git a/lang/python/patches/patch-am b/lang/python/patches/patch-am
new file mode 100644
index 00000000000..dadeb9dbc28
--- /dev/null
+++ b/lang/python/patches/patch-am
@@ -0,0 +1,137 @@
+Index: config.h.in
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/config.h.in,v
+retrieving revision 2.34
+diff -c -r2.34 config.h.in
+*** config.h.in	1998/04/10 19:17:15	2.34
+--- config.h.in	1998/05/01 16:47:39
+***************
+*** 396,398 ****
+--- 396,401 ----
+  
+  /* Define if you have the ieee library (-lieee).  */
+  #undef HAVE_LIBIEEE
++ 
++ /* Define if you have the m library (-lm).  */
++ #undef HAVE_LIBM
+Index: configure
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/configure,v
+retrieving revision 1.77
+diff -c -r1.77 configure
+*** configure	1998/04/20 18:51:49	1.77
+--- configure	1998/05/01 16:54:17
+***************
+*** 1989,2012 ****
+    echo "$ac_t""no" 1>&6
+  fi
+  	# Dynamic linking for HP-UX
+! echo $ac_n "checking for getpwnam in -lsun""... $ac_c" 1>&6
+! echo "configure:1994: checking for getpwnam in -lsun" >&5
+! ac_lib_var=`echo sun'_'getpwnam | sed 'y%./+-%__p_%'`
+  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_save_LIBS="$LIBS"
+! LIBS="-lsun  $LIBS"
+  cat > conftest.$ac_ext <<EOF
+  #line 2002 "configure"
+  #include "confdefs.h"
+  /* Override any gcc2 internal prototype to avoid an error.  */
+  /* We use char because int might match the return type of a gcc2
+      builtin and then its argument prototype would still apply.  */
+! char getpwnam();
+  
+  int main() {
+! getpwnam()
+  ; return 0; }
+  EOF
+  if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+--- 1989,2012 ----
+    echo "$ac_t""no" 1>&6
+  fi
+  	# Dynamic linking for HP-UX
+! echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
+! echo "configure:1994: checking for pow in -lm" >&5
+! ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
+  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "(cached) $ac_c" 1>&6
+  else
+    ac_save_LIBS="$LIBS"
+! LIBS="-lm  $LIBS"
+  cat > conftest.$ac_ext <<EOF
+  #line 2002 "configure"
+  #include "confdefs.h"
+  /* Override any gcc2 internal prototype to avoid an error.  */
+  /* We use char because int might match the return type of a gcc2
+      builtin and then its argument prototype would still apply.  */
+! char pow();
+  
+  int main() {
+! pow()
+  ; return 0; }
+  EOF
+  if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+***************
+*** 2024,2041 ****
+  fi
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+!     ac_tr_lib=HAVE_LIB`echo sun | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+      -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+    cat >> confdefs.h <<EOF
+  #define $ac_tr_lib 1
+  EOF
+  
+!   LIBS="-lsun $LIBS"
+  
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+! 	# NIS (== YP) interface for IRIX 4
+  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
+  # However on SGI IRIX, these exist but are broken.
+  if test "$ac_sys_system" != IRIX
+--- 2024,2041 ----
+  fi
+  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+    echo "$ac_t""yes" 1>&6
+!     ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+      -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+    cat >> confdefs.h <<EOF
+  #define $ac_tr_lib 1
+  EOF
+  
+!   LIBS="-lm $LIBS"
+  
+  else
+    echo "$ac_t""no" 1>&6
+  fi
+! 		# Std math lib -- assume needed if it exists
+  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
+  # However on SGI IRIX, these exist but are broken.
+  if test "$ac_sys_system" != IRIX
+Index: configure.in
+===================================================================
+RCS file: /projects/cvsroot/python/dist/src/configure.in,v
+retrieving revision 1.84
+diff -c -r1.84 configure.in
+*** configure.in	1998/04/20 18:51:54	1.84
+--- configure.in	1998/05/01 16:54:12
+***************
+*** 345,351 ****
+  # checks for libraries
+  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+  AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+! AC_CHECK_LIB(sun, getpwnam)	# NIS (== YP) interface for IRIX 4
+  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
+  # However on SGI IRIX, these exist but are broken.
+  if test "$ac_sys_system" != IRIX
+--- 345,351 ----
+  # checks for libraries
+  AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+  AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+! AC_CHECK_LIB(m, pow)		# Std math lib -- assume needed if it exists
+  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
+  # However on SGI IRIX, these exist but are broken.
+  if test "$ac_sys_system" != IRIX
diff --git a/lang/python/pkg/PLIST-mi b/lang/python/pkg/PLIST-mi
index 93132ae6190..dbdff6dfaa3 100644
--- a/lang/python/pkg/PLIST-mi
+++ b/lang/python/pkg/PLIST-mi
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST-mi,v 1.1 1998/02/01 01:48:55 tron Exp $
+@comment $NetBSD: PLIST-mi,v 1.2 1998/05/04 19:29:23 tron Exp $
 bin/python
 bin/python1.5
 include/python1.5/Python.h
@@ -59,6 +59,7 @@ include/python1.5/thread.h
 include/python1.5/token.h
 include/python1.5/traceback.h
 include/python1.5/tupleobject.h
+@dirrm include/python1.5
 lib/python1.5/BaseHTTPServer.py
 lib/python1.5/BaseHTTPServer.pyc
 lib/python1.5/BaseHTTPServer.pyo
@@ -74,9 +75,6 @@ lib/python1.5/ConfigParser.pyo
 lib/python1.5/MimeWriter.py
 lib/python1.5/MimeWriter.pyc
 lib/python1.5/MimeWriter.pyo
-lib/python1.5/Para.py
-lib/python1.5/Para.pyc
-lib/python1.5/Para.pyo
 lib/python1.5/Queue.py
 lib/python1.5/Queue.pyc
 lib/python1.5/Queue.pyo
@@ -95,9 +93,6 @@ lib/python1.5/UserDict.pyo
 lib/python1.5/UserList.py
 lib/python1.5/UserList.pyc
 lib/python1.5/UserList.pyo
-lib/python1.5/addpack.py
-lib/python1.5/addpack.pyc
-lib/python1.5/addpack.pyo
 lib/python1.5/aifc.py
 lib/python1.5/aifc.pyc
 lib/python1.5/aifc.pyo
@@ -137,9 +132,6 @@ lib/python1.5/cmpcache.pyo
 lib/python1.5/code.py
 lib/python1.5/code.pyc
 lib/python1.5/code.pyo
-lib/python1.5/codehack.py
-lib/python1.5/codehack.pyc
-lib/python1.5/codehack.pyo
 lib/python1.5/colorsys.py
 lib/python1.5/colorsys.pyc
 lib/python1.5/colorsys.pyo
@@ -160,6 +152,7 @@ lib/python1.5/config/install-sh
 lib/python1.5/config/libpython1.5.a
 lib/python1.5/config/makesetup
 lib/python1.5/config/python.o
+@comment dirrm lib/python1.5/config
 lib/python1.5/copy.py
 lib/python1.5/copy.pyc
 lib/python1.5/copy.pyo
@@ -196,9 +189,6 @@ lib/python1.5/fileinput.pyo
 lib/python1.5/find.py
 lib/python1.5/find.pyc
 lib/python1.5/find.pyo
-lib/python1.5/fmt.py
-lib/python1.5/fmt.pyc
-lib/python1.5/fmt.pyo
 lib/python1.5/fnmatch.py
 lib/python1.5/fnmatch.pyc
 lib/python1.5/fnmatch.pyo
@@ -214,6 +204,9 @@ lib/python1.5/ftplib.pyo
 lib/python1.5/getopt.py
 lib/python1.5/getopt.pyc
 lib/python1.5/getopt.pyo
+lib/python1.5/getpass.py
+lib/python1.5/getpass.pyc
+lib/python1.5/getpass.pyo
 lib/python1.5/glob.py
 lib/python1.5/glob.pyc
 lib/python1.5/glob.pyo
@@ -238,6 +231,9 @@ lib/python1.5/httplib.pyo
 lib/python1.5/ihooks.py
 lib/python1.5/ihooks.pyc
 lib/python1.5/ihooks.pyo
+lib/python1.5/imaplib.py
+lib/python1.5/imaplib.pyc
+lib/python1.5/imaplib.pyo
 lib/python1.5/imghdr.py
 lib/python1.5/imghdr.pyc
 lib/python1.5/imghdr.pyo
@@ -349,6 +345,7 @@ lib/python1.5/lib-stdwin/wdbframewin.pyo
 lib/python1.5/lib-stdwin/wdbsrcwin.py
 lib/python1.5/lib-stdwin/wdbsrcwin.pyc
 lib/python1.5/lib-stdwin/wdbsrcwin.pyo
+@comment dirrm lib/python1.5/lib-stdwin
 lib/python1.5/lib-tk/Canvas.py
 lib/python1.5/lib-tk/Canvas.pyc
 lib/python1.5/lib-tk/Canvas.pyo
@@ -367,6 +364,9 @@ lib/python1.5/lib-tk/SimpleDialog.pyo
 lib/python1.5/lib-tk/Tkconstants.py
 lib/python1.5/lib-tk/Tkconstants.pyc
 lib/python1.5/lib-tk/Tkconstants.pyo
+lib/python1.5/lib-tk/Tkdnd.py
+lib/python1.5/lib-tk/Tkdnd.pyc
+lib/python1.5/lib-tk/Tkdnd.pyo
 lib/python1.5/lib-tk/Tkinter.py
 lib/python1.5/lib-tk/Tkinter.pyc
 lib/python1.5/lib-tk/Tkinter.pyo
@@ -385,15 +385,13 @@ lib/python1.5/lib-tk/tkMessageBox.pyo
 lib/python1.5/lib-tk/tkSimpleDialog.py
 lib/python1.5/lib-tk/tkSimpleDialog.pyc
 lib/python1.5/lib-tk/tkSimpleDialog.pyo
+@comment dirrm lib/python1.5/lib-tk
 lib/python1.5/linecache.py
 lib/python1.5/linecache.pyc
 lib/python1.5/linecache.pyo
 lib/python1.5/locale.py
 lib/python1.5/locale.pyc
 lib/python1.5/locale.pyo
-lib/python1.5/lockfile.py
-lib/python1.5/lockfile.pyc
-lib/python1.5/lockfile.pyo
 lib/python1.5/macpath.py
 lib/python1.5/macpath.pyc
 lib/python1.5/macpath.pyo
@@ -424,12 +422,6 @@ lib/python1.5/multifile.pyo
 lib/python1.5/mutex.py
 lib/python1.5/mutex.pyc
 lib/python1.5/mutex.pyo
-lib/python1.5/newdir.py
-lib/python1.5/newdir.pyc
-lib/python1.5/newdir.pyo
-lib/python1.5/ni1.py
-lib/python1.5/ni1.pyc
-lib/python1.5/ni1.pyo
 lib/python1.5/nntplib.py
 lib/python1.5/nntplib.pyc
 lib/python1.5/nntplib.pyo
@@ -468,12 +460,16 @@ lib/python1.5/plat-netbsd1/TERMIOS.py
 lib/python1.5/plat-netbsd1/TERMIOS.pyc
 lib/python1.5/plat-netbsd1/TERMIOS.pyo
 lib/python1.5/plat-netbsd1/regen
+@comment dirrm lib/python1.5/plat-netbsd1
 lib/python1.5/poly.py
 lib/python1.5/poly.pyc
 lib/python1.5/poly.pyo
 lib/python1.5/popen2.py
 lib/python1.5/popen2.pyc
 lib/python1.5/popen2.pyo
+lib/python1.5/poplib.py
+lib/python1.5/poplib.pyc
+lib/python1.5/poplib.pyo
 lib/python1.5/posixfile.py
 lib/python1.5/posixfile.pyc
 lib/python1.5/posixfile.pyo
@@ -502,18 +498,12 @@ lib/python1.5/pyclbr.pyo
 lib/python1.5/quopri.py
 lib/python1.5/quopri.pyc
 lib/python1.5/quopri.pyo
-lib/python1.5/rand.py
-lib/python1.5/rand.pyc
-lib/python1.5/rand.pyo
 lib/python1.5/random.py
 lib/python1.5/random.pyc
 lib/python1.5/random.pyo
 lib/python1.5/re.py
 lib/python1.5/re.pyc
 lib/python1.5/re.pyo
-lib/python1.5/re1.py
-lib/python1.5/re1.pyc
-lib/python1.5/re1.pyo
 lib/python1.5/reconvert.py
 lib/python1.5/reconvert.pyc
 lib/python1.5/reconvert.pyo
@@ -550,6 +540,9 @@ lib/python1.5/shutil.pyo
 lib/python1.5/site.py
 lib/python1.5/site.pyc
 lib/python1.5/site.pyo
+lib/python1.5/smtplib.py
+lib/python1.5/smtplib.pyc
+lib/python1.5/smtplib.pyo
 lib/python1.5/sndhdr.py
 lib/python1.5/sndhdr.pyc
 lib/python1.5/sndhdr.pyo
@@ -571,9 +564,6 @@ lib/python1.5/sunaudio.pyo
 lib/python1.5/symbol.py
 lib/python1.5/symbol.pyc
 lib/python1.5/symbol.pyo
-lib/python1.5/tb.py
-lib/python1.5/tb.pyc
-lib/python1.5/tb.pyo
 lib/python1.5/telnetlib.py
 lib/python1.5/telnetlib.pyc
 lib/python1.5/telnetlib.pyo
@@ -636,6 +626,7 @@ lib/python1.5/test/output/test_timing
 lib/python1.5/test/output/test_tokenize
 lib/python1.5/test/output/test_types
 lib/python1.5/test/output/test_unpack
+lib/python1.5/test/output/test_xmllib
 lib/python1.5/test/output/test_zlib
 lib/python1.5/test/pystone.py
 lib/python1.5/test/pystone.pyc
@@ -802,6 +793,9 @@ lib/python1.5/test/test_types.pyo
 lib/python1.5/test/test_unpack.py
 lib/python1.5/test/test_unpack.pyc
 lib/python1.5/test/test_unpack.pyo
+lib/python1.5/test/test_xmllib.py
+lib/python1.5/test/test_xmllib.pyc
+lib/python1.5/test/test_xmllib.pyo
 lib/python1.5/test/test_zlib.py
 lib/python1.5/test/test_zlib.pyc
 lib/python1.5/test/test_zlib.pyo
@@ -814,6 +808,12 @@ lib/python1.5/test/testrgb.uue
 lib/python1.5/test/tokenize_tests.py
 lib/python1.5/test/tokenize_tests.pyc
 lib/python1.5/test/tokenize_tests.pyo
+lib/python1.5/threading.py
+lib/python1.5/threading.pyc
+lib/python1.5/threading.pyo
+lib/python1.5/threading_api.py
+lib/python1.5/threading_api.pyc
+lib/python1.5/threading_api.pyo
 lib/python1.5/toaiff.py
 lib/python1.5/toaiff.pyc
 lib/python1.5/toaiff.pyo
@@ -872,4 +872,3 @@ lib/python1.5/zmod.py
 lib/python1.5/zmod.pyc
 lib/python1.5/zmod.pyo
 man/man1/python.1
-@dirrm include/python1.5