Upgrade to 1.5.

3 files changed, 131 insertions, 56 deletions

diff --git a/lang/python23/files/Setup b/lang/python23/files/Setup
index 6e6861c369e4..96811ee9823c 100644
--- a/lang/python23/files/Setup
+++ b/lang/python23/files/Setup
@@ -29,7 +29,7 @@
 #
 # Finally, if a line has the literal form
 #
-# *noconfig*
+# *shared*
 #
 # (that is including the '*' and '*' !) then the following modules will
 # not be included in the config.c file, nor in the list of objects to be
@@ -38,7 +38,8 @@
 # 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".)
+# using "make sharedinstall".)  (For compatibility, *noconfig* has the
+# same effect as *shared*.)
 
 # NOTE: As a standard policy, as many modules as can be supported by a
 # platform should be present.  The distribution comes with all modules
@@ -46,34 +47,33 @@
 # to ftp sources from elsewhere.
 
 
-# -------> Uncomment this line if you are running AIX    <----------
-# -------> and if you are building with shared libraries <----------
-#LINKCC= makexp_aix python.exp "" $(MYLIBS) $(ADDOBJS) ; $(CC)
-
-
 # Some special rules to define PYTHONPATH.
 # Edit the definitions below to indicate which options you are using.
 # Don't add any whitespace or comments!
 
 # Directories where library files get installed.
 # DESTLIB is for Python modules; MACHDESTLIB for shared libraries.
-DESTLIB=$(prefix)/share/python1.4
+DESTLIB=$(LIBDEST)
 MACHDESTLIB=$(BINLIBDEST)
 
+# NOTE: all the paths are now relative to the prefix that is computed
+# at run time!
+
 # Standard path -- don't edit.
 # No leading colon since this is the first entry
-DESTPATH=:$(DESTLIB)
+# Empty since this is now just the runtime prefix.
+DESTPATH=
 
 # Site specific path insertions -- should begin with : if non-empty
-SITEPATH=:$(DESTLIB)/NumPy
+SITEPATH=:NumPy
 
 # Standard enabled (tests are always available)
-TESTPATH=:$(DESTLIB)/test
+TESTPATH=:test
 
 # Path for machine- or system-dependent modules (and shared libraries)
-MACHDEPPATH=:$(DESTLIB)/$(MACHDEP):$(MACHDESTLIB)/sharedmodules
+MACHDEPPATH=:plat-$(MACHDEP)
 
-COREPYTHONPATH=.$(SITEPATH)$(DESTPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
 PYTHONPATH=$(COREPYTHONPATH)
 
 
@@ -83,6 +83,9 @@ 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)
 
@@ -90,8 +93,7 @@ signal signalmodule.c		# signal(2)
 
 #gl glmodule.c -lgl -lX11	# Graphics Library -- SGI only
 
-# Thread module -- works on selected systems only, e.g. SGI IRIX and
-# on SunOS 5.x (SOLARIS) only.
+# Thread module -- use only if Python has thread support for your OS.
 # Note that you must have configured (and built!) Python with the
 # --with-thread option passed to the configure script for this to work:
 
@@ -104,17 +106,29 @@ signal signalmodule.c		# signal(2)
 #*shared*
 
 
+# GNU readline.  Unlike previous Python incarnations, GNU readline is
+# now incorporated in an optional module, configured in the Setup file
+# instead of by a configure script switch.  You may have to insert a
+# -L option pointing to the directory where libreadline.* lives,
+# and you may have to change -ltermcap to -ltermlib or perhaps remove
+# it, depending on your system -- see the GNU readline instructions.
+# It's okay for this to be a shared library, too.
+
+readline readline.c -lreadline -ltermcap
+
+
 # Modules that should always be present (non UNIX dependent):
 
 array arraymodule.c	# array objects
 cmath cmathmodule.c	# complex math library functions
 math mathmodule.c -lm	# math library functions, e.g. sin()
-regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style
 strop stropmodule.c	# fast string operations implemented in C
 struct structmodule.c	# binary structure packing/unpacking
 time timemodule.c	# time operations and variables
 operator operator.c	# operator.add() and similar goodies
 
