Upgrade to 1.5.2

2 files changed, 28 insertions, 42 deletions

diff --git a/lang/python/files/Setup b/lang/python/files/Setup
index 3c6e80e1ec4..15f53f4a0a4 100644
--- a/lang/python/files/Setup
+++ b/lang/python/files/Setup
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# $NetBSD: Setup,v 1.4 1998/08/07 11:09:24 agc Exp $
+# $NetBSD: Setup,v 1.5 1999/04/14 04:51:27 tsarna Exp $
 #
 # The file Setup is used by the makesetup script to construct the files
 # Makefile and config.c, from Makefile.pre and config.c.in,
@@ -42,9 +42,13 @@
 # added to the linker options, but rules to create their .o files and
 # their shared libraries will still be added to the Makefile, and
 # their names will be collected in the Make variable SHAREDMODS.  This
-# is used to build modules as shared libraries.  (They must be
-# installed using "make sharedinstall".)  (For compatibility,
+# is used to build modules as shared libraries.  (They can be
+# installed using "make sharedinstall", which is implied by the
+# toplevel "make install" target.)  (For compatibility,
 # *noconfig* has the same effect as *shared*.)
+#
+# In addition, *static* reverses this effect (negating a previous
+# *shared* line).
 
 # NOTE: As a standard policy, as many modules as can be supported by a
 # platform should be present.  The distribution comes with all modules
@@ -73,7 +77,7 @@ DESTPATH=
 SITEPATH=
 
 # Standard path components for test modules
-TESTPATH=:test
+TESTPATH=
 
 # Path components for machine- or system-dependent modules and shared libraries
 MACHDEPPATH=:plat-$(MACHDEP)
@@ -95,7 +99,8 @@ signal signalmodule.c		# signal(2)
 
 # The SGI specific GL module:
 
-#gl glmodule.c cgensupport.c -I$(srcdir) -lgl -lX11
+GLHACK=-Dclear=__GLclear
+#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11
 
 # The thread module is now automatically enabled, see Setup.thread.
 
@@ -108,7 +113,7 @@ signal signalmodule.c		# signal(2)
 
 # Uncommenting the following line tells makesetup that all following
 # modules are to be built as shared libraries (see above for more
-# detail):
+# detail; also note that *static* reverses this effect):
 
 @NOSHARED@*shared*
 
@@ -145,6 +150,7 @@ pwd pwdmodule.c		# pwd(3)
 grp grpmodule.c		# grp(3)
 select selectmodule.c	# select(2); not on ancient System V
 socket socketmodule.c	# socket(2); not on ancient System V
+#_socket socketmodule.c	# socket(2); use this one for BeOS sockets
 errno errnomodule.c	# posix (UNIX) errno values
 
 # The crypt module is now disabled by default because it breaks builds
@@ -196,6 +202,11 @@ resource resource.c	# Jeremy Hylton's rlimit interface
 md5 md5module.c md5c.c
 
 
+# The sha module implements the SHA checksum algorithm.
+# (NIST's Secure Hash Algorithm.)
+sha shamodule.c
+
+
 # The mpz module interfaces to the GNU Multiple Precision library.
 # You need to ftp the GNU MP library.  
 # The GMP variable must point to the GMP source directory.
@@ -217,7 +228,7 @@ md5 md5module.c md5c.c
 # These module work on any SGI machine:
 
 # *** gl must be enabled higher up in this file ***
-#fm fmmodule.c -lfm -lgl		# Font Manager
+#fm fmmodule.c $(GLHACK) -lfm -lgl		# Font Manager
 #sgi sgimodule.c			# sgi.nap() and a few more
 
 # This module requires the header file
@@ -237,11 +248,15 @@ md5 md5module.c md5c.c
 # components such as dialogs and buttons using SGI's GL and FM
 # libraries.  You must ftp the FORMS library separately from
 # ftp://ftp.cs.ruu.nl/pub/SGI/FORMS.  It was tested with FORMS 2.2a.
+# NOTE: if you want to be able to use FORMS and curses simultaneously
+# (or both link them statically into the same binary), you must
+# compile all of FORMS with the cc option "-Dclear=__GLclear".
+
 # The FORMS variable must point to the FORMS subdirectory of the forms
 # toplevel directory:
 
 #FORMS=/ufs/guido/src/forms/FORMS
