Bump zope3 from 3.3.0 to 3.3.1, the latter was released 14 Jan 2007,

and appears to currently be the latest "stable" Zope 3 version.

Discussed with package maintainer, Yoshito Komatsu, who sent me
some minor tweaks to my changes.

The part of Zope/doc/CHANGES.txt relevant for 3.3.0 -> 3.3.1 is:

    Bugfixes

      - Fixed widget bug in zope.app.form.browser; _getCurrentValue always
        returns an input value now. This fixes a bug in _getFormValue.

        (This required a backport of a small restructuring: Changed internal
        widget API to allow retrieving the current value (from request,
        default or current field value) in addition to the current form
        representation of the value.)

      - Fixed bug #707: "layer" directive was marked as deprecated in a
        confusing way.

      - Fixed bug #728: Able to change-dir into non-existant directories using
        FTP

      - Fixed bug #717: formlib raised FormError when schema fields were
        missing from a request although not required.

      - Fixed bug #738: RestrictedPython was unable to parse
        Unicode expressions correctly (as passed in from e.g. ZPTPages).

      - Fixed bug #723: Testbrowser was handling multiple submit buttons with
        the same name incorrectly.

      - Fixed HTML rendered by ItemsMultiDisplayWidget: The 'name' attribute
        is not allowed in list tags and 'type' has a different meaning.

      - Fileresources now also set the Cache-control headers on 304
        responses. This speeds up page loads a lot on pages with many
        resources.

      - Fixed validate method of schema.Date, now it does not accept
        datetime objects anymore. this is needed because datetime and
        date values are not comparable

      - Fixed issue 730: Subversion 1.4 breaks mkzopeinstance.py

      - Fixed zope.annotation.factory to correctly setup containment for
        objects that do not implement IContained.

      - Fixed encoding of newlines, carriage returns, and tabs when
        encoding attributes for widgets so we're consistent under all
        Python 2.4.x versions (including 2.4.4, which failed tests before).

      - Fixed issue 535: make HTTPInputStream work with Python 2.4.4.

      - Improved fix for issue 599: Made sure i18n Message based Invalid
        exceptions are handled correctly.

      - Fixed a bug in getImageInfo which could cause an
        UnboundLocalError under certain conditions.

      - Fixed ``get/queryNextUtility`` to work with multiple base registries.

      - Fixed zope.app.catalog.attribute.AttributeIndex. It did not
        remove the the previous value/object from the index IF the NEW
        value was None.

      - Fixed zope.index.field.index.FieldIndex. Unindex broke if the value
        somehow dropped out of the forward index.

6 files changed, 30 insertions, 19 deletions

diff --git a/www/zope3/Makefile b/www/zope3/Makefile
index f8259d6dd5f..f718c45f570 100644
--- a/www/zope3/Makefile
+++ b/www/zope3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2006/10/01 14:25:23 taca Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/20 17:30:18 he Exp $
 #
 
-DISTNAME=		Zope-3.3.0
-PKGNAME=		zope3-3.3.0
+DISTNAME=		Zope-3.3.1
+PKGNAME=		zope3-3.3.1
 CATEGORIES=		www
-MASTER_SITES=		http://www.zope.org/Products/Zope3/3.3.0/
+MASTER_SITES=		http://www.zope.org/Products/Zope3/3.3.1/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		ykomatsu@akaumigame.org
diff --git a/www/zope3/PLIST b/www/zope3/PLIST
index b5c166b0a14..646621507d2 100644
--- a/www/zope3/PLIST
+++ b/www/zope3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/10/01 14:25:23 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/02/20 17:30:18 he Exp $
 bin/mkzeoinstance
 bin/mkzopeinstance
 bin/zopetest
@@ -138,6 +138,9 @@ share/zope3/lib/python/RestrictedPython/tests/restricted_module.pyo
 share/zope3/lib/python/RestrictedPython/tests/security_in_syntax.py
 share/zope3/lib/python/RestrictedPython/tests/security_in_syntax.pyc
 share/zope3/lib/python/RestrictedPython/tests/security_in_syntax.pyo
+share/zope3/lib/python/RestrictedPython/tests/testCompile.py
+share/zope3/lib/python/RestrictedPython/tests/testCompile.pyc
+share/zope3/lib/python/RestrictedPython/tests/testCompile.pyo
 share/zope3/lib/python/RestrictedPython/tests/testRestrictions.py
 share/zope3/lib/python/RestrictedPython/tests/testRestrictions.pyc
 share/zope3/lib/python/RestrictedPython/tests/testRestrictions.pyo
@@ -6560,6 +6563,7 @@ share/zope3/lib/python/zope/app/folder/configure.zcml
 share/zope3/lib/python/zope/app/folder/filerepresentation.py
 share/zope3/lib/python/zope/app/folder/filerepresentation.pyc
 share/zope3/lib/python/zope/app/folder/filerepresentation.pyo
+share/zope3/lib/python/zope/app/folder/filerepresentation.txt
 share/zope3/lib/python/zope/app/folder/folder.py
 share/zope3/lib/python/zope/app/folder/folder.pyc
 share/zope3/lib/python/zope/app/folder/folder.pyo
@@ -6917,6 +6921,12 @@ share/zope3/lib/python/zope/app/http/exception/tests/test_unauthorized.pyo
 share/zope3/lib/python/zope/app/http/exception/unauthorized.py
 share/zope3/lib/python/zope/app/http/exception/unauthorized.pyc
 share/zope3/lib/python/zope/app/http/exception/unauthorized.pyo
