diff options
Diffstat (limited to 'devel/ocaml-lwt')
-rw-r--r-- | devel/ocaml-lwt/Makefile | 3 | ||||
-rw-r--r-- | devel/ocaml-lwt/PLIST | 45 | ||||
-rw-r--r-- | devel/ocaml-lwt/distinfo | 14 | ||||
-rw-r--r-- | devel/ocaml-lwt/options.mk | 21 |
4 files changed, 9 insertions, 74 deletions
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile index 0acad66d97b..d8de21ae421 100644 --- a/devel/ocaml-lwt/Makefile +++ b/devel/ocaml-lwt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2018/04/05 11:04:39 jaapb Exp $ +# $NetBSD: Makefile,v 1.35 2018/04/05 11:52:28 jaapb Exp $ # .include "Makefile.common" @@ -18,7 +18,6 @@ CONFIGURE_ARGS= -use-libev false do-configure: cd ${WRKSRC} && ocaml src/util/configure.ml ${CONFIGURE_ARGS} -.include "options.mk" .include "../../mk/ocaml.mk" .include "../../devel/ocaml-cppo/buildlink3.mk" .include "../../devel/ocaml-findlib/buildlink3.mk" diff --git a/devel/ocaml-lwt/PLIST b/devel/ocaml-lwt/PLIST index 9369bdcd1d4..2fd382d1a54 100644 --- a/devel/ocaml-lwt/PLIST +++ b/devel/ocaml-lwt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2018/04/05 11:04:39 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.14 2018/04/05 11:52:28 jaapb Exp $ ${OCAML_SITELIB}/lwt/META ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/log/lwt_log.a ${OCAML_SITELIB}/lwt/log/lwt_log.cma @@ -89,18 +89,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/lwt_switch.cmx ${OCAML_SITELIB}/lwt/lwt_switch.ml ${OCAML_SITELIB}/lwt/lwt_switch.mli ${OCAML_SITELIB}/lwt/opam -${OCAML_SITELIB}/lwt/ppx/lwt.ppx.dune -${OCAML_SITELIB}/lwt/ppx/ppx.exe -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.a -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cma -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmi -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmt -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/ppx/ppx_lwt.cmxs -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.ml -${OCAML_SITELIB}/lwt/ppx/ppx_lwt.mli ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.a ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cma ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmi @@ -110,37 +98,6 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.cmxs ${OCAML_SITELIB}/lwt/simple-top/lwt_simple_top.ml ${OCAML_SITELIB}/lwt/simple-top/lwt.simple-top.dune -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.a -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cma -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxa -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/lwt_syntax_log.cmxs -${OCAML_SITELIB}/lwt/syntax/log/lwt.syntax.log.dune -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmi -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmt -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmti -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.cmx -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.ml -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/log/pa_lwt_log.mli -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.a -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cma -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxa -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/lwt_syntax.cmxs -${OCAML_SITELIB}/lwt/syntax/lwt.syntax.dune -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.a -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cma -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxa -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/lwt_syntax_options.cmxs -${OCAML_SITELIB}/lwt/syntax/options/lwt.syntax.options.dune -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmi -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmt -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.cmx -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/options/pa_lwt_options.ml -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmi -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmt -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmti -${PLIST.camlp4}${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/syntax/pa_lwt.cmx -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.ml -${PLIST.camlp4}${OCAML_SITELIB}/lwt/syntax/pa_lwt.mli ${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt/unix/liblwt_unix_stubs.a ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmi ${OCAML_SITELIB}/lwt/unix/lwt_bytes.cmt diff --git a/devel/ocaml-lwt/distinfo b/devel/ocaml-lwt/distinfo index ea0b10132c7..e05b8649b30 100644 --- a/devel/ocaml-lwt/distinfo +++ b/devel/ocaml-lwt/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.16 2018/04/05 11:04:39 jaapb Exp $ +$NetBSD: distinfo,v 1.17 2018/04/05 11:52:28 jaapb Exp $ SHA1 (lwt-3.3.0.tar.gz) = 1a8aec06b4080577a989cbaeec0614359465ea73 RMD160 (lwt-3.3.0.tar.gz) = 2f374a7e315daa03f7f3b3039abbf757dc5b7892 SHA512 (lwt-3.3.0.tar.gz) = 452425c8c0cddd53463da658b1bb8edb0c5ead2e0de0f733dbf624d373fec94c3121e77cc285427770388e16106fae84c32805b6642d1797200660fed91d0f29 Size (lwt-3.3.0.tar.gz) = 312052 bytes -SHA1 (patch-META.lwt) = bd8348dc75f92188db1e00c8afd91c551d5a3267 -SHA1 (patch-src_camlp4_jbuild) = 9cb17cd6cf2b0c4a05b5251829c9c0a42bdf1f10 -SHA1 (patch-src_camlp4_log_jbuild) = 0c8145baebbef764836e41ce1cc308b630513e14 -SHA1 (patch-src_camlp4_options_jbuild) = eac6a3152667d33c14e4b890e395a9d4b52e7a46 -SHA1 (patch-src_ppx_jbuild) = d027f7049f2f3cfe96d4d9d1a5ddcfb3126d17da +SHA1 (patch-META.lwt) = 0581a5dcea185694703955f6c55837465b62888e +SHA1 (patch-src_camlp4_jbuild) = f1d1100dcd9b66875ed69dc25bc5546b52c2532e +SHA1 (patch-src_camlp4_log_jbuild) = 7e6e7dddf0ff1c5983aea6515a43761edab874df +SHA1 (patch-src_camlp4_options_jbuild) = 3c0232d5424b0ad85cf3a99803ebcf54b51c7ac1 +SHA1 (patch-src_ppx_jbuild) = e57f511041d811232af8a4b52c5c39153cca7dc9 SHA1 (patch-src_unix_config_discover.ml) = ef8ea37d85f20d56654514617050ee46d6080ef1 -SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = 5ec0ae3afe3d65e673681fcf8faeebf811e64518 +SHA1 (patch-src_unix_unix__c_unix__stat__job__utils.c) = dbecbc5507e901a1187dc69d0fa0c1dfa2097b22 diff --git a/devel/ocaml-lwt/options.mk b/devel/ocaml-lwt/options.mk deleted file mode 100644 index 3a4189be2c3..00000000000 --- a/devel/ocaml-lwt/options.mk +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: options.mk,v 1.4 2017/09/08 12:45:33 jaapb Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.ocaml-lwt -PKG_SUPPORTED_OPTIONS= camlp4 -PKG_SUGGESTED_OPTIONS= # empty -PLIST_VARS+= camlp4 - -.include "../../mk/bsd.prefs.mk" - -.include "../../mk/bsd.options.mk" - -### -### Camlp4 support -### -.if !empty(PKG_OPTIONS:Mcamlp4) -.include "../../lang/camlp4/buildlink3.mk" -CONFIGURE_ARGS+= -use-camlp4 true -PLIST.camlp4= yes -.else -CONFIGURE_ARGS+= -use-camlp4 false -.endif |