Upgrade to 2.0.

3 files changed, 79 insertions, 105 deletions

diff --git a/lang/python-devel/files/Setup b/lang/python-devel/files/Setup
index e550ce3..5b32c73 100644
--- a/lang/python-devel/files/Setup
+++ b/lang/python-devel/files/Setup
@@ -22,25 +22,27 @@
 # <module> is anything else but should be a valid Python
 # identifier (letters, digits, underscores, beginning with non-digit)
 #
+# (As the makesetup script changes, it may recognize some other
+# arguments as well, e.g. *.so and *.sl as libraries.  See the big
+# case statement in the makesetup script.)
+#
 # Lines can also have the form
 #
 # <name> = <value>
 #
 # which defines a Make variable definition inserted into Makefile.in
 #
-# Finally, if a line has the literal form
-#
-# *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
-# added to the library archive, and their linker options won't be 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, *noconfig* has the
-# same effect as *shared*.)
+# Finally, if a line contains just the word "*shared*" (without the
+# quotes but with the stars), then the following modules will not be
+# included in the config.c file, nor in the list of objects to be
+# added to the library archive, and their linker options won't be
+# 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 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).
@@ -64,20 +66,20 @@ MACHDESTLIB=$(BINLIBDEST)
 # at run time!
 
 # Standard path -- don't edit.
-# No leading colon since this is the first entry
+# No leading colon since this is the first entry.
 # Empty since this is now just the runtime prefix.
 DESTPATH=
 
-# Site specific path insertions -- should begin with : if non-empty
+# Site specific path components -- should begin with : if non-empty
 SITEPATH=
 
-# Standard enabled (tests are always available)
-TESTPATH=:test
+# Standard path components for test modules
+TESTPATH=
 
-# Path for machine- or system-dependent modules (and shared libraries)
+# Path components for machine- or system-dependent modules and shared libraries
 MACHDEPPATH=:plat-$(MACHDEP)
 
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH)
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH)
 PYTHONPATH=$(COREPYTHONPATH)
 
 
@@ -98,8 +100,6 @@ _sre _sre.c			# Fredrik Lundh's new regular expressions
 GLHACK=-Dclear=__GLclear
 #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11
 
-# The thread module is now automatically enabled, see Setup.thread.
-
 # Pure module.  Cannot be linked dynamically.
 # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE
 #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE
@@ -127,16 +127,17 @@ readline readline.c -lmytinfo -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()
+cmath cmathmodule.c # -lm # complex math library functions
+math mathmodule.c -lm # math library functions, e.g. sin()
 strop stropmodule.c	# fast string operations implemented in C
 struct structmodule.c	# binary structure packing/unpacking
-time timemodule.c # -lm	# time operations and variables
+time timemodule.c # -lm # time operations and variables
 operator operator.c	# operator.add() and similar goodies
 _codecs _codecsmodule.c	# access to the builtin codecs and codec registry
 
 unicodedata unicodedata.c unicodedatabase.c
                         # static Unicode character database
+ucnhash ucnhash.c # Unicode Character Name expansion hash table
 
 _locale _localemodule.c  # access to ISO C locale support
 
@@ -149,14 +150,18 @@ fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
 pwd pwdmodule.c		# pwd(3) 
 grp grpmodule.c		# grp(3)
 errno errnomodule.c	# posix (UNIX) errno values
-mmap mmapmodule.c       # Memory-mapped files (also works on Win32)
 select selectmodule.c	# select(2); not on ancient System V
-socket socketmodule.c	# socket(2); not on ancient System V
-errno errnomodule.c	# posix (UNIX) errno values
+_socket socketmodule.c	# socket(2)
+
+# Memory-mapped files (also works on Win32).
+# Some platforms require -lucb.
+mmap mmapmodule.c # -lucb
 
 # Socket module compiled with SSL support; you must edit the SSL variable:
-#SSL=/usr
-#socket socketmodule.c -DUSE_SSL -I$(SSL)/include/openssl -lssl -lcrypto
+#SSL=/usr/local/ssl
+#_socket socketmodule.c \
+#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+#	-L$(SSL)/lib -lssl -lcrypto
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
@@ -167,7 +172,7 @@ crypt cryptmodule.c -lcrypt	# crypt(3); needs -lcrypt on some systems
 # Some more UNIX dependent modules -- off by default, since these
 # are not supported by all UNIX systems:
 
