From fa2cb1e49df37a1b4fe5ae3e93e9fea38c6144d2 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 10 Oct 2019 18:27:05 +0000
Subject: [PATCH] MFS r353409:  MFC r353320:   Rework the logic for installing
 the pkg(8) configuration.

  'quarterly' package sets do not exist for head, so explicitly
  install the 'latest' configuration file there.  Otherwise,
  fall back to the original conditional evaluation to determine
  if the 'latest' or 'quarterly' configuration file should be
  installed.

Approved by:	re (kib)
Sponsored by:	Rubicon Communications, LLC (Netgate)
---
 usr.sbin/pkg/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 98b6cb8afdf..ebfb71c1699 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -1,14 +1,18 @@
 # $FreeBSD$
 
-.if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
-PKGCONFBRANCH?=	quarterly
-.else
 _BRANCH!=	${MAKE} -C ${SRCTOP}/release -V BRANCH
 BRANCH?=	${_BRANCH}
+.if ${BRANCH:MCURRENT} != ""
+PKGCONFBRANCH?=	latest
+.else
 . if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
 PKGCONFBRANCH?=	quarterly
 . else
+.  if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
+PKGCONFBRANCH?=	quarterly
+.  else
 PKGCONFBRANCH?=	latest
+.  endif
 . endif
 .endif
 CONFS=		FreeBSD.conf.${PKGCONFBRANCH}
-- 
2.45.0