CVS commit: pkgsrc/misc/ocaml-opam

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Nov 27 16:53:54 UTC 2018

Modified Files:
        pkgsrc/misc/ocaml-opam: Makefile buildlink3.mk distinfo

Log Message:
Updated misc/ocaml-opam to version 2.0.1.

Package now uses dune, and upstream changes include mainly backported
bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/misc/ocaml-opam/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/misc/ocaml-opam/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/ocaml-opam/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/ocaml-opam/Makefile
diff -u pkgsrc/misc/ocaml-opam/Makefile:1.25 pkgsrc/misc/ocaml-opam/Makefile:1.26
--- pkgsrc/misc/ocaml-opam/Makefile:1.25        Mon Nov 12 16:10:25 2018
+++ pkgsrc/misc/ocaml-opam/Makefile     Tue Nov 27 16:53:53 2018
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2018/11/12 16:10:25 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2018/11/27 16:53:53 jaapb Exp $
 
-VERSION=       2.0.0_rc3
+VERSION=       2.0.1
 GITHUB_PROJECT=        opam
-GITHUB_TAG=    ${VERSION:S/_/-/}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -16,19 +14,10 @@ LICENSE=    gnu-lgpl-v3
 MAKE_JOBS_SAFE=        no
 
 HAS_CONFIGURE=         yes
-OCAML_USE_JBUILDER=    yes
-OCAML_USE_OPAM=                no # obviously
+OCAML_USE_DUNE=        yes
 
 OCAML_FINDLIB_DIRS+=   opam-installer
-
-do-install:
-       for i in opam-installer opam; do \
-       cd ${WRKSRC} && _build/install/default/bin/opam-installer -i --prefix \
-                       ${DESTDIR}${PREFIX} \
-                       --libdir ${OCAML_SITELIBDIR} \
-                       --docdir ${DESTDIR}/${OCAML_TOPKG_DOCDIR} \
-                       $$i; \
-       done
+OPAM_INSTALL_FILES=    opam opam-installer
 
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-extlib/buildlink3.mk"

Index: pkgsrc/misc/ocaml-opam/buildlink3.mk
diff -u pkgsrc/misc/ocaml-opam/buildlink3.mk:1.7 pkgsrc/misc/ocaml-opam/buildlink3.mk:1.8
--- pkgsrc/misc/ocaml-opam/buildlink3.mk:1.7    Thu Jul 19 14:21:31 2018
+++ pkgsrc/misc/ocaml-opam/buildlink3.mk        Tue Nov 27 16:53:53 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/07/19 14:21:31 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/11/27 16:53:53 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-opam
 
 .if !defined(OCAML_OPAM_BUILDLINK3_MK)
 OCAML_OPAM_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=1.2.2
-BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0_rc3
+BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.1
 BUILDLINK_PKGSRCDIR.ocaml-opam?=       ../../misc/ocaml-opam
 
 .endif # OCAML_OPAM_BUILDLINK3_MK

Index: pkgsrc/misc/ocaml-opam/distinfo
diff -u pkgsrc/misc/ocaml-opam/distinfo:1.8 pkgsrc/misc/ocaml-opam/distinfo:1.9
--- pkgsrc/misc/ocaml-opam/distinfo:1.8 Thu Jul 19 14:21:31 2018
+++ pkgsrc/misc/ocaml-opam/distinfo     Tue Nov 27 16:53:53 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2018/07/19 14:21:31 jaapb Exp $
+$NetBSD: distinfo,v 1.9 2018/11/27 16:53:53 jaapb Exp $
 
-SHA1 (opam-2.0.0_rc3.tar.gz) = 8c392bf38a8c60e78a1bed0c487bc5b28c3204bb
-RMD160 (opam-2.0.0_rc3.tar.gz) = d16ef6a34d19a06d2c7e64913f08a1681d0a510a
-SHA512 (opam-2.0.0_rc3.tar.gz) = aaa945e74f4e5e8a5bfea08f4a48a67c4e897a1b2f1bbb8e06eb4ce2d1df2dfa0d12a00e12cee4ceef28782dfdd97afd3a953c4f13864320629b2c253f0f1f77
-Size (opam-2.0.0_rc3.tar.gz) = 861807 bytes
+SHA1 (opam-2.0.1.tar.gz) = 2e38b0a29ca94d48b4d5c172b825c1964567edbc
+RMD160 (opam-2.0.1.tar.gz) = c32b5600435cef1ccc4dd48f2466f392ef8b2351
+SHA512 (opam-2.0.1.tar.gz) = d71c362d70a6b6cb9fe54cc43bfbea8079cca05d4721a7dda951196f543a1ff5af81399a246e0cd68bc590c7bdca388d96c7127217ed637261957047ce725516
+Size (opam-2.0.1.tar.gz) = 622502 bytes