From stephane@freebsd-fr.org  Sun Aug 21 15:22:37 2005
Return-Path: <stephane@freebsd-fr.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1702F16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 15:22:37 +0000 (GMT)
	(envelope-from stephane@freebsd-fr.org)
Received: from Smtp.neuf.fr (sp604001mt.neufgp.fr [84.96.92.60])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E9E743D58
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 15:22:35 +0000 (GMT)
	(envelope-from stephane@freebsd-fr.org)
Received: from sequoia.mondomaineamoi.megalo ([84.100.6.76])
 by sp604001mt.gpm.neuf.ld
 (Sun Java System Messaging Server 6.2-3.03 (built Jun 27 2005))
 with ESMTP id <0ILK003S8W1LITM0@sp604001mt.gpm.neuf.ld> for
 FreeBSD-gnats-submit@freebsd.org; Sun, 21 Aug 2005 17:22:33 +0200 (CEST)
Received: from sequoia.mondomaineamoi.megalo
 (localhost.mondomaineamoi.megalo [127.0.0.1])	by sequoia.mondomaineamoi.megalo
 (8.13.3/8.13.1) with ESMTP id j7LFMePl023465	for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Aug 2005 17:22:40 +0200
Received: (from stephane@localhost)	by sequoia.mondomaineamoi.megalo
 (8.13.3/8.13.1/Submit) id j7LFMeGY023464; Sun,
 21 Aug 2005 17:22:40 +0200 (CEST envelope-from stephane)
Message-Id: <200508211522.j7LFMeGY023464@sequoia.mondomaineamoi.megalo>
Date: Sun, 21 Aug 2005 17:22:40 +0200 (CEST)
From: Stephane Legrand <stephleg@free.fr>
Reply-To: Stephane Legrand <stephleg@free.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] Update www/ocaml-net to 1.1
X-Send-Pr-Version: 3.113
X-GNATS-Notify: garga

>Number:         85188
>Category:       ports
>Synopsis:       [maintainer-update] Update www/ocaml-net to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 21 15:30:19 GMT 2005
>Closed-Date:    Mon Oct 03 13:59:04 GMT 2005
>Last-Modified:  Mon Oct 03 13:59:04 GMT 2005
>Originator:     Stephane Legrand
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
  FreeBSD 5.4-STABLE i386

>Description:
  Update www/ocaml-net to 1.1

>How-To-Repeat:
>Fix:

diff -ruN ocaml-net-orig/Makefile ocaml-net/Makefile
--- ocaml-net-orig/Makefile	Sun Aug 21 15:10:09 2005
+++ ocaml-net/Makefile	Sun Aug 21 15:59:15 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
@@ -29,6 +28,8 @@
 HAS_CONFIGURE=	yes
 # seems required to build www/ocaml-wdialog:
 CONFIGURE_ARGS+=	-enable-compatcgi
+# doesn't build otherwise (may be because the Equeue port is not up to date)
+CONFIGURE_ARGS+=	-without-nethttpd
 
 ALL_TARGET=	all opt
 
