From owner-freebsd-current@FreeBSD.ORG  Tue Dec 14 05:12:37 2010
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 209381065670;
	Tue, 14 Dec 2010 05:12:37 +0000 (UTC)
	(envelope-from bf1783@googlemail.com)
Received: from mail-yw0-f54.google.com (mail-yw0-f54.google.com
	[209.85.213.54])
	by mx1.freebsd.org (Postfix) with ESMTP id C25B28FC13;
	Tue, 14 Dec 2010 05:12:36 +0000 (UTC)
Received: by ywp6 with SMTP id 6so128478ywp.13
	for <multiple recipients>; Mon, 13 Dec 2010 21:12:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=gamma;
	h=domainkey-signature:mime-version:received:received:reply-to:date
	:message-id:subject:from:to:cc:content-type;
	bh=3Fmdt2lc8Aikawbho++x4IH8cxlhVNfAC5ZOWQMour8=;
	b=mmXfv0Jxf8YCsYCwLGmPqLXbd8s1rnZrdq+kB2noUtXxREPhIM5eMCU/WVRqNiYKZF
	JsYMffNXCtyjLp6EiUa26UGgMkjCuAlvwmf9BHTCo80rkaCoklZrIjOOW2e9CtwQjsDd
	fciaUblmvE/AIqoJppP3GKg52gUSjRwRu/LkQ=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma;
	h=mime-version:reply-to:date:message-id:subject:from:to:cc
	:content-type;
	b=GVgYHke3qTiLrkQ+O1H0UFhl/N3vPU985CmU/FxTlEPDfC6nwjCuxTn/YD3z1EjxYG
	C1VAVCrXCaPID91lfuXF/rU4ciOIfLyXpwkFuzMO125dNqs12iigIA11YYhJc9vGyGeY
	JFEMhqCz/fQt0V7qjqrKT6Q1v21KSSA/9BXoA=
MIME-Version: 1.0
Received: by 10.236.103.175 with SMTP id f35mr495992yhg.27.1292302059788; Mon,
	13 Dec 2010 20:47:39 -0800 (PST)
Received: by 10.236.102.142 with HTTP; Mon, 13 Dec 2010 20:47:39 -0800 (PST)
Date: Tue, 14 Dec 2010 04:47:39 +0000
Message-ID: <AANLkTin+qr7Y-vMTbKg9ZKE6_zE+NVYFEMX+Pwy4vbym@mail.gmail.com>
From: "b. f." <bf1783@googlemail.com>
To: freebsd-current@FreeBSD.org
Content-Type: text/plain; charset=ISO-8859-1
Cc: Alexander Best <arundel@freebsd.org>
Subject: Re: a few OptionalObsoleteFiles.inc improvements
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bf1783@gmail.com
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Dec 2010 05:12:37 -0000

Alexander Best wrote:

>any thoughts on this patch? it adds files which will be removed when
>WITHOUT_SYSCONS is set. also it makes sure sysinstall(8) and sade(8) only get
>installed when WITHOUT_SYSINSTALL wasn't defined and also that any related
>executables and manual pages get removed if in fact that var is defined.

...

>diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
>index f3e853e..2151868 100644
>--- a/usr.sbin/Makefile
>+++ b/usr.sbin/Makefile
>@@ -250,7 +250,6 @@ SUBDIR+=    ftp-proxy
> SUBDIR+=       pkg_install
> .endif
>
>-# XXX MK_TOOLCHAIN?
> .if ${MK_PMC} != "no"
> SUBDIR+=       pmcannotate
> SUBDIR+=       pmccontrol
>@@ -283,7 +282,9 @@ SUBDIR+=    praliases
> SUBDIR+=       sendmail
> .endif
 >
>+.if ${MK_SYSINSTALL} != "no"
> SUBDIR+=       sysinstall
>+.endif

I'm glad to see that you're filling in some of the many missing bits
in this file.

The last part of your patch reverts a change that Warner Losh made in
r212525 as part of his tbemd project merge.  It's possible that this
change may have been an unintended, but it followed a discussion in
which Warner rejected a related patch proposed by Garrett Cooper,
partly because sysinstall is included in build-tools in Makefile.inc1,
even though some thought that it should not be.  In any event, you
should probably look into that before committing the last part of your
patch.

b.