From owner-svn-src-all@FreeBSD.ORG  Fri Jul 22 21:41:09 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84AC51065676;
	Fri, 22 Jul 2011 21:41:09 +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 746308FC08;
	Fri, 22 Jul 2011 21:41:09 +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 p6MLf9Dd033472;
	Fri, 22 Jul 2011 21:41:09 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6MLf9Qr033470;
	Fri, 22 Jul 2011 21:41:09 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201107222141.p6MLf9Qr033470@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 22 Jul 2011 21:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224275 - stable/7/usr.sbin/named
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Jul 2011 21:41:09 -0000

Author: dougb
Date: Fri Jul 22 21:41:09 2011
New Revision: 224275
URL: http://svn.freebsd.org/changeset/base/224275

Log:
  MFC r224122:
  
  Fix the location of the default pid file in named.8

Modified:
  stable/7/usr.sbin/named/Makefile
Directory Properties:
  stable/7/usr.sbin/named/   (props changed)

Modified: stable/7/usr.sbin/named/Makefile
==============================================================================
--- stable/7/usr.sbin/named/Makefile	Fri Jul 22 21:40:55 2011	(r224274)
+++ stable/7/usr.sbin/named/Makefile	Fri Jul 22 21:41:09 2011	(r224275)
@@ -33,7 +33,8 @@ LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} $
 
 MAN=		named.8 lwresd.8 named.conf.5
 
-MANFILTER=	sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g"
+MANFILTER=	sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \
+		-e "s@/var\/run\/named\/named.pid@/var/run/named/pid@"
 
 LINKS=		${BINDIR}/named ${BINDIR}/lwresd