From f6b1e6d995020dcec13d641040a4b97dc19cf9e0 Mon Sep 17 00:00:00 2001
From: marius <marius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Fri, 15 Sep 2017 00:32:22 +0000
Subject: [PATCH] - Reset stable/10 back to -PRERELEASE status now that
 releng/10.4   has been branched. - Update __FreeBSD_version to reflect the
 new -STABLE branch. - Switch the pkg(8) configuration for the default
 installation and the   DVD image creation back to the latest set, i. e.
 revert r322737.

Approved by:	re (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/10@323605 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 etc/pkg/FreeBSD.conf               | 2 +-
 release/pkg_repos/release-dvd.conf | 2 +-
 sys/conf/newvers.sh                | 2 +-
 sys/sys/param.h                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
index 68e1d32ac..e4eec8f11 100644
--- a/etc/pkg/FreeBSD.conf
+++ b/etc/pkg/FreeBSD.conf
@@ -8,7 +8,7 @@
 #
 
 FreeBSD: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
index 34997f2c7..95413592b 100644
--- a/release/pkg_repos/release-dvd.conf
+++ b/release/pkg_repos/release-dvd.conf
@@ -1,6 +1,6 @@
 # $FreeBSD$
 release: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index ea7247e75..2e040bd45 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.4"
-BRANCH="BETA4"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
diff --git a/sys/sys/param.h b/sys/sys/param.h
index ca1ecfc1d..b8be153b6 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1003516	/* Master, propagated to newvers */
+#define __FreeBSD_version 1004500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
-- 
2.42.0