From owner-svn-src-head@freebsd.org  Fri Apr 14 06:33:16 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E587D3D841;
 Fri, 14 Apr 2017 06:33:16 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 508C32E5;
 Fri, 14 Apr 2017 06:33:16 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3E6XFoZ072894;
 Fri, 14 Apr 2017 06:33:15 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3E6XFf3072893;
 Fri, 14 Apr 2017 06:33:15 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201704140633.v3E6XFf3072893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Fri, 14 Apr 2017 06:33:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316817 - head/etc/pam.d
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Apr 2017 06:33:16 -0000

Author: ngie
Date: Fri Apr 14 06:33:15 2017
New Revision: 316817
URL: https://svnweb.freebsd.org/changeset/base/316817

Log:
  Derive {AT,RCMDS}{DIR,MODE} from FILE{DIR,MODE}
  
  This reduces duplicity a bit.
  
  MFC after:	7 weeks
  Sponsored by:	Dell EMC Isilon

Modified:
  head/etc/pam.d/Makefile

Modified: head/etc/pam.d/Makefile
==============================================================================
--- head/etc/pam.d/Makefile	Fri Apr 14 05:32:03 2017	(r316816)
+++ head/etc/pam.d/Makefile	Fri Apr 14 06:33:15 2017	(r316817)
@@ -17,24 +17,25 @@ FILES=	README \
 	telnetd \
 	xdm
 
+FILESDIR=	/etc/pam.d
+FILESMODE=	644
+
 .if ${MK_AT} != "no"
 FILESGROUPS+=	AT
 AT+=	atrun
 ATPACKAGE+=	at
-ATDIR=	/etc/pam.d
-ATMODE=	644
+ATDIR=		${FILESDIR}
+ATMODE=		${FILESMODE}
 .endif
 
 .if ${MK_RCMDS} != "no"
 FILESGROUPS+=	RCMDS
 RCMDS+=		rsh
 RCMDSPACKAGE+=	rcmds
-RCMDSDIR=	/etc/pam.d
-RCMDSMODE=	644
+RCMDSDIR=	${FILESDIR}
+RCMDSMODE=	${FILESMODE}
 .endif
 
-FILESDIR=	/etc/pam.d
-FILESMODE=	644
 FILESMODE_README=	444
 LINKS=	${FILESDIR}/ftpd ${FILESDIR}/ftp