Bug 85188

Summary:

[maintainer-update] Update www/ocaml-net to 1.1

Product:

Ports & Packages

Reporter:

stephleg

Component:

Individual Port(s)

Assignee:

Renato Botelho <garga>

Status:

Closed FIXED

Severity:

Affects Only Me

Priority:

Normal

Version:

Latest

Hardware:

Any

OS:

Any

Attachments:

Description	Flags
file.diff	none

Description stephleg 2005-08-21 16:30:19 UTC

  Update www/ocaml-net to 1.1

Comment 1 Volker Stolz freebsd_committer

2005-08-29 17:46:34 UTC

State Changed
From-To: open->feedback

Can you please inquire about a possible enqueue-update?

Comment 2 Volker Stolz freebsd_committer

2005-08-31 13:29:33 UTC

State Changed
From-To: feedback->suspended

Suspend until pots/84766

Comment 3 Volker Stolz freebsd_committer

2005-08-31 13:29:33 UTC

Responsible Changed
From-To: freebsd-ports-bugs->vs

I'll track this.

Comment 4 Volker Stolz freebsd_committer

2005-09-13 13:21:43 UTC

State Changed
From-To: suspended->feedback

We're open for business again. Please post a follow-up with 
the necessary changes to nethttpd including any plist-changes!

Comment 5 Renato Botelho freebsd_committer

2005-09-21 20:36:26 UTC

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!

Comment 6 Renato Botelho freebsd_committer

2005-09-22 10:58:47 UTC

Responsible Changed
From-To: vs->garga

Grabbed.

Comment 7 Renato Botelho freebsd_committer

2005-09-22 11:03:36 UTC

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"

Comment 8 stephleg 2005-10-02 19:41:21 UTC

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

Comment 9 Renato Botelho freebsd_committer

2005-10-03 14:59:03 UTC

State Changed
From-To: feedback->closed

Committed. Thanks!