6 files changed, 30 insertions, 125 deletions

diff --git a/www/zope28/files/CREDITS b/www/zope28/files/CREDITS
deleted file mode 100644
index c84974c8005c..000000000000
--- a/www/zope28/files/CREDITS
+++ /dev/null
@@ -1,6 +0,0 @@
-Special thanks to (in no particular order):
-
-- The Zope makers: Digital Creations.
-- The Python Group
-- Olaf Erb
-- Andreas Ley
diff --git a/www/zope28/files/Message b/www/zope28/files/Message
deleted file mode 100644
index 54fc163809f9..000000000000
--- a/www/zope28/files/Message
+++ /dev/null
@@ -1,57 +0,0 @@
-
-Welcome to Zope.
-
-The basic installation process for FreeBSD now has been done. To have a
-quick look, cd to your Zope base directory (see below) and start Zope
-with:
-
-./start -w <web port> -f <ftp port>
-
-where <web port> is the port where to http-access Zope with your browser
-(try http://localhost:<web port>). It defaults to 80. <ftp-port> is the
-same thing for ftp (upload) access, it defaults to 21. Obviously, you will
-have to specify these if you already use these ports. The user/password
-pair for access to the management screens has been preset to
-zopemaster/test, respectively. 
-
-PLEASE NOTE that the above only is for a quick check only, BUT IT WILL
-LEAVE YOUR ZOPE PROCESS WIDE OPEN TO HACKING SINCE THERE'S NO SECURITY
-WHATSOEVER. Therefore, PLEASE do incorporate the suggested changes (see
-below) to your apache-SSL web server and only start Zope WITHOUT ANY open
-<web port> or <ftp port>. This can be done, also from the Zope base dir,
-by:
-
-./start -w '' -f '' -m '' -p <path to Zope.cgi>/Zope.cgi
-
-where <path to Zope.cgi> is the (full) path to where Zope.cgi lives (see
-below). There now also should be a file in ${PREFIX}/etc/rc.d/ (most
-probably /usr/local/etc/rc.d/) named zope.sh that does the startup for you
-after a reboot.
-
-Also, it might be a good idea now to change the password. You can do that
-with (again, in the Zope base directory):
-
-python zpasswd.py -u <username> -p <passwd> -e CLEARTEXT access
-
-The -e CLEARTEXT presently is *mandatory*, otherwise authentication
-through apache will not work.
-
-You will probably already have gone through Apache's ssl certificate
-generation process. If not, please do so now, if you don't already have a
-certificate. If only a few well known people will have access to your
-management screens, a self-signed one probably will suffice. Please refer
-to the Apache and the Apache-SSL documentation for further information. 
-Use a sufficiently "long" key. Don't forget the https://... when trying to
-access the management pages.
-
-Apache will communicate with Zope through the so-called persistent cgi
-interface (aka pcgi). There's links to more information on the Zope web
-site at http://www.zope.org. Also, this is the best (and only) source of
-help end information on Zope itself.
-
-Zope is Copyrighted (C) by Digital Creations. All rights reserved.
-Please thouroughly read the license (see below) before employing Zope.
-
-Good business,				Peter Cornelius. <pcc@gmx.net>
-
-Please remember these files and directories:
diff --git a/www/zope28/files/apache.conf.Zope-Changes b/www/zope28/files/apache.conf.Zope-Changes
deleted file mode 100644
index bd9e6799c08a..000000000000
--- a/www/zope28/files/apache.conf.Zope-Changes
+++ /dev/null
@@ -1,54 +0,0 @@
-# *** *** ***
-# -------------------
-# Zope Configuration.
-# -------------------
-#
-# IMPORTANT: In order for SSL access to work, copy the part between the
-# lines with the nine asterisks * to your SSL virtual host section, too!
-#
-# This rule adds the trailing slash if omitted. So, we will have it for
-# all subsequent rules
-RewriteEngine on
-RewriteRule ^/Zope$ /Zope/ [R]
-#
-# Zope requires the authentication headers to be passed to it if it is
-# called through the cgi of another web server (like apache). An "easy"
-# way to do so is to do a little mod_rewrite'ing. See doc/WEBSERVER.txt in
-# your Zope base directory for further information.
-#
-# Uncomment the first RewriteRule if you move Zope.cgi into
-# /usr/local/www/cgi-bin
-#
-# This maps maps /Zope/ to the Zope.cgi CGI script.
-RewriteCond %{HTTP:Authorization} ^(.*)
-#RewriteRule ^/Zope/(.*) /usr/local/www/cgi-bin/Zope.cgi/$1 [env=HTTP_CGI_AUTHORIZATION:%1,t=application/x-httpd-cgi,l]
-RewriteRule ^/Zope/(.*) /usr/local/www/cgi-bin.default/Zope.cgi/$1 [env=HTTP_CGI_AUTHORIZATION:%1,t=application/x-httpd-cgi,l]
-#
-
-# *** *** ***
-#
-# This lets the Zope cgi script run:
-#
-
-<Directory /usr/local/www/cgi-bin.default>
-	Options +ExecCGI
-</Directory>
-
-
-# *** *** ***
-#
-# To require SSL to access the Zope management screens, uncomment the
-# next section:
-#
-#<IfDefine SSL>
-#<LocationMatch "/Zope/(.*)manage(.*)">
-# SSLRequireSSL
-#</LocationMatch>
-#
-#<LocationMatch "/cgi-bin/Zope.cgi(.*)manage(.*)">
-# SSLRequireSSL
-#</LocationMatch>
-#</IfDefine>
-#
-# End of Zope configuration section.
-
diff --git a/www/zope28/files/patch-lib-python-zdaemon-zdctl.py b/www/zope28/files/patch-lib-python-zdaemon-zdctl.py
new file mode 100644
index 000000000000..0bdc23957476
--- /dev/null
+++ b/www/zope28/files/patch-lib-python-zdaemon-zdctl.py
@@ -0,0 +1,14 @@
+--- 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/zope.conf_changes b/www/zope28/files/zope.conf_changes
new file mode 100644
index 000000000000..a7f67e1c18aa
--- /dev/null
+++ b/www/zope28/files/zope.conf_changes
@@ -0,0 +1,10 @@
+--- zope.conf.sample.orig	Mon Nov  3 11:04:10 2003
++++ zope.conf.sample	Mon Nov  3 11:04:50 2003
+@@ -137,6 +137,7 @@
+ # Example:
+ #
+ #    effective-user chrism
++effective-user @@@ZOPE_USER@@@
+ 
+ 
+ # Directive: enable-product-installation
diff --git a/www/zope28/files/zope.sh.in b/www/zope28/files/zope.sh.in
index 616a53f07eec..727778464e0e 100644
--- a/www/zope28/files/zope.sh.in
+++ b/www/zope28/files/zope.sh.in
@@ -3,17 +3,15 @@
 case "$1" in
 start)
 	umask 077
-	nohup %%ZOPEBASEDIR%%/start \
-	       -w %%ZOPE_HTTP_PORT%% \
-	       -f %%ZOPE_FTP_PORT%% \
-	       -m %%ZOPE_MONITOR_PORT%% \
-	       -u %%ZOPE_USER%% \
-	       -p %%CGIBINDIR%%/Zope.cgi \
-	    >> %%ZOPEBASEDIR%%/var/zope-output 2>&1 &
+	%%ZOPEBASEDIR%%/bin/zopectl --daemon start > /dev/null 2>&1
 	echo -n " Zope"
 	;;
 stop)
-	%%ZOPEBASEDIR%%/stop
+	%%ZOPEBASEDIR%%/bin/zopectl stop > /dev/null 2>&1
+	echo -n " Zope"
+	;;
+restart)
+	%%ZOPEBASEDIR%%/bin/zopectl restart > /dev/null 2>&1
 	echo -n " Zope"
 	;;
 *)