diff options
| -rw-r--r-- | ObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | bin/Makefile | 1 | ||||
| -rw-r--r-- | bin/freebsd-version/Makefile (renamed from libexec/freebsd-version/Makefile) | 1 | ||||
| -rw-r--r-- | bin/freebsd-version/freebsd-version.1 (renamed from libexec/freebsd-version/freebsd-version.1) | 4 | ||||
| -rw-r--r-- | bin/freebsd-version/freebsd-version.sh.in (renamed from libexec/freebsd-version/freebsd-version.sh.in) | 0 | ||||
| -rw-r--r-- | libexec/Makefile | 1 |
6 files changed, 5 insertions, 4 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 9f3fbb9..e82f3b9 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 e5052ca..7b6a4ab 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 index c4d6e7f..0fe7308 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 index ee3f748..1eea5bb 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 index 0f9a468..0f9a468 100644 --- a/libexec/freebsd-version/freebsd-version.sh.in +++ b/bin/freebsd-version/freebsd-version.sh.in diff --git a/libexec/Makefile b/libexec/Makefile index 1039b24..0b9c961 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -8,7 +8,6 @@ SUBDIR= ${_atf} \ bootpd \ ${_comsat} \ fingerd \ - freebsd-version \ ftpd \ getty \ ${_mail.local} \ |
