svn commit: r353411 - releng/12.1/usr.sbin/pkg

[Glen Barber]

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}