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...

6 files changed, 21 insertions, 46 deletions

diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile
index ff58ee0286c..bc015025aac 100644
--- a/devel/py-curses/Makefile
+++ b/devel/py-curses/Makefile
@@ -1,34 +1,23 @@
-# $NetBSD: Makefile,v 1.10 2000/08/21 21:01:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/10/22 20:01:52 tsarna Exp $
 #
 
-DISTNAME=	cursesmodule-1.5b1
-PKGNAME=	py-curses-1.5b1
+DISTNAME=	${PY_DISTNAME}
+PKGNAME=	py-curses-${PY_VERSION}
+WRKSRC=		${PY_WRKSRC}
 CATEGORIES=	devel
-MASTER_SITES=	ftp://starship.skyport.net/pub/crew/andrich/Unsupported/
+MASTER_SITES=	${PY_MASTER_SITES}
 
 MAINTAINER=	tsarna@netbsd.org
-HOMEPAGE=	http://starship.skyport.net/crew/amk/howto/curses/curses.html
+HOMEPAGE=	http://www.python.org/doc/current/lib/module-curses.html
 
-DEPENDS+=	python-1.5.2:../../lang/python
-DEPENDS+=       ncurses>=4.2:../../devel/ncurses
+DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 
-WRKSRC=		${WRKDIR}/cursesmodule
-ALL_TARGET=	default
+EXTRACT_ELEMENTS=	${PY_MODULES}/_cursesmodule.c
 
-PYTHON_CONFIGDIR=	${LOCALBASE}/lib/python1.5/config/
-
-.if ${MACHINE_ARCH} == "sparc64"
-IGNORE="${PKGNAME} needs dynamic loading"
-.endif
-
-do-configure:
-	${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' \
-	 ${FILESDIR}/Setup.in \
-	 >${WRKSRC}/Setup.in
-	( cd ${WRKSRC} ;\
-	  ${MAKE} -f Makefile.pre.in boot)
+do-configure:	python-std-do-configure
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/cursesmodule.so ${LOCALBASE}/lib/python1.5/lib-dynload
+	${INSTALL_DATA} ${WRKSRC}/_cursesmodule.so ${PY_LIBDIR}/lib-dynload
 
+.include "../../lang/python/Makefile.inc"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-curses/files/Setup.in b/devel/py-curses/files/Setup.in
index dec2951cf91..9dd99d6e1f6 100644
--- a/devel/py-curses/files/Setup.in
+++ b/devel/py-curses/files/Setup.in
@@ -1,4 +1,8 @@
-# $NetBSD: Setup.in,v 1.1 1998/08/12 01:50:01 tsarna Exp $
+# $NetBSD: Setup.in,v 1.2 2000/10/22 20:01:52 tsarna Exp $
 #
 *shared*
-cursesmodule cursesmodule.c -I@LOCALBASE@/include -L@LOCALBASE@/lib -lncurses
+_curses _cursesmodule.c -DHAVE_NCURSES_H -I@LOCALBASE@/include \
+	-L@LOCALBASE@/lib -R@LOCALBASE@/lib -lncurses
+#
+# NetBSD curses (doesn't work):
+# _curses _cursesmodule.c -lcurses
diff --git a/devel/py-curses/files/md5 b/devel/py-curses/files/md5
index 1d75520c07f..813328bf4af 100644
--- a/devel/py-curses/files/md5
+++ b/devel/py-curses/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1998/08/12 01:50:02 tsarna Exp $
+$NetBSD: md5,v 1.2 2000/10/22 20:01:52 tsarna Exp $
 
-MD5 (cursesmodule-1.5b1.tar.gz) = 8d200bc921d31f0a4710b725fb0627e6
+MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98
diff --git a/devel/py-curses/files/patch-sum b/devel/py-curses/files/patch-sum
deleted file mode 100644
index dae14c91305..00000000000
--- a/devel/py-curses/files/patch-sum
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:40 agc Exp $
-
-MD5 (patch-aa) = 05c7caa0827cabe28fd1cdfee9fe2a39
diff --git a/devel/py-curses/patches/patch-aa b/devel/py-curses/patches/patch-aa
deleted file mode 100644
index c920ae94a2f..00000000000
--- a/devel/py-curses/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1998/08/12 01:50:02 tsarna Exp $
-
-Remove this patch when/if ncurses becomes standard
-
---- cursesmodule.c.orig	Tue Aug 11 19:47:48 1998
-+++ cursesmodule.c	Tue Aug 11 19:48:01 1998
-@@ -40,7 +40,7 @@
- /* Includes */
- 
- #include "Python.h"
--#include <curses.h>
-+#include <ncurses.h>
- 
- #ifdef __sgi__
-  /* No attr_t type is available */
diff --git a/devel/py-curses/pkg/PLIST b/devel/py-curses/pkg/PLIST
index aad3ad6c853..05dd8da606d 100644
--- a/devel/py-curses/pkg/PLIST
+++ b/devel/py-curses/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 1998/08/12 01:50:02 tsarna Exp $
-lib/python1.5/lib-dynload/cursesmodule.so
+@comment $NetBSD: PLIST,v 1.2 2000/10/22 20:01:53 tsarna Exp $
+lib/python2.0/lib-dynload/_cursesmodule.so