svn commit: r347034 - in stable/11: . etc/pkg gnu/usr.bin/groff/tmac lib/clang sys/conf

[Glen Barber]

Author: gjb
Date: Thu May  2 23:59:44 2019
New Revision: 347034
URL: https://svnweb.freebsd.org/changeset/base/347034

Log:
  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

Modified:
  stable/11/Makefile.inc1
  stable/11/etc/pkg/FreeBSD.conf
  stable/11/gnu/usr.bin/groff/tmac/mdoc.local.in
  stable/11/lib/clang/llvm.build.mk
  stable/11/sys/conf/newvers.sh

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Thu May  2 22:46:37 2019	(r347033)
+++ stable/11/Makefile.inc1	Thu May  2 23:59:44 2019	(r347034)
@@ -605,7 +605,7 @@ XCXXFLAGS+=	-isystem ${WORLDTMP}/usr/include/c++/v1 -s
 .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}

Modified: stable/11/etc/pkg/FreeBSD.conf
==============================================================================
--- stable/11/etc/pkg/FreeBSD.conf	Thu May  2 22:46:37 2019	(r347033)
+++ stable/11/etc/pkg/FreeBSD.conf	Thu May  2 23:59:44 2019	(r347034)
@@ -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",

Modified: stable/11/gnu/usr.bin/groff/tmac/mdoc.local.in
==============================================================================
--- stable/11/gnu/usr.bin/groff/tmac/mdoc.local.in	Thu May  2 22:46:37 2019	(r347033)
+++ stable/11/gnu/usr.bin/groff/tmac/mdoc.local.in	Thu May  2 23:59:44 2019	(r347034)
@@ -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

Modified: stable/11/lib/clang/llvm.build.mk
==============================================================================
--- stable/11/lib/clang/llvm.build.mk	Thu May  2 22:46:37 2019	(r347033)
+++ stable/11/lib/clang/llvm.build.mk	Thu May  2 23:59:44 2019	(r347034)
@@ -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}

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu May  2 22:46:37 2019	(r347033)
+++ stable/11/sys/conf/newvers.sh	Thu May  2 23:59:44 2019	(r347034)
@@ -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