From owner-svn-src-all@FreeBSD.ORG  Tue Oct 23 20:21:42 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 23F69F14;
 Tue, 23 Oct 2012 20:21:42 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net
 [IPv6:2001:470:1f10:75::2])
 by mx1.freebsd.org (Postfix) with ESMTP id E98A38FC08;
 Tue, 23 Oct 2012 20:21:41 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1FDABB946;
 Tue, 23 Oct 2012 16:21:41 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Andrey Chernov <ache@freebsd.org>
Subject: Re: svn commit: r241962 - stable/8/sys/conf
Date: Tue, 23 Oct 2012 16:20:56 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p20; KDE/4.5.5; amd64; ; )
References: <201210231904.q9NJ4niV036046@svn.freebsd.org>
 <5086ECF5.3050707@freebsd.org>
In-Reply-To: <5086ECF5.3050707@freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201210231620.56440.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Tue, 23 Oct 2012 16:21:41 -0400 (EDT)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org, svn-src-stable-8@freebsd.org
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 23 Oct 2012 20:21:42 -0000

On Tuesday, October 23, 2012 3:16:05 pm Andrey Chernov wrote:
> On 23.10.2012 23:04, John Baldwin wrote:
> >   Remove attempt to use an empty NORMAL_CTFCONVERT and always fall back to
> >   using a the null "@:" command if CTF is disabled.
> 
> Thanks for merging. BTW, you can merge make change into branch 8 too and use
> complex check like that
> 
> .elif (${MAKE_VERSION} >= 8<fix_merged> && ${MAKE_VERSION} < 9000000000) || ${MAKE_VERSION} >= 9201210220
> 
> to keep mk files similar everywhere.
> I don't know it worth efforts and don't check the make change compatible with 
> branch 8.

I considered it a bit risky to merge the make changes to 8 (make in 8 and 9
are not identical), so I went with the simpler fix.

-- 
John Baldwin