From owner-svn-src-all@FreeBSD.ORG  Mon Jul  2 15:28:50 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1E51106566B;
	Mon,  2 Jul 2012 15:28:50 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B416F8FC08;
	Mon,  2 Jul 2012 15:28:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q62FSobQ078097;
	Mon, 2 Jul 2012 15:28:50 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62FSoot078093;
	Mon, 2 Jul 2012 15:28:50 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207021528.q62FSoot078093@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 2 Jul 2012 15:28:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237997 - in head: tools/build/mk tools/build/options
	usr.sbin
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jul 2012 15:28:51 -0000

Author: bapt
Date: Mon Jul  2 15:28:50 2012
New Revision: 237997
URL: http://svn.freebsd.org/changeset/base/237997

Log:
  New build KNOB: WITHOUT_PKGBOOTSTRAP to condition building of usr.sbin/pkg
  Do not condition usr.sbin/pkg building on WITHOUT_PKGTOOLS anymore, so that users can
  remove the old pkg_* tools without removing the pkgng boostrap
  
  Approved by:	des (mentor)
  MFC after:	1 month

Added:
  head/tools/build/options/WITHOUT_PKGBOOSTRAP   (contents, props changed)
Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/Makefile

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jul  2 14:03:19 2012	(r237996)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jul  2 15:28:50 2012	(r237997)
@@ -3482,6 +3482,10 @@ 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
+.endif
+
 .if ${MK_PKGTOOLS} == no
 OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
 OLD_FILES+=etc/periodic/security/460.chkportsum

Added: head/tools/build/options/WITHOUT_PKGBOOSTRAP
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_PKGBOOSTRAP	Mon Jul  2 15:28:50 2012	(r237997)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr pkg
+bootstrap tool

Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile	Mon Jul  2 14:03:19 2012	(r237996)
+++ head/usr.sbin/Makefile	Mon Jul  2 15:28:50 2012	(r237997)
@@ -259,9 +259,12 @@ SUBDIR+=	keyserv
 SUBDIR+=	ftp-proxy
 .endif
 
+.if ${PK_PKGBOOTSTRAP} != "no"
+SUBDIR+=	pkg
+.endif
+
 .if ${MK_PKGTOOLS} != "no"
 SUBDIR+=	pkg_install
-SUBDIR+=	pkg
 .endif
 
 # XXX MK_TOOLCHAIN?