From 2cf918a5a6af7216c5de245ad6ededf28a9637e4 Mon Sep 17 00:00:00 2001
From: peter <peter@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 31 Aug 2014 20:14:22 +0000
Subject: [PATCH] Backport the separation of the knob that controls the legacy
 pkg_install tools (ie: WITH/WITHOUT_PKGTOOLS) and the pkg bootstrap tool.

git-svn-id: svn://svn.freebsd.org/base/stable/8@270887 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 share/mk/bsd.own.mk                      | 1 +
 tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++
 tools/build/options/WITHOUT_PKGBOOTSTRAP | 4 ++++
 usr.sbin/Makefile                        | 5 ++++-
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tools/build/options/WITHOUT_PKGBOOTSTRAP

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 457ef0588..852c91cf2 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -383,6 +383,7 @@ WITH_IDEA=
     OPENSSL \
     PAM \
     PF \
+    PKGBOOTSTRAP \
     PKGTOOLS \
     PMC \
     PORTSNAP \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index aa3a3a179..74ae9f878 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1216,6 +1216,11 @@ OLD_FILES+=usr/share/man/man1/nc.1.gz
 # to be filled in
 #.endif
 
+.if ${MK_PKGBOOTSTRAP} == no
+OLD_FILES+=usr/sbin/pkg
+OLD_FILES+=usr/share/man/man7/pkg.7.gz
+.endif
+
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/security/460.chkportsum
 OLD_FILES+=etc/periodic/weekly/400.status-pkg
diff --git a/tools/build/options/WITHOUT_PKGBOOTSTRAP b/tools/build/options/WITHOUT_PKGBOOTSTRAP
new file mode 100644
index 000000000..121209b09
--- /dev/null
+++ b/tools/build/options/WITHOUT_PKGBOOTSTRAP
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr pkg 7
+bootstrap tool.
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 4af0cd604..974752ea9 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -361,9 +361,12 @@ _keyserv=	keyserv
 _ftp-proxy=	ftp-proxy
 .endif
 
+.if ${MK_PKGBOOTSTRAP} != "no"
+SUBDIR+=	pkg
+.endif
+
 .if ${MK_PKGTOOLS} != "no"
 _pkg_install=	pkg_install
-SUBDIR+=	pkg
 .endif
 
 # XXX MK_TOOLCHAIN?
-- 
2.45.0