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

3 files changed, 67 insertions, 75 deletions

diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile
index 057b7e3d120..0bc75b5bfdf 100644
--- a/lang/py-extclass/Makefile
+++ b/lang/py-extclass/Makefile
@@ -1,42 +1,37 @@
-# $NetBSD: Makefile,v 1.7 2000/07/28 16:40:18 tsarna Exp $
+# $NetBSD: Makefile,v 1.8 2000/10/22 20:01:53 tsarna Exp $
 #
 
-DISTNAME=	Zope-2.2.0-src
-PKGNAME=	py-extclass-2.2.0
+DISTNAME=	Zope-2.2.2-src
+PKGNAME=	py-extclass-2.2.2
 CATEGORIES=	lang
-MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.0/
+MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.digicool.com/releases/ExtensionClass
 
-DEPENDS+=	python-1.5.2:../../lang/python
-
-ALL_TARGET=	default
-PYTHON_LIBDIR=		${LOCALBASE}/lib/python1.5/site-packages
-PYTHON_CONFIGDIR=	${LOCALBASE}/lib/python1.5/config
 EXTRACT_ELEMENTS=       ${DISTNAME}/lib/Components/ExtensionClass
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass
 
 do-configure:
 	( cd ${WRKSRC} ;\
-	  ${CP} ${PYTHON_CONFIGDIR}/Makefile.pre.in . ;\
+	  ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . ;\
 	  ${MAKE} -f Makefile.pre.in boot)
 
 post-build:
-	(cd ${WRKSRC}; ${LOCALBASE}/bin/python ${PREFIX}/lib/python1.5/compileall.py .)
-	(cd ${WRKSRC}; ${LOCALBASE}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py .)
+	(cd ${WRKSRC}; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
+	(cd ${WRKSRC}; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
 
 do-install:
-	(cd ${WRKSRC}; ${INSTALL_DATA} ExtensionClass.h \
-		${LOCALBASE}/include/python1.5 ; \
-	${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR} ; \
-	${INSTALL_SCRIPT} Xaq.py* ComputedAttribute.py* ${PYTHON_LIBDIR} ; \
-	${INSTALL_PROGRAM} *.so ${PYTHON_LIBDIR} ; \
-	${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR}/extclass_test ; \
-	${INSTALL_SCRIPT} test_*.py* ${PYTHON_LIBDIR}/extclass_test ; \
-	${INSTALL_DATA_DIR} ${PYTHON_LIBDIR}/extclass_doc ; \
-	${INSTALL_DATA} *.txt *.stx ${PYTHON_LIBDIR}/extclass_doc)
-
+	(cd ${WRKSRC}; ${INSTALL_DATA} ExtensionClass.h ${PY_INCDIR} ; \
+	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG} ; \
+	${INSTALL_SCRIPT} Xaq.py* ${PY_SITEPKG} ; \
+	${INSTALL_PROGRAM} *.so ${PY_SITEPKG} ; \
+	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}/extclass_test ; \
+	${INSTALL_SCRIPT} test_*.py* ${PY_SITEPKG}/extclass_test ; \
+	${INSTALL_DATA_DIR} ${PY_SITEPKG}/extclass_doc ; \
+	${INSTALL_DATA} *.txt *.stx ${PY_SITEPKG}/extclass_doc)
+
+.include "../../lang/python/Makefile.inc"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py-extclass/files/md5 b/lang/py-extclass/files/md5
index 90041ac5895..2ae5045b22c 100644
--- a/lang/py-extclass/files/md5
+++ b/lang/py-extclass/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/07/28 16:40:18 tsarna Exp $
+$NetBSD: md5,v 1.5 2000/10/22 20:01:53 tsarna Exp $
 