+share/zope3/lib/python/zope/app/http/ftests/__init__.py
+share/zope3/lib/python/zope/app/http/ftests/__init__.pyc
+share/zope3/lib/python/zope/app/http/ftests/__init__.pyo
+share/zope3/lib/python/zope/app/http/ftests/test_put.py
+share/zope3/lib/python/zope/app/http/ftests/test_put.pyc
+share/zope3/lib/python/zope/app/http/ftests/test_put.pyo
 share/zope3/lib/python/zope/app/http/httpdate.py
 share/zope3/lib/python/zope/app/http/httpdate.pyc
 share/zope3/lib/python/zope/app/http/httpdate.pyo
@@ -11740,6 +11750,7 @@ share/zope3/zopeskel/var/README.txt
 @dirrm share/zope3/lib/python/zope/app/i18n/browser
 @dirrm share/zope3/lib/python/zope/app/i18n
 @dirrm share/zope3/lib/python/zope/app/http/tests
+@dirrm share/zope3/lib/python/zope/app/http/ftests
 @dirrm share/zope3/lib/python/zope/app/http/exception/tests
 @dirrm share/zope3/lib/python/zope/app/http/exception
 @dirrm share/zope3/lib/python/zope/app/http
diff --git a/www/zope3/distinfo b/www/zope3/distinfo
index 1f5f79acdbf..4b570117703 100644
--- a/www/zope3/distinfo
+++ b/www/zope3/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/01 14:25:23 taca Exp $
+$NetBSD: distinfo,v 1.5 2007/02/20 17:30:18 he Exp $
 
-SHA1 (Zope-3.3.0.tgz) = 371db51e9d3b98b58beb03beaa3d07eb0f27a2ea
-RMD160 (Zope-3.3.0.tgz) = e8dd6c74d83646d1e9093bb3147450088dcd06e3
-Size (Zope-3.3.0.tgz) = 6634834 bytes
-SHA1 (patch-aa) = 4e4c95ec8809dbade1ddd7f54a05d8fda253e117
-SHA1 (patch-ab) = 3068eed096eb3b3bef71f4d06c4bd7682143f4b3
+SHA1 (Zope-3.3.1.tgz) = 4576ac21c3415563d3b0b747e40963a762b63fce
+RMD160 (Zope-3.3.1.tgz) = 11bf3b8c899518a5965f21a4a372912a4bc1438d
+Size (Zope-3.3.1.tgz) = 6594248 bytes
+SHA1 (patch-aa) = 1e1a29f1519ee50861b513b5ff5254a76541a735
+SHA1 (patch-ab) = c4e098593a36998384fe70150456cae2a8b55c9e
diff --git a/www/zope3/package.mk b/www/zope3/package.mk
index dd404cf8fa4..3d9adfb9a25 100644
--- a/www/zope3/package.mk
+++ b/www/zope3/package.mk
@@ -1,7 +1,7 @@
-# $NetBSD: package.mk,v 1.3 2006/10/01 14:25:23 taca Exp $
+# $NetBSD: package.mk,v 1.4 2007/02/20 17:30:18 he Exp $
 #
 
-DEPENDS+=		zope3>=3.3.0:../../www/zope3
+DEPENDS+=		zope3>=3.3.1:../../www/zope3
 
 .include "Makefile.common"
 
diff --git a/www/zope3/patches/patch-aa b/www/zope3/patches/patch-aa
index a71b2b0d76e..0489f042742 100644
--- a/www/zope3/patches/patch-aa
+++ b/www/zope3/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2006/10/01 14:25:23 taca Exp $
+$NetBSD: patch-aa,v 1.5 2007/02/20 17:30:18 he Exp $
 
---- Dependencies/zdaemon-Zope-3.3.0/zdaemon/zdctl.py.orig	2006-09-21 19:40:21.000000000 +0900
-+++ Dependencies/zdaemon-Zope-3.3.0/zdaemon/zdctl.py
+--- Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdctl.py.orig	2006-09-21 19:40:21.000000000 +0900
++++ Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdctl.py
 @@ -58,6 +58,14 @@ if __name__ == "__main__":
      scriptdir = dirname(normpath(abspath(sys.argv[0])))
      if basename(scriptdir).lower() == "zdaemon":
diff --git a/www/zope3/patches/patch-ab b/www/zope3/patches/patch-ab
index 8a311f5e9ad..d6040b5b090 100644
--- a/www/zope3/patches/patch-ab
+++ b/www/zope3/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2006/10/01 14:25:23 taca Exp $
+$NetBSD: patch-ab,v 1.5 2007/02/20 17:30:18 he Exp $
 
---- Dependencies/zdaemon-Zope-3.3.0/zdaemon/zdrun.py.orig	2006-09-21 19:40:21.000000000 +0900
-+++ Dependencies/zdaemon-Zope-3.3.0/zdaemon/zdrun.py
+--- Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdrun.py.orig	2006-09-21 19:40:21.000000000 +0900
++++ Dependencies/zdaemon-Zope-3.3.1/zdaemon/zdrun.py
 @@ -83,6 +83,14 @@ if __name__ == "__main__":
      scriptdir = dirname(normpath(abspath(sys.argv[0])))
      if basename(scriptdir).lower() == "zdaemon":