Upgrade to 2.7.1.

PR:		ports/68408
Submitted by:	HAYASHI Yasushi
Approved by:	maintainer.

3 files changed, 30 insertions, 17 deletions

diff --git a/www/zope28/files/patch-lib-python-zdaemon-zdctl.py b/www/zope28/files/patch-lib-python-zdaemon-zdctl.py
deleted file mode 100644
index 0bdc2395747..00000000000
--- a/www/zope28/files/patch-lib-python-zdaemon-zdctl.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/python/zdaemon/zdctl.py.orig	Fri Oct 24 23:32:59 2003
-+++ lib/python/zdaemon/zdctl.py	Fri Apr  2 01:55:59 2004
-@@ -208,9 +208,9 @@
-             args += self._get_override("-z", "directory")
-             args.extend(self.options.program)
-             if self.options.daemon:
--                flag = os.P_WAIT
--            else:
-                 flag = os.P_NOWAIT
-+            else:
-+                flag = os.P_WAIT
-             os.spawnvp(flag, args[0], args)
-         elif not self.zd_pid:
-             self.send_action("start")
diff --git a/www/zope28/files/pkg-message.in b/www/zope28/files/pkg-message.in
new file mode 100644
index 00000000000..3d35ab56b35
--- /dev/null
+++ b/www/zope28/files/pkg-message.in
@@ -0,0 +1,27 @@
+**********************************************************************
+
+Zope 2.7 Successfull installed.
+
+To create an instance of Zope please run 
+make instance
+
+You can set the following Variables in /etc/make.conf 
+
+ZOPEINSTANCEBASE	Directory where Zope instance should go
+			(default: %%ZOPEBASEDIR%%)
+ZOPEINSTANCENAME	Default name for a new Zope instance 
+			(default: none)
+
+If you want have multiple Zope you should run 
+make instance INSTANCENAME=<somename>
+
+**********************************************************************
+****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
+
+The default installation directory for Zope Products has changed from 
+%%ZOPEBASEDIR%%/lib/python/Products 
+to %%ZOPEBASEDIR%%/Products. 
+
+You might have to add the following lines to your zope.conf 
+products %%ZOPEBASEDIR%%/Products
+products $INSTANCE/Products
diff --git a/www/zope28/files/zope.sh b/www/zope28/files/zope.sh
index 5613b6431c7..d4f4e4cd681 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.2 2004-04-20 14:29:26 perky Exp $
+# $FreeBSD: /tmp/pcvs/ports/www/zope28/files/Attic/zope.sh,v 1.3 2004-07-02 20:41:00 thierry Exp $
 
 # PROVIDE: zope
 # REQUIRE: DAEMON
@@ -18,7 +18,7 @@ prefix=%%PREFIX%%
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 zope_enable=${zope_enable:-"NO"}        # Enable gkrellmd
-zope_instances=${zope_instances:-""}    # List of instancehome dirs 
+zope_instances=${zope_instances:-""}    # List of instancehome dirs
 
 . %%RC_SUBR%%
 
@@ -47,7 +47,7 @@ if checkyesno zope_enable; then
 	do
 		if [ -r ${instance}/etc/${name}.conf -a -x ${instance}/bin/zopectl ]; then
 			echo -n "       Instance ${instance} -> "
-			${instance}/bin/zopectl $1                           
+			${instance}/bin/zopectl $1
 		fi
 	done
 fi