From holger@gruft.de  Wed Jan  7 04:36:36 2004
Return-Path: <holger@gruft.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 80A1116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jan 2004 04:36:36 -0800 (PST)
Received: from obh.snafu.de (obh.snafu.de [213.73.92.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D834343D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  7 Jan 2004 04:36:34 -0800 (PST)
	(envelope-from holger@gruft.de)
Received: from holger by obh.snafu.de with local (Exim 3.36 #1)
	id 1AeCvJ-000OHM-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 07 Jan 2004 13:36:33 +0100
Message-Id: <E1AeCvJ-000OHM-00@obh.snafu.de>
Date: Wed, 07 Jan 2004 13:36:33 +0100
From: Holger Lamm <holger@e-gitt.net>
Sender: Holger Lamm <holger@gruft.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fix: mldonkey fails to build with ocaml 3.07
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61012
>Category:       ports
>Synopsis:       Fix: mldonkey fails to build with ocaml 3.07
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 07 04:40:10 PST 2004
>Closed-Date:    Wed Jan 07 11:27:00 PST 2004
>Last-Modified:  Wed Jan 07 11:27:00 PST 2004
>Originator:     Holger Lamm
>Release:        FreeBSD 4.9-RC i386
>Organization:
>Environment:
System: FreeBSD gruft.de 4.9-RC FreeBSD 4.9-RC #32: Fri Oct 3 09:40:50 CEST 2003 root@gruft.de:/usr/obj/usr/src/sys/EXPRESS i386


	
>Description:

Under the updated version of ocaml, mldonkey fails to build.

>How-To-Repeat:

Try to compile net/mldonkey with ocaml-3.07_1 installed

>Fix:

diff -Nur mldonkey.orig/Makefile mldonkey/Makefile
--- mldonkey.orig/Makefile	Wed Jan  7 13:30:17 2004
+++ mldonkey/Makefile	Wed Jan  7 13:28:50 2004
@@ -18,7 +18,7 @@
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-pthread
+CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=3
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
 USE_GMAKE=	yes
 ALL_TARGET=	depend opt
diff -Nur mldonkey.orig/files/patch-configure mldonkey/files/patch-configure
--- mldonkey.orig/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ mldonkey/files/patch-configure	Wed Jan  7 13:24:45 2004
@@ -0,0 +1,11 @@
+--- config/configure.orig	Sun Oct 12 20:41:28 2003
++++ config/configure	Wed Jan  7 13:24:29 2004
+@@ -3651,7 +3651,7 @@
+ 
+ case "$OCAMLVERSION" in
+   3.06) TYPE_FORMAT="";;
+-  3.07) TYPE_FORMAT="";;
++  3.07*) TYPE_FORMAT="";;
+   *) TYPE_FORMAT="type ('a,'b,'c) ml_format = ('a,'b, 'c,'c) format  type ('a,'b,'c) format = ('a,'b, 'c) ml_format";;
+ esac		    
+ 
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Wed Jan 7 11:26:52 PST 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61012 
>Unformatted:
