From d04faca30e1f1f418621d89853ad1c037c8ef132 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 20 Sep 2019 00:05:14 +0000
Subject: [PATCH] - Copy stable/12@r352480 to releng/12.1 as part of the 12.1
 release   cycle. - Update from PRERELEASE to BETA1. - Set the default pkg(7)
 repository to 'quarterly'. - Bump __FreeBSD_version. - Prune svn:mergeinfo
 from the new branch.

Approved by:	re (implicit)
Sponsored by:	Rubicon Communications, LLC (Netgate)
---
 release/pkg_repos/release-dvd.conf | 2 +-
 sys/conf/newvers.sh                | 2 +-
 sys/sys/param.h                    | 2 +-
 usr.sbin/pkg/Makefile              | 9 ++++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
index 95413592b71..34997f2c706 100644
--- a/release/pkg_repos/release-dvd.conf
+++ b/release/pkg_repos/release-dvd.conf
@@ -1,6 +1,6 @@
 # $FreeBSD$
 release: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 706887a358b..bbb71911d2b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="PRERELEASE"
+BRANCH="BETA1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 2a8e1e205af..ef66f4ded20 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200519	/* Master, propagated to newvers */
+#define __FreeBSD_version 1201000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 03f4bcea68c..98b6cb8afdf 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -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
-- 
2.45.0