From dhchen@mail.dhchen.com  Sun Dec 21 22:45:17 2003
Return-Path: <dhchen@mail.dhchen.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 83D2816A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Dec 2003 22:45:17 -0800 (PST)
Received: from student.nsysu.edu.tw (student.nsysu.edu.tw [140.117.11.111])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4FDE043D53
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Dec 2003 22:45:14 -0800 (PST)
	(envelope-from dhchen@mail.dhchen.com)
Received: from elearning.nsysu.edu.tw (unknown [140.117.18.182])
	by student.nsysu.edu.tw (Postfix) with ESMTP id 74D5D1F20B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Dec 2003 14:45:05 +0800 (CST)
Received: from localhost (localhost.nsysu.edu.tw [127.0.0.1])
	by elearning.nsysu.edu.tw (Postfix) with ESMTP id B985C6C40
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Dec 2003 14:45:07 +0800 (CST)
Received: from elearning.nsysu.edu.tw ([127.0.0.1])
 by localhost (elearning.nsysu.edu.tw [127.0.0.1]) (amavisd-new, port 10024)
 with SMTP id 26084-09 for <FreeBSD-gnats-submit@freebsd.org>;
 Mon, 22 Dec 2003 14:45:07 +0800 (CST)
Received: from mail.dhchen.com (unknown [211.20.51.115])
	by elearning.nsysu.edu.tw (Postfix) with ESMTP id 400626C3E
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 22 Dec 2003 14:45:07 +0800 (CST)
Received: by mail.dhchen.com (Postfix, from userid 1001)
	id 6169E60E3; Mon, 22 Dec 2003 14:45:43 +0800 (CST)
Message-Id: <20031222064543.6169E60E3@mail.dhchen.com>
Date: Mon, 22 Dec 2003 14:45:43 +0800 (CST)
From: dhchen <dhchen@mail.dhchen.com>
Reply-To: dhchen <dhchen@mail.dhchen.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: ports/net/mldonkey fails to build with the newest ports/lang/ocaml
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         60490
>Category:       ports
>Synopsis:       ports/net/mldonkey fails to build with the newest ports/lang/ocaml
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    leeym
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 21 22:50:22 PST 2003
>Closed-Date:    Mon Jan 12 16:16:25 PST 2004
>Last-Modified:  Mon Jan 12 16:16:25 PST 2004
>Originator:     dhchen
>Release:        FreeBSD 5.2-RC i386
>Organization:
>Environment:
System: FreeBSD mail.dhchen.com 5.2-RC FreeBSD 5.2-RC #4: Sun Dec 21 10:44:17 CST 2003 root@mail.dhchen.com:/usr/obj/usr/src/sys/MAIL i386

>Description:
ports/lang/ocaml changes its version number, and this change makes mldonkey
fail to build because its configure script doesn't recognize ocaml's version number

"make configure"'s output:

checking for ocamlc.opt... (cached) ocamlc.opt
checking for ocamlc... (cached) ocamlc.opt
i386-portbld-freebsd5.2
Testing ocaml version
Need build
checking for /usr/ports/net/mldonkey/work/mldonkey-2.5-4/patches/local/bin/ocamlc.opt... no
checking for rpmbuild... (cached) rpm
checking for rpm... (cached) rpm
checking for wget... (cached) wget
********  Objective-Caml 3.06 is required  *********
*******  Check http://ocaml.inria.fr/  ********
Do you want this script to try to download and install ocaml
LOCALLY in mldonkey directory ?



>How-To-Repeat:
install the newest version of ocaml

cd /usr/ports/net/mldonkey && make install

>Fix:
Below is just a workaround:

Apply this patch:

--- Makefile.orig       Mon Dec 22 14:29:29 2003
+++ Makefile    Mon Dec 22 14:29:47 2003
@@ -18,7 +18,7 @@
 BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml

 GNU_CONFIGURE= yes
-CONFIGURE_ARGS=        --enable-pthread
+CONFIGURE_ARGS=        --enable-pthread --enable-ocamlver=3.07+2
 WRKSRC=                ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
 USE_GMAKE=     yes
 ALL_TARGET=    depend opt

After "make configure", apply this patch:

--- work/mldonkey-2.5-4/src/utils/lib/autoconf.ml.orig  Mon Dec 22 14:33:50 2003
+++ work/mldonkey-2.5-4/src/utils/lib/autoconf.ml       Mon Dec 22 14:33:57 2003
@@ -19,4 +19,3 @@
 let zlib__uncompress_string2 s = Zlib.uncompress_string2 s
 let zlib__compress_string s = Zlib.compress_string s

-type ('a,'b,'c) ml_format = ('a,'b, 'c,'c) format  type ('a,'b,'c) format = ('a,'b, 'c) ml_format


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->leeym 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Sat Dec 27 02:12:42 PST 2003 
Responsible-Changed-Why:  
I'll handle this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=60490 

From: Yen-Ming Lee <leeym@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, dhchen@mail.dhchen.com
Cc:  
Subject: Re: ports/60490: ports/net/mldonkey fails to build with the newest ports/lang/ocaml
Date: Sat, 27 Dec 2003 18:10:49 +0800

 --f2QGlHpHGjS2mn6Y
 Content-Type: multipart/mixed; boundary="pWyiEgJYm5f9v55/"
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 
 
 --pWyiEgJYm5f9v55/
 Content-Type: text/plain; charset=utf8
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 
 How about this patch?
 -- 
 Yen-Ming Lee [۩] KeyID: 0x5EB52E51 : www.leeym.com : Taipei, Taiwan
 
 --pWyiEgJYm5f9v55/
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="mldonkey.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/mldonkey/Makefile,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile
 --- Makefile	30 Oct 2003 09:35:00 -0000	1.12
 +++ Makefile	27 Dec 2003 10:09:36 -0000
 @@ -18,7 +18,9 @@
  BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
  
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--enable-pthread
 +USE_REINPLACE=	yes
 +OCAML_VER=	3.07+2
 +CONFIGURE_ARGS=	--enable-pthread --enable-ocamlver=${OCAML_VER}
  WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.(.)$/-\1/}
  USE_GMAKE=	yes
  ALL_TARGET=	depend opt
 @@ -55,6 +57,7 @@
  .endif
  
  post-patch:
 +	@${REINPLACE_CMD} -e 's,3.07),3.07*),g' ${WRKSRC}/config/configure
  	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \
  		${WRKDIR}/wrapper.sh
  
 
 --pWyiEgJYm5f9v55/--
 
 --f2QGlHpHGjS2mn6Y
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iQCVAwUBP+1aqMnMx0NetS5RAQHokgP+JP1Pt8zjeJoQQZfVBBGOqPTdPLCjndz3
 H7KN3khDiQMQDDO8o2HDEP5yCf+kFXbWJwR2qHcrO24X1VtgcMEtpqKman7OuK0C
 Blj0PvLkKVpHFxXkX/h6HeWFW8xxxw50IiwoSbVgz9Mef2htgF4clBhiYSL8XyS+
 bML1g8Fb+po=
 =wH5W
 -----END PGP SIGNATURE-----
 
 --f2QGlHpHGjS2mn6Y--

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/60490: ports/net/mldonkey fails to build with the newest
	ports/lang/ocaml
Date: Mon, 05 Jan 2004 19:28:44 +0100

 Adding to audit trial from private mail:
 
              Od:=20
 Rob B
 <robbyrnes@ozemail.com.au>
            Komu:=20
 Pav Lucistnik
 <pav@FreeBSD.org>
           Kopie:=20
 freebsd-ports-bugs@FreeBSD.org, leeym@FreeBSD.org
       P=F8edm=ECt:=20
 Re: ports/60490:
 ports/net/mldonkey
 fails to build
 with the newest
 ports/lang/ocaml
           Datum:=20
 Sat, 03 Jan 2004
 12:55:35 +1100
 
 Patch from leeym applied OK, port now builds and installs fine
 
 --=20
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 In God we trust. All others must use the callback verifier.
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Mon Jan 12 16:16:24 PST 2004 
State-Changed-Why:  
Superceded by ports/61012 

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