Pick up latest official patches.

30 files changed, 90 insertions, 45 deletions

diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python+ipv6/distinfo b/lang/python+ipv6/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python+ipv6/distinfo
+++ b/lang/python+ipv6/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python/distinfo b/lang/python/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python15/distinfo b/lang/python15/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python15/distinfo
+++ b/lang/python15/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 66cd8ae34353..802775d3d580 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.32 1998/06/03 07:06:32 tg Exp $
+# $Id: Makefile,v 1.33 1998/06/05 07:09:01 tg Exp $
 #
 
 DISTNAME=       pyth151
@@ -18,7 +18,8 @@ PATCHFILES=	_tkinter.1.txt bltinmodule.1.txt bltinmodule.2.txt \
 		ceval.1.txt configure.2.txt fileobject.1.txt freeze.1.txt \
 		gzip.1.txt imaplib.1.txt imaplib.2.txt imaplib.3.txt \
 		import.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt string.1.txt \
+		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
+		string.1.txt stringobject.1.txt \
 		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index bd029bea0a94..b87948f2964d 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -13,9 +13,11 @@ MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
 MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/pcre.1.txt) = 19808acd1f64eec95266210ff01e3ea4
+MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
 MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
+MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
 MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
+MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
 MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
 MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62