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

[Glen Barber]

Author: gjb
Date: Thu Sep 19 18:50:42 2019
New Revision: 352535
URL: https://svnweb.freebsd.org/changeset/base/352535

Log:
  MFC r352520 (partial):
   The original commit was a direct commit to stable/12, as at the time it
   was presumed it would not be necessary for head.  However, when it is
   time to create a releng branch or switch from PRERELEASE/STABLE to
   BETA/RC, the pkg(7) Makefile needs further adjusting.  This commit
   includes those further adjustments, evaluating the BRANCH variable from
   release/Makefile to determine the pkg(7) repository to use.
  
  Approved by:	re (kib, insta-MFC)
  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 Sep 19 17:42:17 2019	(r352534)
+++ stable/12/usr.sbin/pkg/Makefile	Thu Sep 19 18:50:42 2019	(r352535)
@@ -2,8 +2,15 @@
 
 .if ${MACHINE} != "amd64" && ${MACHINE} != "i386"
 PKGCONFBRANCH?=	quarterly
-.endif
+.else
+_BRANCH!=	${MAKE} -C ${SRCTOP}/release -V BRANCH
+BRANCH?=	${_BRANCH}
+. if ${BRANCH:MBETA*} || ${BRANCH:MRC*} || ${BRANCH:MRELEASE*}
+PKGCONFBRANCH?=	quarterly
+. else
 PKGCONFBRANCH?=	latest
+. endif
+.endif
 CONFS=		FreeBSD.conf.${PKGCONFBRANCH}
 CONFSNAME=	FreeBSD.conf
 CONFSDIR=	/etc/pkg