From stephane@freebsd-fr.org  Tue Mar 23 07:56:47 2004
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 EB26916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 07:56:47 -0800 (PST)
Received: from postfix3-1.free.fr (postfix3-1.free.fr [213.228.0.44])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6FDE643D41
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 07:56:47 -0800 (PST)
	(envelope-from stephane@freebsd-fr.org)
Received: from sequoia.mondomaineamoi.megalo (lns-th2-4f-81-56-223-84.adsl.proxad.net [81.56.223.84])
	by postfix3-1.free.fr (Postfix) with ESMTP id DFF0AC4143
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 16:56:45 +0100 (CET)
Received: from sequoia.mondomaineamoi.megalo (localhost.mondomaineamoi.megalo [127.0.0.1])
	by sequoia.mondomaineamoi.megalo (8.12.9p2/8.12.2) with ESMTP id i2NFuixI067602
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 23 Mar 2004 16:56:44 +0100 (CET)
	(envelope-from stephane@sequoia.mondomaineamoi.megalo)
Received: (from stephane@localhost)
	by sequoia.mondomaineamoi.megalo (8.12.9p2/8.12.5/Submit) id i2NFtOCB067593;
	Tue, 23 Mar 2004 16:55:24 +0100 (CET)
Message-Id: <200403231555.i2NFtOCB067593@sequoia.mondomaineamoi.megalo>
Date: Tue, 23 Mar 2004 16:55:24 +0100 (CET)
From: Stephane Legrand <stephane@freebsd.org>
Reply-To: Stephane Legrand <stephane@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] Update for www/ocaml-net
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         64622
>Category:       ports
>Synopsis:       [maintainer update] Update for www/ocaml-net
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 23 08:00:40 PST 2004
>Closed-Date:    Tue Mar 23 15:40:02 PST 2004
>Last-Modified:  Tue Mar 23 15:40:02 PST 2004
>Originator:     Stephane Legrand <stephane@freebsd.org>
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
  System: FreeBSD 4.9-STABLE

>Description:
	Update www/ocaml-net to 0.97.

   Please note that this PR supersedes the PR ports/64366.

   Please also note that when this PR is committed, the PR ports/64436
   should also be committed to avoid breaking of www/ocaml-wdialog.
   
   Thanks to Ying-Chieh Liao <ijliao@FreeBSD.org> for his patches (this
   PR is nearly equivalent).

>How-To-Repeat:
>Fix:

diff -ruN ocaml-net-orig/Makefile ocaml-net/Makefile
--- ocaml-net-orig/Makefile	Sat Mar 13 21:37:11 2004
+++ ocaml-net/Makefile	Tue Mar 23 13:59:21 2004
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	net
-PORTVERSION=	0.95
-PORTREVISION=	1
+PORTVERSION=	0.97
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlnet
@@ -21,12 +21,40 @@
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
 		${LOCALBASE}/lib/ocaml/site-lib/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 
