svn commit: r270886 - in stable/9: tools/build/mk usr.sbin

[Peter Wemm]

Author: peter
Date: Sun Aug 31 20:11:26 2014
New Revision: 270886
URL: http://svnweb.freebsd.org/changeset/base/270886

Log:
  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

Modified:
  stable/9/tools/build/mk/OptionalObsoleteFiles.inc
  stable/9/usr.sbin/Makefile

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Sun Aug 31 17:56:54 2014	(r270885)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Sun Aug 31 20:11:26 2014	(r270886)
@@ -3249,6 +3249,11 @@ OLD_FILES+=usr/share/man/man8/pflogd.8.g
 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

Modified: stable/9/usr.sbin/Makefile
==============================================================================
--- stable/9/usr.sbin/Makefile	Sun Aug 31 17:56:54 2014	(r270885)
+++ stable/9/usr.sbin/Makefile	Sun Aug 31 20:11:26 2014	(r270886)
@@ -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?