From owner-svn-src-stable-9@FreeBSD.ORG  Sun Aug 31 20:11:27 2014
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 700525FF;
 Sun, 31 Aug 2014 20:11:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5A63713BB;
 Sun, 31 Aug 2014 20:11:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VKBRci042564;
 Sun, 31 Aug 2014 20:11:27 GMT (envelope-from peter@FreeBSD.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VKBR97042562;
 Sun, 31 Aug 2014 20:11:27 GMT (envelope-from peter@FreeBSD.org)
Message-Id: <201408312011.s7VKBR97042562@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: peter set sender to
 peter@FreeBSD.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 31 Aug 2014 20:11:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r270886 - in stable/9: tools/build/mk usr.sbin
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Aug 2014 20:11:27 -0000

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?