From 0c15347269bd048d23cf4ac2b5a2566eb7ca4302 Mon Sep 17 00:00:00 2001
From: "Justin C. Sherrill" <justin@shiningsilence.com>
Date: Thu, 22 Nov 2018 22:37:50 -0500
Subject: [PATCH] 5.4 changes.

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

diff --git a/etc/Makefile.usr b/etc/Makefile.usr
index e29423aa6b..c1e50cd865 100644
--- a/etc/Makefile.usr
+++ b/etc/Makefile.usr
@@ -7,7 +7,7 @@ GITURL_SRC?=git://git.dragonflybsd.org/dragonfly.git
 # Branch to be fetched & checked out
 # * master - latest development branch
 # * DragonFly_RELEASE_x_y - stable release branch x.y
-BRANCH?=master
+BRANCH?=DragonFly_RELEASE_5_4
 
 # DPorts source repository
 GITURL_DPORTS?=git://mirror-master.dragonflybsd.org/dports.git
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index 0e7efaaef1..77e4563be0 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\~5.3
+.ds doc-default-operating-system DragonFly\~5.4
 .
 .
 .\" DragonFly releases not found in doc-common
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0b06f9f9ab..c4ec3b4513 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -39,7 +39,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_5_3"
+BRANCH="RELEASE_5_4"
 
 TYPE="DragonFly"
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index d4e9ac9c48..116bdb5817 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -188,6 +188,7 @@
  * 500315 - add TUNGIFNAME to tun(4)
  * 500316 - add SIOC[ADG]IFGROUP, SIOCGIFGMEMB ioctl
  * 500317 - add wait6() and waitid() syscalls
+ * 500400 - 5.4 release
  */
 #undef __DragonFly_version
 #define __DragonFly_version 500317	/* propagated to newvers */
diff --git a/usr.bin/mandoc/config.h b/usr.bin/mandoc/config.h
index 90fbe3d577..162baa5d63 100644
--- a/usr.bin/mandoc/config.h
+++ b/usr.bin/mandoc/config.h
@@ -18,7 +18,7 @@
 #define HAVE_STRPTIME
 #define HAVE_STRSEP
 
-#define OSNAME "DragonFly 5.3"
+#define OSNAME "DragonFly 5.4"
 
 #if !defined(__BEGIN_DECLS)
 #  ifdef __cplusplus
-- 
2.11.4.GIT