From owner-freebsd-pkgbase@freebsd.org  Tue Apr 26 17:44:13 2016
Return-Path: <owner-freebsd-pkgbase@freebsd.org>
Delivered-To: freebsd-pkgbase@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 AFA12B1D72D
 for <freebsd-pkgbase@mailman.ysv.freebsd.org>;
 Tue, 26 Apr 2016 17:44:13 +0000 (UTC)
 (envelope-from wollman@khavrinen.csail.mit.edu)
Received: from khavrinen.csail.mit.edu (khavrinen.csail.mit.edu
 [IPv6:2001:470:8b2d:1e1c:21b:21ff:feb8:d7b0])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client CN "khavrinen.csail.mit.edu", Issuer "Client CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 076ED1D32
 for <freebsd-pkgbase@freebsd.org>; Tue, 26 Apr 2016 17:44:12 +0000 (UTC)
 (envelope-from wollman@khavrinen.csail.mit.edu)
Received: from khavrinen.csail.mit.edu (localhost [127.0.0.1])
 by khavrinen.csail.mit.edu (8.14.9/8.14.9) with ESMTP id u3QHiBbm038287
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256
 verify=FAIL CN=khavrinen.csail.mit.edu issuer=Client+20CA);
 Tue, 26 Apr 2016 13:44:11 -0400 (EDT)
 (envelope-from wollman@khavrinen.csail.mit.edu)
Received: (from wollman@localhost)
 by khavrinen.csail.mit.edu (8.14.9/8.14.9/Submit) id u3QHiB8w038286;
 Tue, 26 Apr 2016 13:44:11 -0400 (EDT) (envelope-from wollman)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <22303.43243.357400.240656@khavrinen.csail.mit.edu>
Date: Tue, 26 Apr 2016 13:44:11 -0400
From: Garrett Wollman <wollman@csail.mit.edu>
To: Ben Woods <woodsb02@gmail.com>
Cc: freebsd-pkgbase@freebsd.org
Subject: Re: /etc/pkg/FreeBSD.conf being overwritten during pkg upgrade
In-Reply-To: <CAOc73CAKbUTG=P-S2gFkmt5dWrjxRS7pzmXzoxVAvttBsdMDew@mail.gmail.com>
References: <CAOc73CAKbUTG=P-S2gFkmt5dWrjxRS7pzmXzoxVAvttBsdMDew@mail.gmail.com>
X-Mailer: VM 8.2.0b under 24.5.1 (amd64-portbld-freebsd9.3)
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3
 (khavrinen.csail.mit.edu [127.0.0.1]); Tue, 26 Apr 2016 13:44:11 -0400 (EDT)
X-BeenThere: freebsd-pkgbase@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "Packaging the FreeBSD base system." <freebsd-pkgbase.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-pkgbase>, 
 <mailto:freebsd-pkgbase-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-pkgbase/>
List-Post: <mailto:freebsd-pkgbase@freebsd.org>
List-Help: <mailto:freebsd-pkgbase-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase>, 
 <mailto:freebsd-pkgbase-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2016 17:44:13 -0000

<<On Tue, 26 Apr 2016 19:12:42 +0200, Ben Woods <woodsb02@gmail.com> said:

> One minor problem I have noticed is that each time I do a "pkg upgrade -r
> FreeBSD-base" it is overwriting /etc/pkg/FreeBSD.conf which I have edited
> to disable the default repository. My expectation is that configuration
> files should have a 3 way merge to maintain my local edits, rather than
> overwriting them.

Ben, I believe the official supported way to do this is to put your
changes into /usr/local/etc/pkg/repos/FreeBSD.conf instead -- whatever
is in there will override the files in /etc.

-GAWollman