From owner-freebsd-current@FreeBSD.ORG  Fri Feb  2 13:14:53 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6B76F16A402
	for <freebsd-current@freebsd.org>; Fri,  2 Feb 2007 13:14:53 +0000 (UTC)
	(envelope-from danny@cs.huji.ac.il)
Received: from cs1.cs.huji.ac.il (cs1.cs.huji.ac.il [132.65.16.10])
	by mx1.freebsd.org (Postfix) with ESMTP id 2451613C442
	for <freebsd-current@freebsd.org>; Fri,  2 Feb 2007 13:14:53 +0000 (UTC)
	(envelope-from danny@cs.huji.ac.il)
Received: from pampa.cs.huji.ac.il ([132.65.80.32])
	by cs1.cs.huji.ac.il with esmtp id 1HCxo1-000Fas-6x
	for freebsd-current@freebsd.org; Fri, 02 Feb 2007 14:46:17 +0200
X-Mailer: exmh version 2.7.2 01/07/2005 with nmh-1.2
To: freebsd-current@freebsd.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Fri, 02 Feb 2007 14:46:16 +0200
From: Danny Braniss <danny@cs.huji.ac.il>
Message-ID: <E1HCxo1-000Fas-6x@cs1.cs.huji.ac.il>
Subject: cross release mergemaster question
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: Fri, 02 Feb 2007 13:14:53 -0000

hi all,
	is there some magic to run mergemaster on a 6.2 host
for a 7.0 distro? 

	mergemaster -m /r+d/7.0/src -d /d/7
fails when trying to compile(why?)

/lib/libcrypt/crypt-md5.c
cc -O2 -fno-strict-aliasing -pipe  -I/r+d/7.0/src/lib/libcrypt/../libmd 
-I/r+d/7
.0/src/lib/libcrypt/../libutil -I/r+d/7.0/src/lib/libcrypt -DHAS_DES 
-DHAS_BLOWF
ISH -Dauth_getval=__auth_getval -Dproperty_find=__property_find 
-Dproperties_rea
d=__properties_read -Dproperties_free=__properties_free -DMD4Init=__MD4Init 
-DMD
4Final=__MD4Final -DMD4Update=__MD4Update -DMD4Pad=__MD4Pad 
-DMD5Init=__MD5Init
-DMD5Final=__MD5Final -DMD5Update=__MD5Update -DMD5Pad=__MD5Pad  -c 
/r+d/7.0/src
/lib/libcrypt/../libmd/md5c.c
/r+d/7.0/src/lib/libcrypt/../libmd/md5c.c: In function `__MD5Update':
/r+d/7.0/src/lib/libcrypt/../libmd/md5c.c:154: error: argument "in" doesn't 
matc
h prototype
/usr/include/sys/md5.h:46: error: prototype declaration
*** Error code 1

thanks,
	danny