5 files changed, 2 insertions, 19 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 7863814..4351a2b 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3482,10 +3482,6 @@ OLD_FILES+=usr/share/man/man8/pflogd.8.gz
 OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 .endif
 
-.if ${MK_PKGBOOTSTRAP} == no
-OLD_FILES+=usr/sbin/pkg
-.endif
-
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
diff --git a/tools/build/options/WITHOUT_PKGBOOTSTRAP b/tools/build/options/WITHOUT_PKGBOOTSTRAP
deleted file mode 100644
index 1f98dd5..0000000
--- a/tools/build/options/WITHOUT_PKGBOOTSTRAP
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to not build
-.Xr pkg 1
-bootstrap tool
diff --git a/tools/build/options/WITH_BSD_SORT b/tools/build/options/WITH_BSD_SORT
new file mode 100644
index 0000000..a9e654d
--- /dev/null
+++ b/tools/build/options/WITH_BSD_SORT
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install BSD-licensed sort as 'sort' instead of GNU sort.
diff --git a/tools/build/options/WITH_GNU_SORT b/tools/build/options/WITH_GNU_SORT
deleted file mode 100644
index 6bd32c9..0000000
--- a/tools/build/options/WITH_GNU_SORT
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install GNU-licensed sort as 'sort' instead of BSD sort.
diff --git a/tools/build/options/WITH_INSTALL_AS_USER b/tools/build/options/WITH_INSTALL_AS_USER
deleted file mode 100644
index da49014..0000000
--- a/tools/build/options/WITH_INSTALL_AS_USER
+++ /dev/null
@@ -1,9 +0,0 @@
-.\" $FreeBSD$
-Set to make install targets succeed for non-root users by installing
-files with owner and group attributes set to that of the user running
-the
-.Xr make 1
-command.
-The user still has to set the
-.Va DESTDIR
-variable to point to a directory where the user has write permissions.