diff options
Diffstat (limited to 'net/ocamlnet')
| -rw-r--r-- | net/ocamlnet/Makefile | 6 | ||||
| -rw-r--r-- | net/ocamlnet/PLIST | 17 | ||||
| -rw-r--r-- | net/ocamlnet/distinfo | 9 | ||||
| -rw-r--r-- | net/ocamlnet/patches/patch-src_netzip_netgzip.ml | 16 |
4 files changed, 38 insertions, 10 deletions
diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile index 20a168d91ec..7dc90186c4b 100644 --- a/net/ocamlnet/Makefile +++ b/net/ocamlnet/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2012/07/06 09:29:14 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2012/08/20 08:11:58 wiz Exp $ # -DISTNAME= ocamlnet-3.5.1 +DISTNAME= ocamlnet-3.6 CATEGORIES= net MASTER_SITES= http://download.camlcity.org/download/ @@ -17,7 +17,7 @@ DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib HAS_CONFIGURE= yes CONFIGURE_ARGS+= -without-nethttpd -without-rpc-auth-dh -disable-gtk2 \ - -disable-tcl -disable-apache + -disable-tcl -disable-apache -enable-pcre USE_TOOLS+= gmake BUILD_TARGET= all diff --git a/net/ocamlnet/PLIST b/net/ocamlnet/PLIST index da603eb3a1c..821de6081d3 100644 --- a/net/ocamlnet/PLIST +++ b/net/ocamlnet/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2012/07/06 09:29:14 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2012/08/20 08:11:58 wiz Exp $ @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/equeue @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netcgi2-plex @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/netplex @@ -453,8 +453,6 @@ lib/ocaml/site-lib/netstring/netstring.cma ${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.cmxa ${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.p.a ${PLIST.opt}lib/ocaml/site-lib/netstring/netstring.p.cmxa -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 @@ -478,6 +476,14 @@ ${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.p.cmx ${PLIST.opt}lib/ocaml/site-lib/netstring/xdr.p.o lib/ocaml/site-lib/netstring/xdr_mstring.cmi lib/ocaml/site-lib/netstring/xdr_mstring.mli +lib/ocaml/site-lib/netstring-pcre/META +${PLIST.opt}lib/ocaml/site-lib/netstring-pcre/netstring-pcre.a +lib/ocaml/site-lib/netstring-pcre/netstring-pcre.cma +${PLIST.opt}lib/ocaml/site-lib/netstring-pcre/netstring-pcre.cmxa +${PLIST.opt}lib/ocaml/site-lib/netstring-pcre/netstring-pcre.p.a +${PLIST.opt}lib/ocaml/site-lib/netstring-pcre/netstring-pcre.p.cmxa +lib/ocaml/site-lib/netstring-pcre/netstring_pcre.cmi +lib/ocaml/site-lib/netstring-pcre/netstring_pcre.mli lib/ocaml/site-lib/netsys/META lib/ocaml/site-lib/netsys/dllnetsys.so lib/ocaml/site-lib/netsys/libnetsys.a @@ -524,6 +530,8 @@ lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.mli ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.o ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.cmx ${PLIST.opt}lib/ocaml/site-lib/netsys/netsys_oothr_mt_init.p.o +lib/ocaml/site-lib/netsys/netsys_pmanage.cmi +lib/ocaml/site-lib/netsys/netsys_pmanage.mli lib/ocaml/site-lib/netsys/netsys_pollset.cmi lib/ocaml/site-lib/netsys/netsys_pollset.mli lib/ocaml/site-lib/netsys/netsys_pollset_generic.cmi @@ -535,6 +543,8 @@ lib/ocaml/site-lib/netsys/netsys_pollset_win32.mli lib/ocaml/site-lib/netsys/netsys_posix.cmi lib/ocaml/site-lib/netsys/netsys_posix.mli lib/ocaml/site-lib/netsys/netsys_rng.cmi +lib/ocaml/site-lib/netsys/netsys_sem.mli +lib/ocaml/site-lib/netsys/netsys_sem.cmi lib/ocaml/site-lib/netsys/netsys_rng.mli lib/ocaml/site-lib/netsys/netsys_signal.cmi lib/ocaml/site-lib/netsys/netsys_signal.mli @@ -604,6 +614,7 @@ lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.mli ${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.a ${PLIST.opt}lib/ocaml/site-lib/rpc-auth-local/rpc_auth_local.p.cmxa lib/ocaml/site-lib/rpc-generator/META +lib/ocaml/site-lib/rpc-generator/config.cmi lib/ocaml/site-lib/rpc-generator/direct.cmi lib/ocaml/site-lib/rpc-generator/dummy.mli lib/ocaml/site-lib/rpc-generator/generate.cmi diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo index d06c39922f6..e7a83f05f78 100644 --- a/net/ocamlnet/distinfo +++ b/net/ocamlnet/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2012/07/18 21:56:05 wiz Exp $ +$NetBSD: distinfo,v 1.7 2012/08/20 08:11:58 wiz Exp $ -SHA1 (ocamlnet-3.5.1.tar.gz) = 7e1c2ab3ada6735139b47eb852495cd609ebfd6e -RMD160 (ocamlnet-3.5.1.tar.gz) = 133a2572e9ef8a5bf62880a2a6696391d0938a08 -Size (ocamlnet-3.5.1.tar.gz) = 3290994 bytes +SHA1 (ocamlnet-3.6.tar.gz) = 37972c5ed04bbcae4661c40f1b0e49ef1c8111d8 +RMD160 (ocamlnet-3.6.tar.gz) = 3a1af8bc573150a26437e2c7feff3126b1ebfa9e +Size (ocamlnet-3.6.tar.gz) = 3322518 bytes SHA1 (patch-Makefile.rules) = ffe0b4a56e2b1f0449ee6ceedaeffdb5b5abbc9a SHA1 (patch-src_netsys_netsys__c.c) = 3c40b57e0cae5d20823273334f73dc2b5c6dbc51 +SHA1 (patch-src_netzip_netgzip.ml) = 04fd6e50094ed9a25937ed4b548d55f6313dd77b diff --git a/net/ocamlnet/patches/patch-src_netzip_netgzip.ml b/net/ocamlnet/patches/patch-src_netzip_netgzip.ml new file mode 100644 index 00000000000..6575eab9c17 --- /dev/null +++ b/net/ocamlnet/patches/patch-src_netzip_netgzip.ml @@ -0,0 +1,16 @@ +$NetBSD: patch-src_netzip_netgzip.ml,v 1.1 2012/08/20 08:11:58 wiz Exp $ + +Syntax change to conform to ocaml 4.00 +--- src/netzip/netgzip.ml.orig 2012-07-19 23:25:26.000000000 +0000 ++++ src/netzip/netgzip.ml +@@ -322,8 +322,8 @@ class output_deflate ?level ch = + let () = + Netcompression.register + ~iana_name:"gzip" +- ~decoder:(new inflating_pipe) +- ~encoder:(new deflating_pipe) ++ ~decoder:(fun () -> new inflating_pipe ()) ++ ~encoder:(fun () -> new deflating_pipe ()) + () + + |