From 0b18e008ccf74ee87d38ca16c9c4d9bb0b174bec Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 24 Apr 2019 06:25:21 +0000
Subject: [PATCH] Keep two versions of the FreeBSD.conf pkg configuration file;
 one which points at the "latest" branch and one which points at the
 "quarterly" branch.  Install the "latest" version unless overridden via the
 newly added PKGCONFBRANCH variable.

This does not change user-visible behaviour (assuming said vairable is
not set) but will make it easier to change the defaults in the future --
on stable branches we will want "latest" on x86 but "quarterly" elsewhere.

Discussed with:	gjb
MFC after:	3 days
X-MFC:		After MFCing this I'll make a direct commit to stable/* to
		switch non-x86 architectures to "quarterly".
---
 .../pkg/{FreeBSD.conf => FreeBSD.conf.latest}    |  0
 usr.sbin/pkg/FreeBSD.conf.quarterly              | 16 ++++++++++++++++
 usr.sbin/pkg/Makefile                            |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 rename usr.sbin/pkg/{FreeBSD.conf => FreeBSD.conf.latest} (100%)
 create mode 100644 usr.sbin/pkg/FreeBSD.conf.quarterly

diff --git a/usr.sbin/pkg/FreeBSD.conf b/usr.sbin/pkg/FreeBSD.conf.latest
similarity index 100%
rename from usr.sbin/pkg/FreeBSD.conf
rename to usr.sbin/pkg/FreeBSD.conf.latest
diff --git a/usr.sbin/pkg/FreeBSD.conf.quarterly b/usr.sbin/pkg/FreeBSD.conf.quarterly
new file mode 100644
index 00000000000..68e1d32ac68
--- /dev/null
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+#   mkdir -p /usr/local/etc/pkg/repos
+#   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 6ca341f0ad4..2d5f9c9fbb8 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -1,6 +1,8 @@
 # $FreeBSD$
 
-CONFS=	FreeBSD.conf
+PKGCONFBRANCH?=	latest
+CONFS=		FreeBSD.conf.${PKGCONFBRANCH}
+CONFSNAME=	FreeBSD.conf
 CONFSDIR=	/etc/pkg
 CONFSMODE=	644
 PROG=	pkg