From manfred.lotz@yahoo.de  Thu Dec 20 12:45:07 2007
Return-Path: <manfred.lotz@yahoo.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36A9E16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Dec 2007 12:45:07 +0000 (UTC)
	(envelope-from manfred.lotz@yahoo.de)
Received: from smtp006.mail.ukl.yahoo.com (smtp006.mail.ukl.yahoo.com [217.12.11.95])
	by mx1.freebsd.org (Postfix) with SMTP id 9C8EB13C44B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 20 Dec 2007 12:45:06 +0000 (UTC)
	(envelope-from manfred.lotz@yahoo.de)
Received: (qmail 49825 invoked from network); 20 Dec 2007 10:58:36 -0000
Received: from unknown (HELO hermes.bsd.net) (manfred.lotz@84.58.90.21 with login)
  by smtp006.mail.ukl.yahoo.com with SMTP; 20 Dec 2007 10:58:36 -0000
Received: by hermes.bsd.net (Postfix, from userid 1001)
	id D4DEA73E4F; Thu, 20 Dec 2007 11:58:34 +0100 (CET)
Message-Id: <20071220105834.D4DEA73E4F@hermes.bsd.net>
Date: Thu, 20 Dec 2007 11:58:34 +0100 (CET)
From: manfred.lotz@yahoo.de
Reply-To: manfred.lotz@yahoo.de
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: www/ocaml-net New version 2.2.9
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         118888
>Category:       ports
>Synopsis:       Update port: www/ocaml-net New version 2.2.9
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    stas
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 20 12:50:04 UTC 2007
>Closed-Date:    Tue Apr 08 19:46:30 UTC 2008
>Last-Modified:  Tue Apr 08 19:46:30 UTC 2008
>Originator:     Manfred Lotz
>Release:        FreeBSD 7.0-BETA4 i386
>Organization:
>Environment:
7.0-BETA4 FreeBSD 7.0-BETA4 
>Description:
Update of www/ocaml-net to version 2.2.9
Stephane Legrand asked me to take over the www/ocaml-net port because he is no 
longer interested in maintaining it. Please note, that I am a first time
comitter.

No new files. However, I removed the following files:
- pkg-deinstall
- pkg-install
It seems they are no longer required.

Please abort PR 113792 which was an upgrade to ocaml-net 2.2.7 but was in error.

 
Manfred Lotz 
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/www/ocaml-net/Makefile ocaml-net/Makefile
--- /usr/ports/www/ocaml-net/Makefile	2007-05-25 02:39:40.000000000 +0200
+++ ocaml-net/Makefile	2007-12-20 11:25:21.548893203 +0100
@@ -1,20 +1,19 @@
 # New ports collection makefile for:   ocaml-net
-# Date created:        01 March 2003
-# Whom:                Stephane Legrand <stephane@freebsd.org>
+# Date created:        17 June 2007
+# Whom:                Manfred Lotz <manfred.lotz@yahoo.de>
 #
