From 42cdd52718460a4172ee6e51c6686a0cdf094554 Mon Sep 17 00:00:00 2001
From: Devin Teske <dteske@FreeBSD.org>
Date: Sun, 14 Oct 2012 23:45:56 +0000
Subject: [PATCH] Mirror the changes made in SVN r240798:

Replace "( : ${var?} )" syntax with better "[ ${var+set} ]" syntax.

Reviewed by:	adrian (co-mentor)
Approved by:	adrian (co-mentor)
---
 usr.sbin/sysrc/sysrc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index 24a304db36e5..e1c15d63dbb6 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -251,7 +251,7 @@ shift $(( $OPTIND - 1 ))
 # Taint-check all rc.conf(5) files
 #
 errmsg="$pgm: Exiting due to previous syntax errors"
-if ( : ${RC_CONFS?} ) > /dev/null 2>&1; then
+if [ "${RC_CONFS+set}" ]; then
 	( for i in $RC_CONFS; do
 	  	[ -e "$i" ] || continue
 	  	/bin/sh -n "$i" || exit $FAILURE
@@ -311,7 +311,7 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then
 		$( [ "$SHOW_VALUE" ] || echo \ -N )
 		$( [ "$SHOW_FILE"  ] && echo \ -F )
 	"
-	if ( : ${RC_CONFS?} ) > /dev/null 2>&1; then
+	if [ "${RC_CONFS+set}" ]; then
 		args="$args -f '$RC_CONFS'"
 	fi
 	for arg in "$@"; do
@@ -437,8 +437,7 @@ if [ "$SHOW_ALL" ]; then
 			# explicit value, modifying the default behavior of
 			# source_rc_confs().
 			#
-			( : ${RC_CONFS?} ) > /dev/null 2>&1 &&
-				rc_conf_files="$RC_CONFS"
+			[ "${RC_CONFS+set}" ] && rc_conf_files="$RC_CONFS"
 
 			source_rc_confs