5 files changed, 103 insertions, 71 deletions

diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index 54ddcb3076b0..0079e2d24f4c 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zope
-PORTVERSION=	2.8.4
+PORTVERSION=	2.8.5
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-final
diff --git a/www/zope29/distinfo b/www/zope29/distinfo
index 723fa1dd3354..891f8aaf651d 100644
--- a/www/zope29/distinfo
+++ b/www/zope29/distinfo
@@ -1,2 +1,3 @@
-MD5 (zope/Zope-2.8.4-final.tgz) = 08780f229397746527668cee1ddb6416
-SIZE (zope/Zope-2.8.4-final.tgz) = 5447275
+MD5 (zope/Zope-2.8.5-final.tgz) = ead959e36894c3c31367063bce018cfb
+SHA256 (zope/Zope-2.8.5-final.tgz) = 064fd23fb263acb54c13b4ee25d5d58a770f52df48efbbbbe3313b275959017e
+SIZE (zope/Zope-2.8.5-final.tgz) = 5377506
diff --git a/www/zope29/files/zeo28.sh.in b/www/zope29/files/zeo28.sh.in
index bc44e87b3e07..3d1e71a584b7 100644
--- a/www/zope29/files/zeo28.sh.in
+++ b/www/zope29/files/zeo28.sh.in
@@ -1,53 +1,66 @@
 #!/bin/sh
-
-# Start or stop zope
+#
+# Startup script for Zeo server.
+#
 # $FreeBSD$
+#
 
 # PROVIDE: zeo28
 # REQUIRE: DAEMON
 # BEFORE: zope28
-# KEYWORD: FreeBSD shutdown
-#
-prefix=%%PREFIX%%
 
-# Define these zope28_* variables in one of these files:
+# Define these zeo28_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/zeo28
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# zeo28_enable : bool
+#   Enable Zeo ("YES") or not ("NO", the default).
+#
+# zeo28_instances : list
+#   List of dirs with Zeo's instances ("" by default).
 #
-zeo28_enable=${zeo28_enable:-"NO"} # Enable zeo server
-zeo28_instances=${zeo28_instances:-""} # List of instancehome dirs
 
 . %%RC_SUBR%%
 
 name="zeo28"
 rcvar=`set_rcvar`
+
+zeo28ctl () {
+    for instance in $zeo28_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zeo instance ${instance} -> "
+	    ${instance}/bin/zeoctl "$1"
+	fi
+    done
+}
+
+zeo28_start () {
+    echo "Starting Zeo 2.8:"
+    zeo28ctl "start"
+}
+
+zeo28_stop () {
+    echo "Stopping Zeo 2.8:"
+    zeo28ctl "stop"
+}
+
+zeo28_restart () {
+    echo "Restarting Zeo 2.8:"
+    zeo28ctl "restart"
+}
+
+  start_cmd="zeo28_start"
+   stop_cmd="zeo28_stop"
+restart_cmd="zeo28_restart"
+
 load_rc_config $name
 
-if checkyesno zeo28_enable; then
-
-	case "$1" in
-		start)
-			echo "Starting Zeo 2.8"
-		;;
-		stop)
-			echo "Stopping Zeo 2.8"
-		;;
-		restart)
-			echo "Restarting Zeo 2.8"
-		;;
-		*)
-			echo "Unknown action \"$1\""
-		;;
-	esac
-
-	for instance in $zeo28_instances
-	do
-		if [ -r ${instance}/etc/zeo.conf -a -x ${instance}/bin/zeoctl ]; then
-			echo -n "       Instance ${instance} -> "
-			${instance}/bin/zeoctl $1
-		fi
-	done
-fi
+: ${zeo28_enable="NO"}
+: ${zeo28_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zeo28_instances="$*"
+
+run_rc_command "${cmd}"
diff --git a/www/zope29/files/zope28.sh.in b/www/zope29/files/zope28.sh.in
index 899982321f2b..e51d5fa39140 100644
--- a/www/zope29/files/zope28.sh.in
+++ b/www/zope29/files/zope28.sh.in
@@ -1,53 +1,65 @@
 #!/bin/sh
-
-# Start or stop zope
+#
+# Startup script for Zope server.
+#
 # $FreeBSD$
+#
 
 # PROVIDE: zope28
 # REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: FreeBSD shutdown
-#
-prefix=%%PREFIX%%
 
 # Define these zope28_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #       /etc/rc.conf.d/zope28
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# zope28_enable : bool
+#   Enable Zope ("YES") or not ("NO", the default).
+#
+# zope28_instances : list
+#   List of dirs with Zope's instances ("" by default).
 #
-zope28_enable=${zope28_enable:-"NO"} # Enable zope
-zope28_instances=${zope28_instances:-""} # List of instancehome dirs
 
 . %%RC_SUBR%%
 
 name="zope28"
 rcvar=`set_rcvar`
+
+zope28ctl () {
+    for instance in $zope28_instances; do
+	if [ -d ${instance} ]; then
+	    echo -n "  Zope instance ${instance} -> "
+	    ${instance}/bin/zopectl "$1"
+	fi
+    done
+}
+
+zope28_start () {
+    echo "Starting Zope 2.8:"
+    zope28ctl "start"
+}
+
+zope28_stop () {
+    echo "Stopping Zope 2.8:"
+    zope28ctl "stop"
+}
+
+zope28_restart () {
+    echo "Restarting Zope 2.8:"
+    zope28ctl "restart"
+}
+
+  start_cmd="zope28_start"
+   stop_cmd="zope28_stop"
+restart_cmd="zope28_restart"
+
 load_rc_config $name
 
-if checkyesno zope28_enable; then
-
-	case "$1" in
-		start)
-			echo "Starting Zope 2.8"
-		;;
-		stop)
-			echo "Stopping Zope 2.8"
-		;;
-		restart)
-			echo "Restarting Zope 2.8"
-		;;
-		*)
-			echo "Unknown action \"$1\""
-		;;
-	esac
-
-	for instance in $zope28_instances
-	do
-		if [ -r ${instance}/etc/zope.conf -a -x ${instance}/bin/zopectl ]; then
-			echo -n "       Instance ${instance} -> "
-			${instance}/bin/zopectl $1
-		fi
-	done
-fi
+: ${zope28_enable="NO"}
+: ${zope28_instances=""}
+
+cmd="$1"
+[ $# -gt 0 ] && shift
+[ -n  "$*" ] && zope28_instances="$*"
+
+run_rc_command "${cmd}"
diff --git a/www/zope29/pkg-plist b/www/zope29/pkg-plist
index 543c7abb86bd..1c3d861a23f7 100644
--- a/www/zope29/pkg-plist
+++ b/www/zope29/pkg-plist
@@ -107,6 +107,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/permissionEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/roleEdit.dtml
 %%ZOPEBASEDIR%%/lib/python/AccessControl/dtml/userFolderProps.dtml
+%%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/interfaces.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/README
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/securitySuite/ResultObject.pyc
@@ -152,6 +154,8 @@
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testPermissionRole.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurity.pyc
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurityManager.py
+%%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testSecurityManager.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testUserFolder.py
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testUserFolder.pyc
 %%ZOPEBASEDIR%%/lib/python/AccessControl/tests/testZopeGuards.py
@@ -2865,6 +2869,8 @@
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/maybe_lock.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/generate_conflicts.py
+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/generate_conflicts.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testBaseRequest.py
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testBaseRequest.pyc
 %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPRangeSupport.py