10 files changed, 196 insertions, 176 deletions

diff --git a/www/zope213/files/patch-Dependencies-RestrictedPython b/www/zope213/files/patch-Dependencies-RestrictedPython
new file mode 100644
index 000000000000..c5d650024dd0
--- /dev/null
+++ b/www/zope213/files/patch-Dependencies-RestrictedPython
@@ -0,0 +1,10 @@
+--- Dependencies/RestrictedPython-Zope-2.9.0/RestrictedPython/tests/verify.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/RestrictedPython-Zope-2.9.0/RestrictedPython/tests/verify.py	Sun Jan 15 13:43:23 2006
+@@ -21,6 +21,7 @@
+ function.
+ """
+ 
++from __future__ import generators
+ import dis
+ import types
+ 
diff --git a/www/zope213/files/patch-Dependencies-SiteAccess b/www/zope213/files/patch-Dependencies-SiteAccess
new file mode 100644
index 000000000000..2020148cc1aa
--- /dev/null
+++ b/www/zope213/files/patch-Dependencies-SiteAccess
@@ -0,0 +1,10 @@
+--- Dependencies/Products-Zope-2.9.0/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Sat Jan  7 21:07:42 2006
++++ Dependencies/Products-Zope-2.9.0/Products/SiteAccess/tests/testVirtualHostMonster.py	Sun Jan 15 13:39:37 2006
+@@ -12,6 +12,7 @@
+ 
+ from Testing.makerequest import makerequest
+ 
++from __future__ import generators
+ import Zope2
+ Zope2.startup()
+ 
diff --git a/www/zope213/files/patch-lib-python-StructuredText-i18n b/www/zope213/files/patch-Dependencies-StructuredText
index f90e30cb16ba..bb0d36dbada8 100644
--- a/www/zope213/files/patch-lib-python-StructuredText-i18n
+++ b/www/zope213/files/patch-Dependencies-StructuredText
@@ -1,5 +1,28 @@
---- lib/python/StructuredText/DocumentClass.py.orig	Thu Aug 11 09:11:26 2005
-+++ lib/python/StructuredText/DocumentClass.py	Wed Sep  7 13:27:26 2005
+--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentWithImages.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentWithImages.py	Sun Jan 15 10:23:46 2006
+@@ -27,7 +27,7 @@
+ 
+     def doc_img(
+         self, s,
+-        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\[\]\'\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
++        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
+         ):
+ 
+ 
+--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/ST.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/ST.py	Sun Jan 15 10:23:46 2006
+@@ -116,6 +116,9 @@
+     Structure => [paragraph,[sub-paragraphs]]
+     """
+ 
++    if type(paragraphs) == type(''):
++        paragraphs = unicode(paragraphs, 'utf-8')
++
+     currentlevel    = 0
+     currentindent  = 0
+     levels            = {0:0}
+--- Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentClass.py.orig	Sat Jan  7 21:07:51 2006
++++ Dependencies/StructuredText-Zope-2.9.0/StructuredText/DocumentClass.py	Sun Jan 15 10:23:46 2006
 @@ -786,7 +786,7 @@
  
      def doc_literal(
@@ -62,26 +85,3 @@
                     ):
          return self.doc_href(s, expr)
  
