From 5f3850777ee8731079cf7e375a90c10ec7a12058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Wed, 9 Oct 2013 20:47:20 +0000
Subject: [PATCH] By popular demand, move freebsd-version(1) from /libexec to
 /bin.

Approved by:	re (gjb)
---
 ObsoleteFiles.inc                                      | 2 ++
 bin/Makefile                                           | 1 +
 {libexec => bin}/freebsd-version/Makefile              | 1 -
 {libexec => bin}/freebsd-version/freebsd-version.1     | 4 ++--
 {libexec => bin}/freebsd-version/freebsd-version.sh.in | 0
 libexec/Makefile                                       | 1 -
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename {libexec => bin}/freebsd-version/Makefile (96%)
 rename {libexec => bin}/freebsd-version/freebsd-version.1 (97%)
 rename {libexec => bin}/freebsd-version/freebsd-version.sh.in (100%)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9f3fbb9a848d..e82f3b9bc02a 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131009: freebsd-version moved from /libexec to /bin
+OLD_FILES+=/libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
diff --git a/bin/Makefile b/bin/Makefile
index e5052cad51a5..7b6a4ab8c8c0 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -15,6 +15,7 @@ SUBDIR= cat \
 	echo \
 	ed \
 	expr \
+	freebsd-version \
 	getfacl \
 	hostname \
 	kenv \
diff --git a/libexec/freebsd-version/Makefile b/bin/freebsd-version/Makefile
similarity index 96%
rename from libexec/freebsd-version/Makefile
rename to bin/freebsd-version/Makefile
index c4d6e7f1a271..0fe730860c22 100644
--- a/libexec/freebsd-version/Makefile
+++ b/bin/freebsd-version/Makefile
@@ -2,7 +2,6 @@
 
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1
-BINDIR = /libexec
 CLEANFILES = freebsd-version.sh
 NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
 
diff --git a/libexec/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
similarity index 97%
rename from libexec/freebsd-version/freebsd-version.1
rename to bin/freebsd-version/freebsd-version.1
index ee3f748f1288..1eea5bbd972b 100644
--- a/libexec/freebsd-version/freebsd-version.1
+++ b/bin/freebsd-version/freebsd-version.1
@@ -100,13 +100,13 @@ and the kernel.
 .Sh EXAMPLES
 To determine the version of the currently running userland:
 .Bd -literal -offset indent
-/libexec/freebsd-version -u
+/bin/freebsd-version -u
 .Ed
 .Pp
 To inspect a system being repaired using a live CD:
 .Bd -literal -offset indent
 mount -rt ufs /dev/ada0p2 /mnt
-env ROOT=/mnt /mnt/libexec/freebsd-version -ku
+env ROOT=/mnt /mnt/bin/freebsd-version -ku
 .Ed
 .Sh SEE ALSO
 .Xr uname 1 ,
diff --git a/libexec/freebsd-version/freebsd-version.sh.in b/bin/freebsd-version/freebsd-version.sh.in
similarity index 100%
rename from libexec/freebsd-version/freebsd-version.sh.in
rename to bin/freebsd-version/freebsd-version.sh.in
diff --git a/libexec/Makefile b/libexec/Makefile
index 1039b24691de..0b9c9618a1b7 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -8,7 +8,6 @@ SUBDIR=	${_atf} \
 	bootpd \
 	${_comsat} \
 	fingerd \
-	freebsd-version \
 	ftpd \
 	getty \
 	${_mail.local} \