-# $FreeBSD: ports/www/ocaml-net/Makefile,v 1.10 2007/05/25 00:39:40 clsung Exp $
+## $FreeBSD: ports/www/ocaml-net/Makefile,v 1.10 2007/05/25 00:39:40 clsung Exp $
 #
 
 PORTNAME=	net
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.9
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlnet
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	ocaml${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	manfred.lotz@yahoo.de
 COMMENT=	OCaml modules for Internet applications
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
@@ -23,18 +22,11 @@
 RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		${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
+CONFLICTS=	ocaml-equeue-2*
 
 USE_GMAKE=	yes
 
 HAS_CONFIGURE=	yes
-# seems required to build www/ocaml-wdialog:
-CONFIGURE_ARGS+=	-enable-compatcgi
 
 ALL_TARGET=	all opt
 
@@ -45,35 +37,22 @@
 PORTDOCS=	*
 .endif
 
+OCAMLNET_PACKAGES=	netsys netshm equeue shell netstring rpc-generator rpc pop smtp netclient netcgi1 netcgi2 cgi netplex netcgi2-plex
+
 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}
-	@${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
+
+.for pkg in ${OCAMLNET_PACKAGES}
+	@${FIND} ${PREFIX}/lib/ocaml/site-lib/${pkg} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/${pkg}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@unexec ocamlfind remove ${pkg} 2>/dev/null || true" >> ${TMPPLIST}
+.endfor
 
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/../doc/ ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/../examples/ ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
 	@${CHMOD} -R +r ${EXAMPLESDIR}
 	@${FIND} ${EXAMPLESDIR} -type f | \
 		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
diff -ruN /usr/ports/www/ocaml-net/distinfo ocaml-net/distinfo
--- /usr/ports/www/ocaml-net/distinfo	2006-01-07 08:45:07.000000000 +0100
+++ ocaml-net/distinfo	2007-11-08 19:40:26.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (ocamlnet-1.1.1.tar.gz) = 4347d04ae16e69b61940f8679eeeef07
-SHA256 (ocamlnet-1.1.1.tar.gz) = ce9a88a2597e0ea5a3b164979e56bd3f8a02d3277fb8830e16be4b9d3b474be1
-SIZE (ocamlnet-1.1.1.tar.gz) = 793905
+MD5 (ocamlnet-2.2.9.tar.gz) = 3655e3be3bb2806e0a1f48bb7ce16fb3
+SHA256 (ocamlnet-2.2.9.tar.gz) = 134530a4357879e095bdbbb5f21f78634a16ef4d787eb151676b7fee7e4c0dc9
+SIZE (ocamlnet-2.2.9.tar.gz) = 1877257
diff -ruN /usr/ports/www/ocaml-net/pkg-deinstall ocaml-net/pkg-deinstall
--- /usr/ports/www/ocaml-net/pkg-deinstall	2004-10-28 00:45:28.000000000 +0200
+++ ocaml-net/pkg-deinstall	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-grep -v netstring ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
-rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
diff -ruN /usr/ports/www/ocaml-net/pkg-descr ocaml-net/pkg-descr
--- /usr/ports/www/ocaml-net/pkg-descr	2003-04-03 17:16:47.000000000 +0200
+++ ocaml-net/pkg-descr	2007-06-17 09:04:04.000000000 +0200
@@ -1,18 +1,21 @@
 A collection of modules for the Objective Caml language which focus
 on application-level Internet protocols and conventions.
 
-The current distribution contains:
+Ocamlnet consists of a number of libraries:
 
-- a mature implementation of the CGI protocol
-
-- an implementation of the JSERV protocol (AJP-1.2)
-
-- an experimental POP3 client
-
-- a library of string processing functions related to Internet
-  protocols
+    * netstring is about processing strings that occur in network context
+    * netcgi1 and netcgi2 focus on portable web applications
+    * nethttpd is a web server component (HTTP server implementation)
+    * netplex is a generic server framework
+    * rpc implements OncRPC
+    * netclient implements clients for HTTP, FTP, and Telnet
+    * equeue is an event queue used for many protocol implementations
+    * shell is about calling external commands
+    * netshm provides shared memory for IPC purposes
+    * netsys contains bindings for system functions
+    * smtp and pop are two further client implementations
 
 WWW: http://sourceforge.net/projects/ocamlnet
 
-- Stephane Legrand
-  <stephane@freebsd.org>
+- Manfred  Lotz
+  <manfred.lotz@yahoo.de>
diff -ruN /usr/ports/www/ocaml-net/pkg-install ocaml-net/pkg-install
--- /usr/ports/www/ocaml-net/pkg-install	2004-10-28 00:45:28.000000000 +0200
+++ ocaml-net/pkg-install	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if ! grep "${PKG_PREFIX}/lib/ocaml/site-lib/netstring" ${PKG_PREFIX}/lib/ocaml/ld.conf >/dev/null 2>&1; then
-  echo "${PKG_PREFIX}/lib/ocaml/site-lib/netstring" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
-fi
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->stas 
Responsible-Changed-By: stas 
Responsible-Changed-When: Sun Dec 23 21:41:59 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

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

From: Stanislav Sedov <stas@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118888: Update port: www/ocaml-net New version 2.2.9
Date: Mon, 24 Dec 2007 01:08:57 +0300

 I'll update it along with the lang/ocaml when the slush is over.
 
 -- 
 Stanislav Sedov
 ST4096-RIPE

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/118888: commit references a PR
Date: Tue,  8 Apr 2008 19:21:48 +0000 (UTC)

 stas        2008-04-08 19:21:35 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/ocaml-net        Makefile distinfo pkg-descr 
   Removed files:
     www/ocaml-net        pkg-deinstall pkg-install 
   Log:
   - Update ocaml-net to 2.2.9
   - make PREFIX-clean
   - use bsd.ocamk.mk framework
   - update pkg description
   - pass maintainership to submitter.
   
   PR:             ports/118888 (based on)
   Submitted by:   manfred.lotz@yahoo.de
   
   Revision  Changes    Path
   1.11      +29 -51    ports/www/ocaml-net/Makefile
   1.6       +3 -3      ports/www/ocaml-net/distinfo
   1.2       +0 -5      ports/www/ocaml-net/pkg-deinstall (dead)
   1.2       +14 -11    ports/www/ocaml-net/pkg-descr
   1.2       +0 -5      ports/www/ocaml-net/pkg-install (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: stas 
State-Changed-When: Tue Apr 8 19:46:29 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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