diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-09-23 09:11:32 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2021-09-23 09:11:34 +0000 |
| commit | f3eb226bee50d4694718de396087d3f968d4d74c (patch) | |
| tree | 3c6e525d88d7781698da8985ef1727a727c138c8 | |
| parent | cb7052561480c49a5bdffc1fa6c3e4e9d0bc8fa3 (diff) | |
| download | ports-f3eb226bee50d4694718de396087d3f968d4d74c.tar.gz ports-f3eb226bee50d4694718de396087d3f968d4d74c.zip | |
devel/ocaml-result: update the port to version 1.5
- Now builds itself using Dune (devel/ocaml-dune)
- Drop reference to Pervasives; it is deprecated
- Result is an alias to Stdlib.Result on OCaml 4.08+
Reported by: portscout (a while ago)
| -rw-r--r-- | devel/ocaml-result/Makefile | 15 | ||||
| -rw-r--r-- | devel/ocaml-result/distinfo | 6 | ||||
| -rw-r--r-- | devel/ocaml-result/files/patch-Makefile | 8 | ||||
| -rw-r--r-- | devel/ocaml-result/pkg-plist | 9 |
4 files changed, 26 insertions, 12 deletions
diff --git a/devel/ocaml-result/Makefile b/devel/ocaml-result/Makefile index 95c073cab31f..74e53ed73bd6 100644 --- a/devel/ocaml-result/Makefile +++ b/devel/ocaml-result/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev <danfe@FreeBSD.org> PORTNAME= result -PORTVERSION= 1.2 +PORTVERSION= 1.5 CATEGORIES= devel PKGNAMEPREFIX= ocaml- @@ -9,15 +9,18 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Compatibility result module for OCaml LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE.md -USES= gmake +BUILD_DEPENDS= dune:devel/ocaml-dune +USES= gmake +USE_OCAML= yes USE_GITHUB= yes GH_ACCOUNT= janestreet -USE_OCAML= yes -USE_OCAML_FINDLIB= yes -MAKE_JOBS_UNSAFE= yes +ALL_TARGET= default +MAKE_ENV= LIBDIR=${OCAML_SITELIBDIR} + +OPTIONS_DEFINE= DOCS .include <bsd.port.mk> diff --git a/devel/ocaml-result/distinfo b/devel/ocaml-result/distinfo index c4307faa460e..faea9d6e5398 100644 --- a/devel/ocaml-result/distinfo +++ b/devel/ocaml-result/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1457018677 -SHA256 (janestreet-result-1.2_GH0.tar.gz) = 7cf7909f902994dc885ceae1983e4cda3665914c774f774604d076b89f76f7dd -SIZE (janestreet-result-1.2_GH0.tar.gz) = 2100 +TIMESTAMP = 1582184927 +SHA256 (janestreet-result-1.5_GH0.tar.gz) = 1072a8b0b35bd6df939c0670add33027f981e4f69a53233cb006b442fa12af30 +SIZE (janestreet-result-1.5_GH0.tar.gz) = 2291 diff --git a/devel/ocaml-result/files/patch-Makefile b/devel/ocaml-result/files/patch-Makefile new file mode 100644 index 000000000000..019f1667220f --- /dev/null +++ b/devel/ocaml-result/files/patch-Makefile @@ -0,0 +1,8 @@ +--- Makefile.orig 2020-02-20 07:48:47 UTC ++++ Makefile +@@ -1,4 +1,5 @@ + INSTALL_ARGS := $(if $(PREFIX),--prefix $(PREFIX),) ++INSTALL_ARGS += $(if $(LIBDIR),--libdir $(LIBDIR),) + + default: + dune build @install diff --git a/devel/ocaml-result/pkg-plist b/devel/ocaml-result/pkg-plist index cf4c14fd533b..dbb7cf3215d8 100644 --- a/devel/ocaml-result/pkg-plist +++ b/devel/ocaml-result/pkg-plist @@ -1,11 +1,14 @@ %%OCAML_SITELIBDIR%%/result/META +%%OCAML_SITELIBDIR%%/result/dune-package +%%OCAML_SITELIBDIR%%/result/opam %%OCAML_SITELIBDIR%%/result/result.a %%OCAML_SITELIBDIR%%/result/result.cma %%OCAML_SITELIBDIR%%/result/result.cmi -%%OCAML_SITELIBDIR%%/result/result.cmo +%%OCAML_SITELIBDIR%%/result/result.cmt %%OCAML_SITELIBDIR%%/result/result.cmx %%OCAML_SITELIBDIR%%/result/result.cmxa %%OCAML_SITELIBDIR%%/result/result.cmxs -%%OCAML_SITELIBDIR%%/result/result.install %%OCAML_SITELIBDIR%%/result/result.ml -%%OCAML_SITELIBDIR%%/result/result.o +%%PORTDOCS%%share/doc/ocaml/result/CHANGES.md +%%PORTDOCS%%share/doc/ocaml/result/LICENSE.md +%%PORTDOCS%%share/doc/ocaml/result/README.md |