From owner-freebsd-current@FreeBSD.ORG  Tue Mar 30 01:37:11 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E32F616A4CE
	for <current@freebsd.org>; Tue, 30 Mar 2004 01:37:11 -0800 (PST)
Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 32A7043D49
	for <current@freebsd.org>; Tue, 30 Mar 2004 01:37:11 -0800 (PST)
	(envelope-from ache@pobrecita.freebsd.ru)
Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1])
	by nagual.pp.ru (8.12.11/8.12.11) with ESMTP id i2U9ZnPU046247;
	Tue, 30 Mar 2004 13:35:49 +0400 (MSD)
	(envelope-from ache@pobrecita.freebsd.ru)
Received: (from ache@localhost)
	by pobrecita.freebsd.ru (8.12.11/8.12.11/Submit) id i2U9ZnaY046246;
	Tue, 30 Mar 2004 13:35:49 +0400 (MSD)
	(envelope-from ache)
Date: Tue, 30 Mar 2004 13:35:48 +0400
From: Andrey Chernov <ache@nagual.pp.ru>
To: Dag-Erling Sm?rgrav <des@des.no>
Message-ID: <20040330093548.GA46139@nagual.pp.ru>
Mail-Followup-To: Andrey Chernov <ache@nagual.pp.ru>,
	Dag-Erling Sm?rgrav <des@des.no>, current@freebsd.org
References: <20040328182314.GA99956@nagual.pp.ru> <xzpisgmwurw.fsf@dwp.des.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <xzpisgmwurw.fsf@dwp.des.no>
User-Agent: Mutt/1.5.6i
X-AntiVirus: checked by AntiVir Milter 1.1-beta; AVE 6.24.0.7; VDF 6.24.0.75
	     (host: pobrecita.freebsd.ru)
cc: current@freebsd.org
Subject: Re: mtree -L is broken due to unneded type=link additions to
	BSD.*.dist
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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, 30 Mar 2004 09:37:12 -0000

On Tue, Mar 30, 2004 at 11:26:11AM +0200, Dag-Erling Sm?rgrav wrote:
> It does not break 'make hierarchy', unless you have uncommitted
> patches which add -L to the mtree command line.

I use documented way:
MTREE_FOLLOWS_SYMLINKS= -L
in /etc/make.conf

> The BSD.local.dist commit fixes a problem which has plagued port
> maintainers for years (as witnessed by the number of times people have
> inadvertantly committed plists that included share/nls/POSIX and
> share/nls/en_US.US-ASCII).  I committed the same patch to BSD.usr.dist
> for symmetry, since BSD.local.dist is supposed to be (very nearly) a
> subset of BSD.usr.dist.

This problem already fixed long time ago in /usr/ports/Mk/bsd.port.mk:

                        ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; 
\
                        if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" 
]; then
 \
                                cd ${PREFIX}/share/nls; \
                                ${LN} -shf C POSIX; \
                                ${LN} -shf C en_US.US-ASCII; \
                        fi; \

So, none of your patches really needed even for old systems, since 
bsd.port.mk is updated semi-automatically. Maybe I not so right about old 
systems, so commit in the appropriate branch in that case instead. This 
problem definitely not exists in -current.

-- 
Andrey Chernov | http://ache.pp.ru/