From owner-svn-src-all@freebsd.org  Thu Oct 10 18:27:05 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CBF6C145D55;
 Thu, 10 Oct 2019 18:27:05 +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 46q01550p8z4Q6d;
 Thu, 10 Oct 2019 18:27:05 +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 8A7965F79;
 Thu, 10 Oct 2019 18:27:05 +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 x9AIR5W8095707;
 Thu, 10 Oct 2019 18:27:05 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9AIR5ia095706;
 Thu, 10 Oct 2019 18:27:05 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201910101827.x9AIR5ia095706@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 18:27:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-releng@freebsd.org
Subject: svn commit: r353411 - releng/12.1/usr.sbin/pkg
X-SVN-Group: releng
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: releng/12.1/usr.sbin/pkg
X-SVN-Commit-Revision: 353411
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2019 18:27:05 -0000

Author: gjb
Date: Thu Oct 10 18:27:05 2019
New Revision: 353411
URL: https://svnweb.freebsd.org/changeset/base/353411

Log:
  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)

Modified:
  releng/12.1/usr.sbin/pkg/Makefile
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/usr.sbin/pkg/Makefile
==============================================================================
--- releng/12.1/usr.sbin/pkg/Makefile	Thu Oct 10 18:19:22 2019	(r353410)
+++ releng/12.1/usr.sbin/pkg/Makefile	Thu Oct 10 18:27:05 2019	(r353411)
@@ -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}