From owner-svn-src-head@FreeBSD.ORG  Fri Feb 10 00:15:37 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 24CB81065672;
	Fri, 10 Feb 2012 00:15:37 +0000 (UTC)
	(envelope-from marcel@xcllnt.net)
Received: from mail.xcllnt.net (mail.xcllnt.net [70.36.220.4])
	by mx1.freebsd.org (Postfix) with ESMTP id E5F8D8FC0A;
	Fri, 10 Feb 2012 00:15:36 +0000 (UTC)
Received: from [172.23.7.29] (natint3.juniper.net [66.129.224.36])
	(authenticated bits=0)
	by mail.xcllnt.net (8.14.5/8.14.5) with ESMTP id q1A0FS3V043336
	(version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO);
	Thu, 9 Feb 2012 16:15:35 -0800 (PST)
	(envelope-from marcel@xcllnt.net)
Mime-Version: 1.0 (Apple Message framework v1257)
Content-Type: text/plain; charset=us-ascii
From: Marcel Moolenaar <marcel@xcllnt.net>
In-Reply-To: <CAF6rxgnKqJ3uqpm-BKEU5-EGLRWw2a56G5dWWk9pgdW3ZAeGuA@mail.gmail.com>
Date: Thu, 9 Feb 2012 16:15:23 -0800
Content-Transfer-Encoding: 7bit
Message-Id: <1C3260CA-8CDB-4C84-A591-637D2B342683@xcllnt.net>
References: <201202092044.q19KiLUT027539@svn.freebsd.org>
	<BFA09C62-79CF-4F29-A034-9641EDB52B4A@xcllnt.net>
	<CAF6rxgnKqJ3uqpm-BKEU5-EGLRWw2a56G5dWWk9pgdW3ZAeGuA@mail.gmail.com>
To: Eitan Adler <eadler@FreeBSD.org>
X-Mailer: Apple Mail (2.1257)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r231298 - head/etc
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Feb 2012 00:15:37 -0000


On Feb 9, 2012, at 3:09 PM, Eitan Adler wrote:

> On Thu, Feb 9, 2012 at 5:15 PM, Marcel Moolenaar <marcel@xcllnt.net> wrote:
>> 
>> On Feb 9, 2012, at 12:44 PM, Eitan Adler wrote:
>> 
>>> Author: eadler
>>> Date: Thu Feb  9 20:44:20 2012
>>> New Revision: 231298
>>> URL: http://svn.freebsd.org/changeset/base/231298
>>> 
>>> Log:
>>>  Make etc/Makefile more conflict resistant
>> 
>> Nice. Question though: why not the less verbose
> 
> Either would have worked but I went with what was in the original
> patch.  If it is worth it I could change to use the format you
> describe.


I think it's convention (see sys/modules/Makefile or lib/Makefile),
but I could just as well be mistaken (i.e. picked the only makefiles
that do this :-)

I leave it up to you...

-- 
Marcel Moolenaar
marcel@xcllnt.net