First batch of upgrades for Python 2.0:

lang/python             upgraded to 2.0
lang/py-html-docs       upgraded to 2.0
misc/py-readline        upgraded to 2.0
databases/py-gdbm       upgraded to 2.0
x11/py-Tk               upgraded to 2.0
devel/py-curses         upgraded to 2.0
lang/py-extclass        upgraded to 2.2.2 and for Python 2.0
textproc/py-dtml        upgraded to 2.2.2 and for Python 2.0
www/py-zpublisher       upgraded to 2.2.2 and for Python 2.0
print/py-reportlab      upgraded to 1.01 and for Python 2.0

More coming...

10 files changed, 144 insertions, 157 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 2e14132dc5b..1558b65a1f8 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2000/01/09 01:19:11 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2000/10/22 20:01:48 tsarna Exp $
 #
 
-DISTNAME=	py152
-PKGNAME=	python-1.5.2
+DISTNAME=	BeOpen-Python-2.0
+PKGNAME=	python-2.0
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.python.org/pub/python/src/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.pythonlabs.com/products/python2.0/downloads/
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.python.org/
@@ -14,8 +13,9 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 DIST_SUBDIR=	python
 
-WRKSRC=		${WRKDIR}/Python-1.5.2
+WRKSRC=		${WRKDIR}/Python-2.0
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--without-threads
 
 # Make sure having environment variable OPT doesn't affect the
 # installed module-building Makefile
@@ -23,6 +23,11 @@ MAKE_ENV+=	'OPT=${CFLAGS}'
 CONFIGURE_ENV+=	'OPT=${CFLAGS}'
 SCRIPTS_ENV+=	'OPT=${CFLAGS}'
 
+# If Building on NetBSD 1.5, include SSL support
+.if exists(/usr/include/openssl/ssl.h)
+SSLFLAGS=	-DUSE_SSL -I/usr/include/openssl -lssl -lcrypto
+.endif
+
 # Handle the module setup file:
 #   - disable a few broken modules on 64 bit platforms (nothing important)
 #   - handle machines with no dynamic loader
@@ -40,23 +45,33 @@ ZOULARIS?=	${PREFIX}/bsd
 MODADD=		-I${ZOULARIS}/include -L${ZOULARIS}/lib -R${ZOULARIS}/lib
 .endif
 
-post-configure:
+pre-configure:
+	${SED}  -e 's,@NO64BIT@,${NO64BIT},g' \
+		-e 's,@NOSHARED@,${NOSHARED},g' \
+		-e 's,@MODADD@,${MODADD},g' \
+		-e 's,@SSLFLAGS@,${SSLFLAGS},g' \
+		${FILESDIR}/Setup.in >${WRKSRC}/Modules/Setup.in
 	${SED}  -e 's,@NO64BIT@,${NO64BIT},g' \
 		-e 's,@NOSHARED@,${NOSHARED},g' \
 		-e 's,@MODADD@,${MODADD},g' \
