From fabebfc0b851a9d656902e08db1cc6ab44109109 Mon Sep 17 00:00:00 2001
From: gjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 19 Jun 2015 00:00:32 +0000
Subject: [PATCH] Update stable/10 from 10.1-STABLE to 10.2-PRERELEASE, marking
 the official start of the code slush.

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

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn://svn.freebsd.org/base/stable/10@284584 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 gnu/usr.bin/groff/tmac/mdoc.local | 3 ++-
 lib/clang/clang.build.mk          | 4 ++--
 sys/conf/newvers.sh               | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index c46cc9c52..6d3708fae 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -50,7 +50,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.1
+.ds doc-default-operating-system FreeBSD\~10.2
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
@@ -61,6 +61,7 @@
 .ds doc-operating-system-FreeBSD-9.3    9.3
 .ds doc-operating-system-FreeBSD-10.0   10.0
 .ds doc-operating-system-FreeBSD-10.1   10.1
+.ds doc-operating-system-FreeBSD-10.2   10.2
 .ds doc-operating-system-FreeBSD-11.0   11.0
 .
 .\" Definitions for other *BSDs not (yet) in doc-common
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index eb6d460d8..e13a38b17 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.1
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.2
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e66065a34..e9e14136e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,8 +31,8 @@
 # $FreeBSD$
 
 TYPE="FreeBSD"
-REVISION="10.1"
-BRANCH="STABLE"
+REVISION="10.2"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0