From owner-freebsd-ports@FreeBSD.ORG  Sat Jul 24 13:54:58 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F040716A4CE
	for <freebsd-ports@freebsd.org>; Sat, 24 Jul 2004 13:54:58 +0000 (GMT)
Received: from mx2.mail.ru (mx2.mail.ru [194.67.23.122])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8479143D31
	for <freebsd-ports@freebsd.org>; Sat, 24 Jul 2004 13:54:58 +0000 (GMT)
	(envelope-from my-subs@mail.ru)
Received: from [192.115.133.61] (port=49307 helo=ant.zoo)
	by mx2.mail.ru with smtp 
	id 1BoMzI-0004hA-00; Sat, 24 Jul 2004 17:54:56 +0400
Date: Sat, 24 Jul 2004 16:53:49 +0300
From: Alexander Portnoy <my-subs@mail.ru>
To: daniel+unison@pelleg.org
Message-Id: <20040724165349.5c2b53b7.my-subs@mail.ru>
X-Mailer: Sylpheed version 0.9.12-gtk2-20040622 (GTK+ 2.4.3;
	i386-portbld-freebsd5.2.1)
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="Multipart=_Sat__24_Jul_2004_16_53_49_+0300_f5wgrS2wyOL11PR1"
X-Spam: Not detected
cc: freebsd-ports@freebsd.org
Subject: [PATCH] fix unison-2.9.20 linking error with ocaml-3.08
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jul 2004 13:54:59 -0000

This is a multi-part message in MIME format.

--Multipart=_Sat__24_Jul_2004_16_53_49_+0300_f5wgrS2wyOL11PR1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

--- ubase/uprintf.ml.orig       Sat Jul 24 16:33:37 2004
+++ ubase/uprintf.ml    Sat Jul 24 16:33:57 2004
@@ -10,8 +10,8 @@
 (*                                                                     *)
 (***********************************************************************)
 
-external format_int: string -> int -> string = "format_int"
-external format_float: string -> float -> string = "format_float"
+external format_int: string -> int -> string = "caml_format_int"
+external format_float: string -> float -> string = "caml_format_float"
 
 let fprintf outchan doafter format =
   let format = (Obj.magic format : string) in

--Multipart=_Sat__24_Jul_2004_16_53_49_+0300_f5wgrS2wyOL11PR1
Content-Type: application/octet-stream;
 name="patch-ab"
Content-Disposition: attachment;
 filename="patch-ab"
Content-Transfer-Encoding: base64

LS0tIHViYXNlL3VwcmludGYubWwub3JpZwlTYXQgSnVsIDI0IDE2OjMzOjM3IDIwMDQKKysrIHVi
YXNlL3VwcmludGYubWwJU2F0IEp1bCAyNCAxNjozMzo1NyAyMDA0CkBAIC0xMCw4ICsxMCw4IEBA
CiAoKiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICopCiAoKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiopCiAKLWV4dGVybmFsIGZvcm1hdF9p
bnQ6IHN0cmluZyAtPiBpbnQgLT4gc3RyaW5nID0gImZvcm1hdF9pbnQiCi1leHRlcm5hbCBmb3Jt
YXRfZmxvYXQ6IHN0cmluZyAtPiBmbG9hdCAtPiBzdHJpbmcgPSAiZm9ybWF0X2Zsb2F0IgorZXh0
ZXJuYWwgZm9ybWF0X2ludDogc3RyaW5nIC0+IGludCAtPiBzdHJpbmcgPSAiY2FtbF9mb3JtYXRf
aW50IgorZXh0ZXJuYWwgZm9ybWF0X2Zsb2F0OiBzdHJpbmcgLT4gZmxvYXQgLT4gc3RyaW5nID0g
ImNhbWxfZm9ybWF0X2Zsb2F0IgogCiBsZXQgZnByaW50ZiBvdXRjaGFuIGRvYWZ0ZXIgZm9ybWF0
ID0KICAgbGV0IGZvcm1hdCA9IChPYmoubWFnaWMgZm9ybWF0IDogc3RyaW5nKSBpbgo=

--Multipart=_Sat__24_Jul_2004_16_53_49_+0300_f5wgrS2wyOL11PR1--