From 83eb2c37009874672764765ec3bf3b59286c7391 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
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/dhcp6/files/dhcp6c.sh.in     | 2 +-
 net/dhcp6/files/dhcp6relay.sh.in | 2 +-
 net/dhcp6/files/dhcp6s.sh.in     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'net/dhcp6')

diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.sh.in
index e88e376dd79c..1054a0995bac 100644
--- a/net/dhcp6/files/dhcp6c.sh.in
+++ b/net/dhcp6/files/dhcp6c.sh.in
@@ -26,7 +26,7 @@
 . /etc/rc.subr
 
 name="dhcp6c"
-rcvar=${name}_enable
+rcvar=dhcp6c_enable
 
 command="%%PREFIX%%/sbin/${name}"
 start_precmd="${name}_precmd"
diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.sh.in
index 055fe6ebbe5d..849f825ba71d 100644
--- a/net/dhcp6/files/dhcp6relay.sh.in
+++ b/net/dhcp6/files/dhcp6relay.sh.in
@@ -23,7 +23,7 @@
 . /etc/rc.subr
 
 name="dhcp6relay"
-rcvar=${name}_enable
+rcvar=dhcp6relay_enable
 
 command=%%PREFIX%%/sbin/${name}
 start_precmd="${name}_precmd"
diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.sh.in
index e399657f16c6..f13c74b47ef0 100644
--- a/net/dhcp6/files/dhcp6s.sh.in
+++ b/net/dhcp6/files/dhcp6s.sh.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="dhcp6s"
-rcvar=${name}_enable
+rcvar=dhcp6s_enable
 
 command=%%PREFIX%%/sbin/${name}
 start_precmd="${name}_precmd"
-- 
cgit v1.2.3