Attachment 98030 Details for Bug 136855 – zope-2.7.9_3.patch

[patch] zope-2.7.9_3.patch

zope-2.7.9_3.patch (text/plain), 6.90 KB, created by Philip M. Gollucci on 2009-07-17 08:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip M. Gollucci

Created: 2009-07-17 08:20:06 UTC

Size: 6.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/zope/Makefile,v
>retrieving revision 1.78
>diff -u -u -r1.78 Makefile
>--- Makefile	22 Mar 2009 18:22:20 -0000	1.78
>+++ Makefile	17 Jul 2009 07:15:42 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	zope
> PORTVERSION=	2.7.9
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www python zope
> MASTER_SITES=	http://www.zope.org/Products/Zope/Zope-${PORTVERSION}/:src \
> 		http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/:hotfix
>@@ -19,7 +19,7 @@
> 
> WRKSRC=		${WRKDIR}/Zope-${PORTVERSION}-final
> USE_PYTHON=	2.4
>-USE_RC_SUBR=	yes
>+USE_RC_SUBR=	${PORTNAME}
> DIST_SUBDIR=	zope
> HOTFIX=		Hotfix_20070320
> 
>@@ -50,8 +50,6 @@
> MAKEFILE=	makefile
> 
> PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
>-RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
>-		RC_SUBR=${RC_SUBR}
> CONFIG_SUB=	ZOPEBASEDIR=${ZOPEBASEDIR} \
> 		ZOPE_USER=${ZOPE_USER} \
> 		ZOPEINSTANCEDIR=${ZOPEINSTANCEDIR}
>@@ -77,12 +75,6 @@
> 	@${MV} ${ZOPEBASEDIR}/skel/etc/zope.conf.in ${ZOPEBASEDIR}/skel/etc/zope.conf.sample.in
> 	@${SED} ${CONFIG_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} < ${FILESDIR}/pkg-message.in \
> 		> ${PKGMESSAGE}
>-	@${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}
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/www/zope/pkg-plist,v
>retrieving revision 1.45
>diff -u -u -r1.45 pkg-plist
>--- pkg-plist	22 Mar 2009 18:22:20 -0000	1.45
>+++ pkg-plist	17 Jul 2009 07:15:42 -0000
>@@ -1,5 +1,3 @@
>-etc/rc.d/zope.sh
>-etc/rc.d/zeo.sh
> %%ZOPEBASEDIR%%/Products/00readme-freebsd.txt
> %%ZOPEBASEDIR%%/bin/README.txt
> %%ZOPEBASEDIR%%/bin/analyze.py
>Index: files/zeo.in
>===================================================================
>RCS file: files/zeo.in
>diff -N files/zeo.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/zeo.in	17 Jul 2009 07:15:42 -0000
>@@ -0,0 +1,39 @@
>+#!/bin/sh
>+
>+# Start or stop zope
>+# $FreeBSD: ports/www/zope/files/zeo.sh,v 1.5 2009/07/15 16:56:10 dougb Exp $
>+
>+# PROVIDE: zeo
>+# REQUIRE: DAEMON
>+# BEFORE: zope
>+# KEYWORD: shutdown
>+
>+# 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
>+extra_commands="status"
>+
>+if checkyesno zeo_enable; then
>+    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/zeo.sh
>===================================================================
>RCS file: files/zeo.sh
>diff -N files/zeo.sh
>--- files/zeo.sh	15 Jul 2009 16:56:10 -0000	1.5
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,39 +0,0 @@
>-#!/bin/sh
>-
>-# Start or stop zope
>-# $FreeBSD: ports/www/zope/files/zeo.sh,v 1.5 2009/07/15 16:56:10 dougb Exp $
>-
>-# PROVIDE: zeo
>-# REQUIRE: DAEMON
>-# BEFORE: zope
>-# KEYWORD: shutdown
>-
>-# 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
>-extra_commands="status"
>-
>-if checkyesno zeo_enable; then
>-    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.in
>===================================================================
>RCS file: files/zope.in
>diff -N files/zope.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/zope.in	17 Jul 2009 07:15:42 -0000
>@@ -0,0 +1,39 @@
>+#!/bin/sh
>+
>+# Start or stop zope
>+# $FreeBSD: ports/www/zope/files/zope.sh,v 1.8 2009/07/15 16:56:10 dougb Exp $
>+
>+# PROVIDE: zope
>+# REQUIRE: DAEMON
>+# BEFORE: LOGIN
>+# KEYWORD: shutdown
>+
>+# 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
>+extra_commands="status"
>+
>+if checkyesno zope_enable; then
>+    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
>Index: files/zope.sh
>===================================================================
>RCS file: files/zope.sh
>diff -N files/zope.sh
>--- files/zope.sh	15 Jul 2009 16:56:10 -0000	1.8
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,39 +0,0 @@
>-#!/bin/sh
>-
>-# Start or stop zope
>-# $FreeBSD: ports/www/zope/files/zope.sh,v 1.8 2009/07/15 16:56:10 dougb Exp $
>-
>-# PROVIDE: zope
>-# REQUIRE: DAEMON
>-# BEFORE: LOGIN
>-# KEYWORD: shutdown
>-
>-# 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
>-extra_commands="status"
>-
>-if checkyesno zope_enable; then
>-    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

Actions: View | Diff

Attachments on bug 136855: 98030 | 98031