-MD5 (Zope-2.2.0-src.tgz) = e9a66aa64a75317ff6cefe3d3dce6286
+MD5 (python/Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/lang/py-extclass/pkg/PLIST b/lang/py-extclass/pkg/PLIST
index 455bc8e0c8b..8c3c8c65c3f 100644
--- a/lang/py-extclass/pkg/PLIST
+++ b/lang/py-extclass/pkg/PLIST
@@ -1,51 +1,48 @@
-@comment $NetBSD: PLIST,v 1.2 2000/07/28 16:40:18 tsarna Exp $
-include/python1.5/ExtensionClass.h
-lib/python1.5/site-packages/Acquisition.so
-lib/python1.5/site-packages/ComputedAttribute.so
-lib/python1.5/site-packages/ComputedAttribute.py
-lib/python1.5/site-packages/ComputedAttribute.pyc
-lib/python1.5/site-packages/ComputedAttribute.pyo
-lib/python1.5/site-packages/ExtensionClass.so
-lib/python1.5/site-packages/MethodObject.so
-lib/python1.5/site-packages/Missing.so
-lib/python1.5/site-packages/MultiMapping.so
-lib/python1.5/site-packages/Record.so
-lib/python1.5/site-packages/Sync.so
-lib/python1.5/site-packages/ThreadLock.so
-lib/python1.5/site-packages/Xaq.py
-lib/python1.5/site-packages/Xaq.pyc
-lib/python1.5/site-packages/Xaq.pyo
-lib/python1.5/site-packages/extclass_doc/COPYRIGHT.txt
-lib/python1.5/site-packages/extclass_doc/Acquisition.stx
-lib/python1.5/site-packages/extclass_doc/ExtensionClass.stx
-lib/python1.5/site-packages/extclass_doc/MultiMapping.stx
-lib/python1.5/site-packages/extclass_doc/index.stx
-lib/python1.5/site-packages/extclass_test/test_Sync.py
-lib/python1.5/site-packages/extclass_test/test_ThreadLock.py
-lib/python1.5/site-packages/extclass_test/test_acquisition.py
-lib/python1.5/site-packages/extclass_test/test_add.py
-lib/python1.5/site-packages/extclass_test/test_binding.py
-lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.py
-lib/python1.5/site-packages/extclass_test/test_func_attr.py
-lib/python1.5/site-packages/extclass_test/test_method_hook.py
-lib/python1.5/site-packages/extclass_test/test_MultiMapping.py
-lib/python1.5/site-packages/extclass_test/test_MultiMapping.pyc
-lib/python1.5/site-packages/extclass_test/test_MultiMapping.pyo
-lib/python1.5/site-packages/extclass_test/test_Sync.pyc
-lib/python1.5/site-packages/extclass_test/test_Sync.pyo
-lib/python1.5/site-packages/extclass_test/test_ThreadLock.pyc
-lib/python1.5/site-packages/extclass_test/test_ThreadLock.pyo
-lib/python1.5/site-packages/extclass_test/test_acquisition.pyc
-lib/python1.5/site-packages/extclass_test/test_acquisition.pyo
-lib/python1.5/site-packages/extclass_test/test_add.pyc
-lib/python1.5/site-packages/extclass_test/test_add.pyo
-lib/python1.5/site-packages/extclass_test/test_binding.pyc
-lib/python1.5/site-packages/extclass_test/test_binding.pyo
-lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.pyc
-lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.pyo
-lib/python1.5/site-packages/extclass_test/test_func_attr.pyc
-lib/python1.5/site-packages/extclass_test/test_func_attr.pyo
-lib/python1.5/site-packages/extclass_test/test_method_hook.pyc
-lib/python1.5/site-packages/extclass_test/test_method_hook.pyo
-@dirrm lib/python1.5/site-packages/extclass_doc
-@dirrm lib/python1.5/site-packages/extclass_test
+@comment $NetBSD: PLIST,v 1.3 2000/10/22 20:01:53 tsarna Exp $
+include/python2.0/ExtensionClass.h
+lib/python2.0/site-packages/Acquisition.so
+lib/python2.0/site-packages/ComputedAttribute.so
+lib/python2.0/site-packages/ExtensionClass.so
+lib/python2.0/site-packages/MethodObject.so
+lib/python2.0/site-packages/Missing.so
+lib/python2.0/site-packages/MultiMapping.so
+lib/python2.0/site-packages/Record.so
+lib/python2.0/site-packages/Sync.so
+lib/python2.0/site-packages/ThreadLock.so
+lib/python2.0/site-packages/Xaq.py
+lib/python2.0/site-packages/Xaq.pyc
+lib/python2.0/site-packages/Xaq.pyo
+lib/python2.0/site-packages/extclass_doc/COPYRIGHT.txt
+lib/python2.0/site-packages/extclass_doc/Acquisition.stx
+lib/python2.0/site-packages/extclass_doc/ExtensionClass.stx
+lib/python2.0/site-packages/extclass_doc/MultiMapping.stx
+lib/python2.0/site-packages/extclass_doc/index.stx
+lib/python2.0/site-packages/extclass_test/test_Sync.py
+lib/python2.0/site-packages/extclass_test/test_ThreadLock.py
+lib/python2.0/site-packages/extclass_test/test_acquisition.py
+lib/python2.0/site-packages/extclass_test/test_add.py
+lib/python2.0/site-packages/extclass_test/test_binding.py
+lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.py
+lib/python2.0/site-packages/extclass_test/test_func_attr.py
+lib/python2.0/site-packages/extclass_test/test_method_hook.py
+lib/python2.0/site-packages/extclass_test/test_MultiMapping.py
+lib/python2.0/site-packages/extclass_test/test_MultiMapping.pyc
+lib/python2.0/site-packages/extclass_test/test_MultiMapping.pyo
+lib/python2.0/site-packages/extclass_test/test_Sync.pyc
+lib/python2.0/site-packages/extclass_test/test_Sync.pyo
+lib/python2.0/site-packages/extclass_test/test_ThreadLock.pyc
+lib/python2.0/site-packages/extclass_test/test_ThreadLock.pyo
+lib/python2.0/site-packages/extclass_test/test_acquisition.pyc
+lib/python2.0/site-packages/extclass_test/test_acquisition.pyo
+lib/python2.0/site-packages/extclass_test/test_add.pyc
+lib/python2.0/site-packages/extclass_test/test_add.pyo
+lib/python2.0/site-packages/extclass_test/test_binding.pyc
+lib/python2.0/site-packages/extclass_test/test_binding.pyo
+lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.pyc
+lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.pyo
+lib/python2.0/site-packages/extclass_test/test_func_attr.pyc
+lib/python2.0/site-packages/extclass_test/test_func_attr.pyo
+lib/python2.0/site-packages/extclass_test/test_method_hook.pyc
+lib/python2.0/site-packages/extclass_test/test_method_hook.pyo
+@dirrm lib/python2.0/site-packages/extclass_doc
+@dirrm lib/python2.0/site-packages/extclass_test