svn commit: r353320 - head/usr.sbin/pkg

[Glen Barber]

Author: gjb
Date: Tue Oct  8 18:58:23 2019
New Revision: 353320
URL: https://svnweb.freebsd.org/changeset/base/353320

Log:
  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.
  
  Reported by:	manu
  Reviewed by:	manu
  MFC after:	3 days
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/usr.sbin/pkg/Makefile

Modified: head/usr.sbin/pkg/Makefile
==============================================================================
--- head/usr.sbin/pkg/Makefile	Tue Oct  8 18:21:44 2019	(r353319)
+++ head/usr.sbin/pkg/Makefile	Tue Oct  8 18:58:23 2019	(r353320)
@@ -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}