Attachment 48322 Details for Bug 73969 – file.diff

[patch] file.diff

file.diff (text/plain), 9.16 KB, created by Gerhard Schmidt on 2004-11-15 14:40:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerhard Schmidt

Created: 2004-11-15 14:40:20 UTC

Size: 9.16 KB

patch

obsolete

>diff -urN /usr/ports/www/zope/Makefile zope/Makefile
>--- /usr/ports/www/zope/Makefile	Sat Jul 24 13:06:23 2004
>+++ zope/Makefile	Mon Nov 15 15:03:20 2004
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	zope
>-PORTVERSION=	2.7.2
>+PORTVERSION=	2.7.3
> CATEGORIES=	www python zope
> MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
> DISTNAME=	Zope-${PORTVERSION}-0
>@@ -73,6 +73,9 @@
> 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
> 		${FILESDIR}/zope.sh > ${PREFIX}/etc/rc.d/zope.sh
> 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zope.sh
>+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>+		${FILESDIR}/zeo.sh > ${PREFIX}/etc/rc.d/zeo.sh
>+	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/zeo.sh
> 	@${MKDIR} ${ZOPEBASEDIR}/Products
> 	@${CP} ${FILESDIR}/Products_00readme-freebsd.txt ${ZOPEBASEDIR}/Products/00readme-freebsd.txt
> 	@${CAT} ${PKGMESSAGE}
>@@ -87,6 +90,12 @@
> 	@${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
> 	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/instance_message
> 	@${RM} -f ${ZOPEBASEDIR}/bin/copyzopeskel.pyc
>+
>+zeo:
>+	@${ZOPEBASEDIR}/bin/mkzeoinstance.py ${ZOPEINSTANCEDIR}
>+	@${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/var
>+	@${CHOWN} ${ZOPE_USER} ${ZOPEINSTANCEDIR}/log
>+	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/zeo_message
> 
> pre-package:
> 	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.package.in \
>diff -urN /usr/ports/www/zope/distinfo zope/distinfo
>--- /usr/ports/www/zope/distinfo	Sat Jul 24 13:06:23 2004
>+++ zope/distinfo	Mon Nov 15 13:50:37 2004
>@@ -1,2 +1,2 @@
>-MD5 (zope/Zope-2.7.2-0.tgz) = 08b3c4a119aa1ded2e7b1b3d5bc45425
>-SIZE (zope/Zope-2.7.2-0.tgz) = 2754459
>+MD5 (zope/Zope-2.7.3-0.tgz) = 15001ab6d429dc80b1f49735e8d2ee10
>+SIZE (zope/Zope-2.7.3-0.tgz) = 2778293
>diff -urN /usr/ports/www/zope/files/instance_message zope/files/instance_message
>--- /usr/ports/www/zope/files/instance_message	Tue Apr 20 16:18:32 2004
>+++ zope/files/instance_message	Mon Nov 15 15:04:06 2004
>@@ -11,4 +11,5 @@
> If there is already a zope_instances entry please add 
> %%ZOPEINSTANCEDIR%% separated by a space. 
> 
>-
>+Don`t forget to create %%ZOPEINSTANCEDIR%%/etc/zope.conf before 
>+starting the zope server
>diff -urN /usr/ports/www/zope/files/pkg-message.in zope/files/pkg-message.in
>--- /usr/ports/www/zope/files/pkg-message.in	Sat Jul 24 13:06:23 2004
>+++ zope/files/pkg-message.in	Mon Nov 15 14:54:02 2004
>@@ -18,6 +18,13 @@
> The Instancefiles created by make instance will not be remove when the
> port is deinstalled. You'll have to delete them yourself.
> 
>+** ZEO Instances ** (Optional) 
>+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet
>+
>+To create a ZEO instance please run 
>+make zeo [INSTANCENAME=<somename>]
>+
>+
> **********************************************************************
> ****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
> 
>diff -urN /usr/ports/www/zope/files/pkg-message.package.in zope/files/pkg-message.package.in
>--- /usr/ports/www/zope/files/pkg-message.package.in	Sat Jul 24 13:06:23 2004
>+++ zope/files/pkg-message.package.in	Mon Nov 15 14:54:32 2004
>@@ -20,9 +20,23 @@
> zope_enable="YES"
> zope_instances="<INSTANCEDIR>" 
> 
>-If there is already a zope_instances entry please add 
>-<INSTANCEDIR> separated by a space. 
>+Additional zope Instances have to be added to zope_instances 
>+seperated by a space. 
> 
>+** ZEO Instances ** (Optional) 
>+** Please refere to http://zope.org/Products/ZEO/ZEOFactSheet  
>+
>+If you want to run a ZEO server please create a ZEO instancen by 
>+calling %%ZOPEBASEDIR%%/bin/mkzopeinstance.py <ZEODIR>
>+
>+To start the ZEO Server at System startup add the following lines to 
>+/etc/rc.conf
>+
>+zeo_enable="YES"
>+zeo_instances="<ZEODIR>"
>+
>+Additional zeo Instances have to be added to zeo_instances seperated 
>+by a space. 
> 
> **********************************************************************
> ****** ATTENTION ***** ATTENTION ***** ATTENTION ***** ATTENTION *****
>diff -urN /usr/ports/www/zope/files/zeo.sh zope/files/zeo.sh
>--- /usr/ports/www/zope/files/zeo.sh	Thu Jan  1 01:00:00 1970
>+++ zope/files/zeo.sh	Mon Nov 15 15:29:44 2004
>@@ -0,0 +1,53 @@
>+#!/bin/sh
>+
>+# Start or stop zope
>+# $FreeBSD: ports/www/zope/files/zope.sh,v 1.3 2004/07/02 20:41:00 thierry 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 gkrellmd
>+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 -urN /usr/ports/www/zope/files/zeo_message zope/files/zeo_message
>--- /usr/ports/www/zope/files/zeo_message	Thu Jan  1 01:00:00 1970
>+++ zope/files/zeo_message	Mon Nov 15 15:02:40 2004
>@@ -0,0 +1,15 @@
>+**********************************************************************
>+
>+ZEO instance successfully installed 
>+
>+If Zope should get started automatically when the system starts, 
>+please add the following lines to /etc/rc.conf
>+
>+zeo_enable="YES"
>+zeo_instances="%%ZOPEINSTANCEDIR%%" 
>+
>+If there is already a zeo_instances entry please add 
>+%%ZOPEINSTANCEDIR%% separated by a space. 
>+
>+Don`t forget to edit %%ZOPEINSTANCEDIR%%/etc/zeo.conf before starting 
>+the zeo server
>diff -urN /usr/ports/www/zope/files/zope.sh zope/files/zope.sh
>--- /usr/ports/www/zope/files/zope.sh	Fri Jul  2 22:41:00 2004
>+++ zope/files/zope.sh	Mon Nov 15 15:30:07 2004
>@@ -13,7 +13,7 @@
> # Define these zope_* variables in one of these files:
> #       /etc/rc.conf
> #       /etc/rc.conf.local
>-#       /etc/rc.conf.d/gkrellmd
>+#       /etc/rc.conf.d/zope
> #
> # DO NOT CHANGE THESE DEFAULT VALUES HERE
> #
>diff -urN /usr/ports/www/zope/pkg-plist zope/pkg-plist
>--- /usr/ports/www/zope/pkg-plist	Sat Jul 24 13:06:23 2004
>+++ zope/pkg-plist	Mon Nov 15 15:18:11 2004
>@@ -1,4 +1,5 @@
> etc/rc.d/zope.sh
>+etc/rc.d/zeo.sh
> %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
> %%ZOPEBASEDIR%%/bin/README.txt
> %%ZOPEBASEDIR%%/bin/check_catalog.py
>@@ -1253,6 +1254,8 @@
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/TransienceInterfaces.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.py
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/TransientObject.pyc
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.py
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/TransactionHelper.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.py
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/__init__.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/dtml/addTransientObjectContainer.dtml
>@@ -1270,6 +1273,10 @@
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObject.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.py
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransientObjectContainer.pyc
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.py
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testCounters.pyc
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.py
>+%%ZOPEBASEDIR%%/lib/python/Products/Transience/tests/testTransactionHelper.pyc
> %%ZOPEBASEDIR%%/lib/python/Products/Transience/www/datacontainer.gif
> %%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.py
> %%ZOPEBASEDIR%%/lib/python/Products/ZCTextIndex/BaseIndex.pyc
>@@ -2374,6 +2381,8 @@
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testHTTPResponse.pyc
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.py
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testTaintedString.pyc
>+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.py
>+%%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/testPublish.pyc
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.py
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/tests/test_xmlrpc.pyc
> %%ZOPEBASEDIR%%/lib/python/ZPublisher/xmlrpc.py
>@@ -2642,6 +2651,8 @@
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/parts.pyc
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.py
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/references.pyc
>+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.py
>+%%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/directives/tables.pyc
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.py
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/__init__.pyc
> %%ZOPEBASEDIR%%/lib/python/docutils/parsers/rst/languages/af.py
>@@ -2820,6 +2831,7 @@
> %%ZOPEBASEDIR%%/lib/python/zdaemon/zdoptions.pyc
> %%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.py
> %%ZOPEBASEDIR%%/lib/python/zdaemon/zdrun.pyc
>+%%ZOPEBASEDIR%%/lib/python/version.txt
> %%ZOPEBASEDIR%%/skel/Extensions/README.txt
> %%ZOPEBASEDIR%%/skel/Products/README.txt
> %%ZOPEBASEDIR%%/skel/README.txt

Actions: View | Diff

Attachments on bug 73969: 48322