From owner-freebsd-current  Thu Feb 24 20:55: 1 2000
Delivered-To: freebsd-current@freebsd.org
Received: from kbtfw.kubota.co.jp (kbtfw.kubota.co.jp [133.253.102.202])
	by hub.freebsd.org (Postfix) with ESMTP id 06E0C37BD79
	for <freebsd-current@freebsd.org>; Thu, 24 Feb 2000 20:54:51 -0800 (PST)
	(envelope-from haro@tk.kubota.co.jp)
Received: by kbtfw.kubota.co.jp; id NAA24234; Fri, 25 Feb 2000 13:54:44 +0900 (JST)
Received: from unknown(133.253.31.1) by kbtfw.kubota.co.jp via smap (V4.2)
	id xma023934; Fri, 25 Feb 00 13:54:04 +0900
Received: (from uucp@localhost)
	by lemond.gkn.kubota.co.jp (8.9.3+3.2W/3.7W00013112) with UUCP id NAA08403
	for freebsd-current@freebsd.org; Fri, 25 Feb 2000 13:54:02 +0900 (JST)
Received: from localhost (localhost [127.0.0.1])
	by jkpc15.ttr.kubota.co.jp (8.9.3/3.7W-uucp) with ESMTP id NAA02132
	for <freebsd-current@freebsd.org>; Fri, 25 Feb 2000 13:52:18 +0900 (JST)
To: freebsd-current@freebsd.org
Subject: mergemaster fail with crypto changes
X-Mailer: Mew version 1.94.1 on Emacs 19.34 / Mule 2.3 (SUETSUMUHANA)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <20000225135218A.haro@tk.kubota.co.jp>
Date: Fri, 25 Feb 2000 13:52:18 +0900
From: haro@tk.kubota.co.jp (Munehiro Matsuda)
X-Dispatcher: imput version 990905(IM130)
Lines: 40
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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

=------------------------------------------------------------------------------
           _ _    Munehiro (haro) Matsuda
 -|- /_\  |_|_|   Office of Business Planning & Development, Kubota Corp.
 /|\ |_|  |_|_|   1-3 Nihonbashi-Muromachi 3-Chome
                  Chuo-ku Tokyo 103, Japan
                  Tel: +81-3-3245-3318  Fax: +81-3-32454-3315
                  Email: haro@tk.kubota.co.jp


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