Change installation prefix and names of startup scripts for easy migration.

Permit running www/zope and www/zope28 at the same time on the same host.
Use static pkg-plist instead dynamic one.

PR:		86397
Submitted by:	Denis Shaposhnikov (maintainer)

5 files changed, 116 insertions, 106 deletions

diff --git a/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py b/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
new file mode 100644
index 000000000000..ab23edef96c5
--- /dev/null
+++ b/www/zope213/files/patch-lib-python-products-siteaccess-tests-testvirtualhostmonster.py
@@ -0,0 +1,10 @@
+--- lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py.orig	Thu Aug 11 09:11:19 2005
++++ lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py	Wed Sep  7 12:19:37 2005
+@@ -12,6 +12,7 @@
+ 
+ from Testing.makerequest import makerequest
+ 
++from __future__ import generators
+ import Zope2
+ Zope2.startup()
+ 
diff --git a/www/zope213/files/zeo.sh.in b/www/zope213/files/zeo.sh.in
deleted file mode 100644
index e067cc43f120..000000000000
--- a/www/zope213/files/zeo.sh.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zeo.sh.in,v 1.1 2005-09-18 21:33:04 vsevolod Exp $
-
-# 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 zeo server
-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/zeo28.sh.in b/www/zope213/files/zeo28.sh.in
new file mode 100644
index 000000000000..bc44e87b3e07
--- /dev/null
+++ b/www/zope213/files/zeo28.sh.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $FreeBSD$
+
+# PROVIDE: zeo28
+# REQUIRE: DAEMON
+# BEFORE: zope28
+# 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/zeo28
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+zeo28_enable=${zeo28_enable:-"NO"} # Enable zeo server
+zeo28_instances=${zeo28_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zeo28"
+rcvar=`set_rcvar`
+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
diff --git a/www/zope213/files/zope.sh.in b/www/zope213/files/zope.sh.in
deleted file mode 100644
index 769e450a91d3..000000000000
--- a/www/zope213/files/zope.sh.in
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# Start or stop zope
-# $FreeBSD: /tmp/pcvs/ports/www/zope213/files/Attic/zope.sh.in,v 1.7 2005-09-18 21:33:04 vsevolod Exp $
-
-# PROVIDE: zope
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# 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/zope
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-zope_enable=${zope_enable:-"NO"}        # Enable zope
-zope_instances=${zope_instances:-""}    # List of instancehome dirs
-
-. %%RC_SUBR%%
-
-name="zope"
-rcvar=`set_rcvar`
-load_rc_config $name
-
-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
-fi
diff --git a/www/zope213/files/zope28.sh.in b/www/zope213/files/zope28.sh.in
new file mode 100644
index 000000000000..899982321f2b
--- /dev/null
+++ b/www/zope213/files/zope28.sh.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Start or stop zope
+# $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=${zope28_enable:-"NO"} # Enable zope
+zope28_instances=${zope28_instances:-""} # List of instancehome dirs
+
+. %%RC_SUBR%%
+
+name="zope28"
+rcvar=`set_rcvar`
+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