---- lib/python/StructuredText/DocumentWithImages.py.orig	Thu Aug 11 09:11:26 2005
-+++ lib/python/StructuredText/DocumentWithImages.py	Wed Sep  7 13:30:10 2005
-@@ -27,7 +27,7 @@
- 
-     def doc_img(
-         self, s,
--        expr1=re.compile('\"([ _a-zA-Z0-9*.:/;,\[\]\'\-\n\~]+)\":img:([a-zA-Z0-9%\_\-.:/\?=;,\n\~]+)').search,
-+        expr1=re.compile('\"((?:\w|[ *.:/;,\-\n\~])+)\":img:([a-zA-Z0-9\_\-.:/;,\n\~]+)', re.U).search,
-         ):
- 
- 
---- lib/python/StructuredText/ST.py.orig	Thu Aug 11 09:11:26 2005
-+++ lib/python/StructuredText/ST.py	Wed Sep  7 13:27:26 2005
-@@ -116,6 +116,9 @@
-     Structure => [paragraph,[sub-paragraphs]]
-     """
- 
-+    if type(paragraphs) == type(''):
-+        paragraphs = unicode(paragraphs, 'utf-8')
-+
-     currentlevel    = 0
-     currentindent  = 0
-     levels            = {0:0}
diff --git a/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py b/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
deleted file mode 100644
index ab23edef96c5..000000000000
--- a/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Thu Aug 11 09:11:19 2005
-+++ lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py	Wed Sep  7 12:19:37 2005
-@@ -12,6 +12,7 @@
- 
- from Testing.makerequest import makerequest
- 
-+from __future__ import generators
- import Zope2
- Zope2.startup()
- 
diff --git a/www/zope213/files/patch-lib-python-restrictedpython-tests-verify.py b/www/zope213/files/patch-lib-python-restrictedpython-tests-verify.py
deleted file mode 100644
index 125b4307cd91..000000000000
--- a/www/zope213/files/patch-lib-python-restrictedpython-tests-verify.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/python/RestrictedPython/tests/verify.py.orig	Thu Jun 17 13:39:24 2004
-+++ lib/python/RestrictedPython/tests/verify.py	Thu Jun 17 13:39:41 2004
-@@ -21,6 +21,7 @@
- function.
- """
- 
-+from __future__ import generators
- import dis
- import types
- 
diff --git a/www/zope213/files/patch-zope.conf.in b/www/zope213/files/patch-zope.conf.in
new file mode 100644
index 000000000000..fd7e9b19ec32
--- /dev/null
+++ b/www/zope213/files/patch-zope.conf.in
@@ -0,0 +1,20 @@
+--- Zope/skel/etc/zope.conf.in.orig	Sun Jan 15 11:56:31 2006
++++ Zope/skel/etc/zope.conf.in	Sun Jan 15 11:57:01 2006
+@@ -866,7 +866,7 @@
+ #
+ #    large-file-threshold 1Mb
+ 
+-# Directive: default_zpublisher_encoding
++# Directive: default-zpublisher-encoding
+ #
+ # Description:
+ #     This controls what character set is used to encode unicode
+@@ -876,7 +876,7 @@
+ #
+ # Example:
+ #
+-#    default_zpublisher_encoding utf-8
++#    default-zpublisher-encoding utf-8
+ 
+ # Directives: servers
+ #
diff --git a/www/zope213/files/zeo28.sh.in b/www/zope213/files/zeo28.sh.in
deleted file mode 100644
index 3d1e71a584b7..000000000000
--- a/www/zope213/files/zeo28.sh.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#
-# Startup script for Zeo server.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: zeo28
-# REQUIRE: DAEMON
-# BEFORE: zope28
-
-# Define these zeo28_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/zeo28
-#
-# zeo28_enable : bool
-#   Enable Zeo ("YES") or not ("NO", the default).
-#
-# zeo28_instances : list
-#   List of dirs with Zeo's instances ("" by default).
-#
-
-. %%RC_SUBR%%
-
-name="zeo28"
-rcvar=`set_rcvar`
-
-zeo28ctl () {
-    for instance in $zeo28_instances; do
-	if [ -d ${instance} ]; then
-	    echo -n "  Zeo instance ${instance} -> "
-	    ${instance}/bin/zeoctl "$1"
-	fi
-    done
-}
-
-zeo28_start () {
-    echo "Starting Zeo 2.8:"
-    zeo28ctl "start"
-}
-
-zeo28_stop () {
-    echo "Stopping Zeo 2.8:"
-    zeo28ctl "stop"
-}
-
-zeo28_restart () {
-    echo "Restarting Zeo 2.8:"
-    zeo28ctl "restart"
-}
-
-  start_cmd="zeo28_start"
-   stop_cmd="zeo28_stop"
-restart_cmd="zeo28_restart"
-
-load_rc_config $name
-
-: ${zeo28_enable="NO"}
-: ${zeo28_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n  "$*" ] && zeo28_instances="$*"
-
-run_rc_command "${cmd}"
diff --git a/www/zope213/files/zeo29.sh.in b/www/zope213/files/zeo29.sh.in
new file mode 100644
index 000000000000..50943aaefa8a
--- /dev/null
+++ b/www/zope213/files/zeo29.sh.in
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# Startup script for Zeo server.
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zeo29
+# REQUIRE: DAEMON
+# BEFORE: zope29
+
+# Define these zeo29_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/zeo29
+#
+# zeo29_enable : bool
+#   Enable Zeo ("YES") or not ("NO", the default).
+#
+# zeo29_instances : list
+#   List of dirs with Zeo's instances ("" by default).
+#
+
+. %%RC_SUBR%%
+
+name="zeo29"
+rcvar=`set_rcvar`
+
+zeo29ctl () {
+    for instance in $zeo29_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zeo instance ${instance} -> "
+	    ${instance}/bin/zeoctl "$1"
+	fi
+    done
+}
+
+zeo29_start () {
+    echo "Starting Zeo 2.9:"
+    zeo29ctl "start"
+}
+
+zeo29_stop () {
+    echo "Stopping Zeo 2.9:"
+    zeo29ctl "stop"
+}
+
+zeo29_restart () {
+    echo "Restarting Zeo 2.9:"
+    zeo29ctl "restart"
+}
+
+  start_cmd="zeo29_start"
+   stop_cmd="zeo29_stop"
+restart_cmd="zeo29_restart"
+
+load_rc_config $name
+
+: ${zeo29_enable="NO"}
+: ${zeo29_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zeo29_instances="$*"
+
+run_rc_command "${cmd}"
diff --git a/www/zope213/files/zope28.sh.in b/www/zope213/files/zope28.sh.in
deleted file mode 100644
index e51d5fa39140..000000000000
--- a/www/zope213/files/zope28.sh.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-# Startup script for Zope server.
-#
-# $FreeBSD$
-#
-
-# PROVIDE: zope28
-# REQUIRE: DAEMON
-
-# Define these zope28_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/zope28
-#
-# zope28_enable : bool
-#   Enable Zope ("YES") or not ("NO", the default).
-#
-# zope28_instances : list
-#   List of dirs with Zope's instances ("" by default).
-#
-
-. %%RC_SUBR%%
-
-name="zope28"
-rcvar=`set_rcvar`
-
-zope28ctl () {
-    for instance in $zope28_instances; do
-	if [ -d ${instance} ]; then
-	    echo -n "  Zope instance ${instance} -> "
-	    ${instance}/bin/zopectl "$1"
-	fi
-    done
-}
-
-zope28_start () {
-    echo "Starting Zope 2.8:"
-    zope28ctl "start"
-}
-
-zope28_stop () {
-    echo "Stopping Zope 2.8:"
-    zope28ctl "stop"
-}
-
-zope28_restart () {
-    echo "Restarting Zope 2.8:"
-    zope28ctl "restart"
-}
-
-  start_cmd="zope28_start"
-   stop_cmd="zope28_stop"
-restart_cmd="zope28_restart"
-
-load_rc_config $name
-
-: ${zope28_enable="NO"}
-: ${zope28_instances=""}
-
-cmd="$1"
-[ $# -gt 0 ] && shift
-[ -n  "$*" ] && zope28_instances="$*"
-
-run_rc_command "${cmd}"
diff --git a/www/zope213/files/zope29.sh.in b/www/zope213/files/zope29.sh.in
new file mode 100644
index 000000000000..601a08ccc2a7
--- /dev/null
+++ b/www/zope213/files/zope29.sh.in
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Startup script for Zope server.
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zope29
+# REQUIRE: DAEMON
+
+# Define these zope29_* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/zope29
+#
+# zope29_enable : bool
+#   Enable Zope ("YES") or not ("NO", the default).
+#
+# zope29_instances : list
+#   List of dirs with Zope's instances ("" by default).
+#
+
+. %%RC_SUBR%%
+
+name="zope29"
+rcvar=`set_rcvar`
+
+zope29ctl () {
+    for instance in $zope29_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zope instance ${instance} -> "
+	    ${instance}/bin/zopectl "$1"
+	fi
+    done
+}
+
+zope29_start () {
+    echo "Starting Zope 2.9:"
+    zope29ctl "start"
+}
+
+zope29_stop () {
+    echo "Stopping Zope 2.9:"
+    zope29ctl "stop"
+}
+
+zope29_restart () {
+    echo "Restarting Zope 2.9:"
+    zope29ctl "restart"
+}
+
+  start_cmd="zope29_start"
+   stop_cmd="zope29_stop"
+restart_cmd="zope29_restart"
+
+load_rc_config $name
+
+: ${zope29_enable="NO"}
+: ${zope29_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zope29_instances="$*"
+
+run_rc_command "${cmd}"