From owner-freebsd-current@freebsd.org  Tue May 10 10:40:05 2016
Return-Path: <owner-freebsd-current@freebsd.org>
Delivered-To: freebsd-current@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B35D4B3584D
 for <freebsd-current@mailman.ysv.freebsd.org>;
 Tue, 10 May 2016 10:40:05 +0000 (UTC)
 (envelope-from hannes@mehnert.org)
Received: from mail.mehnert.org (mail.mehnert.org [213.73.89.200])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7DBBC19A7
 for <freebsd-current@freebsd.org>; Tue, 10 May 2016 10:40:05 +0000 (UTC)
 (envelope-from hannes@mehnert.org)
Received: from [128.232.110.198] (c198.al.cl.cam.ac.uk [128.232.110.198])
 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
 (Client CN "hannes@mehnert.org", Issuer "mehnert root CA" (not verified))
 by mail.mehnert.org (Postfix) with ESMTPS id 42B4033A1
 for <freebsd-current@freebsd.org>; Tue, 10 May 2016 12:40:03 +0200 (CEST)
Subject: Re: mergemaster broken in r299288
To: freebsd-current@freebsd.org
References: <20d29828-ddfe-46cc-b8c3-ca580ae69a29@mehnert.org>
From: Hannes Mehnert <hannes@mehnert.org>
Message-ID: <4c2c160a-0a3f-0ffa-2b3f-f6e65b1f77a6@mehnert.org>
Date: Tue, 10 May 2016 12:39:44 +0200
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101
 Thunderbird/45.0
MIME-Version: 1.0
In-Reply-To: <20d29828-ddfe-46cc-b8c3-ca580ae69a29@mehnert.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 May 2016 10:40:05 -0000

On 10/05/2016 11:06, Hannes Mehnert wrote:
> # mergemaster
> 
> *** Creating the temporary root environment in /var/tmp/temproot
>  *** /var/tmp/temproot ready for use
>  *** Creating and populating directory structure in /var/tmp/temproot
> 
> sed: 1: "s/compat$/files/": bad flag in substitute command: 's'
> 
>   *** FATAL ERROR: Cannot 'cd' to ~/freebsd and install files to
>       the temproot environment
> 
> any hints?

cause is etc/Makefile line 333 (did sed change its semantics?)
 .if ${MK_NIS} == "no"
       sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
                ${DESTDIR}/etc/nsswitch.conf
 .endif