-#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl
+#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl
 
 
 # SunOS specific modules -- off by default:
@@ -270,12 +285,12 @@ TKPATH=:lib-tk
 
 # *** Always uncomment this (leave the leading underscore in!):
 # _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
+#	-I/usr/local/include \
 # *** Uncomment and edit to reflect where your X11 header files are:
 #	-I/usr/X11R6/include \
 # *** Or uncomment this for Solaris:
 #	-I/usr/openwin/include \
-# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-#	-I/usr/local/include \
 # *** Uncomment and edit for Tix extension only:
 #	-DWITH_TIX -ltix4.1.8.0 \
 # *** Uncomment and edit for BLT extension only:
@@ -392,7 +407,7 @@ cPickle cPickle.c
 #fpetest fpetestmodule.c
 
 # Andrew Kuchling's zlib module.
-# This require zlib 1.0.4 (or later).  See http://quest.jpl.nasa.gov/zlib/
+# This require zlib 1.1.3 (or later).
 # See http://www.cdrom.com/pub/infozip/zlib/
 zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 
diff --git a/lang/python/files/md5 b/lang/python/files/md5
index 4dbdb8e144d..a34d654fdc5 100644
--- a/lang/python/files/md5
+++ b/lang/python/files/md5
@@ -1,32 +1,3 @@
-$NetBSD: md5,v 1.7 1999/03/03 19:47:45 tsarna Exp $
+$NetBSD: md5,v 1.8 1999/04/14 04:51:27 tsarna Exp $
 
-MD5 (python/pyth151.tgz) = 485f5febc1d2865abea2adc72a345827
-MD5 (python/freeze.1.txt) = 7cb9266ba6db670cd019cf27c77468ef
-MD5 (python/_tkinter.1.txt) = 7298bfd731a613a28e2cb72ad8e3e266
-MD5 (python/configure.1.txt) = 8d525b80d2442021dc29fbd328b8f87d
-MD5 (python/object.1.txt) = f03bad9c3d67190232fce407b0c0fa51
-MD5 (python/parsermodule.1.txt) = 24e41667e705fbe310e8d8dd85da706d
-MD5 (python/zlibmodule.1.txt) = 7d8dfda5f91fd370e001d1f544afd279
-MD5 (python/string.1.txt) = 581f5dc5c173e8f9927a5a71f7c2b0cc
-MD5 (python/bltinmodule.1.txt) = c1edf803162860802d45c32d9799daaa
-MD5 (python/timemodule.1.txt) = 7f53c69797c03c7db56f117514790e0d
-MD5 (python/fileobject.1.txt) = 20ebd260276bdf6c3723c62a370e1c8c
-MD5 (python/urllib.1.txt) = d8b46f39d521d5d6738fe4c6e905a313
-MD5 (python/pcre.1.txt) = f3776741849f1be9fc1cd55dc0faeadd
-MD5 (python/configure.2.txt) = a51d521cf899a74b234f5b0fc1a2207c
-MD5 (python/imaplib.1.txt) = ece2e50e69e7ec86c1a9cc310d5ae220
-MD5 (python/urllib.2.txt) = e0189571f5b40a87be4c20ad13a02e62
-MD5 (python/sgmllib.1.txt) = e5ef0538266ff97efd830dfdcc2fcdd5
-MD5 (python/bltinmodule.2.txt) = 07ba49023b28437733ec611ddf4558fb
-MD5 (python/ceval.1.txt) = 1d062f62a16189df9832defd22aa9735
-MD5 (python/gzip.1.txt) = 55140b037c55b19795ed4543986c2fd4
-MD5 (python/imaplib.2.txt) = f8cb53849055badd3037545a92d1a123
-MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
-MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
-MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
-MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
-MD5 (python/classobject.1.txt) = f65618df540a8819299b65eafe775e6a
-MD5 (python/SocketServer.1.txt) = 7ad43e38616efa28b28710e686462494
-MD5 (python/bltinmodule.3.txt) = 7ebef8ec99284c743ae4804638780bd7
-MD5 (python/longobject.1.txt) = 069fe0a8fdeaa60a8cf5ff68877a66a3
-MD5 (python/stropmodule.1.txt) = 0f7729796b64cfdf7ad63d74e95fac9d
+MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752