8 files changed, 68 insertions, 68 deletions

diff --git a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
index de948e1d265b..d4380353c01b 100644
--- a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
@@ -18,23 +18,23 @@ paranoia=%%PARANOIA%%				# compiled in paranoia?
 jail=%%JAIL%%				# compiled in jail?
 
 # override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags= # -q -early_chroot		# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-dhcpd_withumask=022			# file creation mask
+dhcpd_enable=${dhcpd_enable:-"NO"}
+dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot		# command option(s)
+dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
+dhcpd_ifaces=${dhcpd_ifaces:-}				# ethernet interface(s)
+dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
 
-dhcpd_chuser_enable=YES			# runs w/o privileges?
-dhcpd_withuser=${name}			# user name to run as
-dhcpd_withgroup=${name}			# group name to run as
+dhcpd_chuser_enable=${dhcpd_chuser_enable:-"YES"}	# runs w/o privileges?
+dhcpd_withuser=${dhcpd_withuser:-${name}}		# user name to run as
+dhcpd_withgroup=${dhcpd_withgroup:-${name}}		# group name to run as
 
-dhcpd_chroot_enable=NO			# runs chrooted?
-dhcpd_rootdir=/var/db/${name}		# directory to run in
+dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
+dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
 
 # untested
-dhcpd_jail_enable=NO			# runs imprisoned?
-dhcpd_hostname=				# jail hostname
-dhcpd_ipaddress=			# jail ip address
+dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
+dhcpd_hostname=${dhcpd_hostname:-}			# jail hostname
+dhcpd_ipaddress=${dhcpd_ipaddress:-}			# jail ip address
 
 safe_run ()	# rc command [args...]
 {
diff --git a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
index 4302d7360ff1..3c72b5520efe 100644
--- a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
@@ -12,10 +12,10 @@
 #
 
 # override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
+dhcrelay_enable=${dhcrelay_enable:-"NO"}
+dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
+dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
+dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {
diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
index de948e1d265b..d4380353c01b 100644
--- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
@@ -18,23 +18,23 @@ paranoia=%%PARANOIA%%				# compiled in paranoia?
 jail=%%JAIL%%				# compiled in jail?
 
 # override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags= # -q -early_chroot		# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-dhcpd_withumask=022			# file creation mask
+dhcpd_enable=${dhcpd_enable:-"NO"}
+dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot		# command option(s)
+dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
+dhcpd_ifaces=${dhcpd_ifaces:-}				# ethernet interface(s)
+dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
 
-dhcpd_chuser_enable=YES			# runs w/o privileges?
-dhcpd_withuser=${name}			# user name to run as
-dhcpd_withgroup=${name}			# group name to run as
+dhcpd_chuser_enable=${dhcpd_chuser_enable:-"YES"}	# runs w/o privileges?
+dhcpd_withuser=${dhcpd_withuser:-${name}}		# user name to run as
+dhcpd_withgroup=${dhcpd_withgroup:-${name}}		# group name to run as
 
-dhcpd_chroot_enable=NO			# runs chrooted?
-dhcpd_rootdir=/var/db/${name}		# directory to run in
+dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
+dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
 
 # untested
-dhcpd_jail_enable=NO			# runs imprisoned?
-dhcpd_hostname=				# jail hostname
-dhcpd_ipaddress=			# jail ip address
+dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
+dhcpd_hostname=${dhcpd_hostname:-}			# jail hostname
+dhcpd_ipaddress=${dhcpd_ipaddress:-}			# jail ip address
 
 safe_run ()	# rc command [args...]
 {
diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
index 4302d7360ff1..3c72b5520efe 100644
--- a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample
@@ -12,10 +12,10 @@
 #
 
 # override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
+dhcrelay_enable=${dhcrelay_enable:-"NO"}
+dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
+dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
+dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
index de948e1d265b..d4380353c01b 100644
--- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
@@ -18,23 +18,23 @@ paranoia=%%PARANOIA%%				# compiled in paranoia?
 jail=%%JAIL%%				# compiled in jail?
 
 # override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags= # -q -early_chroot		# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-dhcpd_withumask=022			# file creation mask
+dhcpd_enable=${dhcpd_enable:-"NO"}
+dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot		# command option(s)
+dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
+dhcpd_ifaces=${dhcpd_ifaces:-}				# ethernet interface(s)
+dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
 
-dhcpd_chuser_enable=YES			# runs w/o privileges?
-dhcpd_withuser=${name}			# user name to run as
-dhcpd_withgroup=${name}			# group name to run as
+dhcpd_chuser_enable=${dhcpd_chuser_enable:-"YES"}	# runs w/o privileges?
+dhcpd_withuser=${dhcpd_withuser:-${name}}		# user name to run as
+dhcpd_withgroup=${dhcpd_withgroup:-${name}}		# group name to run as
 
-dhcpd_chroot_enable=NO			# runs chrooted?
-dhcpd_rootdir=/var/db/${name}		# directory to run in
+dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
+dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
 
 # untested
-dhcpd_jail_enable=NO			# runs imprisoned?
-dhcpd_hostname=				# jail hostname
-dhcpd_ipaddress=			# jail ip address
+dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
+dhcpd_hostname=${dhcpd_hostname:-}			# jail hostname
+dhcpd_ipaddress=${dhcpd_ipaddress:-}			# jail ip address
 
 safe_run ()	# rc command [args...]
 {
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
index 4302d7360ff1..3c72b5520efe 100644
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
@@ -12,10 +12,10 @@
 #
 
 # override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
+dhcrelay_enable=${dhcrelay_enable:-"NO"}
+dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
+dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
+dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {
diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
index de948e1d265b..d4380353c01b 100644
--- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
@@ -18,23 +18,23 @@ paranoia=%%PARANOIA%%				# compiled in paranoia?
 jail=%%JAIL%%				# compiled in jail?
 
 # override these variables in /etc/rc.conf
-dhcpd_enable=NO
-dhcpd_flags= # -q -early_chroot		# command option(s)
-dhcpd_conf=%%PREFIX%%/etc/${name}.conf	# configuration file
-dhcpd_ifaces=				# ethernet interface(s)
-dhcpd_withumask=022			# file creation mask
+dhcpd_enable=${dhcpd_enable:-"NO"}
+dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot		# command option(s)
+dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
+dhcpd_ifaces=${dhcpd_ifaces:-}				# ethernet interface(s)
+dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
 
-dhcpd_chuser_enable=YES			# runs w/o privileges?
-dhcpd_withuser=${name}			# user name to run as
-dhcpd_withgroup=${name}			# group name to run as
+dhcpd_chuser_enable=${dhcpd_chuser_enable:-"YES"}	# runs w/o privileges?
+dhcpd_withuser=${dhcpd_withuser:-${name}}		# user name to run as
+dhcpd_withgroup=${dhcpd_withgroup:-${name}}		# group name to run as
 
-dhcpd_chroot_enable=NO			# runs chrooted?
-dhcpd_rootdir=/var/db/${name}		# directory to run in
+dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
+dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
 
 # untested
-dhcpd_jail_enable=NO			# runs imprisoned?
-dhcpd_hostname=				# jail hostname
-dhcpd_ipaddress=			# jail ip address
+dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
+dhcpd_hostname=${dhcpd_hostname:-}			# jail hostname
+dhcpd_ipaddress=${dhcpd_ipaddress:-}			# jail ip address
 
 safe_run ()	# rc command [args...]
 {
diff --git a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
index 4302d7360ff1..3c72b5520efe 100644
--- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
@@ -12,10 +12,10 @@
 #
 
 # override these variables in /etc/rc.conf
-dhcrelay_enable=NO
-dhcrelay_flags=				# command option(s)
-dhcrelay_servers=			# dhcrelay server(s)
-dhcrelay_ifaces=			# ethernet interface(s)
+dhcrelay_enable=${dhcrelay_enable:-"NO"}
+dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
+dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
+dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {