upgrade to 1.5.2b1 (fixes build problem along the way)

3 files changed, 5 insertions, 64 deletions

diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 0c39a7b4a7ba..6ee88748e267 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,33 +3,22 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.41 1998/11/11 05:37:26 asami Exp $
+# $Id: Makefile,v 1.42 1998/12/02 08:24:49 asami Exp $
 #
 
-DISTNAME=       pyth151
-PKGNAME=        python-1.5.1
+DISTNAME=       py152b1
+PKGNAME=        python-1.5.2b1
 CATEGORIES=	lang python tk80
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
-PATCH_SITES=	http://www.python.org/1.5/patches-1.5.1/
-PATCHFILES=	_tkinter.1.txt SocketServer.1.txt bltinmodule.1.txt \
-		bltinmodule.2.txt bltinmodule.3.txt \
-		ceval.1.txt classobject.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 longobject.1.txt object.1.txt \
-		parsermodule.1.txt pcre.1.txt sgmllib.1.txt sgmllib.2.txt \
-		string.1.txt stringobject.1.txt stropmodule.1.txt \
-		timemodule.1.txt urllib.1.txt urllib.2.txt zlibmodule.1.txt
-
 MAINTAINER=	tg@FreeBSD.ORG
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
 DIST_SUBDIR=	python
-WRKSRC=		${WRKDIR}/Python-1.5.1
+WRKSRC=		${WRKDIR}/Python-1.5.2b1
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 MAKE_FLAGS=	'OPT=${CFLAGS}'
diff --git a/lang/python15/distinfo b/lang/python15/distinfo
index e926f76d5eef..0de618e34ac8 100644
--- a/lang/python15/distinfo
+++ b/lang/python15/distinfo
@@ -1,29 +1 @@
-MD5 (python/pyth151.tgz) = eb8ef6e37e543058a2d47996ecf62427
-MD5 (python/_tkinter.1.txt) = 7298bfd731a613a28e2cb72ad8e3e266
-MD5 (python/SocketServer.1.txt) = 7ad43e38616efa28b28710e686462494
-MD5 (python/bltinmodule.1.txt) = c1edf803162860802d45c32d9799daaa
-MD5 (python/bltinmodule.2.txt) = 07ba49023b28437733ec611ddf4558fb
-MD5 (python/bltinmodule.3.txt) = 7ebef8ec99284c743ae4804638780bd7
-MD5 (python/ceval.1.txt) = 1d062f62a16189df9832defd22aa9735
-MD5 (python/classobject.1.txt) = f65618df540a8819299b65eafe775e6a
-MD5 (python/configure.2.txt) = a51d521cf899a74b234f5b0fc1a2207c
-MD5 (python/fileobject.1.txt) = 20ebd260276bdf6c3723c62a370e1c8c
-MD5 (python/freeze.1.txt) = 7cb9266ba6db670cd019cf27c77468ef
-MD5 (python/gzip.1.txt) = 55140b037c55b19795ed4543986c2fd4
-MD5 (python/imaplib.1.txt) = ece2e50e69e7ec86c1a9cc310d5ae220
-MD5 (python/imaplib.2.txt) = f8cb53849055badd3037545a92d1a123
-MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
-MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
-MD5 (python/longobject.1.txt) = 069fe0a8fdeaa60a8cf5ff68877a66a3
-MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
-MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-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/stropmodule.1.txt) = 0f7729796b64cfdf7ad63d74e95fac9d
-MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
-MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
-MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
-MD5 (python/zlibmodule.1.txt) = 7d8dfda5f91fd370e001d1f544afd279
+MD5 (python/py152b1.tgz) = 77c8ccba5924c2cdd2df39d9ff9ddc2b
diff --git a/lang/python15/files/patch-ab b/lang/python15/files/patch-ab
deleted file mode 100644
index 9ed08036511d..000000000000
--- a/lang/python15/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-*** Python/importdl.c.orig	Tue Sep 29 12:17:52 1998
---- Python/importdl.c	Tue Sep 29 12:18:40 1998
-***************
-*** 211,217 ****
-  extern char *Py_GetProgramName();
-  
-  #ifndef FUNCNAME_PATTERN
-! #if defined(__hp9000s300) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__BORLANDC__)
-  #define FUNCNAME_PATTERN "_init%.200s"
-  #else
-  #define FUNCNAME_PATTERN "init%.200s"
---- 211,217 ----
-  extern char *Py_GetProgramName();
-  
-  #ifndef FUNCNAME_PATTERN
-! #if defined(__hp9000s300) || defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(__ELF__)) || defined(__OpenBSD__) || defined(__BORLANDC__)
-  #define FUNCNAME_PATTERN "_init%.200s"
-  #else
-  #define FUNCNAME_PATTERN "init%.200s"
-