8 files changed, 91 insertions, 14 deletions
diff --git a/www/zope210/files/instance_message b/www/zope210/files/instance_message.in
index a6e9d214a56f..a6e9d214a56f 100644
--- a/www/zope210/files/instance_message
+++ b/www/zope210/files/instance_message.in
diff --git a/www/zope210/files/pkg-message.package.in b/www/zope210/files/package-pkg-message.in
index c12fa22a3981..83e710fc3205 100644
--- a/www/zope210/files/pkg-message.package.in
+++ b/www/zope210/files/package-pkg-message.in
@@ -1,6 +1,6 @@
 **********************************************************************
 
-Zope 2.7 Successfull installed.
+Zope Successfull installed.
 
 To create an instance of Zope please run 
 %%ZOPEBASEDIR%%/bin/mkzopeinstance.py -d <INSTANCEDIR>
diff --git a/www/zope210/files/patch-lib-python-StructuredText-i18n b/www/zope210/files/patch-lib-python-StructuredText-i18n
new file mode 100644
index 000000000000..f90e30cb16ba
--- /dev/null
+++ b/www/zope210/files/patch-lib-python-StructuredText-i18n
@@ -0,0 +1,87 @@
+--- 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
+@@ -786,7 +786,7 @@
+ 
+     def doc_literal(
+         self, s,
+-        expr = re.compile(r"(\W+|^)'([%s%s%s\s]+)'([%s]+|$)" % (letters, digits, literal_punc, phrase_delimiters)).search,):
++        expr = re.compile(r"(\W+|^)'((?:\w|[%s%s\s])+)'([%s]+|$)" % (digits, literal_punc, phrase_delimiters), re.U).search,):
+ 
+         # old expr... failed to cross newlines.
+         #        expr=re.compile(
+@@ -804,7 +804,9 @@
+ 
+     def doc_emphasize(
+         self, s,
+-        expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
++        # i18nal variant
++        expr = re.compile(r'\*((?:\w|[%s\s])+?)\*' % (strongem_punc), re.U).search
++        #expr = re.compile(r'\*([%s%s%s\s]+?)\*' % (letters, digits, strongem_punc)).search
+         #expr = re.compile(r'\s*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*(?!\*|-)' % letters).search       # old expr, inconsistent punctuation
+         ):
+ 
+@@ -850,7 +852,7 @@
+ 
+     def doc_underline(self,
+                       s,
+-                      expr=re.compile(r'_([%s%s%s\s]+)_([\s%s]|$)' % (letters, digits, under_punc,phrase_delimiters)).search):
++                      expr=re.compile(r'_((?:\w|[%s\s])+)_([\s%s]|$)' % (under_punc,phrase_delimiters), re.U).search):
+ 
+         result = expr(s)
+         if result:
+@@ -864,7 +866,7 @@
+ 
+     def doc_strong(self,
+                    s,
+-                   expr = re.compile(r'\*\*([%s%s%s\s]+?)\*\*' % (letters, digits, strongem_punc)).search
++                   expr = re.compile(r'\*\*((?:\w|[%s%s\s])+?)\*\*' % (digits, strongem_punc), re.U).search
+                    #expr = re.compile(r'\s*\*\*([ \n\r%s0-9.:/;,\'\"\?\-\_\/\=\-\>\<\(\)]+)\*\*(?!\*|-)' % letters).search, # old expr, inconsistent punc, failed to cross newlines.
+         ):
+ 
+@@ -876,7 +878,7 @@
+             return None
+ 
+     ## Some constants to make the doc_href() regex easier to read.
+-    _DQUOTEDTEXT = r'("[ %s0-9\n\r%s]+")' % (letters,dbl_quoted_punc) ## double quoted text
++    _DQUOTEDTEXT = r'("[^"]+")'
+     _ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+     _ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
+ 
+@@ -884,12 +886,12 @@
+ 
+ 
+     def doc_href1(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES, re.U).search
+                    ):
+         return self.doc_href(s, expr)
+ 
+     def doc_href2(self, s,
+-                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES).search
++                  expr=re.compile(_DQUOTEDTEXT + r'(\,\s+)' + _ABSOLUTE_URL + _SPACES, re.U).search
+                    ):
+         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/zope210/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py b/www/zope210/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
deleted file mode 100644
index d59014d921e2..000000000000
--- a/www/zope210/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Thu Jun 17 13:38:08 2004
-+++ lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py	Thu Jun 17 13:38:24 2004
-@@ -12,6 +12,7 @@
- 
- from Testing.makerequest import makerequest
- 
-+from __future__ import generators
- import Zope
- Zope.startup()
- 
diff --git a/www/zope210/files/pkg-message.in b/www/zope210/files/pkg-message.in
index 15a2c892b6b9..656c606114b6 100644
--- a/www/zope210/files/pkg-message.in
+++ b/www/zope210/files/pkg-message.in
@@ -1,6 +1,6 @@
 **********************************************************************
 
-Zope 2.7 Successfull installed.
+Zope Successfull installed.
 
 To create an instance of Zope please run 
 make instance
diff --git a/www/zope210/files/zeo.sh b/www/zope210/files/zeo.sh.in
index f067c06de8db..ef9d1689803b 100644
--- a/www/zope210/files/zeo.sh
+++ b/www/zope210/files/zeo.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Start or stop zope
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zeo.sh.in,v 1.1 2005-09-18 21:33:04 vsevolod Exp $
 
 # PROVIDE: zeo
 # REQUIRE: DAEMON
diff --git a/www/zope210/files/zeo_message b/www/zope210/files/zeo_message.in
index 3d3fd82a201b..3d3fd82a201b 100644
--- a/www/zope210/files/zeo_message
+++ b/www/zope210/files/zeo_message.in
diff --git a/www/zope210/files/zope.sh b/www/zope210/files/zope.sh.in
index 353a5f2b6aaf..f46daa2bdfa6 100644
--- a/www/zope210/files/zope.sh
+++ b/www/zope210/files/zope.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh,v 1.5 2005-02-18 16:52:17 pav Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh.in,v 1.7 2005-09-18 21:33:04 vsevolod Exp $
 
 # PROVIDE: zope
 # REQUIRE: DAEMON