Updated to 2.0.1

4 files changed, 44 insertions, 22 deletions

diff --git a/www/zope/Makefile b/www/zope/Makefile
index 09dc1d55ada..9a4fc4dc8fb 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 1999/06/19 22:48:23 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 1999/09/23 17:42:59 tsarna Exp $
 #
 
-DISTNAME=	Zope-1.10.3-src
-PKGNAME=	zope-1.10.3
+DISTNAME=	Zope-2.0.1-src
+PKGNAME=	zope-2.0.1
 CATEGORIES=	www
-MASTER_SITES=   http://www.zope.org/Download/Releases/Zope-1.10.3/
+MASTER_SITES=   http://www.zope.org/Products/Zope/2.0.1/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
@@ -29,7 +29,7 @@ do-install:
 	${PREFIX}/bin/python \
 		${PREFIX}/lib/python1.5/compileall.py ${ZOPEDIR}
 	chmod -R a+rX ${ZOPEDIR}
-	(cd ${PREFIX}; find lib/zope -type f -print >>${PLIST_SRC})
+	(cd ${PREFIX}; find lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC})
 	(cd ${PREFIX}; find -d lib/zope -type d -print | \
 	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
 	${SED} -e "s,/usr/pkg,${PREFIX}," \
diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in
index e6e44229de8..2bca3765660 100644
--- a/www/zope/files/Makefile.in
+++ b/www/zope/files/Makefile.in
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.in,v 1.3 1999/06/19 22:48:23 tsarna Exp $
+# $NetBSD: Makefile.in,v 1.4 1999/09/23 17:42:59 tsarna Exp $
 
-all: all-pcgi all-lib all-dt all-bobopos all-search
-configure: config-pcgi config-lib config-dt config-bobopos config-search
+all: 	all-pcgi all-lib all-dt all-zodb all-search all-expat link-cpickle
+configure: config-pcgi config-lib config-dt config-zodb config-search \
+	config-expat
 	
 config-pcgi:
 	(cd pcgi; ./configure)
@@ -25,13 +26,13 @@ config-dt:
 all-dt:
 	(cd lib/python/DocumentTemplate; make)
 
-config-bobopos:
-	(cd lib/python/BoboPOS; \
+config-zodb:
+	(cd lib/python/ZODB; \
 	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
 	make -f Makefile.pre.in boot PYTHON=python)
 
-all-bobopos:
-	(cd lib/python/BoboPOS; make)
+all-zodb:
+	(cd lib/python/ZODB; make)
 
 
 config-search:
@@ -42,3 +43,16 @@ config-search:
 all-search:
 	(cd lib/python/SearchIndex; make)
 
+config-expat:
+	(cd lib/python/Shared/DC/xml/pyexpat; \
+	cp @PREFIX@/lib/python1.5/config/Makefile.pre.in . ; \
+	make -f Makefile.pre.in boot PYTHON=python)
+
+all-expat:
+	(cd lib/python/Shared/DC/xml/pyexpat; make)
+
+link-cpickle:
+	(cd lib/python/ZODB; \
+	ln -s ../cPickle.so cPickle.so; \
+	ln -s ../cStringIO.so cStringIO.so )
+
diff --git a/www/zope/files/md5 b/www/zope/files/md5
index 89ddfaee371..acaf09dfe33 100644
--- a/www/zope/files/md5
+++ b/www/zope/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/06/19 22:48:23 tsarna Exp $
+$NetBSD: md5,v 1.6 1999/09/23 17:42:59 tsarna Exp $
 
-MD5 (Zope-1.10.3-src.tgz) = 7fae8b874b5e497410adc2b36fe9183a
+MD5 (Zope-2.0.1-src.tgz) = 72010bdc62585201dc5ef658422de42a
diff --git a/www/zope/files/zope-install.py b/www/zope/files/zope-install.py
index ab05c9fd084..2866be5ac3c 100755
--- a/www/zope/files/zope-install.py
+++ b/www/zope/files/zope-install.py
@@ -1,6 +1,6 @@
 #!/usr/pkg/bin/python
 #
-#	$NetBSD: zope-install.py,v 1.3 1999/06/19 22:48:23 tsarna Exp $
+#	$NetBSD: zope-install.py,v 1.4 1999/09/23 17:42:59 tsarna Exp $
 #
 # Copyright (c) 1998,1999 Endicor Technologies, Inc.
 # All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
@@ -35,11 +35,14 @@ apconf = prefix + "/etc/httpd/httpd.conf"
 zopedir = prefix + "/lib/zope"
 zopevar = zopedir + "/var"
 zopedata = "/var/zope"
+ext = "fs"
+module = "Zope"
 
 def usage():
-    print 'usage: zope-install [-n] [-p perms] [-u user] [-g group] [-d dir] [-c cgidir] instancename'
+    print 'usage: zope-install [-n] [-b] [-p perms] [-u user] [-g group] [-d dir] [-c cgidir] instancename'
     print
     print '\t-n\tshow what would be done, but don\'t actually do it'
+    print '\t-b\tuse old .bbb format BoboPOS format instead of .fs ZODB format'
     print '\t-p\tmanager permissions, in the form'
     print '\t\tusername:plaintextpassword[:domain-restrinction]'
     print '\t\teg: "root:mypass" or "root:mypass:*.mydomain.com'
@@ -60,8 +63,8 @@ def exists(f):
 
 def resourcefile(v):
     resource = '''#!%(zopedir)s/pcgi/pcgi-wrapper
-PCGI_NAME=Main
-PCGI_MODULE_PATH=%(zopedir)s/lib/python/Main.py
+PCGI_NAME=%(module)s
+PCGI_MODULE_PATH=%(zopedir)s/lib/python/%(module)s.py
 PCGI_PUBLISHER=%(zopedir)s/pcgi/pcgi_publisher.py
 PCGI_EXE=%(python)s
 PCGI_SOCKET_FILE=%(instvar)s/pcgi.soc
@@ -106,7 +109,7 @@ def createfile(pretend, fname, contents):
         f.close()
             
 if __name__ == "__main__":
-    optlist, args = getopt.getopt(sys.argv[1:], 'np:u:g:d:c:')
+    optlist, args = getopt.getopt(sys.argv[1:], 'bnp:u:g:d:c:')
     if len(args) != 1:
         usage()
 
@@ -121,6 +124,9 @@ if __name__ == "__main__":
     for (oname, oarg) in optlist:
         if oname == '-n':
             pretend = 1
+        elif oname == '-b':
+            ext = "bbb"
+            module = "Main"
         elif oname == '-p':
             perms = oarg
             seenperms = 1
@@ -140,8 +146,8 @@ if __name__ == "__main__":
     
     runsys(pretend, "mkdir -p " + instvar)
 
-    if not exists(instvar + "/Data.bbb"):
-        runsys(pretend, "cp %(zopevar)s/Data.bbb.in %(instvar)s" % vars())
+    if not exists(instvar + "/Data." + ext):
+        runsys(pretend, "cp %(zopevar)s/Data.%(ext)s.in %(instvar)s" % vars())
 
     runsys(pretend, "chown -R %(user)s:%(group)s %(dirname)s" % vars())
     runsys(pretend, "chmod -R u+rwX,g+rX,g-w,o-rwx %(dirname)s" % vars())
@@ -164,10 +170,12 @@ if __name__ == "__main__":
 
     sys.stderr.write("""
 now you will need to add lines similar to these to your
-Apache srm.conf file to enable access to your instance
+Apache httpd.conf file to enable access to your instance
 via http://yourwebserver/instance/
 
 RewriteEngine on
 RewriteCond %%{HTTP:Authorization}  ^(.*)
 RewriteRule ^/%(instance)s($|/)(.*) %(cgidir)s/%(instance)s.cgi/$2  [e=HTTP_CGI_AUTHORIZATION:%%1,t=application/x-httpd-cgi,l]
+
+You may need to add Options ExecCGI on "<Directory />" for this to work.
 """ % vars())