@@ -48,6 +49,14 @@
 		${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 -ruN ocaml-net-orig/distinfo ocaml-net/distinfo
--- ocaml-net-orig/distinfo	Sun Aug 21 15:10:09 2005
+++ ocaml-net/distinfo	Sun Aug 21 15:13:11 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:
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Mon Aug 29 16:46:34 GMT 2005 
State-Changed-Why:  
Can you please inquire about a possible enqueue-update? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85188 
State-Changed-From-To: feedback->suspended 
State-Changed-By: vs 
State-Changed-When: Wed Aug 31 12:29:33 GMT 2005 
State-Changed-Why:  
Suspend until pots/84766 


Responsible-Changed-From-To: freebsd-ports-bugs->vs 
Responsible-Changed-By: vs 
Responsible-Changed-When: Wed Aug 31 12:29:33 GMT 2005 
Responsible-Changed-Why:  
I'll track this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85188 
State-Changed-From-To: suspended->feedback 
State-Changed-By: vs 
State-Changed-When: Tue Sep 13 12:21:43 GMT 2005 
State-Changed-Why:  
We're open for business again. Please post a follow-up with 
the necessary changes to nethttpd including any plist-changes! 

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

From: Renato Botelho <garga@FreeBSD.org>
To: bug-followup@FreeBSD.org, stephleg@free.fr
Cc: Volker Stolz <vs@FreeBSD.org>
Subject: Re: ports/85188: [maintainer-update] Update www/ocaml-net to 1.1
Date: Wed, 21 Sep 2005 16:36:26 -0300

 I propose the following patch:
 
 --- ocaml-net.patch begins here ---
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/www/ocaml-net/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- Makefile	27 Oct 2004 22:45:28 -0000	1.6
 +++ Makefile	21 Sep 2005 19:32:11 -0000
 @@ -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,9 @@
  
  BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
  		ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
 -		${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
 +		${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre \
 +		${LOCALBASE}/lib/ocaml/site-lib/equeue/equeue.a:${PORTSDIR}/devel/ocaml-equeue
 +RUN_DEPENDS=	${BUILD_DEPENDS}
  
  WRKSRC=		${WRKDIR}/${DISTNAME}/src
  
 @@ -48,6 +48,18 @@
  		${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}
 +	@${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}
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  	${CP} -R ${WRKSRC}/../doc/ ${DOCSDIR}
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/www/ocaml-net/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo	18 Oct 2004 16:52:45 -0000	1.3
 +++ distinfo	21 Sep 2005 19:32:11 -0000
 @@ -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
 --- ocaml-net.patch ends here ---
 
 Thanks
 -- 
 Renato Botelho <garga @ FreeBSD.org>
                <freebsd @ galle.com.br>
 GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
 
 YOW!!  Everybody out of the GENETIC POOL!
Responsible-Changed-From-To: vs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Thu Sep 22 09:58:47 GMT 2005 
Responsible-Changed-Why:  
Grabbed. 

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

From: Renato Botelho <garga@FreeBSD.org>
To: stephane@FreeBSD.org
Cc: bug-followup@FreeBSD.org, stephleg@free.fr
Subject: Re: ports/85188: [maintainer-update] Update www/ocaml-net to 1.1
Date: Thu, 22 Sep 2005 07:03:36 -0300

 Dear maintainer of port www/ocaml-net, please, take a look at:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/85188
 
 Do you approve this patch?
 -- 
 Renato Botelho <garga @ FreeBSD.org>
                <freebsd @ galle.com.br>
 GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
 
 Liar, n.:
 	A lawyer with a roving commission.
 		-- Ambrose Bierce, "The Devil's Dictionary"

From: Stephane Legrand <stephleg@free.fr>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/85188: [maintainer-update] Update www/ocaml-net to 1.1
Date: Sun, 02 Oct 2005 20:41:21 +0200

 Hi,
 
 Here is my new patch with nethttpd support.
 
 
 diff -ruN ocaml-net-orig/Makefile ocaml-net/Makefile
 --- ocaml-net-orig/Makefile	Thu Oct 28 00:45:28 2004
 +++ ocaml-net/Makefile	Sun Oct  2 18:26:52 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
 @@ -22,6 +21,11 @@
  		${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
  
 +.if !defined(WITHOUT_NETHTTPD)
 +BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/equeue/equeue.a:${PORTSDIR}/devel/ocaml-equeue
 +RUN_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/equeue/equeue.a:${PORTSDIR}/devel/ocaml-equeue
 +.endif
 +
  WRKSRC=		${WRKDIR}/${DISTNAME}/src
  
  USE_GMAKE=	yes
 @@ -48,6 +52,21 @@
  		${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(WITHOUT_NETHTTPD)
 +	@${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}
 +.endif
 +
  .if !defined(NOPORTDOCS)
  	@${MKDIR} ${DOCSDIR}
  	${CP} -R ${WRKSRC}/../doc/ ${DOCSDIR}
 diff -ruN ocaml-net-orig/distinfo ocaml-net/distinfo
 --- ocaml-net-orig/distinfo	Mon Oct 18 18:52:45 2004
 +++ ocaml-net/distinfo	Sun Oct  2 18:27:03 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
 
 
 -- 
 <stephleg@free.fr>
 Forums FreeBSD Francophone: forums.freebsd-fr.org
 Club Unix/Log. libres Cosne/Loire: www.cosnix.org
State-Changed-From-To: feedback->closed 
State-Changed-By: garga 
State-Changed-When: Mon Oct 3 13:59:03 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

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