From nobody@FreeBSD.org  Wed Aug 10 16:13:25 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4287B16A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 10 Aug 2005 16:13:25 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 12D6F43D46
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 10 Aug 2005 16:13:25 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j7AGDOK2087057
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 10 Aug 2005 16:13:24 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j7AGDOCx087055;
	Wed, 10 Aug 2005 16:13:24 GMT
	(envelope-from nobody)
Message-Id: <200508101613.j7AGDOCx087055@www.freebsd.org>
Date: Wed, 10 Aug 2005 16:13:24 GMT
From: Jun Mukai <mukai@jmuk.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: update port: www/ocaml-net to 1.1
X-Send-Pr-Version: www-2.3

>Number:         84767
>Category:       ports
>Synopsis:       update port: www/ocaml-net to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 10 16:20:12 GMT 2005
>Closed-Date:    Wed Aug 24 06:47:38 GMT 2005
>Last-Modified:  Wed Aug 24 06:47:38 GMT 2005
>Originator:     Jun Mukai
>Release:        FreeBSD 4.10-RELEASE
>Organization:
>Environment:
FreeBSD verraeter 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Tue Jun  1 14:16:21 JST 2004     mukai@verraeter:/usr/obj/usr/src/sys/VERRAETER  i386
>Description:
update  www/ocaml-net to 1.1
>How-To-Repeat:
      
>Fix:
diff -ru ocaml-net.orig/Makefile ocaml-net/Makefile
--- ocaml-net.orig/Makefile     Fri Oct 29 03:12:16 2004
+++ ocaml-net/Makefile  Thu Aug 11 00:55:51 2005
@@ -6,8 +6,7 @@
 #

 PORTNAME=      net
-PORTVERSION=   0.98
-PORTREVISION=  1
+PORTVERSION=   1.1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=    ocamlnet
@@ -19,8 +18,10 @@

 BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
                ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
