Update to 2.2.2 and for Python 2.0

5 files changed, 40 insertions, 25 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 82d21ea7e6d..5b9b39f678f 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2000/08/23 21:33:53 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/10/22 23:11:48 tsarna Exp $
 #
 
-DISTNAME=	Zope-2.1.4-src
-PKGNAME=	zope-2.1.4
+DISTNAME=	Zope-2.2.2-src
+PKGNAME=	zope-2.2.2
 CATEGORIES=	www
-MASTER_SITES=   http://www.zope.org/Products/Zope/2.1.4/
+MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.zope.org/
 
-DEPENDS+=	python-1.5.2:../../lang/python
-DEPENDS+=	py-extclass>=2.1.4:../../lang/py-extclass
-DEPENDS+=	py-dtml-2.2.0:../../textproc/py-dtml
+DEPENDS+=	py-extclass>=2.2.2:../../lang/py-extclass
+DEPENDS+=	py-dtml>=2.2.2:../../textproc/py-dtml
+
+DIST_SUBDIR=	python
 
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
@@ -31,7 +32,7 @@ do-install:
 	${MKDIR} ${ZOPEDIR}
 	(cd ${WRKSRC}; ${PAX} -r -w -s'/.*\.[cho]$$//' . ${ZOPEDIR})
 	${PREFIX}/bin/python \
-		${PREFIX}/lib/python1.5/compileall.py ${ZOPEDIR}
+		${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR}
 	${CHMOD} -R a+rX ${ZOPEDIR}
 	(cd ${PREFIX}; ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC})
 	(cd ${PREFIX}; ${FIND} -d lib/zope -type d -print | \
diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in
index fbb6506dbdd..3ad4b7faf11 100644
--- a/www/zope/files/Makefile.in
+++ b/www/zope/files/Makefile.in
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.in,v 1.5 2000/02/15 02:48:40 tsarna Exp $
+# $NetBSD: Makefile.in,v 1.6 2000/10/22 23:11:48 tsarna Exp $
 
-all: 	all-pcgi all-lib all-zodb all-search all-expat link-cpickle
+all: 	all-pcgi all-lib all-zodb all-search all-expat # link-cpickle
 configure: config-pcgi config-lib config-zodb config-search \
 	config-expat
 	
@@ -12,7 +12,7 @@ all-pcgi:
 
 config-lib:
 	(cd lib/python; \
-	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
+	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=@PREFIX@/bin/python)
 
 all-lib:
@@ -20,7 +20,7 @@ all-lib:
 
 config-zodb:
 	(cd lib/python/ZODB; \
-	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
+	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-zodb:
@@ -29,7 +29,7 @@ all-zodb:
 
 config-search:
 	(cd lib/python/SearchIndex; \
-	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
+	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-search:
@@ -37,7 +37,7 @@ all-search:
 
 config-expat:
 	(cd lib/python/Shared/DC/xml/pyexpat; \
-	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
+	cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
 all-expat:
diff --git a/www/zope/files/md5 b/www/zope/files/md5
index c328238dd51..cbfd6634610 100644
--- a/www/zope/files/md5
+++ b/www/zope/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.7 2000/02/15 02:48:40 tsarna Exp $
+$NetBSD: md5,v 1.8 2000/10/22 23:11:48 tsarna Exp $
 
-MD5 (Zope-2.1.4-src.tgz) = 1260517dbf159869c594d3ba464fff9a
+MD5 (python/Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
diff --git a/www/zope/patches/patch-aa b/www/zope/patches/patch-aa
index 0661c9ec2f8..605199b73db 100644
--- a/www/zope/patches/patch-aa
+++ b/www/zope/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2000/02/15 02:48:40 tsarna Exp $
-
-Remove stuff built by other packages (py-extclass, zlib incl. in python)
+$NetBSD: patch-aa,v 1.5 2000/10/22 23:11:48 tsarna Exp $
 
 --- lib/python/Setup.orig	Mon Jul 19 18:55:11 1999
-+++ lib/python/Setup	Mon Feb 14 20:37:57 2000
-@@ -1,15 +1,5 @@
++++ lib/python/Setup	Sun Oct 22 16:40:04 2000
+@@ -1,23 +1,7 @@
  *shared*
  
 -ExtensionClass 	  ../Components/ExtensionClass/ExtensionClass.c    -I../Components/ExtensionClass
@@ -17,10 +15,11 @@ Remove stuff built by other packages (py-extclass, zlib incl. in python)
 -Record            ../Components/ExtensionClass/Record.c            -I../Components/ExtensionClass
 -ComputedAttribute ../Components/ExtensionClass/ComputedAttribute.c -I../Components/ExtensionClass
 -
- cStringIO      ../Components/cPickle/cStringIO.c
- cPickle        ../Components/cPickle/cPickle.c
- 
-@@ -18,6 +8,3 @@
+-cStringIO      ../Components/cPickle/cStringIO.c
+-cPickle        ../Components/cPickle/cPickle.c
+-
+ BTree         ../Components/BTree/BTree.c     -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
+ IIBTree        ../Components/BTree/IIBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
  IOBTree        ../Components/BTree/IOBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
  OIBTree        ../Components/BTree/OIBTree.c  -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
  intSet         ../Components/BTree/intSet.c   -I../Components/ExtensionClass  -I../Components/BTree -I./ZODB
diff --git a/www/zope/patches/patch-ab b/www/zope/patches/patch-ab
new file mode 100644
index 00000000000..166e6612381
--- /dev/null
+++ b/www/zope/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2000/10/22 23:11:48 tsarna Exp $
+
+--- lib/python/AccessControl/SecurityManagement.py.orig	Thu May 11 14:54:13 2000
++++ lib/python/AccessControl/SecurityManagement.py	Sun Oct 22 18:58:29 2000
+@@ -89,7 +89,9 @@
+ __version__='$Revision: 1.1 $'[11:-2]
+ 
+ import SpecialUsers
+-from thread import get_ident
++try: import thread
++except: get_ident=lambda: 0
++else: get_ident=thread.get_ident
+ from SecurityManager import SecurityManager
+ 
+ _managers={}