-WRKSRC=	${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_GMAKE=	yes
 
 HAS_CONFIGURE=	yes
 
 ALL_TARGET=	all opt
+
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+
+PORTDOCS=	*
+.endif
+
+post-install:
+	@${FIND} ${PREFIX}/lib/ocaml/site-lib/cgi -type f | \
+		${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/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}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/../doc/ ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/../examples/ ${EXAMPLESDIR}
+	@${CHMOD} -R +r ${EXAMPLESDIR}
+	@${FIND} ${EXAMPLESDIR} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff -ruN ocaml-net-orig/distinfo ocaml-net/distinfo
--- ocaml-net-orig/distinfo	Sat Mar 13 21:37:11 2004
+++ ocaml-net/distinfo	Tue Mar 23 13:57:11 2004
@@ -1 +1,2 @@
-MD5 (ocamlnet-0.95.tar.gz) = a5c63db289734db78df4dbf4be580688
+MD5 (ocamlnet-0.97.tar.gz) = 60e2afa16e0ee55828822b365791793b
+SIZE (ocamlnet-0.97.tar.gz) = 383163
diff -ruN ocaml-net-orig/pkg-plist ocaml-net/pkg-plist
--- ocaml-net-orig/pkg-plist	Sat Mar 13 21:37:11 2004
+++ ocaml-net/pkg-plist	Tue Mar 23 14:26:24 2004
@@ -1,73 +1 @@
-lib/ocaml/site-lib/cgi/META
-lib/ocaml/site-lib/cgi/cgi.a
-lib/ocaml/site-lib/cgi/cgi.cma
-lib/ocaml/site-lib/cgi/cgi.cmxa
-lib/ocaml/site-lib/cgi/netcgi.cmi
-lib/ocaml/site-lib/cgi/netcgi.mli
-lib/ocaml/site-lib/cgi/netcgi_env.cmi
-lib/ocaml/site-lib/cgi/netcgi_env.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv_ajp12.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv_ajp12.mli
-lib/ocaml/site-lib/cgi/netcgi_jserv_app.cmi
-lib/ocaml/site-lib/cgi/netcgi_jserv_app.mli
-lib/ocaml/site-lib/cgi/netcgi_types.cmi
-lib/ocaml/site-lib/cgi/netcgi_types.mli
-lib/ocaml/site-lib/netstring/META
-lib/ocaml/site-lib/netstring/cgi.cmi
-lib/ocaml/site-lib/netstring/cgi.mli
-lib/ocaml/site-lib/netstring/mimestring.cmi
-lib/ocaml/site-lib/netstring/mimestring.mli
-lib/ocaml/site-lib/netstring/netaddress.cmi
-lib/ocaml/site-lib/netstring/netaddress.mli
-lib/ocaml/site-lib/netstring/netaux.cmi
-lib/ocaml/site-lib/netstring/netaux.mli
-lib/ocaml/site-lib/netstring/netbuffer.cmi
-lib/ocaml/site-lib/netstring/netbuffer.mli
-lib/ocaml/site-lib/netstring/netchannels.cmi
-lib/ocaml/site-lib/netstring/netchannels.mli
-lib/ocaml/site-lib/netstring/netconversion.cmi
-lib/ocaml/site-lib/netstring/netconversion.mli
-lib/ocaml/site-lib/netstring/netdate.cmi
-lib/ocaml/site-lib/netstring/netdate.mli
-lib/ocaml/site-lib/netstring/netencoding.cmi
-lib/ocaml/site-lib/netstring/netencoding.mli
-lib/ocaml/site-lib/netstring/nethtml.cmi
-lib/ocaml/site-lib/netstring/nethtml.mli
-lib/ocaml/site-lib/netstring/nethtml_scanner.cmi
-lib/ocaml/site-lib/netstring/netmappings.cmi
-lib/ocaml/site-lib/netstring/netmappings.mli
-lib/ocaml/site-lib/netstring/netmappings_iso.cmi
-lib/ocaml/site-lib/netstring/netmappings_iso.cmo
-lib/ocaml/site-lib/netstring/netmappings_iso.cmx
-lib/ocaml/site-lib/netstring/netmappings_iso.o
-lib/ocaml/site-lib/netstring/netmappings_other.cmi
-lib/ocaml/site-lib/netstring/netmappings_other.cmo
-lib/ocaml/site-lib/netstring/netmappings_other.cmx
-lib/ocaml/site-lib/netstring/netmappings_other.o
-lib/ocaml/site-lib/netstring/netmime.cmi
-lib/ocaml/site-lib/netstring/netmime.mli
-lib/ocaml/site-lib/netstring/netsendmail.cmi
-lib/ocaml/site-lib/netstring/netsendmail.mli
-lib/ocaml/site-lib/netstring/netstream.cmi
-lib/ocaml/site-lib/netstring/netstream.mli
-lib/ocaml/site-lib/netstring/netstring.a
-lib/ocaml/site-lib/netstring/netstring.cma
-lib/ocaml/site-lib/netstring/netstring.cmxa
-lib/ocaml/site-lib/netstring/netstring_mt.cmi
-lib/ocaml/site-lib/netstring/netstring_mt.cmo
-lib/ocaml/site-lib/netstring/netstring_mt.cmx
-lib/ocaml/site-lib/netstring/netstring_mt.mli
-lib/ocaml/site-lib/netstring/netstring_mt.o
-lib/ocaml/site-lib/netstring/netstring_pcre.cmi
-lib/ocaml/site-lib/netstring/netstring_pcre.mli
-lib/ocaml/site-lib/netstring/netstring_str.cmi
-lib/ocaml/site-lib/netstring/netstring_str.mli
-lib/ocaml/site-lib/netstring/netstring_top.cmi
-lib/ocaml/site-lib/netstring/netstring_top.cmo
-lib/ocaml/site-lib/netstring/netstring_top.mli
-lib/ocaml/site-lib/netstring/neturl.cmi
-lib/ocaml/site-lib/netstring/neturl.mli
-@dirrm lib/ocaml/site-lib/cgi
-@dirrm lib/ocaml/site-lib/netstring
+
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Tue Mar 23 12:12:59 PST 2004 
Responsible-Changed-Why:  
I requested this so grab 

http://www.freebsd.org/cgi/query-pr.cgi?pr=64622 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Mar 23 15:39:54 PST 2004 
State-Changed-Why:  
Committed, thanks! 

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