From owner-freebsd-current  Thu Feb 24 21:16:13 2000
Delivered-To: freebsd-current@freebsd.org
Received: from chmls05.mediaone.net (ne.mediaone.net [24.128.1.70])
	by hub.freebsd.org (Postfix) with ESMTP id 499D537BE11
	for <freebsd-current@FreeBSD.ORG>; Thu, 24 Feb 2000 21:15:50 -0800 (PST)
	(envelope-from bloom@acm.org)
Received: from reyim.ne.mediaone.net ([24.218.251.241])
	by chmls05.mediaone.net (8.8.7/8.8.7) with ESMTP id AAA23900
	for <freebsd-current@FreeBSD.ORG>; Fri, 25 Feb 2000 00:15:47 -0500 (EST)
Received: from acm.org (localhost [127.0.0.1])
	by reyim.ne.mediaone.net (8.9.3/8.9.3) with ESMTP id XAA50502;
	Thu, 24 Feb 2000 23:04:03 -0500 (EST)
	(envelope-from bloom@acm.org)
Message-ID: <38B5FF33.DE8D6C6A@acm.org>
Date: Thu, 24 Feb 2000 23:04:03 -0500
From: Jim Bloom <bloom@acm.org>
Reply-To: bloom@acm.org
X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 4.0-CURRENT i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Munehiro Matsuda <haro@tk.kubota.co.jp>
Cc: freebsd-current@FreeBSD.ORG
Subject: Re: mergemaster fail with crypto changes
References: <20000225135218A.haro@tk.kubota.co.jp>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

While I was working on this project before I found out that Mark was 95%
done already, I made those tests be:

	.in !defined(NO_OPENSSH) && !defined(NOCRYPT)

NOCRYPT has been the standard way of indicating that the cryptograph
package has not been installed.

Jim Bloom
bloom@acm.org

Munehiro Matsuda wrote:
> 
> Hi all,
> 
> I don't have crypto in my source tree, because I'm in Japan,
> I get following error using mergemaster.
> 
> ----------8<---------8<---------Cut here---------8<---------8<---------
> # mergemaster
>     ....
>     ....
> install: /usr/src/etc/../crypto/openssh/ssh_config: No such file or directory
> *** Error code 71
> 
> Stop in /usr/src/etc.
> 
>   *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to the
>       temproot environment
> ----------8<---------8<---------Cut here---------8<---------8<---------
> 
> In /usr/src/etc/Makefile (rev  1.214), it should check for existance of
> crypto directory.
> 
> --- Makefile.ctm        Fri Feb 25 11:53:34 2000
> +++ Makefile    Fri Feb 25 13:47:10 2000
> @@ -20,7 +20,7 @@
>         ${.CURDIR}/../usr.bin/mail/misc/mail.rc \
>         ${.CURDIR}/../usr.bin/locate/locate/locate.rc
> 
> -.if !defined(NO_OPENSSH)
> +.if exists(${.CURDIR}../crypto) && !defined(NO_OPENSSH)
>  BIN1+= ${.CURDIR}/../crypto/openssh/ssh_config \
>         ${.CURDIR}/../crypto/openssh/sshd_config
>  .endif


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message