From owner-freebsd-current@FreeBSD.ORG  Sun Sep 28 12:11:15 2008
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 226EF1065690;
	Sun, 28 Sep 2008 12:11:15 +0000 (UTC)
	(envelope-from rea-fbsd@codelabs.ru)
Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.177.45])
	by mx1.freebsd.org (Postfix) with ESMTP id C52348FC17;
	Sun, 28 Sep 2008 12:11:14 +0000 (UTC)
	(envelope-from rea-fbsd@codelabs.ru)
DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=one; d=codelabs.ru;
	h=Received:Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:Content-Type:Content-Disposition:In-Reply-To:Sender;
	b=ZxPDmc5r0CI5Ly7RhUy3Hw8QQiTXV0TiG2QPLEVU4Z1YoaIoHVp8ZrgbXrt4Zd/wNRqXemsolSXOZc9gQfzBYldgXV5kZYtpCWaBvOqG+itl5UQsEmfjrI7ir8e9GpqMhbEy1e7Lu/Dn/0lgKNbwZfFelFBGi2oY8kaRfPPWbO4=;
Received: from amnesiac.at.no.dns (ppp91-78-250-120.pppoe.mtu-net.ru
	[91.78.250.120])
	by 0.mx.codelabs.ru with esmtpsa (TLSv1:AES256-SHA:256)
	id 1Kjv7J-000G05-8e; Sun, 28 Sep 2008 16:11:13 +0400
Date: Sun, 28 Sep 2008 16:11:10 +0400
From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To: Maksim Yevmenkin <maksim.yevmenkin@gmail.com>
Message-ID: <jJlCq0ojwnpdGNTywGuwPz0vEt8@jDDGiF+UOTKHtefK+yxHRoLasP8>
References: <bb4a86c70809261001l543f1c58q3567afa6bbae0070@mail.gmail.com>
	<8mjnlfjxki8xBLJGjaWITKbl+tA@Nv45r0f9gWT8HCu35qu0Xm2Zg98>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="h31gzZEtNLTqOjlF"
Content-Disposition: inline
In-Reply-To: <8mjnlfjxki8xBLJGjaWITKbl+tA@Nv45r0f9gWT8HCu35qu0Xm2Zg98>
Sender: rea-fbsd@codelabs.ru
Cc: freebsd-current@freebsd.org, dougb@freebsd.org
Subject: Re: mergemaster broken
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 28 Sep 2008 12:11:15 -0000


--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Me again.

Sat, Sep 27, 2008 at 02:45:12PM +0400, Eygene Ryabinkin wrote:
> This is not very clean, so I had created a quick patch for mergemaster
> (from -STABLE, have no -CURRENT at hand just now, sorry).  It enables
> all 'make' invocations to search /usr/src/share/mk prior to look for
> includes in /usr/share/mk.  Works for my quick testing, but there can be
> some rough points I had not noticed.  Please, try it.

Just verified the patch on -CURRENT -- works for me and cures your
problem, if I am using bsd.own.mk rev 1.77 during the run of the
mergemaster.
--=20
Eygene
 _                ___       _.--.   #
 \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
 /  ' `         ,       __.--'      #  to read the on-line manual  =20
 )/' _/     \   `-_,   /            #  while single-stepping the kernel.
 `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
     _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook=20
    {_.-``-'         {_/            #

--h31gzZEtNLTqOjlF
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (FreeBSD)

iEYEARECAAYFAkjfdF4ACgkQthUKNsbL7YhXGACeLNZFXDoyVbyzFJ4+HSZeTFDg
j/oAoJW4uxA9ikz1SaRiwzqNoC6Y621A
=805Z
-----END PGP SIGNATURE-----

--h31gzZEtNLTqOjlF--