-nis nismodule.c 	# Sun yellow pages -- not everywhere
+nis nismodule.c #-lnsl	# Sun yellow pages -- not everywhere
 termios termios.c	# Steen Lumholt's termios module
 resource resource.c	# Jeremy Hylton's rlimit interface
 
@@ -181,26 +186,6 @@ imageop imageop.c	# Operations on images
 rgbimg rgbimgmodule.c   # Read SGI RGB image files (but coded portably)
 
 
-# The stdwin module provides a simple, portable (between X11 and Mac)
-# windowing interface.  You need to ftp the STDWIN library, e.g. from
-# ftp://ftp.cwi.nl/pub/stdwin.  (If you get it elsewhere, be sure to
-# get version 1.0 or higher!)  The STDWIN variable must point to the
-# STDWIN toplevel directory.
-
-# Uncomment and edit as needed:
-#STDWIN=/ufs/guido/src/stdwin
-
-# Uncomment these lines:
-#STDWINPATH=:$(DESTLIB)/stdwin
-#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a
-#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a
-#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11
-
-# Use this instead of the last two lines above for alphanumeric stdwin:
-#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a
-#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap
-
-
 # The md5 module implements the RSA Data Security, Inc. MD5
 # Message-Digest Algorithm, described in RFC 1321.  The necessary files
 # md5c.c and md5.h are included here.
@@ -226,7 +211,7 @@ sha shamodule.c
 # ftp://gatekeeper.dec.com/.b/usenet/comp.sources.misc/volume40/fgmp/part01.Z
 
 #GMP=/ufs/guido/src/gmp
-#mpz mpzmodule.c -lgmp
+#mpz mpzmodule.c -I$(GMP) $(GMP)/libgmp.a
 
 
 # SGI IRIX specific modules -- off by default.
@@ -234,13 +219,12 @@ sha shamodule.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
 # /usr/people/4Dgifts/iristools/include/izoom.h:
-
-#imgfile imgfile.c -limage -lgutil -lm	# Image Processing Utilities
+#imgfile imgfile.c -limage -lgutil -lgl -lm	# Image Processing Utilities
 
 
 # These modules require the Multimedia Development Option (I think):
@@ -255,11 +239,15 @@ sha shamodule.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:
@@ -293,20 +281,18 @@ TKPATH=:lib-tk
 
 # *** 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:
+# *** 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:
 #	-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:
@@ -317,9 +303,12 @@ TKPATH=:lib-tk
 #	-L/usr/X11R6/lib \
 # *** Or uncomment this for Solaris:
 #	-L/usr/openwin/lib \
+# *** Uncomment these for TOGL extension only:
+#	-lGL -lGLU -lXext -lXmu \
+# *** Uncomment for AIX:
+#	-lld \
 # *** Always uncomment this; X11 libraries to link with:
-#	-lX11 -lXext -lXmu
-
+#	-lX11
 
 # Lance Ellinghaus's modules:
 
@@ -327,12 +316,12 @@ rotor rotormodule.c		# enigma-inspired encryption
 syslog syslogmodule.c		# syslog daemon interface
 
 
-# Lance's curses module.  This requires the System V version of
-# curses, sometimes known as ncurses (e.g. on Linux, link with
-# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
+# Curses support, requring the System V version of curses, often
+# provided by the ncurses library.  e.g. on Linux, link with -lncurses
+# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
 # -L/usr/5lib before -lcurses).
 
-_curses _cursesmodule.c -lmytinfo -lncurses -ltermcap
+_curses _cursesmodule.c -lmytinfo -lcurses -ltermcap
 
 
 
@@ -348,6 +337,7 @@ new newmodule.c
 
 dl dlmodule.c
 
+
 # Modules that provide persistent dictionary-like semantics.  You will
 # probably want to arrange for at least one of them to be available on
 # your machine, though none are defined by default because of library
@@ -371,11 +361,16 @@ dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
 #
 # Edit the variables DB and DBPORT to point to the db top directory
 # and the subdirectory of PORT where you built it.
+#
+# (See http://www.jenkon-dev.com/~rd/python/ for an interface to
+# BSD DB 2.1.0.)
+
+# Note: If a db.h file is found by configure, bsddb will be enabled
+# automatically via Setup.config.in
 
