From owner-svn-src-all@freebsd.org Thu Aug 16 13:27:06 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A888105B9A6; Thu, 16 Aug 2018 13:27:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from mail.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B6B082294; Thu, 16 Aug 2018 13:27:06 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from dhcp-10-248-98-203.eduroam.wireless.private.cam.ac.uk (global-5-141.nat-2.net.cam.ac.uk [131.111.5.141]) by mail.baldwin.cx (Postfix) with ESMTPSA id C4D4410AFCD; Thu, 16 Aug 2018 09:27:04 -0400 (EDT) Subject: Re: svn commit: r337648 - in head: etc etc/defaults etc/periodic usr.sbin/periodic usr.sbin/periodic/etc usr.sbin/periodic/etc/daily usr.sbin/periodic/etc/monthly usr.sbin/periodic/etc/security usr.sbi... To: Brad Davis , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201808111711.w7BHB9bt042827@repo.freebsd.org> From: John Baldwin Message-ID: Date: Thu, 16 Aug 2018 14:27:03 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <201808111711.w7BHB9bt042827@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mail.baldwin.cx); Thu, 16 Aug 2018 09:27:05 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.99.2 at mail.baldwin.cx X-Virus-Status: Clean X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Aug 2018 13:27:06 -0000 On 8/11/18 6:11 PM, Brad Davis wrote: > Author: brd > Date: Sat Aug 11 17:11:08 2018 > New Revision: 337648 > URL: https://svnweb.freebsd.org/changeset/base/337648 > > Log: > Move all periodic related config and scripts to usr.sbin/periodic/ > > This makes pkgbase easier by tagging these as CONFS so they are properly > tagged as config files. > > Approved by: will (mentor) > Sponsored by: Essen Hackathon > Differential Revision: https://reviews.freebsd.org/D16553 After this, 'make distribution' no longer installs /etc/defaults/periodic.conf and etcupdate wants to remove it (due to FILES vs CONF). I think mergemaster won't notice. In my case the differing $FreeBSD$ made etcupdate just emit a warning saying a modified file couldn't be removed, but if someone wasn't using an svn client that expanded the tags it would be removed. -- John Baldwin