+               ${LOCALBASE}/lib/ocaml/site-lib/equeue-core/equeue.a:${PORTSDIR}/devel/ocaml-equeue \
+               ${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
+RUN_DEPENDS=   ${LOCALBASE}/lib/ocaml/site-lib/equeue-core/equeue.a:${PORTSDIR}/devel/ocaml-equeue \
                ${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
-RUN_DEPENDS=   ${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre

 WRKSRC=                ${WRKDIR}/${DISTNAME}/src

diff -ru ocaml-net.orig/distinfo ocaml-net/distinfo
--- ocaml-net.orig/distinfo     Tue Oct 19 03:12:51 2004
+++ ocaml-net/distinfo  Thu Aug 11 00:51:05 2005
@@ -1,2 +1,2 @@
-MD5 (ocamlnet-0.98.tar.gz) = 229b7ed78b4c3ffae41b83625a13c3da
-SIZE (ocamlnet-0.98.tar.gz) = 639820
+MD5 (ocamlnet-1.1.tar.gz) = 2ec265aeea6a6470e7493ab047cef261
+SIZE (ocamlnet-1.1.tar.gz) = 813800
>Release-Note:
>Audit-Trail:

From: Denis Shaposhnikov <dsh@vlink.ru>
To: bug-followup@FreeBSD.org, mukai@jmuk.org
Cc:  
Subject: Re: ports/84767: update port: www/ocaml-net to 1.1
Date: Mon, 15 Aug 2005 11:11:06 +0400

 I think, this patch is better, because pkg-plist patched too.
 
 diff -Nru ocaml-net.orig/Makefile ocaml-net/Makefile
 --- ocaml-net.orig/Makefile	Thu Oct 28 02:45:28 2004
 +++ ocaml-net/Makefile	Thu Aug  4 15:23:06 2005
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	net
 -PORTVERSION=	0.98
 -PORTREVISION=	1
 +PORTVERSION=	1.1
  CATEGORIES=	www
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	ocamlnet
 @@ -44,10 +43,22 @@
  		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
  	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/cgi" >> ${TMPPLIST}
  	@${ECHO_CMD} "@unexec ocamlfind remove cgi 2>/dev/null || true" >> ${TMPPLIST}
 +	@${FIND} ${PREFIX}/lib/ocaml/site-lib/nethttpd -type f | \
 +		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
 +	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/nethttpd" >> ${TMPPLIST}
 +	@${ECHO_CMD} "@unexec ocamlfind remove nethttpd 2>/dev/null || true" >> ${TMPPLIST}
  	@${FIND} ${PREFIX}/lib/ocaml/site-lib/netstring -type f | \
  		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
  	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/netstring" >> ${TMPPLIST}
  	@${ECHO_CMD} "@unexec ocamlfind remove netstring 2>/dev/null || true" >> ${TMPPLIST}
 +	@${FIND} ${PREFIX}/lib/ocaml/site-lib/pop -type f | \
 +		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
 +	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/pop" >> ${TMPPLIST}
 +	@${ECHO_CMD} "@unexec ocamlfind remove pop 2>/dev/null || true" >> ${TMPPLIST}
 +	@${FIND} ${PREFIX}/lib/ocaml/site-lib/smtp -type f | \
 +		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
 +	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/smtp" >> ${TMPPLIST}
 +	@${ECHO_CMD} "@unexec ocamlfind remove smtp 2>/dev/null || true" >> ${TMPPLIST}
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  	${CP} -R ${WRKSRC}/../doc/ ${DOCSDIR}
 diff -Nru ocaml-net.orig/distinfo ocaml-net/distinfo
 --- ocaml-net.orig/distinfo	Mon Oct 18 20:52:45 2004
 +++ ocaml-net/distinfo	Thu Aug  4 15:13:54 2005
 @@ -1,2 +1,2 @@
 -MD5 (ocamlnet-0.98.tar.gz) = 229b7ed78b4c3ffae41b83625a13c3da
 -SIZE (ocamlnet-0.98.tar.gz) = 639820
 +MD5 (ocamlnet-1.1.tar.gz) = 2ec265aeea6a6470e7493ab047cef261
 +SIZE (ocamlnet-1.1.tar.gz) = 813800
 
 -- 
 DSS5-RIPE DSS-RIPN 2:550/5068@fidonet 2:550/5069@fidonet
 mailto:dsh@vlink.ru http://neva.vlink.ru/~dsh/

From: Stephane Legrand <stephleg@free.fr>
To: bug-followup@FreeBSD.org, mukai@jmuk.org
Cc:  
Subject: Re: ports/84767: update port: www/ocaml-net to 1.1
Date: Mon, 22 Aug 2005 21:59:19 +0200

 Hi,
 
 Did you try to build ocaml-net with your patch with the Nethttpd
 support and with the FreeBSD port of Equeue (which is not up to
 date) ? I tried but i have a building error so i removed the Nethttpd
 support for my ocaml-net port update (see
 http://www.freebsd.org/cgi/query-pr.cgi?pr=85188).
 
 
 Regards,
 Stephane Legrand.
 -- 
 <stephleg@free.fr>
 Forums FreeBSD Francophone: forums.freebsd-fr.org
 Club Unix/Log. libres Cosne/Loire: www.cosnix.org

From: Stephane Legrand <stephleg@free.fr>
To: Jun Mukai <mukai@jmuk.org>
Cc: bug-followup@freebsd.org
Subject: Re: ports/84767: update port: www/ocaml-net to 1.1
Date: Tue, 23 Aug 2005 21:57:50 +0200

 On Tue, Aug 23, 2005 at 04:18:59PM +0900, Jun Mukai wrote:
 > Hi stephane,
 > 
 > I also sent a pr for update of Equeue ports. see
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=84766.
 
 Ah, ok. I didn't know.
  
 > With ocaml-equeue-2.1, I success to build ocaml-net with Nethttpd
 > support.
 
 Ok. So, i propose to close this PR 84767 and use PR 85188 to update
 ocaml-net for now. When the Equeue port will be updated thanks to
 your patch, i will send a new PR to add support for Nethttpd. I
 want to add a Makefile variable to be able to not build the Nethttpd
 support (the default will be with Nethttpd support) because it's a
 GPL licence and i guess this can be a problem for some projects.
 
 
 Regards,
 Stephane Legrand.
 -- 
 <stephleg@free.fr>
 Forums FreeBSD Francophone: forums.freebsd-fr.org
 Club Unix/Log. libres Cosne/Loire: www.cosnix.org
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Wed Aug 24 06:46:59 GMT 2005 
State-Changed-Why:  
Superceeded by ports/85188 (mostly).  The remaining lines will be sent 
by the port's maintainer as a separate PR. 

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