-		${FILESDIR}/Setup >${WRKSRC}/Modules/Setup
+		${FILESDIR}/Setup.config.in >${WRKSRC}/Modules/Setup.config.in
 
 post-install:
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${PREFIX}; ${FIND} lib/python1.5 -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} include/python1.5 -type f -print \
+	(cd ${PREFIX}; ${FIND} lib/python2.0 -type f -print | \
+		${GREP} -v site-packages >>${PLIST_SRC})
+	${ECHO} lib/python2.0/site-packages/README >>${PLIST_SRC}
+	(cd ${PREFIX}; ${FIND} include/python2.0 -type f -print \
 		>>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d include/python1.5 -type d -print | \
+	(cd ${PREFIX}; ${FIND} -d include/python2.0 -type d -print | \
+		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+	(cd ${PREFIX}; ${FIND} -d lib/python2.0 -type d -print | \
+		${GREP} -v site-packages | tee /tmp/x | \
+		${GREP} -vx lib/python2.0 | tee /tmp/y | \
 		${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-	${ECHO} "@unexec ${RM} -rf %D/lib/python1.5" >>${PLIST_SRC}
 	# Reinstall Python binary to get it stripped
-	${RM} ${PREFIX}/bin/python ${PREFIX}/bin/python1.5
-	${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin
-	${LN} ${PREFIX}/bin/python ${PREFIX}/bin/python1.5
+	${RM} ${PREFIX}/bin/python2.0 ${PREFIX}/bin/python
+	${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin/python2.0
+	${LN} ${PREFIX}/bin/python2.0 ${PREFIX}/bin/python
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc
new file mode 100644
index 00000000000..f22d8c30594
--- /dev/null
+++ b/lang/python/Makefile.inc
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile.inc,v 1.1 2000/10/22 20:01:48 tsarna Exp $
+#
+
+PY_VERSION=	2.0
+PY_DISTNAME=	BeOpen-Python-${PY_VERSION}
+PY_MASTER_SITES=http://www.pythonlabs.com/products/python${PY_VERSION}/downloads/
+DIST_SUBDIR?=	python
+
+PY_WRKSRC=	${WRKDIR}/Python-${PY_VERSION}/Modules
+PY_MODULES=	Python-${PY_VERSION}/Modules
+
+PY_CONFIGDIR=	${LOCALBASE}/lib/python${PY_VERSION}/config
+PY_LIBPATH=	lib/python${PY_VERSION}
+PY_LIBDIR=	${LOCALBASE}/${PY_LIBPATH}
+PY_SITEPATH=	${PY_LIBPATH}/site-packages
+PY_SITEPKG=	${PY_LIBDIR}/site-packages
+PY_PROG=	${LOCALBASE}/bin/python${PY_VERSION}
+PY_INCDIR=	${LOCALBASE}/include/python${PY_VERSION}
+
+PY_COMPILEDIR=	${PY_PROG} ${PY_LIBDIR}/compileall.py
+
+DEPENDS+=	python-${PY_VERSION}*:../../lang/python
+
+ALL_TARGET?=	default
+
+.if ${MACHINE_ARCH} == "sparc64"
+IGNORE="${PKGNAME} needs dynamic loading"
+.endif
+
+# This is used for standard modules shipped with Python but build as
+# separate packages.
+
+python-std-do-configure:
+	${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' \
+	-e 's%@X11BASE@%${X11BASE}%g' ${FILESDIR}/Setup.in \
+	 >${WRKSRC}/Setup.in
+	( cd ${WRKSRC} ;\
+	 ${CP} ${PY_CONFIGDIR}/Makefile.pre.in .;\
+	 ${MAKE} -f Makefile.pre.in boot)
diff --git a/lang/python/files/Setup.config.in b/lang/python/files/Setup.config.in
new file mode 100644
index 00000000000..b0e56951705
--- /dev/null
+++ b/lang/python/files/Setup.config.in
@@ -0,0 +1,18 @@
+# This file is transmogrified into Setup.config by config.status.
+
+# The purpose of this file is to conditionally enable certain modules
+# based on configure-time options.  Currently thread support and
+# garbage collection support are the only two modules so enabled.
+
+@USE_THREAD_MODULE@thread threadmodule.c
+
+# Garbage collection enabled with --with-cycle-gc
+@USE_GC_MODULE@gc gcmodule.c
+
+# You may want this to be built as a dynamically loaded module; uncomment
+# the following line in that case:
+
+*shared*
+
+# bsddb module enabled by --with-libdb or presence of db.h
+bsddb bsddbmodule.c @MODADD@
diff --git a/lang/python/files/Setup b/lang/python/files/Setup.in
index baf34663735..ed1c2cab784 100644
--- a/lang/python/files/Setup
+++ b/lang/python/files/Setup.in
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 #
-# $NetBSD: Setup,v 1.6 1999/05/15 17:00:14 tsarna Exp $
+# $NetBSD: Setup.in,v 1.1 2000/10/22 20:01:49 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,
@@ -82,7 +82,7 @@ TESTPATH=
 # 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)
 
 
@@ -96,14 +96,13 @@ regex regexmodule.c regexpr.c	# Regular expressions, GNU Emacs style
 pcre pcremodule.c pypcre.c	# Regular expressions, Perl style (for re.py)
 posix posixmodule.c		# posix (UNIX) system calls
 signal signalmodule.c		# signal(2)
+_sre _sre.c			# Fredrik Lundh's new regular expressions
 
 # The SGI specific GL module:
 
 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
@@ -137,8 +136,13 @@ strop stropmodule.c	# fast string operations implemented in C
 struct structmodule.c	# binary structure packing/unpacking
 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
+_locale _localemodule.c  # access to ISO C locale support
 
 
 # Modules with some UNIX dependencies -- on by default:
@@ -148,10 +152,17 @@ operator operator.c	# operator.add() and similar goodies
 fcntl fcntlmodule.c	# fcntl(2) and ioctl(2)
 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
+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)
+
+# Socket module compiled with SSL support; you must edit the SSL variable:
+#SSL=/usr/local/ssl
+#_socket socketmodule.c \
+#	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \
+#	-L$(SSL)/lib -lssl -lcrypto
+_socket socketmodule.c @SSLFLAGS@
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
@@ -161,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		# Sun yellow pages -- not everywhere
 termios termios.c	# Steen Lumholt's termios module
 resource resource.c	# Jeremy Hylton's rlimit interface
 
@@ -175,26 +186,6 @@ resource resource.c	# Jeremy Hylton's rlimit interface
 @NO64BIT@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=:lib-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.
@@ -264,6 +255,11 @@ sha shamodule.c
 #sunaudiodev sunaudiodev.c
 
 
+# Linux specific modules -- off by default:
+
+#linuxaudiodev linuxaudiodev.c
+
+
 # George Neville-Neil's timing module:
 
 timing timingmodule.c
@@ -320,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 -lcurses -ltermcap
+# _curses _cursesmodule.c -lcurses -ltermcap
 
 
 
@@ -351,30 +347,14 @@ new newmodule.c
 
 # The standard Unix dbm module:
 
-dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
+#dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
 
 # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
 
 #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
 
-
-# Berkeley DB interface.
-#
-# This requires the Berkeley DB code, see
-# ftp://ftp.cs.berkeley.edu/pub/4bsd/db.1.85.tar.gz
-#
-# 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.)
-
-#DB=/depot/sundry/src/berkeley-db/db.1.85
-#DBPORT=$(DB)/PORT/irix.5.3
-bsddb bsddbmodule.c @MODADD@
-
 # David Wayne Williams' soundex module (obsolete -- this will disappear!)
-soundex soundex.c
+#soundex soundex.c
 
 # Helper module for various ascii-encoders
 binascii binascii.c
@@ -409,6 +389,28 @@ cPickle cPickle.c
 # See http://www.cdrom.com/pub/infozip/zlib/
 zlib zlibmodule.c @MODADD@ -lz
 
+# Interface to the Expat XML parser
+#
+# Expat is written by James Clark and must be downloaded separately
+# (see below).  The pyexpat module was written by Paul Prescod after a
+# prototype by Jack Jansen.
+#
+# The Expat dist includes Windows .lib and .dll files.  Home page is at
+# http://www.jclark.com/xml/expat.html, the current production release is
+# always ftp://ftp.jclark.com/pub/xml/expat.zip.
+#
+# 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
+#pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat
+
 
 # Example -- included for reference only:
 # xx xxmodule.c
diff --git a/lang/python/files/md5 b/lang/python/files/md5
index a34d654fdc5..2ea75c91d30 100644
--- a/lang/python/files/md5
+++ b/lang/python/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1999/04/14 04:51:27 tsarna Exp $
+$NetBSD: md5,v 1.9 2000/10/22 20:01:49 tsarna Exp $
 
-MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
+MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
diff --git a/lang/python/files/patch-sum b/lang/python/files/patch-sum
deleted file mode 100644
index 55360f1b274..00000000000
--- a/lang/python/files/patch-sum
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: patch-sum,v 1.2 2000/09/10 20:59:06 wiz Exp $
-
-MD5 (patch-aa) = 92cd2dace0eb2cc5e0d28ce8d26472ec
-MD5 (patch-ab) = 44ceb9b4e2e5fe8430e53fcf400a6d88
-MD5 (patch-ac) = 07c1bb21ea1df7e6bf8fa2b3c95c5617
diff --git a/lang/python/patches/patch-aa b/lang/python/patches/patch-aa
deleted file mode 100644
index 72cce81d66e..00000000000
--- a/lang/python/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/04/14 05:11:22 tsarna Exp $
-
-Deal with egcs's unexpectedly long version string.
-
---- Python/getversion.c.orig	Tue Apr 13 23:58:15 1999
-+++ Python/getversion.c	Tue Apr 13 23:58:22 1999
-@@ -39,7 +39,7 @@
- Py_GetVersion()
- {
- 	static char version[100];
--	sprintf(version, "%.10s (%.40s) %.40s", PY_VERSION,
-+	sprintf(version, "%.10s (%.40s) %.50s", PY_VERSION,
- 		Py_GetBuildInfo(), Py_GetCompiler());
- 	return version;
- }
diff --git a/lang/python/patches/patch-ab b/lang/python/patches/patch-ab
deleted file mode 100644
index 561d98ece96..00000000000
--- a/lang/python/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/09/10 20:59:07 wiz Exp $
-
-If libnet is installed, this check results in a link error. -- wiz
-
---- configure.in.orig	Sat Apr 10 18:01:48 1999
-+++ configure.in
-@@ -548,7 +548,6 @@
- *)
- AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4
- AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets
--AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS
- ;;
- esac
- 
diff --git a/lang/python/patches/patch-ac b/lang/python/patches/patch-ac
deleted file mode 100644
index f3e23c4cbe1..00000000000
--- a/lang/python/patches/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2000/09/10 20:59:07 wiz Exp $
-
-If libnet is installed, this check results in a link error. -- wiz
-
---- configure.orig	Sat Apr 10 18:02:18 1999
-+++ configure
-@@ -2499,46 +2499,6 @@
-   echo "$ac_t""no" 1>&6
- fi
-  # SVR4 sockets
--echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6
--echo "configure:2504: checking for socket in -lnet" >&5
--ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lnet $LIBS $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 2512 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char socket();
--
--int main() {
--socket()
--; return 0; }
--EOF
--if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  LIBS="-lnet $LIBS"
--else
--  echo "$ac_t""no" 1>&6
--fi
-- # BeOS
- ;;
- esac
- 
diff --git a/lang/python/pkg/PLIST.pre b/lang/python/pkg/PLIST.pre
index 34d48d527d5..b54a255b330 100644
--- a/lang/python/pkg/PLIST.pre
+++ b/lang/python/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1 1999/04/14 04:51:29 tsarna Exp $
+@comment $NetBSD: PLIST.pre,v 1.2 2000/10/22 20:01:50 tsarna Exp $
 bin/python
-bin/python1.5
+bin/python2.0
 man/man1/python.1