Date: Tue, 1 Mar 2011 20:07:37 GMT From: Jaap Boender <jaapb@kerguelen.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155170: [update] www/ocaml-net to 3.2.1 Message-ID: <201103012007.p21K7bvS017192@red.freebsd.org> Resent-Message-ID: <201103012010.p21KAFnT043883@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155170 >Category: ports >Synopsis: [update] www/ocaml-net to 3.2.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 01 20:10:15 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jaap Boender >Release: 8.2-STABLE >Organization: >Environment: FreeBSD joffre.kerguelen.org 8.2-STABLE FreeBSD 8.2-STABLE #2: Fri Feb 25 13:50:05 CET 2011 root@joffre.kerguelen.org:/usr/obj/usr/src/sys/JOFFRE amd64 >Description: This patch combines ports/122890 with an update to the newest stable version: 3.2.1. It adds two new modules, netcamlbox and netmulticore. There are other changes: - The new Rpc_proxy layer - Netplex has been extended (Netplex_sharedvar etc.) - New implementation of the Shell library for starting subprocesses - Uniform debugging with Netlog.Debug - Exception printers (Netexn) - Coordination of signal handling in Netsys_signal - New foundation for Unixqueue via pollsets - Extended Unixqueue engines (e.g. Uq_io) - More system calls in netsys - Camlboxes as an efficient way of message passing between processes - The netcgi1 library has been dropped in favor of netcgi2 However, to deal with the many options, this needs the original version of bsd.ocaml.mk I submitted in ports/122844 (in the committed version, the two for loops have been replaced with .for loops, which creates problems with shell variable expansion). >How-To-Repeat: n/a >Fix: patch to port directory included. Patch attached with submission follows: diff -Naur ocaml-net/Makefile ocaml-net-new/Makefile --- ocaml-net/Makefile 2009-11-20 23:53:08.000000000 +0100 +++ ocaml-net-new/Makefile 2011-03-01 20:30:13.310448101 +0100 @@ -6,10 +6,9 @@ # PORTNAME= net -PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTVERSION= 3.2.1 CATEGORIES= www -MASTER_SITES= SF/ocaml${PORTNAME}/ocaml${PORTNAME}/${PORTVERSION} +MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- DISTNAME= ocaml${PORTNAME}-${PORTVERSION} @@ -24,6 +23,8 @@ USE_GMAKE= yes USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_LDCONFIG= yes +USE_OCAMLFIND_PLIST= yes HAS_CONFIGURE= yes ALL_TARGET= all opt @@ -42,16 +43,87 @@ .endif OCAML_PKGDIRS= netsys netshm equeue shell netstring rpc-generator \ - rpc pop smtp netclient netcgi1 netcgi2 cgi netplex \ - netcgi2-plex + rpc pop smtp netclient netcgi2 netplex \ + netcgi2-plex netcamlbox netmulticore +OCAML_LDLIBS= ${OCAML_SITELIBDIR}/netsys ${OCAML_SITELIBDIR}/netshm \ + ${OCAML_SITELIBDIR}/equeue ${OCAML_SITELIBDIR}/shell \ + ${OCAML_SITELIBDIR}/netstring \ + ${OCAML_SITELIBDIR}/rpc-generator ${OCAML_SITELIBDIR}/rpc \ + ${OCAML_SITELIBDIR}/pop ${OCAML_SITELIBDIR}/smtp \ + ${OCAML_SITELIBDIR}/netclient ${OCAML_SITELIBDIR}/netcgi2 \ + ${OCAML_SITELIBDIR}/netplex ${OCAML_SITELIBDIR}/netcgi2-plex \ + ${OCAML_SITELIBDIR}/netcamlbox ${OCAML_SITELIBDIR}/netmulticore + +OPTIONS= SSL "Enable SSL support" ON \ + NETHTTPD "Enable the integrated HTTP daemon" OFF \ + AUTH_DH "Enable Diffie-Hellman authorization support" OFF \ + GTK "Enable GTK support" OFF \ + GTK2 "Enable GTK2 support" OFF \ + APACHE "Enable Apache mod connector (experimental)" OFF + +.include <bsd.port.pre.mk> + +.if defined(WITHOUT_SSL) +CONFIGURE_ARGS+= -disable-ssl +.else +CONFIGURE_ARGS+= -enable-ssl +BUILD_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl +RUN_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl +OCAML_PKGDIRS+= equeue-ssl rpc-ssl +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/equeue-ssl \ + ${OCAML_SITELIBDIR}/rpc-ssl +.endif -post-install: +.if defined(WITH_NETHTTPD) +CONFIGURE_ARGS+= -with-nethttpd +OCAML_PKGDIRS+= nethttpd nethttpd-for-netcgi1 nethttpd-for-netcgi2 +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/nethttpd \ + ${OCAML_SITELIBDIR}/nethttpd-for-netcgi1 \ + ${OCAML_SITELIBDIR}/nethttpd-for-netcgi2 +.else +CONFIGURE_ARGS+= -without-nethttpd +.endif -.for pkg in ${OCAML_PKGDIRS} - @${FIND} ${PREFIX}/lib/ocaml/site-lib/${pkg} -type f | \ - ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} -.endfor +.if defined(WITH_AUTH_DH) +CONFIGURE_ARGS+= -with-rpc-auth-dh +BUILD_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps +RUN_DEPENDS+= ${SA_DIR}/cryptgps/cryptgps.a:${PORTSDIR}/security/ocaml-cryptgps +OCAML_PKGDIRS+= rpc-auth-dh +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/rpc-auth-dh +.else +CONFIGURE_ARGS+= -without-rpc-auth-dh +.endif + +.if defined(WITH_GTK) +CONFIGURE_ARGS+= -enable-gtk +BUILD_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk +RUN_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk +OCAML_PKGDIRS+= equeue-gtk1 +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/equeue-gtk1 +.else +CONFIGURE_ARGS+= -disable-gtk +.endif +.if defined(WITH_GTK2) +CONFIGURE_ARGS+= -enable-gtk2 +BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 +OCAML_PKGDIRS+= equeue-gtk2 +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/equeue-gtk2 +.else +CONFIGURE_ARGS+= -disable-gtk2 +.endif + +.if defined(WITH_APACHE) +USE_APACHE= 1.3+ +CONFIGURE_ARGS+= -enable-apache -apxs ${APXS} -apache ${HTTPD} +OCAML_PKGDIRS+= netcgi_apache +OCAML_LDLIBS+= ${OCAML_SITELIBDIR}/netcgi_apache +.else +CONFIGURE_ARGS+= -disable-apache +.endif + +post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR}/ @(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR}/) @@ -60,4 +132,4 @@ @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -Naur ocaml-net/distinfo ocaml-net-new/distinfo --- ocaml-net/distinfo 2008-04-08 21:21:34.000000000 +0200 +++ ocaml-net-new/distinfo 2011-03-01 19:24:59.893417445 +0100 @@ -1,3 +1,2 @@ -MD5 (ocamlnet-2.2.9.tar.gz) = 3655e3be3bb2806e0a1f48bb7ce16fb3 -SHA256 (ocamlnet-2.2.9.tar.gz) = 134530a4357879e095bdbbb5f21f78634a16ef4d787eb151676b7fee7e4c0dc9 -SIZE (ocamlnet-2.2.9.tar.gz) = 1877257 +SHA256 (ocamlnet-3.2.1.tar.gz) = 3d68a178c172e2e68fbe0527b4224a07f5f61722515c7cecb1d77b1a96436ef0 +SIZE (ocamlnet-3.2.1.tar.gz) = 2732852 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103012007.p21K7bvS017192>