From e83d139ddaaf7187625b50b9971579692bd314e9 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 2 May 2019 23:59:44 +0000
Subject: [PATCH] Update stable/11 from 11.2-STABLE to 11.3-PRERELEASE, marking
 the official start of the code slush for the 11.3-RELEASE cycle.

Set the default mdoc(7) version to 11.3, and update the clang(1)
TARGET_TRIPLE to reflect 11.3.

Update the default pkg(8) repository to the 'quarterly' branch to
prevent further 11.3 builds from downgrading packages when invoking
'pkg upgrade' for the duration of the cycle.  This will be reverted
on the stable/11 branch once releng/11.3 is branched. [*]

Approved by:	re (implicit)
MFC after:	6 weeks
MFC note:	reminder to revert pkg(8) default repository [8]
Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1                        | 2 +-
 etc/pkg/FreeBSD.conf                 | 2 +-
 gnu/usr.bin/groff/tmac/mdoc.local.in | 3 ++-
 lib/clang/llvm.build.mk              | 2 +-
 sys/conf/newvers.sh                  | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 97a5f62e6ee..890a9b09cb3 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -605,7 +605,7 @@ XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -std=c++11 \
 .endif
 .else
 TARGET_ABI?=	unknown
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.2
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.3
 XCFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 XCFLAGS+=	--sysroot=${WORLDTMP}
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
index e4eec8f1145..68e1d32ac68 100644
--- a/etc/pkg/FreeBSD.conf
+++ b/etc/pkg/FreeBSD.conf
@@ -8,7 +8,7 @@
 #
 
 FreeBSD: {
-  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/gnu/usr.bin/groff/tmac/mdoc.local.in b/gnu/usr.bin/groff/tmac/mdoc.local.in
index 019ab21accb..fe263d564ed 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local.in
+++ b/gnu/usr.bin/groff/tmac/mdoc.local.in
@@ -50,7 +50,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~11.2
+.ds doc-default-operating-system FreeBSD\~11.3
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-2.2.9  2.2.9
@@ -68,6 +68,7 @@
 .ds doc-operating-system-FreeBSD-11.0   11.0
 .ds doc-operating-system-FreeBSD-11.1   11.1
 .ds doc-operating-system-FreeBSD-11.2   11.2
+.ds doc-operating-system-FreeBSD-11.3   11.3
 .
 .\" Definitions for other *BSDs not (yet) in doc-common
 .ds doc-operating-system-NetBSD-7.0     7.0
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 05149d866a2..9e0a12ff8b2 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -33,7 +33,7 @@ TARGET_ABI=	-gnueabi
 TARGET_ABI=
 .endif
 VENDOR=		unknown
-OS_VERSION=	freebsd11.2
+OS_VERSION=	freebsd11.3
 
 LLVM_TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
 LLVM_BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d9e17dbb9fd..e1610a81a99 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -43,8 +43,8 @@
 #                      included if the tree is modified.
 
 TYPE="FreeBSD"
-REVISION="11.2"
-BRANCH="STABLE"
+REVISION="11.3"
+BRANCH="PRERELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0