From 83eb2c37009874672764765ec3bf3b59286c7391 Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sat, 14 Jan 2012 08:57:23 +0000 Subject: In the rc.d scripts, change assignments to rcvar to use the literal name_enable wherever possible, and ${name}_enable when it's not, to prepare for the demise of set_rcvar(). In cases where I had to hand-edit unusual instances also modify formatting slightly to be more uniform (and in some cases, correct). This includes adding some $FreeBSD$ tags, and most importantly moving rcvar= to right after name= so it's clear that one is derived from the other. --- net-mgmt/zabbix2-server/files/zabbix_agentd.in | 2 +- net-mgmt/zabbix2-server/files/zabbix_proxy.in | 2 +- net-mgmt/zabbix2-server/files/zabbix_server.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'net-mgmt/zabbix2-server') diff --git a/net-mgmt/zabbix2-server/files/zabbix_agentd.in b/net-mgmt/zabbix2-server/files/zabbix_agentd.in index eacfffddb0c7..4af7fa72f13f 100644 --- a/net-mgmt/zabbix2-server/files/zabbix_agentd.in +++ b/net-mgmt/zabbix2-server/files/zabbix_agentd.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="zabbix_agentd" -rcvar=${name}_enable +rcvar=zabbix_agentd_enable command="%%PREFIX%%/sbin/${name}" required_files="%%ETCDIR%%/${name}.conf" diff --git a/net-mgmt/zabbix2-server/files/zabbix_proxy.in b/net-mgmt/zabbix2-server/files/zabbix_proxy.in index c997126b98a9..58898c6ecd3a 100644 --- a/net-mgmt/zabbix2-server/files/zabbix_proxy.in +++ b/net-mgmt/zabbix2-server/files/zabbix_proxy.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="zabbix_proxy" -rcvar=${name}_enable +rcvar=zabbix_proxy_enable command="%%PREFIX%%/sbin/${name}" required_files="%%ETCDIR%%/${name}.conf" diff --git a/net-mgmt/zabbix2-server/files/zabbix_server.in b/net-mgmt/zabbix2-server/files/zabbix_server.in index 4f4bb8d2c0c4..4e381a6ff894 100644 --- a/net-mgmt/zabbix2-server/files/zabbix_server.in +++ b/net-mgmt/zabbix2-server/files/zabbix_server.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="zabbix_server" -rcvar=${name}_enable +rcvar=zabbix_server_enable command="%%PREFIX%%/sbin/${name}" required_files="%%ETCDIR%%/${name}.conf" -- cgit v1.2.3