aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/zope/Makefile11
-rw-r--r--www/zope/distinfo4
-rw-r--r--www/zope/files/instance_message3
-rw-r--r--www/zope/files/pkg-message.in7
-rw-r--r--www/zope/files/pkg-message.package.in18
-rw-r--r--www/zope/files/zeo.sh53
-rw-r--r--www/zope/files/zeo_message15
-rw-r--r--www/zope/files/zope.sh4
-rw-r--r--www/zope/pkg-plist12
-rw-r--r--www/zope210/Makefile11
-rw-r--r--www/zope210/distinfo4
-rw-r--r--www/zope210/files/instance_message3
-rw-r--r--www/zope210/files/pkg-message.in7
-rw-r--r--www/zope210/files/pkg-message.package.in18
-rw-r--r--www/zope210/files/zeo.sh53
-rw-r--r--www/zope210/files/zeo_message15
-rw-r--r--www/zope210/files/zope.sh4
-rw-r--r--www/zope210/pkg-plist12
-rw-r--r--www/zope211/Makefile11
-rw-r--r--www/zope211/distinfo4
-rw-r--r--www/zope211/files/instance_message3
-rw-r--r--www/zope211/files/pkg-message.in7
-rw-r--r--www/zope211/files/pkg-message.package.in18
-rw-r--r--www/zope211/files/zeo.sh53
-rw-r--r--www/zope211/files/zeo_message15
-rw-r--r--www/zope211/files/zope.sh4
-rw-r--r--www/zope211/pkg-plist12
-rw-r--r--www/zope213/Makefile11
-rw-r--r--www/zope213/distinfo4
-rw-r--r--www/zope213/files/instance_message3
-rw-r--r--www/zope213/files/pkg-message.in7
-rw-r--r--www/zope213/files/pkg-message.package.in18
-rw-r--r--www/zope213/files/zeo.sh53
-rw-r--r--www/zope213/files/zeo_message15
-rw-r--r--www/zope213/files/zope.sh4
-rw-r--r--www/zope213/pkg-plist12
-rw-r--r--www/zope28/Makefile11
-rw-r--r--www/zope28/distinfo4
-rw-r--r--www/zope28/files/instance_message3
-rw-r--r--www/zope28/files/pkg-message.in7
-rw-r--r--www/zope28/files/pkg-message.package.in18
-rw-r--r--www/zope28/files/zeo.sh53
-rw-r--r--www/zope28/files/zeo_message15
-rw-r--r--www/zope28/files/zope.sh4
-rw-r--r--www/zope28/pkg-plist12
-rw-r--r--www/zope29/Makefile11
-rw-r--r--www/zope29/distinfo4
-rw-r--r--www/zope29/files/instance_message3
-rw-r--r--www/zope29/files/pkg-message.in7
-rw-r--r--www/zope29/files/pkg-message.package.in18
-rw-r--r--www/zope29/files/zeo.sh53
-rw-r--r--www/zope29/files/zeo_message15
-rw-r--r--www/zope29/files/zope.sh4
-rw-r--r--www/zope29/pkg-plist12
54 files changed, 714 insertions, 48 deletions
diff --git a/www/zope/Makefile b/www/zope/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope/distinfo b/www/zope/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope/distinfo
+++ b/www/zope/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope/files/instance_message b/www/zope/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope/files/instance_message
+++ b/www/zope/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope/files/pkg-message.in b/www/zope/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope/files/pkg-message.in
+++ b/www/zope/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope/files/pkg-message.package.in b/www/zope/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope/files/pkg-message.package.in
+++ b/www/zope/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope/files/zeo.sh b/www/zope/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope/files/zeo_message b/www/zope/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope/files/zope.sh b/www/zope/files/zope.sh
index d60b3c172c8f..933132518bed 100644
--- a/www/zope/files/zope.sh
+++ b/www/zope/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope/pkg-plist b/www/zope/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope/pkg-plist
+++ b/www/zope/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope210/distinfo b/www/zope210/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope210/distinfo
+++ b/www/zope210/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope210/files/instance_message b/www/zope210/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope210/files/instance_message
+++ b/www/zope210/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope210/files/pkg-message.in b/www/zope210/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope210/files/pkg-message.in
+++ b/www/zope210/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope210/files/pkg-message.package.in b/www/zope210/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope210/files/pkg-message.package.in
+++ b/www/zope210/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope210/files/zeo.sh b/www/zope210/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope210/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope210/files/zeo_message b/www/zope210/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope210/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope210/files/zope.sh b/www/zope210/files/zope.sh
index f63e48793a73..4529b3aa2eee 100644
--- a/www/zope210/files/zope.sh
+++ b/www/zope210/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope210/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope210/pkg-plist b/www/zope210/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope210/pkg-plist
+++ b/www/zope210/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope211/distinfo b/www/zope211/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope211/distinfo
+++ b/www/zope211/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope211/files/instance_message b/www/zope211/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope211/files/instance_message
+++ b/www/zope211/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope211/files/pkg-message.in b/www/zope211/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope211/files/pkg-message.in
+++ b/www/zope211/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope211/files/pkg-message.package.in b/www/zope211/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope211/files/pkg-message.package.in
+++ b/www/zope211/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope211/files/zeo.sh b/www/zope211/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope211/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope211/files/zeo_message b/www/zope211/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope211/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope211/files/zope.sh b/www/zope211/files/zope.sh
index 55693a2b3f34..49f7d8d17d39 100644
--- a/www/zope211/files/zope.sh
+++ b/www/zope211/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope211/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope211/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope211/pkg-plist b/www/zope211/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope211/pkg-plist
+++ b/www/zope211/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope213/distinfo b/www/zope213/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope213/distinfo
+++ b/www/zope213/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope213/files/instance_message b/www/zope213/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope213/files/instance_message
+++ b/www/zope213/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope213/files/pkg-message.in b/www/zope213/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope213/files/pkg-message.in
+++ b/www/zope213/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope213/files/pkg-message.package.in b/www/zope213/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope213/files/pkg-message.package.in
+++ b/www/zope213/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope213/files/zeo.sh b/www/zope213/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope213/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope213/files/zeo_message b/www/zope213/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope213/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope213/files/zope.sh b/www/zope213/files/zope.sh
index 3ae2588b6fc2..dd8efe5baf02 100644
--- a/www/zope213/files/zope.sh
+++ b/www/zope213/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope213/pkg-plist b/www/zope213/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope213/pkg-plist
+++ b/www/zope213/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope28/distinfo b/www/zope28/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope28/distinfo
+++ b/www/zope28/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope28/files/instance_message b/www/zope28/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope28/files/instance_message
+++ b/www/zope28/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope28/files/pkg-message.in b/www/zope28/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope28/files/pkg-message.in
+++ b/www/zope28/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope28/files/pkg-message.package.in b/www/zope28/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope28/files/pkg-message.package.in
+++ b/www/zope28/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope28/files/zeo.sh b/www/zope28/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope28/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope28/files/zeo_message b/www/zope28/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope28/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope28/files/zope.sh b/www/zope28/files/zope.sh
index d4f4e4cd6815..a676eef3ec6e 100644
--- a/www/zope28/files/zope.sh
+++ b/www/zope28/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope28/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope28/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope28/pkg-plist b/www/zope28/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope28/pkg-plist
+++ b/www/zope28/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 3d316c47ff12..1c4a6cdc148d 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= zope
-PORTVERSION= 2.7.2
+PORTVERSION= 2.7.3
CATEGORIES= www python zope
MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/
DISTNAME= Zope-${PORTVERSION}-0
@@ -73,6 +73,9 @@ post-install:
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
+ @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+ ${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
+ @${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
@${MKDIR} ${ZOPEBASEDIR}/Products
@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
@${CAT} ${PKGMESSAGE}
@@ -88,6 +91,12 @@ instance:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
+zeo:
+ @${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
+ @${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
+ @${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
+
pre-package:
@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
> ${PKGMESSAGE}
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index b4cbd18aa6eb..bd9f37a99df1 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,2 +1,2 @@
-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
diff --git a/www/zope29/files/instance_message b/www/zope29/files/instance_message
index 2521235227d8..a6e9d214a56f 100644
--- a/www/zope29/files/instance_message
+++ b/www/zope29/files/instance_message
@@ -11,4 +11,5 @@ zope_instances="%%ZOPEINSTANCEDIR%%"
If there is already a zope_instances entry please add
%%ZOPEINSTANCEDIR%% separated by a space.
-
+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before
+starting the zope server
diff --git a/www/zope29/files/pkg-message.in b/www/zope29/files/pkg-message.in
index 30e5737acdee..15a2c892b6b9 100644
--- a/www/zope29/files/pkg-message.in
+++ b/www/zope29/files/pkg-message.in
@@ -18,6 +18,13 @@ make instance INSTANCENAME=<somename>
The Instancefiles created by make instance will not be remove when the
port is deinstalled. You'll have to delete them yourself.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+To create a ZEO instance please run
+make zeo [INSTANCENAME=<somename>]
+
+
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope29/files/pkg-message.package.in b/www/zope29/files/pkg-message.package.in
index 61059991c698..c12fa22a3981 100644
--- a/www/zope29/files/pkg-message.package.in
+++ b/www/zope29/files/pkg-message.package.in
@@ -20,9 +20,23 @@ please add the following lines to /etc/rc.conf
zope_enable="YES"
zope_instances="<INSTANCEDIR>"
-If there is already a zope_instances entry please add
-<INSTANCEDIR> separated by a space.
+Additional zope Instances have to be added to zope_instances
+seperated by a space.
+** ZEO Instances ** (Optional)
+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
+
+If you want to run a ZEO server please create a ZEO instancen by
+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
+
+To start the ZEO Server at System startup add the following lines to
+/etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="<ZEODIR>"
+
+Additional zeo Instances have to be added to zeo_instances seperated
+by a space.
**********************************************************************
****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
diff --git a/www/zope29/files/zeo.sh b/www/zope29/files/zeo.sh
new file mode 100644
index 000000000000..099f579fd9a2
--- /dev/null
+++ b/www/zope29/files/zeo.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo
+# REQUIRE: DAEMON
+# BEFORE: zope
+# KEYWORD: FreeBSD shutdown
+#
+prefix=%%PREFIX%%
+
+# Define these zope_* variables in one of these files:
+# /etc/rc.conf
+# /etc/rc.conf.local
+# /etc/rc.conf.d/zeo
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo_enable=${zeo_enable:-"NO"} # Enable gkrellmd
+zeo_instances=${zeo_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo"
+rcvar=`set_rcvar`
+load_rc_config $name
+
+if checkyesno zeo_enable; then
+
+ case "$1" in
+ start)
+ echo "Starting Zeo"
+ ;;
+ stop)
+ echo "Stopping Zeo"
+ ;;
+ restart)
+ echo "Restarting Zeo"
+ ;;
+ *)
+ echo "Unknown action \"$1\""
+ ;;
+ esac
+
+ for instance in $zeo_instances
+ do
+ if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zeoctl ]; then
+ echo -n " Instance ${instance} -> "
+ ${instance}/bin/zeoctl $1
+ fi
+ done
+fi
diff --git a/www/zope29/files/zeo_message b/www/zope29/files/zeo_message
new file mode 100644
index 000000000000..3d3fd82a201b
--- /dev/null
+++ b/www/zope29/files/zeo_message
@@ -0,0 +1,15 @@
+**********************************************************************
+
+ZEO instance successfully installed
+
+If Zope should get started automatically when the system starts,
+please add the following lines to /etc/rc.conf
+
+zeo_enable="YES"
+zeo_instances="%%ZOPEINSTANCEDIR%%"
+
+If there is already a zeo_instances entry please add
+%%ZOPEINSTANCEDIR%% separated by a space.
+
+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting
+the zeo server
diff --git a/www/zope29/files/zope.sh b/www/zope29/files/zope.sh
index 68dd8848a533..9d4c398f5a2f 100644
--- a/www/zope29/files/zope.sh
+++ b/www/zope29/files/zope.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope29/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope29/files/Attic/zope.sh,v 1.4 2004-11-16 00:02:25 pav Exp $
# PROVIDE: zope
# REQUIRE: DAEMON
@@ -13,7 +13,7 @@ prefix=%%PREFIX%%
# Define these zope_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/gkrellmd
+# /etc/rc.conf.d/zope
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index e3571af37007..0db239a34800 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -1,4 +1,5 @@
etc/rc.d/zope.sh
+etc/rc.d/zeo.sh
%%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
%%ZOPEBASEDIR%%/bin/README.txt
%%ZOPEBASEDIR%%/bin/check_catalog.py
@@ -1253,6 +1254,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
@@ -1270,6 +1273,10 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
%%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
%%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
@@ -2374,6 +2381,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
%%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
@@ -2642,6 +2651,8 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
@@ -2820,6 +2831,7 @@ etc/rc.d/zope.sh
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
%%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
+%%ZOPEBASEDIR%%/lib/python/version.txt
%%ZOPEBASEDIR%%/skel/Extensions/README.txt
%%ZOPEBASEDIR%%/skel/Products/README.txt
%%ZOPEBASEDIR%%/skel/README.txt