From owner-svn-src-all@freebsd.org  Mon Jun 29 18:06:01 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A6DD35007E;
 Mon, 29 Jun 2020 18:06:01 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 49wb5P13tZz48yR;
 Mon, 29 Jun 2020 18:06:01 +0000 (UTC)
 (envelope-from kevans@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07CBBB59E;
 Mon, 29 Jun 2020 18:06:01 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05TI60S2004536;
 Mon, 29 Jun 2020 18:06:00 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05TI60UM004535;
 Mon, 29 Jun 2020 18:06:00 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202006291806.05TI60UM004535@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Mon, 29 Jun 2020 18:06:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r362787 - head/usr.sbin/mailwrapper
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/usr.sbin/mailwrapper
X-SVN-Commit-Revision: 362787
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2020 18:06:01 -0000

Author: kevans
Date: Mon Jun 29 18:06:00 2020
New Revision: 362787
URL: https://svnweb.freebsd.org/changeset/base/362787

Log:
  mailwrapper: switch mailer.conf to CONFS
  
  This matches what was already being done in dma(8), and should again make
  this merge with etcupdate/mergemaster.
  
  Reported by:	jhb

Modified:
  head/usr.sbin/mailwrapper/Makefile

Modified: head/usr.sbin/mailwrapper/Makefile
==============================================================================
--- head/usr.sbin/mailwrapper/Makefile	Mon Jun 29 17:47:00 2020	(r362786)
+++ head/usr.sbin/mailwrapper/Makefile	Mon Jun 29 18:06:00 2020	(r362787)
@@ -31,9 +31,9 @@ SYMLINKS+=	..${BINDIR}/mailwrapper /bin/rmail
 # dma(8) are installed and simply provide a default that can be changed for an
 # alternative in ports.
 .if ${MK_SENDMAIL} != "no" || ${MK_DMAGENT} == "no"
-FILES=		${SRCTOP}/etc/mail/mailer.conf
-FILESDIR=	/etc/mail
-FILESMODE=	644
+CONFS=		${SRCTOP}/etc/mail/mailer.conf
+CONFSDIR=	/etc/mail
+CONFSMODE=	644
 .endif
 .endif