+#_locale _localemodule.c  # access to ISO C locale support
+
 
 # Modules with some UNIX dependencies -- on by default:
 # (If you have a really backward UNIX, select and socket may not be
@@ -136,10 +150,11 @@ errno errnomodule.c	# posix (UNIX) errno values
 dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
 nis nismodule.c 	# Sun yellow pages -- not everywhere
 termios termios.c	# Steen Lumholt's termios module
-#_xdr xdrmodule.c # -lnsl # Helper for xdrlib.py
+resource resource.c	# Jeremy Hylton's rlimit interface
 
 
-# Multimedia modules -- on by default.
+# Multimedia modules -- off by default.
+# These don't work for 64-bit platforms!!!
 # These represent audio samples or images as strings:
 
 audioop audioop.c	# Operations on audio samples
@@ -177,10 +192,9 @@ md5 md5module.c md5c.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.
-# This was originally written and tested against GMP 1.2.  I have
-# compiled it against GMP 1.3.2 (the latest I believe) and it seems to
-# work OK, but I haven't tested it thoroughly (lacking knowledge about
-# it).
+# This was originally written and tested against GMP 1.2 and 1.3.2.
+# It has been modified by Rob Hooft to work with 2.0.2 as well, but I
+# haven't tested it recently.
 
 # A compatible MP library unencombered by the GPL also exists.  It was
 # posted to comp.sources.misc in volume 40 and is widely available from
@@ -188,7 +202,7 @@ md5 md5module.c md5c.c
 # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
 
 #GMP=/ufs/guido/src/gmp
-#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a
+#mpz mpzmodule.c -lgmp
 
 
 # SGI IRIX specific modules -- off by default.
@@ -231,26 +245,51 @@ md5 md5module.c md5c.c
 
 # George Neville-Neil's timing module:
 
-#timing timingmodule.c
+timing timingmodule.c
 
 
 # The _tkinter module.
 #
-# See the section "The Tk interface" in ../README for more info.
-#
-# Enable the TKPATH line and choose the most applicable _tkinter line.
-# You may have to change /usr/local to wherever Tcl/Tk are installed.
-# Change the -l arguments to use Tcl 7.4 and Tk 4.0!
-
-# *** ALWAYS enable this line:
-#TKPATH=:$(DESTLIB)/tkinter
-
-# *** Enable *one* of the following lines:
-# For Solaris:
-#_tkinter _tkinter.c -I/usr/openwin/include -I/usr/local/include -L/usr/openwin/lib -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11
-# For generic system (may have to add -I/-L options to find X11):
-#_tkinter _tkinter.c -I/usr/local/include -L/usr/local/lib -ltk4.1 -ltcl7.5 -lX11
-#_tkinter _tkinter.c -I${PREFIX}/include/tk8.0 -I${PREFIX}/include/tcl8.0 -I${X11BASE}/include -L${PREFIX}/lib -L${X11BASE}/lib -ltk80 -ltcl80 -lX11
+# The TKPATH variable is always enabled, to save you the effort.
+TKPATH=:lib-tk
+
+# The command for _tkinter is long and site specific.  Please
+# uncomment and/or edit those parts as indicated.  If you don't have a
+# specific extension (e.g. Tix or BLT), leave the corresponding line
+# commented out.  (Leave the trailing backslashes in!  If you
+# experience strange errors, you may want to join all uncommented
+# lines and remove the backslashes -- the backslash interpretation is
+# done by the shell's "read" command and it may not be implemented on
+# every system.
+
+# *** Always uncomment this (leave the leading underscore in!):
+# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
+# *** Uncommend 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:
+#	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
+# *** Uncomment and edit for PIL (TkImaging) extension only:
+#	-DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
+# *** Uncomment and edit for Mesa (what's Mesa?):
+#	-lGL -lGLU -lMesatk -lMesaaux \
+# *** Uncomment and edit for TOGL extension only:
+#	-DWITH_TOGL togl.c \
+# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
+#	-L/usr/local/lib \
+# *** Uncomment and edit to reflect your Tcl/Tk versions:
+#	-ltk8.0 -ltcl8.0 \
+# *** Uncomment and edit to reflect where your X11 libraries are:
+#	-L/usr/X11R6/lib \
+# *** Or uncomment this for Solaris:
+#	-L/usr/openwin/lib \
+# *** Always uncomment this; X11 libraries to link with:
+#	-lX11 -lXext -lXmu
 
 
 # Lance Ellinghaus's modules:
