kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- After repocopy from www/zope29, update to 2.10.1

Browse source 
PR:		ports/106001
Submitted by:	HAYASHI Yasushi <yasi@yasi.to> (maintainer)
Repocopy by:	marcus
This commit is contained in:
Pav Lucistnik 2006-11-30 13:52:22 +00:00
parent 40421a6b20
commit 5ab6ad22df
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=178337
40 changed files with 5245 additions and 3972 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
www/Makefile
View file

@ -1182,6 +1182,7 @@
SUBDIR += ziproxy
SUBDIR += znavigator
SUBDIR += zope
SUBDIR += zope210
SUBDIR += zope28
SUBDIR += zope29
SUBDIR += zope3

16
www/zope210/Makefile
View file

@ -1,12 +1,12 @@
# New ports collection makefile for: Zope-2.9.x
# Date created: Mon Jan 10 14:40:00 JST 2006
# New ports collection makefile for: Zope-2.10.x
# Date created: Mon Nov 28 22:09:00 JST 2006
# Whom: Yasushi Hayashi <yasi@yasi.to>
#
# $FreeBSD$
#
PORTNAME= zope29
PORTVERSION= 2.9.6
PORTNAME= zope210
PORTVERSION= 2.10.1
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-final
@ -17,8 +17,7 @@ MAINTAINER= yasi@yasi.to
COMMENT= An object-based web application platform
USE_PYTHON= 2.4
USE_RC_SUBR= ${PORTNAME}.sh zeo29.sh
LATEST_LINK= zope29
USE_RC_SUBR= ${PORTNAME}.sh zeo210.sh
# Note: the notes that follow reflect the decisions of prior maintainers
# of this port. IOW, don't blame me if you don't like the way it's done.
@ -27,7 +26,7 @@ LATEST_LINK= zope29
# Change these, if you like, via the environment.
ZOPE_USER?= www
WEBBASEDIR?= www
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope29
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope210
# Do not change anything below this line.
@ -72,6 +71,9 @@ post-configure:
-e 's,^.*LN.*PYTHON.*$$,,g' \
${WRKSRC}/${MAKEFILE}
post-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
post-install:
${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in

6
www/zope210/distinfo
View file

@ -1,3 +1,3 @@
MD5 (zope/Zope-2.9.6-final.tgz) = a87008a9e78248072ea5908e1006b269
SHA256 (zope/Zope-2.9.6-final.tgz) = 00ffe561df9ede6543bf5dceeea964048ee005705ba98dd8f8dbfcd8dd64fcc4
SIZE (zope/Zope-2.9.6-final.tgz) = 6989768
MD5 (zope/Zope-2.10.1-final.tgz) = 10733d25719535eeb8ca995dd627106f
SHA256 (zope/Zope-2.10.1-final.tgz) = a759dc9312a9e8ebb87d721fbb0124caafd18a1860e5f5bd2186f1459e68c17b
SIZE (zope/Zope-2.10.1-final.tgz) = 7128570

6
www/zope210/files/instance_message.in
View file

@ -5,10 +5,10 @@ Zope instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="%%ZOPEINSTANCEDIR%%"
zope210_enable="YES"
zope210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope29_instances entry please add
If there is already a zope210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before

12
www/zope210/files/package-pkg-message.in
View file

@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="<INSTANCEDIR>"
zope210_enable="YES"
zope210_instances="<INSTANCEDIR>"
Additional zope Instances have to be added to zope29_instances
Additional zope Instances have to be added to zope210_instances
seperated by a space.
** ZEO Instances ** (Optional)
@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
To start the ZEO Server at System startup add the following lines to
/etc/rc.conf
zeo29_enable="YES"
zeo29_instances="<ZEODIR>"
zeo210_enable="YES"
zeo210_instances="<ZEODIR>"
Additional zeo Instances have to be added to zeo29_instances seperated
Additional zeo Instances have to be added to zeo210_instances seperated
by a space.
**********************************************************************

76
www/zope210/files/patch-lib-python-StructuredText → www/zope210/files/patch-lib-python-zope-structuredtext
View file

@ -1,49 +1,25 @@
--- lib/python/StructuredText/DocumentWithImages.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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,
):
--- lib/python/StructuredText/ST.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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}
--- lib/python/StructuredText/DocumentClass.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/StructuredText/DocumentClass.py Sun Jan 15 10:23:46 2006
@@ -786,7 +786,7 @@
--- lib/python/zope/structuredtext/document.py.orig Thu Nov 23 16:54:41 2006
+++ lib/python/zope/structuredtext/document.py Thu Nov 23 17:14:20 2006
@@ -556,7 +556,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 @@
r = expr(s)
if r:
start, end = r.span(2)
@@ -564,7 +564,8 @@
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 @@
r=expr(s)
@@ -605,7 +606,7 @@
def doc_underline(self,
s,
@ -52,7 +28,7 @@
result = expr(s)
if result:
@@ -864,7 +866,7 @@
@@ -617,7 +618,7 @@
def doc_strong(self,
s,
@ -61,17 +37,16 @@
#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
@@ -627,19 +628,19 @@
return (stng.StructuredTextStrong(s[start:end]), start-2, end+2)
## 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'("[^"]+")'
+ _DQUOTEDTEXT = r'("[^"]+")' ## double quoted text
_ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
_ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
@@ -884,12 +886,12 @@
_SPACES = r'(\s*)'
def doc_href1(self, s,
- expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
@ -82,6 +57,27 @@
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)
@@ -693,7 +694,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,
):
r=expr1(s)
--- lib/python/zope/structuredtext/stng.py.orig Thu Nov 23 17:00:38 2006
+++ lib/python/zope/structuredtext/stng.py Thu Nov 23 17:02:45 2006
@@ -105,6 +105,9 @@
[paragraph,[sub-paragraphs]]
"""
+ if type(paragraphs) == type(''):
+ paragraphs = unicode(paragraphs, 'utf-8')
+
currentlevel = 0
currentindent = 0
levels = {0:0}

66
www/zope210/files/zeo210.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope210/files/zeo210.sh.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope210/files/zeo29.sh.in
View file

@ -1,66 +0,0 @@
#!/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}"

6
www/zope210/files/zeo_message.in
View file

@ -5,10 +5,10 @@ ZEO instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zeo29_enable="YES"
zeo29_instances="%%ZOPEINSTANCEDIR%%"
zeo210_enable="YES"
zeo210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zeo29_instances entry please add
If there is already a zeo210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting

65
www/zope210/files/zope210.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope210/files/zope210.sh.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope210/files/zope29.sh.in
View file

@ -1,65 +0,0 @@
#!/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}"

2557
www/zope210/pkg-plist
View file

File diff suppressed because it is too large Load diff

16
www/zope211/Makefile
View file

@ -1,12 +1,12 @@
# New ports collection makefile for: Zope-2.9.x
# Date created: Mon Jan 10 14:40:00 JST 2006
# New ports collection makefile for: Zope-2.10.x
# Date created: Mon Nov 28 22:09:00 JST 2006
# Whom: Yasushi Hayashi <yasi@yasi.to>
#
# $FreeBSD$
#
PORTNAME= zope29
PORTVERSION= 2.9.6
PORTNAME= zope210
PORTVERSION= 2.10.1
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-final
@ -17,8 +17,7 @@ MAINTAINER= yasi@yasi.to
COMMENT= An object-based web application platform
USE_PYTHON= 2.4
USE_RC_SUBR= ${PORTNAME}.sh zeo29.sh
LATEST_LINK= zope29
USE_RC_SUBR= ${PORTNAME}.sh zeo210.sh
# Note: the notes that follow reflect the decisions of prior maintainers
# of this port. IOW, don't blame me if you don't like the way it's done.
@ -27,7 +26,7 @@ LATEST_LINK= zope29
# Change these, if you like, via the environment.
ZOPE_USER?= www
WEBBASEDIR?= www
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope29
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope210
# Do not change anything below this line.
@ -72,6 +71,9 @@ post-configure:
-e 's,^.*LN.*PYTHON.*$$,,g' \
${WRKSRC}/${MAKEFILE}
post-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
post-install:
${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in

6
www/zope211/distinfo
View file

@ -1,3 +1,3 @@
MD5 (zope/Zope-2.9.6-final.tgz) = a87008a9e78248072ea5908e1006b269
SHA256 (zope/Zope-2.9.6-final.tgz) = 00ffe561df9ede6543bf5dceeea964048ee005705ba98dd8f8dbfcd8dd64fcc4
SIZE (zope/Zope-2.9.6-final.tgz) = 6989768
MD5 (zope/Zope-2.10.1-final.tgz) = 10733d25719535eeb8ca995dd627106f
SHA256 (zope/Zope-2.10.1-final.tgz) = a759dc9312a9e8ebb87d721fbb0124caafd18a1860e5f5bd2186f1459e68c17b
SIZE (zope/Zope-2.10.1-final.tgz) = 7128570

6
www/zope211/files/instance_message.in
View file

@ -5,10 +5,10 @@ Zope instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="%%ZOPEINSTANCEDIR%%"
zope210_enable="YES"
zope210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope29_instances entry please add
If there is already a zope210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before

12
www/zope211/files/package-pkg-message.in
View file

@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="<INSTANCEDIR>"
zope210_enable="YES"
zope210_instances="<INSTANCEDIR>"
Additional zope Instances have to be added to zope29_instances
Additional zope Instances have to be added to zope210_instances
seperated by a space.
** ZEO Instances ** (Optional)
@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
To start the ZEO Server at System startup add the following lines to
/etc/rc.conf
zeo29_enable="YES"
zeo29_instances="<ZEODIR>"
zeo210_enable="YES"
zeo210_instances="<ZEODIR>"
Additional zeo Instances have to be added to zeo29_instances seperated
Additional zeo Instances have to be added to zeo210_instances seperated
by a space.
**********************************************************************

76
www/zope213/files/patch-lib-python-StructuredText → www/zope211/files/patch-lib-python-zope-structuredtext
View file

@ -1,49 +1,25 @@
--- lib/python/StructuredText/DocumentWithImages.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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,
):
--- lib/python/StructuredText/ST.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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}
--- lib/python/StructuredText/DocumentClass.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/StructuredText/DocumentClass.py Sun Jan 15 10:23:46 2006
@@ -786,7 +786,7 @@
--- lib/python/zope/structuredtext/document.py.orig Thu Nov 23 16:54:41 2006
+++ lib/python/zope/structuredtext/document.py Thu Nov 23 17:14:20 2006
@@ -556,7 +556,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 @@
r = expr(s)
if r:
start, end = r.span(2)
@@ -564,7 +564,8 @@
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 @@
r=expr(s)
@@ -605,7 +606,7 @@
def doc_underline(self,
s,
@ -52,7 +28,7 @@
result = expr(s)
if result:
@@ -864,7 +866,7 @@
@@ -617,7 +618,7 @@
def doc_strong(self,
s,
@ -61,17 +37,16 @@
#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
@@ -627,19 +628,19 @@
return (stng.StructuredTextStrong(s[start:end]), start-2, end+2)
## 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'("[^"]+")'
+ _DQUOTEDTEXT = r'("[^"]+")' ## double quoted text
_ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
_ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
@@ -884,12 +886,12 @@
_SPACES = r'(\s*)'
def doc_href1(self, s,
- expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
@ -82,6 +57,27 @@
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)
@@ -693,7 +694,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,
):
r=expr1(s)
--- lib/python/zope/structuredtext/stng.py.orig Thu Nov 23 17:00:38 2006
+++ lib/python/zope/structuredtext/stng.py Thu Nov 23 17:02:45 2006
@@ -105,6 +105,9 @@
[paragraph,[sub-paragraphs]]
"""
+ if type(paragraphs) == type(''):
+ paragraphs = unicode(paragraphs, 'utf-8')
+
currentlevel = 0
currentindent = 0
levels = {0:0}

66
www/zope211/files/zeo210.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope211/files/zeo210.sh.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope211/files/zeo29.sh.in
View file

@ -1,66 +0,0 @@
#!/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}"

6
www/zope211/files/zeo_message.in
View file

@ -5,10 +5,10 @@ ZEO instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zeo29_enable="YES"
zeo29_instances="%%ZOPEINSTANCEDIR%%"
zeo210_enable="YES"
zeo210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zeo29_instances entry please add
If there is already a zeo210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting

65
www/zope211/files/zope210.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope211/files/zope210.sh.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope211/files/zope29.sh.in
View file

@ -1,65 +0,0 @@
#!/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}"

2557
www/zope211/pkg-plist
View file

File diff suppressed because it is too large Load diff

16
www/zope213/Makefile
View file

@ -1,12 +1,12 @@
# New ports collection makefile for: Zope-2.9.x
# Date created: Mon Jan 10 14:40:00 JST 2006
# New ports collection makefile for: Zope-2.10.x
# Date created: Mon Nov 28 22:09:00 JST 2006
# Whom: Yasushi Hayashi <yasi@yasi.to>
#
# $FreeBSD$
#
PORTNAME= zope29
PORTVERSION= 2.9.6
PORTNAME= zope210
PORTVERSION= 2.10.1
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-final
@ -17,8 +17,7 @@ MAINTAINER= yasi@yasi.to
COMMENT= An object-based web application platform
USE_PYTHON= 2.4
USE_RC_SUBR= ${PORTNAME}.sh zeo29.sh
LATEST_LINK= zope29
USE_RC_SUBR= ${PORTNAME}.sh zeo210.sh
# Note: the notes that follow reflect the decisions of prior maintainers
# of this port. IOW, don't blame me if you don't like the way it's done.
@ -27,7 +26,7 @@ LATEST_LINK= zope29
# Change these, if you like, via the environment.
ZOPE_USER?= www
WEBBASEDIR?= www
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope29
SZOPEBASEDIR?= ${WEBBASEDIR}/Zope210
# Do not change anything below this line.
@ -72,6 +71,9 @@ post-configure:
-e 's,^.*LN.*PYTHON.*$$,,g' \
${WRKSRC}/${MAKEFILE}
post-build:
-@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/
post-install:
${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in \
${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in

6
www/zope213/distinfo
View file

@ -1,3 +1,3 @@
MD5 (zope/Zope-2.9.6-final.tgz) = a87008a9e78248072ea5908e1006b269
SHA256 (zope/Zope-2.9.6-final.tgz) = 00ffe561df9ede6543bf5dceeea964048ee005705ba98dd8f8dbfcd8dd64fcc4
SIZE (zope/Zope-2.9.6-final.tgz) = 6989768
MD5 (zope/Zope-2.10.1-final.tgz) = 10733d25719535eeb8ca995dd627106f
SHA256 (zope/Zope-2.10.1-final.tgz) = a759dc9312a9e8ebb87d721fbb0124caafd18a1860e5f5bd2186f1459e68c17b
SIZE (zope/Zope-2.10.1-final.tgz) = 7128570

6
www/zope213/files/instance_message.in
View file

@ -5,10 +5,10 @@ Zope instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="%%ZOPEINSTANCEDIR%%"
zope210_enable="YES"
zope210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope29_instances entry please add
If there is already a zope210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before

12
www/zope213/files/package-pkg-message.in
View file

@ -17,10 +17,10 @@ when the package is deinstalled. You`ll have to delete them yourself.
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zope29_enable="YES"
zope29_instances="<INSTANCEDIR>"
zope210_enable="YES"
zope210_instances="<INSTANCEDIR>"
Additional zope Instances have to be added to zope29_instances
Additional zope Instances have to be added to zope210_instances
seperated by a space.
** ZEO Instances ** (Optional)
@ -32,10 +32,10 @@ calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
To start the ZEO Server at System startup add the following lines to
/etc/rc.conf
zeo29_enable="YES"
zeo29_instances="<ZEODIR>"
zeo210_enable="YES"
zeo210_instances="<ZEODIR>"
Additional zeo Instances have to be added to zeo29_instances seperated
Additional zeo Instances have to be added to zeo210_instances seperated
by a space.
**********************************************************************

76
www/zope211/files/patch-lib-python-StructuredText → www/zope213/files/patch-lib-python-zope-structuredtext
View file

@ -1,49 +1,25 @@
--- lib/python/StructuredText/DocumentWithImages.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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,
):
--- lib/python/StructuredText/ST.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/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}
--- lib/python/StructuredText/DocumentClass.py.orig Sat Jan 7 21:07:51 2006
+++ lib/python/StructuredText/DocumentClass.py Sun Jan 15 10:23:46 2006
@@ -786,7 +786,7 @@
--- lib/python/zope/structuredtext/document.py.orig Thu Nov 23 16:54:41 2006
+++ lib/python/zope/structuredtext/document.py Thu Nov 23 17:14:20 2006
@@ -556,7 +556,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 @@
r = expr(s)
if r:
start, end = r.span(2)
@@ -564,7 +564,8 @@
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 @@
r=expr(s)
@@ -605,7 +606,7 @@
def doc_underline(self,
s,
@ -52,7 +28,7 @@
result = expr(s)
if result:
@@ -864,7 +866,7 @@
@@ -617,7 +618,7 @@
def doc_strong(self,
s,
@ -61,17 +37,16 @@
#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
@@ -627,19 +628,19 @@
return (stng.StructuredTextStrong(s[start:end]), start-2, end+2)
## 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'("[^"]+")'
+ _DQUOTEDTEXT = r'("[^"]+")' ## double quoted text
_ABSOLUTE_URL=r'((http|https|ftp|mailto|file|about)[:/]+?[%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
_ABS_AND_RELATIVE_URL=r'([%s0-9_\@\.\,\?\!\/\:\;\-\#\~\=\&\%%\+]+)' % letters
@@ -884,12 +886,12 @@
_SPACES = r'(\s*)'
def doc_href1(self, s,
- expr=re.compile(_DQUOTEDTEXT + "(:)" + _ABS_AND_RELATIVE_URL + _SPACES).search
@ -82,6 +57,27 @@
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)
@@ -693,7 +694,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,
):
r=expr1(s)
--- lib/python/zope/structuredtext/stng.py.orig Thu Nov 23 17:00:38 2006
+++ lib/python/zope/structuredtext/stng.py Thu Nov 23 17:02:45 2006
@@ -105,6 +105,9 @@
[paragraph,[sub-paragraphs]]
"""
+ if type(paragraphs) == type(''):
+ paragraphs = unicode(paragraphs, 'utf-8')
+
currentlevel = 0
currentindent = 0
levels = {0:0}

66
www/zope213/files/zeo210.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope213/files/zeo210.sh.in Normal file
View file

@ -0,0 +1,66 @@
#!/bin/sh
#
# Startup script for Zeo server.
#
# $FreeBSD$
#
# PROVIDE: zeo210
# REQUIRE: DAEMON
# BEFORE: zope210
# Define these zeo210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zeo210
#
# zeo210_enable : bool
# Enable Zeo ("YES") or not ("NO", the default).
#
# zeo210_instances : list
# List of dirs with Zeo's instances ("" by default).
#
. %%RC_SUBR%%
name="zeo210"
rcvar=`set_rcvar`
zeo210ctl () {
for instance in $zeo210_instances; do
if [ -d ${instance} ]; then
echo -n " Zeo instance ${instance} -> "
${instance}/bin/zeoctl "$1"
fi
done
}
zeo210_start () {
echo "Starting Zeo 2.10:"
zeo210ctl "start"
}
zeo210_stop () {
echo "Stopping Zeo 2.10:"
zeo210ctl "stop"
}
zeo210_restart () {
echo "Restarting Zeo 2.10:"
zeo210ctl "restart"
}
start_cmd="zeo210_start"
stop_cmd="zeo210_stop"
restart_cmd="zeo210_restart"
load_rc_config $name
: ${zeo210_enable="NO"}
: ${zeo210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zeo210_instances="$*"
run_rc_command "${cmd}"

66
www/zope213/files/zeo29.sh.in
View file

@ -1,66 +0,0 @@
#!/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}"

6
www/zope213/files/zeo_message.in
View file

@ -5,10 +5,10 @@ ZEO instance successfully installed
If Zope should get started automatically when the system starts,
please add the following lines to /etc/rc.conf
zeo29_enable="YES"
zeo29_instances="%%ZOPEINSTANCEDIR%%"
zeo210_enable="YES"
zeo210_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zeo29_instances entry please add
If there is already a zeo210_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting

65
www/zope213/files/zope210.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope213/files/zope210.sh.in Normal file
View file

@ -0,0 +1,65 @@
#!/bin/sh
#
# Startup script for Zope server.
#
# $FreeBSD$
#
# PROVIDE: zope210
# REQUIRE: DAEMON
# Define these zope210_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
# /etc/rc.conf.d/zope210
#
# zope210_enable : bool
# Enable Zope ("YES") or not ("NO", the default).
#
# zope210_instances : list
# List of dirs with Zope's instances ("" by default).
#
. %%RC_SUBR%%
name="zope210"
rcvar=`set_rcvar`
zope210ctl () {
for instance in $zope210_instances; do
if [ -d ${instance} ]; then
echo -n " Zope instance ${instance} -> "
${instance}/bin/zopectl "$1"
fi
done
}
zope210_start () {
echo "Starting Zope 2.10:"
zope210ctl "start"
}
zope210_stop () {
echo "Stopping Zope 2.10:"
zope210ctl "stop"
}
zope210_restart () {
echo "Restarting Zope 2.10:"
zope210ctl "restart"
}
start_cmd="zope210_start"
stop_cmd="zope210_stop"
restart_cmd="zope210_restart"
load_rc_config $name
: ${zope210_enable="NO"}
: ${zope210_instances=""}
cmd="$1"
[ $# -gt 0 ] && shift
[ -n "$*" ] && zope210_instances="$*"
run_rc_command "${cmd}"

65
www/zope213/files/zope29.sh.in
View file

@ -1,65 +0,0 @@
#!/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}"

2557
www/zope213/pkg-plist
View file

File diff suppressed because it is too large Load diff