From owner-svn-src-head@FreeBSD.ORG  Sun Jan  8 20:25:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B40521065670;
	Sun,  8 Jan 2012 20:25:29 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F1138FC13;
	Sun,  8 Jan 2012 20:25:29 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q08KPT7l005969;
	Sun, 8 Jan 2012 20:25:29 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q08KPTd1005965;
	Sun, 8 Jan 2012 20:25:29 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201201082025.q08KPTd1005965@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 8 Jan 2012 20:25:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229822 - in head/etc: . rc.d
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jan 2012 20:25:29 -0000

Author: dougb
Date: Sun Jan  8 20:25:29 2012
New Revision: 229822
URL: http://svn.freebsd.org/changeset/base/229822

Log:
  There is no longer a need to abstract ${rcvar_manpage} as we are not
  attempting to maintain compatibility with NetBSD for some years now.

Modified:
  head/etc/rc.d/hostname
  head/etc/rc.subr

Modified: head/etc/rc.d/hostname
==============================================================================
--- head/etc/rc.d/hostname	Sun Jan  8 20:09:26 2012	(r229821)
+++ head/etc/rc.d/hostname	Sun Jan  8 20:25:29 2012	(r229822)
@@ -65,7 +65,7 @@ hostname_start()
 		# Null hostname is probably OK if DHCP is in use.
 		#
 		if [ -z "`list_net_interfaces dhcp`" ]; then
-			warn "\$hostname is not set -- see ${rcvar_manpage}."
+			warn "\$hostname is not set -- see rc.conf(5)."
 		fi
 		return
 	fi

Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr	Sun Jan  8 20:09:26 2012	(r229821)
+++ head/etc/rc.subr	Sun Jan  8 20:25:29 2012	(r229822)
@@ -32,7 +32,6 @@
 #	functions used by various rc scripts
 #
 
-: ${rcvar_manpage:='rc.conf(5)'}
 : ${RC_PID:=$$}; export RC_PID
 
 #
@@ -152,7 +151,7 @@ checkyesno()
 		return 1
 		;;
 	*)
-		warn "\$${1} is not set properly - see ${rcvar_manpage}."
+		warn "\$${1} is not set properly - see rc.conf(5)."
 		return 1
 		;;
 	esac