From 3dcecb73071c0acab8df204eab38f72e1103f052 Mon Sep 17 00:00:00 2001
From: "Justin C. Sherrill" <justin@shiningsilence.com>
Date: Fri, 29 Sep 2017 20:10:43 -0400
Subject: [PATCH] 5.0 branching.

---
 etc/Makefile.usr                  | 10 +++++-----
 gnu/usr.bin/groff/tmac/mdoc.local |  4 +++-
 sys/conf/newvers.sh               |  2 +-
 sys/sys/param.h                   |  2 ++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index ea74467a45..8d6307e959 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -73,10 +73,10 @@ src-create-repo: src-check
 	@cd ${.CURDIR}/src && \
 		git remote add origin git://${GITHOST}/dragonfly.git
 	cd ${.CURDIR}/src && git fetch origin
-	cd ${.CURDIR}/src && git branch master origin/master
+	cd ${.CURDIR}/src && git branch DragonFly_RELEASE_5_0 origin/DragonFly_RELEASE_5_0
 
 src-create: src-create-repo
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_5_0
 	cd ${.CURDIR}/src && git pull
 
 src-create-shallow: src-check
@@ -87,12 +87,12 @@ src-create-shallow: src-check
 	cd ${.CURDIR}/src && \
 	    git remote add origin git://${GITHOST}/dragonfly.git
 	cd ${.CURDIR}/src && git fetch --depth=1 origin
-	cd ${.CURDIR}/src && git branch master origin/master
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git branch DragonFly_RELEASE_5_0 origin/DragonFly_RELEASE_5_0
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_5_0
 	cd ${.CURDIR}/src && git pull
 
 src-checkout: src-check-hasdir
-	cd ${.CURDIR}/src && git checkout master
+	cd ${.CURDIR}/src && git checkout DragonFly_RELEASE_5_0
 
 src-update: src-check-hasdir
 	cd ${.CURDIR}/src && git pull
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 3517661b3f..9bd1f9d490 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -69,7 +69,7 @@
 .
 .
 .\" Default .Os value
-.ds doc-default-operating-system DragonFly\~4.9
+.ds doc-default-operating-system DragonFly\~5.0
 .
 .
 .\" DragonFly releases not found in doc-common
@@ -101,6 +101,8 @@
 .ds doc-operating-system-DragonFly-4.7 4.7
 .ds doc-operating-system-DragonFly-4.8 4.8
 .ds doc-operating-system-DragonFly-4.9 4.9
+.ds doc-operating-system-DragonFly-5.0 5.0
+.ds doc-operating-system-DragonFly-5.1 5.1
 .
 .\" FreeBSD releases not found in doc-common.
 .ds doc-operating-system-FreeBSD-7.2  7.2
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 08b23d474c..7bbaf91c5a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -39,7 +39,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_4_9"
+BRANCH="RELEASE_5_0"
 
 TYPE="DragonFly"
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 0fc104100e..c648ac43a9 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -160,6 +160,8 @@
  * 400908 - {clock,pthread}_getcpuclockid()
  * 400909 - deleted ortentry, SIOC{ADD,DEL}RT, RTM_OLD{ADD,DEL}
  * 400910 - routing table is only available on netisr_ncpus
+ * 500000 - 5.0 release
+ * 500100 - 5.1 development
  */
 #undef __DragonFly_version
 #define __DragonFly_version 400910	/* propagated to newvers */
-- 
2.41.0