svn commit: r353409 - stable/12/usr.sbin/pkg

[Glen Barber]

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}