From owner-freebsd-stable@FreeBSD.ORG  Tue Apr  5 10:51:26 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4569416A4CE
	for <freebsd-stable@freebsd.org>;
	Tue,  5 Apr 2005 10:51:26 +0000 (GMT)
Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C697E43D45
	for <freebsd-stable@freebsd.org>;
	Tue,  5 Apr 2005 10:51:24 +0000 (GMT)	(envelope-from boris@ntmk.ru)
Received: from boris.nikom.ru ([10.1.16.195])
	by mail.ntmk.ru with esmtp (Exim 4.44)
	id 1DIleT-00051E-S9
	for freebsd-stable@freebsd.org; Tue, 05 Apr 2005 16:51:22 +0600
Message-ID: <42526DA9.7040605@ntmk.ru>
Date: Tue, 05 Apr 2005 16:51:21 +0600
From: Boris Kovalenko <boris@ntmk.ru>
User-Agent: Mozilla Thunderbird 1.0.2 (X11/20050328)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: freebsd-stable@freebsd.org
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 7bit
Subject: 5.4 PRE mergemaster fails
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Production branch of FreeBSD source code
	<freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Apr 2005 10:51:26 -0000

Hello!

	mergemaster fails when NOCRYPT=true. This is because of 
/usr/src/etc/Makefile (line 26)
.if !defined(NOCRYPT)
SSH= ....

but no check when installing (line 102)
install ... ${SSH}

-- 
With respect,
	Boris Kovalenko