From owner-dev-commits-ports-main@freebsd.org Thu Sep 23 09:12:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90DA167C23F; Thu, 23 Sep 2021 09:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HFTvz3gtCz3pgH; Thu, 23 Sep 2021 09:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5E76928271; Thu, 23 Sep 2021 09:12:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18N9Clc9026505; Thu, 23 Sep 2021 09:12:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18N9ClGF026504; Thu, 23 Sep 2021 09:12:47 GMT (envelope-from git) Date: Thu, 23 Sep 2021 09:12:47 GMT Message-Id: <202109230912.18N9ClGF026504@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: f3eb226bee50 - main - devel/ocaml-result: update the port to version 1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3eb226bee50d4694718de396087d3f968d4d74c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Sep 2021 09:12:47 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3eb226bee50d4694718de396087d3f968d4d74c commit f3eb226bee50d4694718de396087d3f968d4d74c Author: Alexey Dokuchaev AuthorDate: 2021-09-23 09:11:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-09-23 09:11:34 +0000 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) --- devel/ocaml-result/Makefile | 15 +++++++++------ devel/ocaml-result/distinfo | 6 +++--- devel/ocaml-result/files/patch-Makefile | 8 ++++++++ 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 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 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