Zope-2.8.5

[Marc Balmer <marc_(_at_)_msys_(_dot_)_ch>]

Attached patch updates www/zope to version 2.8.5.  Any objections
if I committ that?

- Marc Balmer

diff -urN -x CVS www/zope/Makefile mystuff/ports/www/zope/Makefile
--- www/zope/Makefile	Mon Nov  7 11:21:01 2005
+++ mystuff/ports/www/zope/Makefile	Wed Dec 21 13:50:14 2005
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2005/11/06 20:20:58 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.20 2004/08/06 08:03:39 xsa Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"object-oriented web application server"
 
-VERSION=	2.8.4
+VERSION=	2.8.5
 DISTNAME=	Zope-${VERSION}-final
 PKGNAME=	${DISTNAME:S/-final//:L}
 CATEGORIES=     www
@@ -56,6 +56,9 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.OpenBSD ${ZOPEHOME}/doc
+	${LOCALBASE}/bin/python${MODPY_VERSION} \
+	    ${LOCALBASE}/lib/python${MODPY_VERSION}/compileall.py \
+	    ${PREFIX}/lib/zope/bin
 
 do-regress: fake
 	${PYTHON_BIN} ${WRKINST}/${ZOPEHOME}/bin/test.py \
diff -urN -x CVS www/zope/distinfo mystuff/ports/www/zope/distinfo
--- www/zope/distinfo	Mon Nov  7 11:21:01 2005
+++ mystuff/ports/www/zope/distinfo	Tue Dec 20 15:54:55 2005
@@ -1,4 +1,4 @@
-MD5 (Zope-2.8.4-final.tgz) = 08780f229397746527668cee1ddb6416
-RMD160 (Zope-2.8.4-final.tgz) = 39433af4f6d6766bffce53f81f24716be2a562b9
-SHA1 (Zope-2.8.4-final.tgz) = a3e21c8ac1613fde5f46b925c6250c62daddc463
-SIZE (Zope-2.8.4-final.tgz) = 5447275
+MD5 (Zope-2.8.5-final.tgz) = ead959e36894c3c31367063bce018cfb
+RMD160 (Zope-2.8.5-final.tgz) = f8bdfee08fdd199d3e54148ad28d4db16adffc20
+SHA1 (Zope-2.8.5-final.tgz) = 69cccc95f6af6031b2bc95a1d2b96b54fd812a9e
+SIZE (Zope-2.8.5-final.tgz) = 5377506
diff -urN -x CVS www/zope/pkg/MESSAGE mystuff/ports/www/zope/pkg/MESSAGE
--- www/zope/pkg/MESSAGE	Mon Nov  7 11:21:02 2005
+++ mystuff/ports/www/zope/pkg/MESSAGE	Sat Jan  8 14:23:49 2005
@@ -1,7 +1,7 @@
-This package uses the INSTANCE_HOME installation method, as described at
-http://www.zope.org/Members/4am/instancehome.  This allows you to install the
-Zope package once and create as many sites as you want without changing your
-core Zope installation.
+This package uses the INSTANCE_HOME installation method, as described
+at http://www.zope.org/Members/4am/instancehome.  This allows you
+to install the Zope package once and create as many sites as you
+want without changing your core Zope installation.
 
 Have a look at ${ZOPEHOME}/doc/README.OpenBSD
 to see how to create your instance and have it start at boot time.
diff -urN -x CVS www/zope/pkg/PLIST mystuff/ports/www/zope/pkg/PLIST
--- www/zope/pkg/PLIST	Mon Nov  7 11:21:05 2005
+++ mystuff/ports/www/zope/pkg/PLIST	Wed Dec 21 13:28:00 2005
@@ -1,39 +1,67 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.16 2005/11/06 20:20:59 mbalmer Exp $
+_(_at_)_comment $OpenBSD: PLIST,v 1.14 2004/09/28 12:47:20 xsa Exp $
 @newgroup _zope:534
 @newuser _zope:534:_zope:daemon:Zope Account:/nonexistent:/sbin/nologin
 lib/zope/
 lib/zope/bin/
 lib/zope/bin/README.txt
 lib/zope/bin/analyze.py
+lib/zope/bin/analyze.pyc
 lib/zope/bin/check_catalog.py
+lib/zope/bin/check_catalog.pyc
 lib/zope/bin/checkbtrees.py
+lib/zope/bin/checkbtrees.pyc
 lib/zope/bin/compilezpy.py
+lib/zope/bin/compilezpy.pyc
 lib/zope/bin/copyzopeskel.py
-_(_at_)_unexec rm -f %D/lib/zope/bin/copyzopeskel.pyc
+lib/zope/bin/copyzopeskel.pyc
 lib/zope/bin/decompilezpy.py
+lib/zope/bin/decompilezpy.pyc
 lib/zope/bin/fsdump.py
+lib/zope/bin/fsdump.pyc
 lib/zope/bin/fsrefs.py
+lib/zope/bin/fsrefs.pyc
 lib/zope/bin/fstail.py
+lib/zope/bin/fstail.pyc
 lib/zope/bin/fstest.py
+lib/zope/bin/fstest.pyc
 lib/zope/bin/load_site.py
+lib/zope/bin/load_site.pyc
 lib/zope/bin/migrate.py
+lib/zope/bin/migrate.pyc
 lib/zope/bin/mkzeoinstance.py
+lib/zope/bin/mkzeoinstance.pyc
 lib/zope/bin/mkzopeinstance.py
+lib/zope/bin/mkzopeinstance.pyc
 lib/zope/bin/netspace.py
+lib/zope/bin/netspace.pyc
 lib/zope/bin/parsezeolog.py
+lib/zope/bin/parsezeolog.pyc
 lib/zope/bin/reindex_catalog.py
+lib/zope/bin/reindex_catalog.pyc
 lib/zope/bin/repozo.py
+lib/zope/bin/repozo.pyc
 lib/zope/bin/requestprofiler.py
+lib/zope/bin/requestprofiler.pyc
 lib/zope/bin/space.py
+lib/zope/bin/space.pyc
 lib/zope/bin/test.py
+lib/zope/bin/test.pyc
 lib/zope/bin/timeout.py
+lib/zope/bin/timeout.pyc
 lib/zope/bin/zeopack.py
+lib/zope/bin/zeopack.pyc
 lib/zope/bin/zeoqueue.py
+lib/zope/bin/zeoqueue.pyc
 lib/zope/bin/zeoreplay.py
+lib/zope/bin/zeoreplay.pyc
 lib/zope/bin/zeoserverlog.py
+lib/zope/bin/zeoserverlog.pyc
 lib/zope/bin/zeoup.py
+lib/zope/bin/zeoup.pyc
 lib/zope/bin/zodbload.py
+lib/zope/bin/zodbload.pyc
 lib/zope/bin/zpasswd.py
+lib/zope/bin/zpasswd.pyc
 lib/zope/doc/
 lib/zope/doc/CHANGES.txt
 lib/zope/doc/CREDITS.txt
@@ -117,6 +145,8 @@
 lib/zope/lib/python/AccessControl/dtml/permissionEdit.dtml
 lib/zope/lib/python/AccessControl/dtml/roleEdit.dtml
 lib/zope/lib/python/AccessControl/dtml/userFolderProps.dtml
+lib/zope/lib/python/AccessControl/interfaces.py
+lib/zope/lib/python/AccessControl/interfaces.pyc
 lib/zope/lib/python/AccessControl/securitySuite/
 lib/zope/lib/python/AccessControl/securitySuite/README
 lib/zope/lib/python/AccessControl/securitySuite/ResultObject.py
@@ -170,6 +200,8 @@
 lib/zope/lib/python/AccessControl/tests/testPermissionRole.pyc
 lib/zope/lib/python/AccessControl/tests/testSecurity.py
 lib/zope/lib/python/AccessControl/tests/testSecurity.pyc
+lib/zope/lib/python/AccessControl/tests/testSecurityManager.py
+lib/zope/lib/python/AccessControl/tests/testSecurityManager.pyc
 lib/zope/lib/python/AccessControl/tests/testUserFolder.py
 lib/zope/lib/python/AccessControl/tests/testUserFolder.pyc
 lib/zope/lib/python/AccessControl/tests/testZopeGuards.py
@@ -3093,6 +3125,8 @@
 lib/zope/lib/python/ZPublisher/tests/
 lib/zope/lib/python/ZPublisher/tests/__init__.py
 lib/zope/lib/python/ZPublisher/tests/__init__.pyc
+lib/zope/lib/python/ZPublisher/tests/generate_conflicts.py
+lib/zope/lib/python/ZPublisher/tests/generate_conflicts.pyc
 lib/zope/lib/python/ZPublisher/tests/testBaseRequest.py
 lib/zope/lib/python/ZPublisher/tests/testBaseRequest.pyc
 lib/zope/lib/python/ZPublisher/tests/testHTTPRangeSupport.py