From owner-svn-src-all@FreeBSD.ORG  Tue Oct 23 19:16:06 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 D53224CD
 for <svn-src-all@freebsd.org>; Tue, 23 Oct 2012 19:16:06 +0000 (UTC)
 (envelope-from mailer-daemon@vniz.net)
Received: from mail-la0-f54.google.com (mail-la0-f54.google.com
 [209.85.215.54])
 by mx1.freebsd.org (Postfix) with ESMTP id 3C5F68FC18
 for <svn-src-all@freebsd.org>; Tue, 23 Oct 2012 19:16:05 +0000 (UTC)
Received: by mail-la0-f54.google.com with SMTP id e12so3299970lag.13
 for <svn-src-all@freebsd.org>; Tue, 23 Oct 2012 12:16:04 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=google.com; s=20120113;
 h=message-id:disposition-notification-to:date:from:user-agent
 :mime-version:to:cc:subject:references:in-reply-to:openpgp
 :content-type:content-transfer-encoding:x-gm-message-state;
 bh=TiKwXfG3XCUHHO7YwY4RbFNwT5KK7lroelcXw35GOFU=;
 b=fvCkXt/tLAiGhy4ugRPhR2NCgIOppV92OgtESEtDj67BiMJ4bY/pEdRvnC2WMRLxFL
 vnAWbG4Ya7f/+fV+Mchj2rhf7PX2UQPK33yA0KJDUr6HI9CKOytNLKEk85rJYOtxG/XM
 H8u9OP4z4Fhom/w8H52M1pSmkZefjCo2RsOK51MK6e+3D/ayYAYpk2p5YkVGdxrP2ZJO
 8R78mObDwWfLIKJof3Nzm/YVDfSfuJJa0RN2b8FKbsq6kQ8KDahfgotwBqXSynqw2wrW
 drSy2fLGuprFyWgRnRkNNQyfjamQDSH7weVPYFM4RGf4hkK4j6ZBnD8U4mz9lbKo6Lra
 NTSw==
Received: by 10.112.102.10 with SMTP id fk10mr5458470lbb.40.1351019764565;
 Tue, 23 Oct 2012 12:16:04 -0700 (PDT)
Received: from [192.168.1.2] ([89.169.140.97])
 by mx.google.com with ESMTPS id y10sm4326006lbg.4.2012.10.23.12.16.03
 (version=SSLv3 cipher=OTHER); Tue, 23 Oct 2012 12:16:04 -0700 (PDT)
Message-ID: <5086ECF5.3050707@freebsd.org>
Date: Tue, 23 Oct 2012 23:16:05 +0400
From: Andrey Chernov <ache@freebsd.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:16.0) Gecko/20121010 Thunderbird/16.0.1
MIME-Version: 1.0
To: John Baldwin <jhb@FreeBSD.org>
Subject: Re: svn commit: r241962 - stable/8/sys/conf
References: <201210231904.q9NJ4niV036046@svn.freebsd.org>
In-Reply-To: <201210231904.q9NJ4niV036046@svn.freebsd.org>
OpenPGP: id=964474DD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Gm-Message-State: ALoCoQn1vSNCOi8YBKlFM18aIcr3FmpH+WEaZV0HiE4w4IuCleOlxEyIw2bYwmZqnwM9xqIgyn9t
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 19:16:06 -0000

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.