From da38c75b5a85d9171a50ff52330de76ee7be2c95 Mon Sep 17 00:00:00 2001
From: peter <peter@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 31 Aug 2014 20:11:26 +0000
Subject: [PATCH] WITH/WITHOUT_PKGBOOTSTRAP were MFC'ed, but were never
 connected to the build.  As a result, the knob for disabling pkg_install also
 disabled the pkg bootstrap tool

git-svn-id: svn://svn.freebsd.org/base/stable/9@270886 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++
 usr.sbin/Makefile                        | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index ff4d0a71b..e16f46ad5 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -3249,6 +3249,11 @@ 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
+OLD_FILES+=usr/share/man/man7/pkg.7.gz
+.endif
+
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index dc5b85875..294866b05 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -265,9 +265,12 @@ _pc_sysinstall=	pc-sysinstall
 SUBDIR+=	ftp-proxy
 .endif
 
+.if ${MK_PKGBOOTSTRAP} != "no"
+SUBDIR+=	pkg
+.endif
+
 .if ${MK_PKGTOOLS} != "no"
 SUBDIR+=	pkg_install
-SUBDIR+=	pkg
 .endif
 
 # XXX MK_TOOLCHAIN?
-- 
2.45.0