3 files changed, 32 insertions, 77 deletions

diff --git a/www/ocaml-net/Makefile b/www/ocaml-net/Makefile
index 0abdbd44bdb7..effa43a89146 100644
--- a/www/ocaml-net/Makefile
+++ b/www/ocaml-net/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	net
-PORTVERSION=	0.95
-PORTREVISION=	1
+PORTVERSION=	0.97
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ocamlnet
@@ -21,7 +20,7 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		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
 
@@ -29,4 +28,32 @@ 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 --git a/www/ocaml-net/distinfo b/www/ocaml-net/distinfo
index 9cf73ef405c1..855f64ad9728 100644
--- a/www/ocaml-net/distinfo
+++ b/www/ocaml-net/distinfo
@@ -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 --git a/www/ocaml-net/pkg-plist b/www/ocaml-net/pkg-plist
deleted file mode 100644
index 8adbb9c1d5f0..000000000000
--- a/www/ocaml-net/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-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