Index: Makefile =================================================================== RCS file: /home/ncvs/ports/www/zope/Makefile,v retrieving revision 1.70 diff -u -r1.70 Makefile --- Makefile 17 Oct 2005 18:07:26 -0000 1.70 +++ Makefile 25 Dec 2005 21:24:15 -0000 @@ -7,6 +7,7 @@ PORTNAME= zope PORTVERSION= 2.7.8 +PORTREVISION= 1 CATEGORIES= www python zope MASTER_SITES= http://www.zope.org/Products/Zope/${PORTVERSION}/ DISTNAME= Zope-${PORTVERSION}-final Index: files/zeo.sh =================================================================== RCS file: /home/ncvs/ports/www/zope/files/zeo.sh,v retrieving revision 1.2 diff -u -r1.2 zeo.sh --- files/zeo.sh 18 Feb 2005 16:52:17 -0000 1.2 +++ files/zeo.sh 25 Dec 2005 21:33:43 -0000 @@ -25,29 +25,17 @@ name="zeo" rcvar=`set_rcvar` load_rc_config $name +extra_commands="status" 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 + for instance in $zeo_instances; do + required_files="${instance}/etc/${name}.conf ${instance}/bin/zeoctl" + zeo_command="${instance}/bin/zeoctl" + start_cmd="${zeo_command} start" + stop_cmd="${zeo_command} stop" + restart_cmd="${zeo_command} restart" + status_cmd="${zeo_command} status" + echo -n "Zeo instance ${instance} -> " + run_rc_command "$1" + done fi Index: files/zope.sh =================================================================== RCS file: /home/ncvs/ports/www/zope/files/zope.sh,v retrieving revision 1.5 diff -u -r1.5 zope.sh --- files/zope.sh 18 Feb 2005 16:52:17 -0000 1.5 +++ files/zope.sh 25 Dec 2005 21:22:24 -0000 @@ -25,29 +25,17 @@ name="zope" rcvar=`set_rcvar` load_rc_config $name +extra_commands="status" if checkyesno zope_enable; then - - case "$1" in - start) - echo "Starting Zope" - ;; - stop) - echo "Stopping Zope" - ;; - restart) - echo "Restarting Zope" - ;; - *) - echo "Unknown action \"$1\"" - ;; - esac - - for instance in $zope_instances - do - if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then - echo -n " Instance ${instance} -> " - ${instance}/bin/zopectl $1 - fi - done + for instance in $zope_instances; do + required_files="${instance}/etc/${name}.conf ${instance}/bin/zopectl" + zope_command="${instance}/bin/zopectl" + start_cmd="${zope_command} start" + stop_cmd="${zope_command} stop" + restart_cmd="${zope_command} restart" + status_cmd="${zope_command} status" + echo -n "Zope instance ${instance} -> " + run_rc_command "$1" + done fi