Attachment 53023 Details for Bug 80245 – zabbix-1.0_3.diff

[patch] zabbix-1.0_3.diff

zabbix-1.0_3.diff (text/plain), 4.04 KB, created by Robin Breathe on 2005-09-26 22:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Breathe

Created: 2005-09-26 22:39:29 UTC

Size: 4.04 KB

patch

obsolete

>diff -ruN zabbix-1.0_2/Makefile zabbix/Makefile
>--- zabbix-1.0_2/Makefile	Mon Jan 31 00:35:51 2005
>+++ zabbix/Makefile	Mon Sep 26 21:32:50 2005
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	zabbix
> PORTVERSION=	1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES?=	net-mgmt
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>@@ -74,11 +74,7 @@
> pre-patch:
> .if !defined(ZABBIX_AGENT_ONLY)
> 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/pkg-message > ${PKGMESSAGE}
>-	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix.sh.sample > \
>-		${WRKDIR}/zabbix.sh.sample
> .endif
>-	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \
>-		${WRKDIR}/zabbix-agent.sh.sample
> 
> .ifndef(ZABBIX_AGENT_ONLY)
> post-patch:
>@@ -113,10 +109,10 @@
> 	${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix
> 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \
> 			${PREFIX}/share/zabbix/create
>-	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \
>+	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix_suckerd.sh \
> 			${PREFIX}/etc/rc.d
> .endif
>-	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix-agent.sh.sample \
>+	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix_agentd.sh \
> 			${PREFIX}/etc/rc.d
> 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
> .ifndef(ZABBIX_AGENT_ONLY)
>diff -ruN zabbix-1.0_2/pkg-plist zabbix/pkg-plist
>--- zabbix-1.0_2/pkg-plist	Sat Feb 28 22:20:28 2004
>+++ zabbix/pkg-plist	Mon Sep 26 21:33:13 2005
>@@ -3,8 +3,8 @@
> etc/zabbix/zabbix_suckerd.conf.sample
> etc/zabbix/zabbix_trapper.conf.sample
> etc/zabbix/zabbix_trapperd.conf.sample
>-etc/rc.d/zabbix.sh.sample
>-etc/rc.d/zabbix-agent.sh.sample
>+etc/rc.d/zabbix_suckerd.sh
>+etc/rc.d/zabbix_agentd.sh
> bin/zabbix_agent
> bin/zabbix_agentd
> bin/zabbix_sender
>diff -ruN zabbix-1.0_2/scripts/zabbix-agent.sh.sample zabbix/scripts/zabbix-agent.sh.sample
>--- zabbix-1.0_2/scripts/zabbix-agent.sh.sample	Sat Oct 25 23:36:31 2003
>+++ zabbix/scripts/zabbix-agent.sh.sample	Thu Jan  1 00:00:00 1970
>@@ -1,14 +0,0 @@
>-#!/bin/sh
>-
>-prefix=%PREFIX%
>-
>-zabbix_agentd_enable="YES"
>-
>-. %LOCALBASE%/etc/rc.subr
>-
>-name="zabbix_agentd"
>-rcvar=`set_rcvar`
>-command="${prefix}/bin/${name}"
>-required_files="/etc/zabbix/${name}.conf"
>-
>-run_rc_command "$1"
>diff -ruN zabbix-1.0_2/scripts/zabbix.sh.sample zabbix/scripts/zabbix.sh.sample
>--- zabbix-1.0_2/scripts/zabbix.sh.sample	Sat Oct 25 23:36:31 2003
>+++ zabbix/scripts/zabbix.sh.sample	Thu Jan  1 00:00:00 1970
>@@ -1,14 +0,0 @@
>-#!/bin/sh
>-
>-prefix=%PREFIX%
>-
>-zabbix_suckerd_enable="YES"
>-
>-. %LOCALBASE%/etc/rc.subr
>-
>-name="zabbix_suckerd"
>-rcvar=`set_rcvar`
>-command="${prefix}/bin/${name}"
>-required_files="/etc/zabbix/${name}.conf"
>-
>-run_rc_command "$1"
>diff -ruN zabbix-1.0_2/scripts/zabbix_agentd.sh zabbix/scripts/zabbix_agentd.sh
>--- zabbix-1.0_2/scripts/zabbix_agentd.sh	Thu Jan  1 00:00:00 1970
>+++ zabbix/scripts/zabbix_agentd.sh	Mon Sep 26 21:35:48 2005
>@@ -0,0 +1,26 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: zabbix_agentd
>+# REQUIRE: LOGIN
>+# KEYWORD: FreeBSD shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable zabbix_agentd:
>+#
>+#zabbix_agentd_enable="YES"
>+#
>+zabbix_agentd_enable=${zabbix_agentd_enable-"NO"}
>+
>+. %%RC_SUBR%%
>+
>+name=zabbix_agentd
>+rcvar=`set_rcvar`
>+
>+command=%%PREFIX%%/sbin/${name}
>+required_files=%%PREFIX%%/etc/${name}.conf
>+
>+load_rc_config ${name}
>+run_rc_command "$1"
>diff -ruN zabbix-1.0_2/scripts/zabbix_suckerd.sh zabbix/scripts/zabbix_suckerd.sh
>--- zabbix-1.0_2/scripts/zabbix_suckerd.sh	Thu Jan  1 00:00:00 1970
>+++ zabbix/scripts/zabbix_suckerd.sh	Mon Sep 26 21:25:35 2005
>@@ -0,0 +1,26 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+# PROVIDE: zabbix_suckerd
>+# REQUIRE: LOGIN
>+# KEYWORD: FreeBSD shutdown
>+
>+#
>+# Add the following lines to /etc/rc.conf to enable zabbix_suckerd:
>+#
>+#zabbix_suckerd_enable="YES"
>+#
>+zabbix_suckerd_enable=${zabbix_suckerd_enable-"NO"}
>+
>+. %%RC_SUBR%%
>+
>+name=zabbix_suckerd
>+rcvar=`set_rcvar`
>+
>+command=%%PREFIX%%/sbin/${name}
>+required_files=%%PREFIX%%/etc/${name}.conf
>+
>+load_rc_config ${name}
>+run_rc_command "$1"

Actions: View | Diff

Attachments on bug 80245: 53023