-#DB=/depot/sundry/src/db.1.85/
-#DBPORT=$(DB)/PORT/sunos.5.2
-#bsddb bsddbmodule.o -I$(DB)/include -I$(DBPORT) $(DBPORT)/libdb.a
-bsddb bsddbmodule.o
+#DB=/depot/sundry/src/berkeley-db/db.1.85
+#DBPORT=$(DB)/PORT/irix.5.3
+#bsddb bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a
 
 
 
@@ -385,7 +380,7 @@ bsddb bsddbmodule.o
 # Helper module for various ascii-encoders
 binascii binascii.c
 
-# Fred Drake's interface to the Python parser.
+# Fred Drake's interface to the Python parser
 parser parsermodule.c
 
 # Digital Creations' cStringIO and cPickle
@@ -415,7 +410,6 @@ fpetest fpetestmodule.c
 # See http://www.cdrom.com/pub/infozip/zlib/
 zlib zlibmodule.c -lz
 
-
 # Interface to the Expat XML parser
 #
 # Expat is written by James Clark and must be downloaded separately
@@ -426,10 +420,16 @@ zlib zlibmodule.c -lz
 # http://www.jclark.com/xml/expat.html, the current production release is
 # always ftp://ftp.jclark.com/pub/xml/expat.zip.
 #
-# (Note: the expat build process doesn't yet build a libexpat.a; you can
-# do this manually while we try convince the author to add it.)
+# EXPAT_DIR, below, should point to the expat/ directory created by
+# unpacking the Expat source distribution.
+#
+# Note: the expat build process doesn't yet build a libexpat.a; you can
+# do this manually while we try convince the author to add it.  To do so,
+# cd to EXPAT_DIR, run "make" if you have not done so, then run:
+#
+#    ar cr libexpat.a xmltok/*.o xmlparse/*.o
 #
-#EXPAT_DIR=/usr/local/src/expat/
+#EXPAT_DIR=/usr/local/src/expat
 #pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat
 
 
diff --git a/lang/python-devel/files/Setup.OpenSSL b/lang/python-devel/files/Setup.OpenSSL
index 8e5c71a..c67597149 100644
--- a/lang/python-devel/files/Setup.OpenSSL
+++ b/lang/python-devel/files/Setup.OpenSSL
@@ -2,7 +2,5 @@
 
 # Socket module compiled with SSL support; you must edit the SSL variable:
 SSL=/usr
-socket socketmodule.c \
-        -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
-        -L$(SSL)/lib -lssl -lcrypto
+_socket socketmodule.c -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl -L$(SSL)/lib -lssl -lcrypto
 
diff --git a/lang/python-devel/files/patch-aa b/lang/python-devel/files/patch-aa
index bf67a5c..b4e2980 100644
--- a/lang/python-devel/files/patch-aa
+++ b/lang/python-devel/files/patch-aa
@@ -1,13 +1,6 @@
---- Makefile.in.orig	Thu Aug  3 19:00:01 2000
-+++ Makefile.in	Wed Aug 16 17:38:14 2000
-@@ -95,14 +95,14 @@
- # Modes for directories, executables and data files created by the
- # install process.  Default to group-writable directories but
- # user-only-writable for executables and data files.
--DIRMODE=	775
-+DIRMODE=	755
- EXEMODE=	755
- FILEMODE=	644
+--- Makefile.in.orig	Wed Aug 30 11:43:56 2000
++++ Makefile.in	Wed Aug 30 16:32:22 2000
+@@ -110,8 +110,8 @@
  
  # Portable install script (configure doesn't always guess right)
  INSTALL=	@srcdir@/install-sh -c
@@ -18,20 +11,3 @@
  
  # Use this to make a link between python$(VERSION) and python in $(BINDIR)
  LN=@LN@
-@@ -259,7 +259,7 @@
- # Install the library
- PLATDIR=	plat-$(MACHDEP)
- MACHDEPS=	$(PLATDIR)
--LIBSUBDIRS=	lib-old lib-tk site-packages test test/output encodings \
-+LIBSUBDIRS=	lib-old lib-tk site-packages test test/output curses encodings \
- 		distutils distutils/command $(MACHDEPS)
- libinstall:	python $(srcdir)/Lib/$(PLATDIR)
- 		@for i in $(SCRIPTDIR) $(LIBDEST); \
-@@ -303,6 +303,7 @@
- 				case $$i in \
- 				*CVS) ;; \
- 				*.py[co]) ;; \
-+				*.orig) ;; \
- 				*~) ;; \
- 				*) \
- 					if test -d $$i; then continue; fi; \