From owner-svn-src-stable-12@freebsd.org  Thu Oct 10 17:29:47 2019
Return-Path: <owner-svn-src-stable-12@freebsd.org>
Delivered-To: svn-src-stable-12@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 BCA76144855;
 Thu, 10 Oct 2019 17:29:47 +0000 (UTC) (envelope-from gjb@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)
 server-signature RSA-PSS (4096 bits)
 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 46pykz4Vh5z4MFV;
 Thu, 10 Oct 2019 17:29:47 +0000 (UTC) (envelope-from gjb@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 799DD549F;
 Thu, 10 Oct 2019 17:29:47 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9AHTlwN060224;
 Thu, 10 Oct 2019 17:29:47 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9AHTlnC060223;
 Thu, 10 Oct 2019 17:29:47 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201910101729.x9AHTlnC060223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 10 Oct 2019 17:29:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r353409 - stable/12/usr.sbin/pkg
X-SVN-Group: stable-12
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: stable/12/usr.sbin/pkg
X-SVN-Commit-Revision: 353409
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-12@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 12-stable src tree
 <svn-src-stable-12.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-12/>
List-Post: <mailto:svn-src-stable-12@freebsd.org>
List-Help: <mailto:svn-src-stable-12-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-12>, 
 <mailto:svn-src-stable-12-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2019 17:29:47 -0000

Author: gjb
Date: Thu Oct 10 17:29:47 2019
New Revision: 353409
URL: https://svnweb.freebsd.org/changeset/base/353409

Log:
  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.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  stable/12/usr.sbin/pkg/Makefile
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/pkg/Makefile
==============================================================================
--- stable/12/usr.sbin/pkg/Makefile	Thu Oct 10 16:29:13 2019	(r353408)
+++ stable/12/usr.sbin/pkg/Makefile	Thu Oct 10 17:29:47 2019	(r353409)
@@ -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}