From 86ca65f57ad87a05f05ac15211ddb69946f1db92 Mon Sep 17 00:00:00 2001 From: chrisz Date: Sat, 17 Aug 2019 13:29:42 +0000 Subject: [PATCH] hardcode OCaml library path into dune binary. This makes findlib superfluous when using dune. "get it in" naddy@ --- devel/dune/Makefile | 32 +-- devel/dune/pkg/PFRAG.dynlink-native | 9 + devel/dune/pkg/PFRAG.native | 104 +++++++ devel/dune/pkg/PLIST | 412 +++++++++++++++++++++++++++- devel/ocaml-biniou/Makefile | 4 +- devel/ocaml-configurator/Makefile | 4 +- devel/ocaml-cppo/Makefile | 5 +- devel/ocaml-easy-format/Makefile | 7 +- devel/ocaml-yojson/Makefile | 4 +- graphics/ocaml-cairo/Makefile | 4 +- x11/lablgtk3/Makefile | 5 +- 11 files changed, 539 insertions(+), 51 deletions(-) create mode 100644 devel/dune/pkg/PFRAG.dynlink-native create mode 100644 devel/dune/pkg/PFRAG.native diff --git a/devel/dune/Makefile b/devel/dune/Makefile index 4f35c1157f9..fb67922e8a1 100644 --- a/devel/dune/Makefile +++ b/devel/dune/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/07/12 20:44:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2019/08/17 13:29:42 chrisz Exp $ COMMENT = OCaml build system @@ -7,6 +7,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml GH_PROJECT = dune GH_TAGNAME = 1.10.0 +REVISION = 1 HOMEPAGE = https://github.com/ocaml/dune @@ -22,32 +23,19 @@ MODULES = lang/ocaml BUILD_DEPENDS = sysutils/findlib CONFIGURE_STYLE = simple +CONFIGURE_ARGS = --libdir ${PREFIX}/lib/ocaml/ USE_GMAKE = Yes + MAKE_FLAGS = DUNE_FLAGS="--display verbose -j ${MAKE_JOBS}" ALL_TARGET = release + +FAKE_FLAGS = PREFIX=${PREFIX} LIBDIR=lib/ocaml INSTALL_TARGET = install -idir = ${WRKSRC}/_boot/install/default -docdir = ${PREFIX}/share/doc/dune - -.include - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dune - ${INSTALL_DATA} \ - ${idir}/doc/dune/{CHANGES,README,LICENSE}.md \ - ${PREFIX}/share/doc/dune - ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} \ - ${idir}/share/emacs/site-lisp/* \ - ${PREFIX}/share/emacs/site-lisp/ - ${INSTALL_MAN} ${idir}/man/man1/* ${PREFIX}/man/man1/ - ${INSTALL_MAN} ${idir}/man/man5/* ${PREFIX}/man/man5/ -.if ${PROPERTIES:Mocaml_native} - ${INSTALL_PROGRAM} ${idir}/bin/* ${PREFIX}/bin/ -.else - ${INSTALL_SCRIPT} ${idir}/bin/* ${PREFIX}/bin/ -.endif +post-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT} + mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/ + rmdir ${PREFIX}/doc .include diff --git a/devel/dune/pkg/PFRAG.dynlink-native b/devel/dune/pkg/PFRAG.dynlink-native new file mode 100644 index 00000000000..bc3ca91c54e --- /dev/null +++ b/devel/dune/pkg/PFRAG.dynlink-native @@ -0,0 +1,9 @@ +@comment $OpenBSD: PFRAG.dynlink-native,v 1.1 2019/08/17 13:29:42 chrisz Exp $ +lib/ocaml/dune/_caml/dune_caml.cmxs +lib/ocaml/dune/_dune_lang/dune_lang.cmxs +lib/ocaml/dune/_ocaml_config/ocaml_config.cmxs +lib/ocaml/dune/_result/dune_result.cmxs +lib/ocaml/dune/_stdune/stdune.cmxs +lib/ocaml/dune/_wp/dune/wp_dune.cmxs +lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.cmxs +lib/ocaml/dune/configurator/configurator.cmxs diff --git a/devel/dune/pkg/PFRAG.native b/devel/dune/pkg/PFRAG.native new file mode 100644 index 00000000000..96fbf46cbba --- /dev/null +++ b/devel/dune/pkg/PFRAG.native @@ -0,0 +1,104 @@ +@comment $OpenBSD: PFRAG.native,v 1.1 2019/08/17 13:29:42 chrisz Exp $ +%%dynlink%% +lib/ocaml/dune/_caml/dune_caml.a +lib/ocaml/dune/_caml/dune_caml.cmx +lib/ocaml/dune/_caml/dune_caml.cmxa +lib/ocaml/dune/_dune_lang/dune_lang.a +lib/ocaml/dune/_dune_lang/dune_lang.cmx +lib/ocaml/dune/_dune_lang/dune_lang.cmxa +lib/ocaml/dune/_dune_lang/dune_lang__.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Escape.cmx +lib/ocaml/dune/_dune_lang/dune_lang__File_syntax.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Jbuild_lexer.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Lexer.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Lexer_shared.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Template.cmx +lib/ocaml/dune/_dune_lang/dune_lang__Types.cmx +lib/ocaml/dune/_ocaml_config/ocaml_config.a +lib/ocaml/dune/_ocaml_config/ocaml_config.cmx +lib/ocaml/dune/_ocaml_config/ocaml_config.cmxa +lib/ocaml/dune/_result/dune_result.a +lib/ocaml/dune/_result/dune_result.cmx +lib/ocaml/dune/_result/dune_result.cmxa +lib/ocaml/dune/_result/dune_result__.cmx +lib/ocaml/dune/_result/dune_result__Result.cmx +lib/ocaml/dune/_result/dune_result__Result_compat.cmx +lib/ocaml/dune/_stdune/stdune.a +lib/ocaml/dune/_stdune/stdune.cmx +lib/ocaml/dune/_stdune/stdune.cmxa +lib/ocaml/dune/_stdune/stdune__.cmx +lib/ocaml/dune/_stdune/stdune__Ansi_color.cmx +lib/ocaml/dune/_stdune/stdune__Appendable_list.cmx +lib/ocaml/dune/_stdune/stdune__Array.cmx +lib/ocaml/dune/_stdune/stdune__Bin.cmx +lib/ocaml/dune/_stdune/stdune__Bool.cmx +lib/ocaml/dune/_stdune/stdune__Bytes.cmx +lib/ocaml/dune/_stdune/stdune__Char.cmx +lib/ocaml/dune/_stdune/stdune__Common.cmx +lib/ocaml/dune/_stdune/stdune__Comparable.cmx +lib/ocaml/dune/_stdune/stdune__Digest.cmx +lib/ocaml/dune/_stdune/stdune__Dyn.cmx +lib/ocaml/dune/_stdune/stdune__Dyn0.cmx +lib/ocaml/dune/_stdune/stdune__Either.cmx +lib/ocaml/dune/_stdune/stdune__Env.cmx +lib/ocaml/dune/_stdune/stdune__Escape.cmx +lib/ocaml/dune/_stdune/stdune__Exn.cmx +lib/ocaml/dune/_stdune/stdune__Exn_with_backtrace.cmx +lib/ocaml/dune/_stdune/stdune__Fdecl.cmx +lib/ocaml/dune/_stdune/stdune__Filename.cmx +lib/ocaml/dune/_stdune/stdune__Float.cmx +lib/ocaml/dune/_stdune/stdune__Fmt.cmx +lib/ocaml/dune/_stdune/stdune__Fn.cmx +lib/ocaml/dune/_stdune/stdune__Hashable.cmx +lib/ocaml/dune/_stdune/stdune__Hashtbl.cmx +lib/ocaml/dune/_stdune/stdune__Hashtbl_intf.cmx +lib/ocaml/dune/_stdune/stdune__Id.cmx +lib/ocaml/dune/_stdune/stdune__Import.cmx +lib/ocaml/dune/_stdune/stdune__Int.cmx +lib/ocaml/dune/_stdune/stdune__Interned.cmx +lib/ocaml/dune/_stdune/stdune__Io.cmx +lib/ocaml/dune/_stdune/stdune__List.cmx +lib/ocaml/dune/_stdune/stdune__Loc.cmx +lib/ocaml/dune/_stdune/stdune__Loc0.cmx +lib/ocaml/dune/_stdune/stdune__Map.cmx +lib/ocaml/dune/_stdune/stdune__Map_intf.cmx +lib/ocaml/dune/_stdune/stdune__Monad.cmx +lib/ocaml/dune/_stdune/stdune__Nothing.cmx +lib/ocaml/dune/_stdune/stdune__Option.cmx +lib/ocaml/dune/_stdune/stdune__Or_exn.cmx +lib/ocaml/dune/_stdune/stdune__Ordering.cmx +lib/ocaml/dune/_stdune/stdune__Path.cmx +lib/ocaml/dune/_stdune/stdune__Path_intf.cmx +lib/ocaml/dune/_stdune/stdune__Poly.cmx +lib/ocaml/dune/_stdune/stdune__Pp.cmx +lib/ocaml/dune/_stdune/stdune__Proc.cmx +lib/ocaml/dune/_stdune/stdune__Result.cmx +lib/ocaml/dune/_stdune/stdune__Set.cmx +lib/ocaml/dune/_stdune/stdune__Set_intf.cmx +lib/ocaml/dune/_stdune/stdune__Sexp.cmx +lib/ocaml/dune/_stdune/stdune__Sexp0.cmx +lib/ocaml/dune/_stdune/stdune__Sexp_intf.cmx +lib/ocaml/dune/_stdune/stdune__Staged.cmx +lib/ocaml/dune/_stdune/stdune__String.cmx +lib/ocaml/dune/_stdune/stdune__String_split.cmx +lib/ocaml/dune/_stdune/stdune__Table.cmx +lib/ocaml/dune/_stdune/stdune__Tuple.cmx +lib/ocaml/dune/_stdune/stdune__Type_eq.cmx +lib/ocaml/dune/_stdune/stdune__Unit.cmx +lib/ocaml/dune/_stdune/stdune__Univ_map.cmx +lib/ocaml/dune/_wp/dune/wp.cmx +lib/ocaml/dune/_wp/dune/wp__wp_dune__.cmx +lib/ocaml/dune/_wp/dune/wp_dune.a +lib/ocaml/dune/_wp/dune/wp_dune.cmxa +lib/ocaml/dune/_wp/jbuilder/wp.cmx +lib/ocaml/dune/_wp/jbuilder/wp__wp_jbuilder__.cmx +lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.a +lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.cmxa +lib/ocaml/dune/configurator/configurator.a +lib/ocaml/dune/configurator/configurator.cmx +lib/ocaml/dune/configurator/configurator.cmxa +lib/ocaml/dune/configurator/configurator__.cmx +lib/ocaml/dune/configurator/configurator__Extract_obj.cmx +lib/ocaml/dune/configurator/configurator__V1.cmx diff --git a/devel/dune/pkg/PLIST b/devel/dune/pkg/PLIST index e37df908010..43733f5120c 100644 --- a/devel/dune/pkg/PLIST +++ b/devel/dune/pkg/PLIST @@ -1,8 +1,409 @@ -@comment $OpenBSD: PLIST,v 1.4 2019/06/19 09:18:18 chrisz Exp $ +@comment $OpenBSD: PLIST,v 1.5 2019/08/17 13:29:42 chrisz Exp $ @pkgpath sysutils/dune +%%native%% @bin bin/dune @bin bin/jbuilder @bin bin/ocaml-syntax-shims +lib/ocaml/dune/ +lib/ocaml/dune/META +lib/ocaml/dune/_caml/ +lib/ocaml/dune/_caml/dune_caml.cma +lib/ocaml/dune/_caml/dune_caml.cmi +lib/ocaml/dune/_caml/dune_caml.cmt +lib/ocaml/dune/_caml/dune_caml.ml +lib/ocaml/dune/_dune_lang/ +lib/ocaml/dune/_dune_lang/atom.ml +lib/ocaml/dune/_dune_lang/atom.mli +lib/ocaml/dune/_dune_lang/dune_lang.cma +lib/ocaml/dune/_dune_lang/dune_lang.cmi +lib/ocaml/dune/_dune_lang/dune_lang.cmt +lib/ocaml/dune/_dune_lang/dune_lang.cmti +lib/ocaml/dune/_dune_lang/dune_lang.ml +lib/ocaml/dune/_dune_lang/dune_lang.mli +lib/ocaml/dune/_dune_lang/dune_lang__.cmi +lib/ocaml/dune/_dune_lang/dune_lang__.cmt +lib/ocaml/dune/_dune_lang/dune_lang__.ml +lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Atom.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Dune_lexer.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Escape.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Escape.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Escape.cmti +lib/ocaml/dune/_dune_lang/dune_lang__File_syntax.cmi +lib/ocaml/dune/_dune_lang/dune_lang__File_syntax.cmt +lib/ocaml/dune/_dune_lang/dune_lang__File_syntax.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Jbuild_lexer.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Jbuild_lexer.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Jbuild_lexer.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Lexer.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Lexer.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Lexer.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Lexer_shared.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Lexer_shared.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Lexer_shared.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Template.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Template.cmt +lib/ocaml/dune/_dune_lang/dune_lang__Template.cmti +lib/ocaml/dune/_dune_lang/dune_lang__Types.cmi +lib/ocaml/dune/_dune_lang/dune_lang__Types.cmt +lib/ocaml/dune/_dune_lang/dune_lexer.ml +lib/ocaml/dune/_dune_lang/dune_lexer.mli +lib/ocaml/dune/_dune_lang/escape.ml +lib/ocaml/dune/_dune_lang/escape.mli +lib/ocaml/dune/_dune_lang/file_syntax.ml +lib/ocaml/dune/_dune_lang/file_syntax.mli +lib/ocaml/dune/_dune_lang/jbuild_lexer.ml +lib/ocaml/dune/_dune_lang/jbuild_lexer.mli +lib/ocaml/dune/_dune_lang/lexer.ml +lib/ocaml/dune/_dune_lang/lexer.mli +lib/ocaml/dune/_dune_lang/lexer_shared.ml +lib/ocaml/dune/_dune_lang/lexer_shared.mli +lib/ocaml/dune/_dune_lang/template.ml +lib/ocaml/dune/_dune_lang/template.mli +lib/ocaml/dune/_dune_lang/types.ml +lib/ocaml/dune/_ocaml_config/ +lib/ocaml/dune/_ocaml_config/ocaml_config.cma +lib/ocaml/dune/_ocaml_config/ocaml_config.cmi +lib/ocaml/dune/_ocaml_config/ocaml_config.cmt +lib/ocaml/dune/_ocaml_config/ocaml_config.cmti +lib/ocaml/dune/_ocaml_config/ocaml_config.ml +lib/ocaml/dune/_ocaml_config/ocaml_config.mli +lib/ocaml/dune/_result/ +lib/ocaml/dune/_result/dune_result.cma +lib/ocaml/dune/_result/dune_result.cmi +lib/ocaml/dune/_result/dune_result.cmt +lib/ocaml/dune/_result/dune_result.ml +lib/ocaml/dune/_result/dune_result__.cmi +lib/ocaml/dune/_result/dune_result__.cmt +lib/ocaml/dune/_result/dune_result__.ml +lib/ocaml/dune/_result/dune_result__Result.cmi +lib/ocaml/dune/_result/dune_result__Result.cmt +lib/ocaml/dune/_result/dune_result__Result.cmti +lib/ocaml/dune/_result/dune_result__Result_compat.cmi +lib/ocaml/dune/_result/dune_result__Result_compat.cmt +lib/ocaml/dune/_result/result.ml +lib/ocaml/dune/_result/result.mli +lib/ocaml/dune/_result/result_compat.ml +lib/ocaml/dune/_stdune/ +lib/ocaml/dune/_stdune/ansi_color.ml +lib/ocaml/dune/_stdune/ansi_color.mli +lib/ocaml/dune/_stdune/appendable_list.ml +lib/ocaml/dune/_stdune/appendable_list.mli +lib/ocaml/dune/_stdune/array.ml +lib/ocaml/dune/_stdune/bin.ml +lib/ocaml/dune/_stdune/bin.mli +lib/ocaml/dune/_stdune/bool.ml +lib/ocaml/dune/_stdune/bool.mli +lib/ocaml/dune/_stdune/bytes.ml +lib/ocaml/dune/_stdune/bytes.mli +lib/ocaml/dune/_stdune/char.ml +lib/ocaml/dune/_stdune/common.ml +lib/ocaml/dune/_stdune/comparable.ml +lib/ocaml/dune/_stdune/comparable.mli +lib/ocaml/dune/_stdune/digest.ml +lib/ocaml/dune/_stdune/digest.mli +lib/ocaml/dune/_stdune/dyn.ml +lib/ocaml/dune/_stdune/dyn.mli +lib/ocaml/dune/_stdune/dyn0.ml +lib/ocaml/dune/_stdune/either.ml +lib/ocaml/dune/_stdune/either.mli +lib/ocaml/dune/_stdune/env.ml +lib/ocaml/dune/_stdune/env.mli +lib/ocaml/dune/_stdune/escape.ml +lib/ocaml/dune/_stdune/escape.mli +lib/ocaml/dune/_stdune/exn.ml +lib/ocaml/dune/_stdune/exn.mli +lib/ocaml/dune/_stdune/exn_with_backtrace.ml +lib/ocaml/dune/_stdune/exn_with_backtrace.mli +lib/ocaml/dune/_stdune/fdecl.ml +lib/ocaml/dune/_stdune/fdecl.mli +lib/ocaml/dune/_stdune/filename.ml +lib/ocaml/dune/_stdune/filename.mli +lib/ocaml/dune/_stdune/float.ml +lib/ocaml/dune/_stdune/float.mli +lib/ocaml/dune/_stdune/fmt.ml +lib/ocaml/dune/_stdune/fmt.mli +lib/ocaml/dune/_stdune/fn.ml +lib/ocaml/dune/_stdune/fn.mli +lib/ocaml/dune/_stdune/hashable.ml +lib/ocaml/dune/_stdune/hashtbl.ml +lib/ocaml/dune/_stdune/hashtbl.mli +lib/ocaml/dune/_stdune/hashtbl_intf.ml +lib/ocaml/dune/_stdune/id.ml +lib/ocaml/dune/_stdune/id.mli +lib/ocaml/dune/_stdune/import.ml +lib/ocaml/dune/_stdune/int.ml +lib/ocaml/dune/_stdune/int.mli +lib/ocaml/dune/_stdune/interned.ml +lib/ocaml/dune/_stdune/interned.mli +lib/ocaml/dune/_stdune/io.ml +lib/ocaml/dune/_stdune/io.mli +lib/ocaml/dune/_stdune/list.ml +lib/ocaml/dune/_stdune/list.mli +lib/ocaml/dune/_stdune/loc.ml +lib/ocaml/dune/_stdune/loc.mli +lib/ocaml/dune/_stdune/loc0.ml +lib/ocaml/dune/_stdune/map.ml +lib/ocaml/dune/_stdune/map.mli +lib/ocaml/dune/_stdune/map_intf.ml +lib/ocaml/dune/_stdune/monad.ml +lib/ocaml/dune/_stdune/monad.mli +lib/ocaml/dune/_stdune/nothing.ml +lib/ocaml/dune/_stdune/nothing.mli +lib/ocaml/dune/_stdune/option.ml +lib/ocaml/dune/_stdune/option.mli +lib/ocaml/dune/_stdune/or_exn.ml +lib/ocaml/dune/_stdune/or_exn.mli +lib/ocaml/dune/_stdune/ordering.ml +lib/ocaml/dune/_stdune/ordering.mli +lib/ocaml/dune/_stdune/path.ml +lib/ocaml/dune/_stdune/path.mli +lib/ocaml/dune/_stdune/path_intf.ml +lib/ocaml/dune/_stdune/poly.ml +lib/ocaml/dune/_stdune/poly.mli +lib/ocaml/dune/_stdune/pp.ml +lib/ocaml/dune/_stdune/pp.mli +lib/ocaml/dune/_stdune/proc.ml +lib/ocaml/dune/_stdune/proc.mli +lib/ocaml/dune/_stdune/result.ml +lib/ocaml/dune/_stdune/result.mli +lib/ocaml/dune/_stdune/set.ml +lib/ocaml/dune/_stdune/set.mli +lib/ocaml/dune/_stdune/set_intf.ml +lib/ocaml/dune/_stdune/sexp.ml +lib/ocaml/dune/_stdune/sexp.mli +lib/ocaml/dune/_stdune/sexp0.ml +lib/ocaml/dune/_stdune/sexp_intf.ml +lib/ocaml/dune/_stdune/staged.ml +lib/ocaml/dune/_stdune/staged.mli +lib/ocaml/dune/_stdune/stdune.cma +lib/ocaml/dune/_stdune/stdune.cmi +lib/ocaml/dune/_stdune/stdune.cmt +lib/ocaml/dune/_stdune/stdune.ml +lib/ocaml/dune/_stdune/stdune__.cmi +lib/ocaml/dune/_stdune/stdune__.cmt +lib/ocaml/dune/_stdune/stdune__.ml +lib/ocaml/dune/_stdune/stdune__Ansi_color.cmi +lib/ocaml/dune/_stdune/stdune__Ansi_color.cmt +lib/ocaml/dune/_stdune/stdune__Ansi_color.cmti +lib/ocaml/dune/_stdune/stdune__Appendable_list.cmi +lib/ocaml/dune/_stdune/stdune__Appendable_list.cmt +lib/ocaml/dune/_stdune/stdune__Appendable_list.cmti +lib/ocaml/dune/_stdune/stdune__Array.cmi +lib/ocaml/dune/_stdune/stdune__Array.cmt +lib/ocaml/dune/_stdune/stdune__Bin.cmi +lib/ocaml/dune/_stdune/stdune__Bin.cmt +lib/ocaml/dune/_stdune/stdune__Bin.cmti +lib/ocaml/dune/_stdune/stdune__Bool.cmi +lib/ocaml/dune/_stdune/stdune__Bool.cmt +lib/ocaml/dune/_stdune/stdune__Bool.cmti +lib/ocaml/dune/_stdune/stdune__Bytes.cmi +lib/ocaml/dune/_stdune/stdune__Bytes.cmt +lib/ocaml/dune/_stdune/stdune__Bytes.cmti +lib/ocaml/dune/_stdune/stdune__Char.cmi +lib/ocaml/dune/_stdune/stdune__Char.cmt +lib/ocaml/dune/_stdune/stdune__Common.cmi +lib/ocaml/dune/_stdune/stdune__Common.cmt +lib/ocaml/dune/_stdune/stdune__Comparable.cmi +lib/ocaml/dune/_stdune/stdune__Comparable.cmt +lib/ocaml/dune/_stdune/stdune__Comparable.cmti +lib/ocaml/dune/_stdune/stdune__Digest.cmi +lib/ocaml/dune/_stdune/stdune__Digest.cmt +lib/ocaml/dune/_stdune/stdune__Digest.cmti +lib/ocaml/dune/_stdune/stdune__Dyn.cmi +lib/ocaml/dune/_stdune/stdune__Dyn.cmt +lib/ocaml/dune/_stdune/stdune__Dyn.cmti +lib/ocaml/dune/_stdune/stdune__Dyn0.cmi +lib/ocaml/dune/_stdune/stdune__Dyn0.cmt +lib/ocaml/dune/_stdune/stdune__Either.cmi +lib/ocaml/dune/_stdune/stdune__Either.cmt +lib/ocaml/dune/_stdune/stdune__Either.cmti +lib/ocaml/dune/_stdune/stdune__Env.cmi +lib/ocaml/dune/_stdune/stdune__Env.cmt +lib/ocaml/dune/_stdune/stdune__Env.cmti +lib/ocaml/dune/_stdune/stdune__Escape.cmi +lib/ocaml/dune/_stdune/stdune__Escape.cmt +lib/ocaml/dune/_stdune/stdune__Escape.cmti +lib/ocaml/dune/_stdune/stdune__Exn.cmi +lib/ocaml/dune/_stdune/stdune__Exn.cmt +lib/ocaml/dune/_stdune/stdune__Exn.cmti +lib/ocaml/dune/_stdune/stdune__Exn_with_backtrace.cmi +lib/ocaml/dune/_stdune/stdune__Exn_with_backtrace.cmt +lib/ocaml/dune/_stdune/stdune__Exn_with_backtrace.cmti +lib/ocaml/dune/_stdune/stdune__Fdecl.cmi +lib/ocaml/dune/_stdune/stdune__Fdecl.cmt +lib/ocaml/dune/_stdune/stdune__Fdecl.cmti +lib/ocaml/dune/_stdune/stdune__Filename.cmi +lib/ocaml/dune/_stdune/stdune__Filename.cmt +lib/ocaml/dune/_stdune/stdune__Filename.cmti +lib/ocaml/dune/_stdune/stdune__Float.cmi +lib/ocaml/dune/_stdune/stdune__Float.cmt +lib/ocaml/dune/_stdune/stdune__Float.cmti +lib/ocaml/dune/_stdune/stdune__Fmt.cmi +lib/ocaml/dune/_stdune/stdune__Fmt.cmt +lib/ocaml/dune/_stdune/stdune__Fmt.cmti +lib/ocaml/dune/_stdune/stdune__Fn.cmi +lib/ocaml/dune/_stdune/stdune__Fn.cmt +lib/ocaml/dune/_stdune/stdune__Fn.cmti +lib/ocaml/dune/_stdune/stdune__Hashable.cmi +lib/ocaml/dune/_stdune/stdune__Hashable.cmt +lib/ocaml/dune/_stdune/stdune__Hashtbl.cmi +lib/ocaml/dune/_stdune/stdune__Hashtbl.cmt +lib/ocaml/dune/_stdune/stdune__Hashtbl.cmti +lib/ocaml/dune/_stdune/stdune__Hashtbl_intf.cmi +lib/ocaml/dune/_stdune/stdune__Hashtbl_intf.cmt +lib/ocaml/dune/_stdune/stdune__Id.cmi +lib/ocaml/dune/_stdune/stdune__Id.cmt +lib/ocaml/dune/_stdune/stdune__Id.cmti +lib/ocaml/dune/_stdune/stdune__Import.cmi +lib/ocaml/dune/_stdune/stdune__Import.cmt +lib/ocaml/dune/_stdune/stdune__Int.cmi +lib/ocaml/dune/_stdune/stdune__Int.cmt +lib/ocaml/dune/_stdune/stdune__Int.cmti +lib/ocaml/dune/_stdune/stdune__Interned.cmi +lib/ocaml/dune/_stdune/stdune__Interned.cmt +lib/ocaml/dune/_stdune/stdune__Interned.cmti +lib/ocaml/dune/_stdune/stdune__Io.cmi +lib/ocaml/dune/_stdune/stdune__Io.cmt +lib/ocaml/dune/_stdune/stdune__Io.cmti +lib/ocaml/dune/_stdune/stdune__List.cmi +lib/ocaml/dune/_stdune/stdune__List.cmt +lib/ocaml/dune/_stdune/stdune__List.cmti +lib/ocaml/dune/_stdune/stdune__Loc.cmi +lib/ocaml/dune/_stdune/stdune__Loc.cmt +lib/ocaml/dune/_stdune/stdune__Loc.cmti +lib/ocaml/dune/_stdune/stdune__Loc0.cmi +lib/ocaml/dune/_stdune/stdune__Loc0.cmt +lib/ocaml/dune/_stdune/stdune__Map.cmi +lib/ocaml/dune/_stdune/stdune__Map.cmt +lib/ocaml/dune/_stdune/stdune__Map.cmti +lib/ocaml/dune/_stdune/stdune__Map_intf.cmi +lib/ocaml/dune/_stdune/stdune__Map_intf.cmt +lib/ocaml/dune/_stdune/stdune__Monad.cmi +lib/ocaml/dune/_stdune/stdune__Monad.cmt +lib/ocaml/dune/_stdune/stdune__Monad.cmti +lib/ocaml/dune/_stdune/stdune__Nothing.cmi +lib/ocaml/dune/_stdune/stdune__Nothing.cmt +lib/ocaml/dune/_stdune/stdune__Nothing.cmti +lib/ocaml/dune/_stdune/stdune__Option.cmi +lib/ocaml/dune/_stdune/stdune__Option.cmt +lib/ocaml/dune/_stdune/stdune__Option.cmti +lib/ocaml/dune/_stdune/stdune__Or_exn.cmi +lib/ocaml/dune/_stdune/stdune__Or_exn.cmt +lib/ocaml/dune/_stdune/stdune__Or_exn.cmti +lib/ocaml/dune/_stdune/stdune__Ordering.cmi +lib/ocaml/dune/_stdune/stdune__Ordering.cmt +lib/ocaml/dune/_stdune/stdune__Ordering.cmti +lib/ocaml/dune/_stdune/stdune__Path.cmi +lib/ocaml/dune/_stdune/stdune__Path.cmt +lib/ocaml/dune/_stdune/stdune__Path.cmti +lib/ocaml/dune/_stdune/stdune__Path_intf.cmi +lib/ocaml/dune/_stdune/stdune__Path_intf.cmt +lib/ocaml/dune/_stdune/stdune__Poly.cmi +lib/ocaml/dune/_stdune/stdune__Poly.cmt +lib/ocaml/dune/_stdune/stdune__Poly.cmti +lib/ocaml/dune/_stdune/stdune__Pp.cmi +lib/ocaml/dune/_stdune/stdune__Pp.cmt +lib/ocaml/dune/_stdune/stdune__Pp.cmti +lib/ocaml/dune/_stdune/stdune__Proc.cmi +lib/ocaml/dune/_stdune/stdune__Proc.cmt +lib/ocaml/dune/_stdune/stdune__Proc.cmti +lib/ocaml/dune/_stdune/stdune__Result.cmi +lib/ocaml/dune/_stdune/stdune__Result.cmt +lib/ocaml/dune/_stdune/stdune__Result.cmti +lib/ocaml/dune/_stdune/stdune__Set.cmi +lib/ocaml/dune/_stdune/stdune__Set.cmt +lib/ocaml/dune/_stdune/stdune__Set.cmti +lib/ocaml/dune/_stdune/stdune__Set_intf.cmi +lib/ocaml/dune/_stdune/stdune__Set_intf.cmt +lib/ocaml/dune/_stdune/stdune__Sexp.cmi +lib/ocaml/dune/_stdune/stdune__Sexp.cmt +lib/ocaml/dune/_stdune/stdune__Sexp.cmti +lib/ocaml/dune/_stdune/stdune__Sexp0.cmi +lib/ocaml/dune/_stdune/stdune__Sexp0.cmt +lib/ocaml/dune/_stdune/stdune__Sexp_intf.cmi +lib/ocaml/dune/_stdune/stdune__Sexp_intf.cmt +lib/ocaml/dune/_stdune/stdune__Staged.cmi +lib/ocaml/dune/_stdune/stdune__Staged.cmt +lib/ocaml/dune/_stdune/stdune__Staged.cmti +lib/ocaml/dune/_stdune/stdune__String.cmi +lib/ocaml/dune/_stdune/stdune__String.cmt +lib/ocaml/dune/_stdune/stdune__String.cmti +lib/ocaml/dune/_stdune/stdune__String_split.cmi +lib/ocaml/dune/_stdune/stdune__String_split.cmt +lib/ocaml/dune/_stdune/stdune__String_split.cmti +lib/ocaml/dune/_stdune/stdune__Table.cmi +lib/ocaml/dune/_stdune/stdune__Table.cmt +lib/ocaml/dune/_stdune/stdune__Table.cmti +lib/ocaml/dune/_stdune/stdune__Tuple.cmi +lib/ocaml/dune/_stdune/stdune__Tuple.cmt +lib/ocaml/dune/_stdune/stdune__Tuple.cmti +lib/ocaml/dune/_stdune/stdune__Type_eq.cmi +lib/ocaml/dune/_stdune/stdune__Type_eq.cmt +lib/ocaml/dune/_stdune/stdune__Type_eq.cmti +lib/ocaml/dune/_stdune/stdune__Unit.cmi +lib/ocaml/dune/_stdune/stdune__Unit.cmt +lib/ocaml/dune/_stdune/stdune__Unit.cmti +lib/ocaml/dune/_stdune/stdune__Univ_map.cmi +lib/ocaml/dune/_stdune/stdune__Univ_map.cmt +lib/ocaml/dune/_stdune/stdune__Univ_map.cmti +lib/ocaml/dune/_stdune/string.ml +lib/ocaml/dune/_stdune/string.mli +lib/ocaml/dune/_stdune/string_split.ml +lib/ocaml/dune/_stdune/string_split.mli +lib/ocaml/dune/_stdune/table.ml +lib/ocaml/dune/_stdune/table.mli +lib/ocaml/dune/_stdune/tuple.ml +lib/ocaml/dune/_stdune/tuple.mli +lib/ocaml/dune/_stdune/type_eq.ml +lib/ocaml/dune/_stdune/type_eq.mli +lib/ocaml/dune/_stdune/unit.ml +lib/ocaml/dune/_stdune/unit.mli +lib/ocaml/dune/_stdune/univ_map.ml +lib/ocaml/dune/_stdune/univ_map.mli +lib/ocaml/dune/_wp/ +lib/ocaml/dune/_wp/dune/ +lib/ocaml/dune/_wp/dune/wp.cmi +lib/ocaml/dune/_wp/dune/wp.cmt +lib/ocaml/dune/_wp/dune/wp.ml +lib/ocaml/dune/_wp/dune/wp__wp_dune__.cmi +lib/ocaml/dune/_wp/dune/wp__wp_dune__.cmt +lib/ocaml/dune/_wp/dune/wp__wp_dune__.ml +lib/ocaml/dune/_wp/dune/wp_dune.cma +lib/ocaml/dune/_wp/jbuilder/ +lib/ocaml/dune/_wp/jbuilder/wp.cmi +lib/ocaml/dune/_wp/jbuilder/wp.cmt +lib/ocaml/dune/_wp/jbuilder/wp.ml +lib/ocaml/dune/_wp/jbuilder/wp__wp_jbuilder__.cmi +lib/ocaml/dune/_wp/jbuilder/wp__wp_jbuilder__.cmt +lib/ocaml/dune/_wp/jbuilder/wp__wp_jbuilder__.ml +lib/ocaml/dune/_wp/jbuilder/wp_jbuilder.cma +lib/ocaml/dune/_wp/wp.cmi +lib/ocaml/dune/_wp/wp.cmti +lib/ocaml/dune/_wp/wp.mli +lib/ocaml/dune/configurator/ +lib/ocaml/dune/configurator/configurator.cma +lib/ocaml/dune/configurator/configurator.cmi +lib/ocaml/dune/configurator/configurator.cmt +lib/ocaml/dune/configurator/configurator.ml +lib/ocaml/dune/configurator/configurator__.cmi +lib/ocaml/dune/configurator/configurator__.cmt +lib/ocaml/dune/configurator/configurator__.ml +lib/ocaml/dune/configurator/configurator__Extract_obj.cmi +lib/ocaml/dune/configurator/configurator__Extract_obj.cmt +lib/ocaml/dune/configurator/configurator__Extract_obj.cmti +lib/ocaml/dune/configurator/configurator__V1.cmi +lib/ocaml/dune/configurator/configurator__V1.cmt +lib/ocaml/dune/configurator/configurator__V1.cmti +lib/ocaml/dune/configurator/extract_obj.ml +lib/ocaml/dune/configurator/extract_obj.mli +lib/ocaml/dune/configurator/v1.ml +lib/ocaml/dune/configurator/v1.mli +lib/ocaml/dune/dune-package +lib/ocaml/dune/opam @man man/man1/dune-build.1 @man man/man1/dune-clean.1 @man man/man1/dune-compute.1 @@ -23,10 +424,11 @@ @man man/man1/dune-utop.1 @man man/man1/dune.1 @man man/man5/dune-config.5 -share/doc/dune/ -share/doc/dune/CHANGES.md -share/doc/dune/LICENSE.md -share/doc/dune/README.md +share/doc/ocaml-dune/ +share/doc/ocaml-dune/dune/ +share/doc/ocaml-dune/dune/CHANGES.md +share/doc/ocaml-dune/dune/LICENSE.md +share/doc/ocaml-dune/dune/README.md share/emacs/ share/emacs/site-lisp/ share/emacs/site-lisp/dune-flymake.el diff --git a/devel/ocaml-biniou/Makefile b/devel/ocaml-biniou/Makefile index be4bfc5faa2..4f504cb8f65 100644 --- a/devel/ocaml-biniou/Makefile +++ b/devel/ocaml-biniou/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 19:04:48 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = binary data format designed for speed, safety, usability CATEGORIES = devel @@ -18,8 +18,6 @@ MODULES = lang/ocaml BUILD_DEPENDS = devel/dune \ devel/ocaml-easy-format -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT} mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/ diff --git a/devel/ocaml-configurator/Makefile b/devel/ocaml-configurator/Makefile index 06e65c150da..0cb2327caf6 100644 --- a/devel/ocaml-configurator/Makefile +++ b/devel/ocaml-configurator/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 18:54:39 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = library for feature testing CATEGORIES = devel @@ -17,8 +17,6 @@ MODULES = lang/ocaml BUILD_DEPENDS = devel/dune -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml - ALL_TARGET = post-install: diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile index 788f881b73f..ae208ff9213 100644 --- a/devel/ocaml-cppo/Makefile +++ b/devel/ocaml-cppo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/08/04 18:40:20 chrisz Exp $ +# $OpenBSD: Makefile,v 1.5 2019/08/17 13:29:42 chrisz Exp $ COMMENT = OCaml preprocessor CATEGORIES = devel @@ -16,11 +16,8 @@ WANTLIB = c m MODULES = lang/ocaml BUILD_DEPENDS = devel/dune \ - sysutils/findlib \ devel/ocaml-ocamlbuild -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT} mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/ diff --git a/devel/ocaml-easy-format/Makefile b/devel/ocaml-easy-format/Makefile index ce316645b8d..211fea498b9 100644 --- a/devel/ocaml-easy-format/Makefile +++ b/devel/ocaml-easy-format/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 19:06:03 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = interface to the OCaml stdlib Format module CATEGORIES = devel @@ -15,10 +15,7 @@ WANTLIB = c m MODULES = lang/ocaml -BUILD_DEPENDS = devel/dune \ - sysutils/findlib - -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml +BUILD_DEPENDS = devel/dune post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT} diff --git a/devel/ocaml-yojson/Makefile b/devel/ocaml-yojson/Makefile index f4eac179532..de89d13c0d2 100644 --- a/devel/ocaml-yojson/Makefile +++ b/devel/ocaml-yojson/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 19:07:43 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = optimized parsing and printing library for the JSON format CATEGORIES = devel @@ -20,8 +20,6 @@ BUILD_DEPENDS = devel/dune \ devel/ocaml-easy-format \ devel/ocaml-biniou -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml - post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT} mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/ diff --git a/graphics/ocaml-cairo/Makefile b/graphics/ocaml-cairo/Makefile index ac33a6f715f..17456dce4c1 100644 --- a/graphics/ocaml-cairo/Makefile +++ b/graphics/ocaml-cairo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 19:09:17 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = binding to cairo, a 2D vector graphics library CATEGORIES = graphics @@ -26,8 +26,6 @@ LIB_DEPENDS = devel/pango \ graphics/gdk-pixbuf2 \ x11/gtk+2 -FAKE_FLAGS = OCAMLFIND_DESTDIR=${LOCALBASE}/lib/ocaml - ALL_TARGET = post-install: diff --git a/x11/lablgtk3/Makefile b/x11/lablgtk3/Makefile index 2fb4cb088c8..d625f84c175 100644 --- a/x11/lablgtk3/Makefile +++ b/x11/lablgtk3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/08/04 19:13:19 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $ COMMENT = OCaml interface to GTK+3 CATEGORIES = x11 devel @@ -19,8 +19,7 @@ LIB_DEPENDS = x11/gtk+3 \ devel/gettext,-runtime \ x11/gtksourceview3 -BUILD_DEPENDS = sysutils/findlib \ - devel/dune \ +BUILD_DEPENDS = devel/dune \ x11/gnome/librsvg \ x11/gnome/libgnomecanvas \ graphics/ocaml-cairo