Include official patches.

30 files changed, 435 insertions, 45 deletions

diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 80ec47f185c8..d4355a782d3c 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.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python+ipv6/distinfo b/lang/python+ipv6/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python+ipv6/distinfo
+++ b/lang/python+ipv6/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 80ec47f185c8..d4355a782d3c 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.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python/distinfo b/lang/python/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python15/distinfo b/lang/python15/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python15/distinfo
+++ b/lang/python15/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python20/distinfo b/lang/python20/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python20/distinfo
+++ b/lang/python20/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python21/distinfo b/lang/python21/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python21/distinfo
+++ b/lang/python21/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 80ec47f185c8..d4355a782d3c 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,7 +3,7 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.22 1998/02/27 10:21:32 tg Exp $
+# $Id: Makefile,v 1.23 1998/03/03 08:05:04 tg Exp $
 #
 
 DISTNAME=       python1.5
@@ -12,11 +12,18 @@ CATEGORIES=	lang tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
+PATCH_SITES=	http://www.python.org/1.5/patches/
+PATCHFILES=	abstract.1.txt code.1.txt fileobject.1.txt listobject.1.txt \
+		ntpath.1.txt pcre.1.txt pypcre.1.txt pythonrun.1.txt \
+		random.1.txt re.1.txt re.2.txt rfc822.1.txt shelve.1.txt \
+		strop.1.txt tokenizer.1.txt tokenizer.2.txt urllib.1.txt \
+		urllib.2.txt versioncheck.1.txt
+
 MAINTAINER=	tg@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index c311d933aadb..ee36ba7e5562 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1 +1,20 @@
-MD5 (python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/python1.5.tar.gz) = 7964dcbae1e55e961549f0b4d4713711
+MD5 (python/abstract.1.txt) = 2bb1556642ee4dc83b2701d3da6bf672
+MD5 (python/code.1.txt) = e320750ef2a6175719bde805a7f46bf5
+MD5 (python/fileobject.1.txt) = d1a1ac93614b6f0421b7507d5effeeb0
+MD5 (python/listobject.1.txt) = 8ace491259e3a96fa85f886e007b31ab
+MD5 (python/ntpath.1.txt) = a39fad5fa440caedc117cc60e20ea307
+MD5 (python/pcre.1.txt) = 203b8822810701bdf0be476045bb659f
+MD5 (python/pypcre.1.txt) = c29628a9b435f6d73d500d9c0a59d322
+MD5 (python/pythonrun.1.txt) = 251580925646b5403154cb0962294026
+MD5 (python/random.1.txt) = 20eb92e833e18e53d7ba2a00d7e8abb0
+MD5 (python/re.1.txt) = 9cb9e54af8660fad1b50e7bf64e788b4
+MD5 (python/re.2.txt) = 433dba90d856555c60439302b6dd6c94
+MD5 (python/rfc822.1.txt) = 4999ae0ad9126c1f4c06a00045fdaec8
+MD5 (python/shelve.1.txt) = 662279e6d943d5ff3eb3f4f4d16cf51f
+MD5 (python/strop.1.txt) = cd4bfe0042f31c8f0d62fe476e996c3c
+MD5 (python/tokenizer.1.txt) = 74e25c8197cd546e2b17bb55059beed8
+MD5 (python/tokenizer.2.txt) = 068eaf43f215be4d15e25491a4176e27
+MD5 (python/urllib.1.txt) = 6cbf3bbc00cf4089fb696658544940b4
+MD5 (python/urllib.2.txt) = 38cd523685a68a93806450ec4661fc0b
+MD5 (python/versioncheck.1.txt) = bf45797af2ad3ce7e44e1b89ced04181