@@ -311,6 +350,32 @@ binascii binascii.c
 # Fred Drake's interface to the Python parser.
 #parser parsermodule.c
 
+# Digital Creations' cStringIO and cPickle
+cStringIO cStringIO.c
+cPickle cPickle.c
+
+
+# Lee Busby's SIGFPE modules.
+# The library to link fpectl with is platform specific.
+# Choose *one* of the options below for fpectl:
+
+# For SGI IRIX (tested on 5.3):
+#fpectl fpectlmodule.c -lfpe
+
+# For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2):
+# (Without the compiler you don't have -lsunmath.)
+#fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm
+
+# For other systems: see instructions in fpectlmodule.c.
+fpectl fpectlmodule.c
+
+# Test module for fpectl.  No extra libraries needed.
+fpetest fpetestmodule.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
+
 
 # Example -- included for reference only:
 # xx xxmodule.c
diff --git a/lang/python23/files/Setup.gmp b/lang/python23/files/Setup.gmp
new file mode 100644
index 000000000000..5e70d8f76734
--- /dev/null
+++ b/lang/python23/files/Setup.gmp
@@ -0,0 +1,16 @@
+*shared*
+
+# 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.
+# This was originally written and tested against GMP 1.2 and 1.3.2.
+# It has been modified by Rob Hooft to work with 2.0.2 as well, but I
+# haven't tested it recently.
+
+# A compatible MP library unencombered by the GPL also exists.  It was
+# posted to comp.sources.misc in volume 40 and is widely available from
+# FTP archive sites. One URL for it is:
+# ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
+
+GMP=/usr/src/contrib/libgmp
+mpz mpzmodule.c -I$(GMP) -I$(GMP)/mpn/generic -lgmp
diff --git a/lang/python23/files/patch-aa b/lang/python23/files/patch-aa
index 12e39c30e2e7..d55ebc99fd46 100644
--- a/lang/python23/files/patch-aa
+++ b/lang/python23/files/patch-aa
@@ -1,19 +1,13 @@
---- Makefile.in.orig	Fri Oct 25 16:37:32 1996
-+++ Makefile.in	Mon May 12 21:04:38 1997
-@@ -98,7 +98,7 @@
- LIBDIR=		$(exec_prefix)/lib
- MANDIR=		$(prefix)/man
- INCLUDEDIR=	$(prefix)/include
--SCRIPTDIR=	$(prefix)/lib
-+SCRIPTDIR=	$(prefix)/share
+--- Makefile.in.orig	Tue Dec  9 16:18:33 1997
++++ Makefile.in	Sat Dec 13 11:19:12 1997
+@@ -131,8 +131,8 @@
  
- # Detailed destination directories
- BINLIBDEST=	$(LIBDIR)/python$(VERSION)
-@@ -288,6 +288,7 @@
- 			echo $(INSTALL_DATA) $$i $(INCLUDEPY); \
- 			$(INSTALL_DATA) $$i $(INCLUDEPY); \
- 		done
-+		$(INSTALL_DATA) config.h $(INCLUDEPY)
+ # Portable install script (configure doesn't always guess right)
+ INSTALL=	@srcdir@/install-sh -c
+-INSTALL_PROGRAM=${INSTALL} -m $(EXEMODE)
+-INSTALL_DATA=	${INSTALL} -m $(FILEMODE)
++INSTALL_PROGRAM=${BSD_INSTALL_SCRIPT}
++INSTALL_DATA=	${BSD_INSTALL_DATA}
  
- # Install the lib*.a files and miscellaneous stuff needed by extensions
- # This goes into $(exec_prefix)
+ # --with-PACKAGE options for configure script
+ # e.g. --with-readline --with-svr5 --with-solaris --with-thread