CVS commit: pkgsrc/misc/ocaml-opam

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jan 10 16:33:23 UTC 2018

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

Log Message:
Updated package misc/ocaml-opam to version 2.0.0beta5.

This version includes several bugfixes; see the CHANGES file.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/ocaml-opam/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/ocaml-opam/PLIST \
    pkgsrc/misc/ocaml-opam/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 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.19 pkgsrc/misc/ocaml-opam/Makefile:1.20
--- pkgsrc/misc/ocaml-opam/Makefile:1.19        Mon Jan  1 21:18:44 2018
+++ pkgsrc/misc/ocaml-opam/Makefile     Wed Jan 10 16:33:23 2018
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2018/01/01 21:18:44 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/10 16:33:23 jaapb Exp $
 
-VERSION=       2.0.0_beta4
+VERSION=       2.0.0_beta5
 GITHUB_PROJECT=        opam
 GITHUB_TAG=    ${VERSION:S/_/-/}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -18,12 +17,16 @@ MAKE_JOBS_SAFE=     no
 OCAML_USE_JBUILDER=    yes
 OCAML_USE_OPAM=                no # obviously
 
+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} \
-                       opam.install
+                       $$i; \
+       done
 
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
 .include "../../devel/ocaml-extlib/buildlink3.mk"

Index: pkgsrc/misc/ocaml-opam/PLIST
diff -u pkgsrc/misc/ocaml-opam/PLIST:1.4 pkgsrc/misc/ocaml-opam/PLIST:1.5
--- pkgsrc/misc/ocaml-opam/PLIST:1.4    Fri Sep  8 16:50:46 2017
+++ pkgsrc/misc/ocaml-opam/PLIST        Wed Jan 10 16:33:23 2018
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2017/09/08 16:50:46 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/10 16:33:23 jaapb Exp $
 bin/opam
 bin/opam-installer
+${OCAML_SITELIB}/opam-installer/META
+${OCAML_SITELIB}/opam-installer/opam
 ${OCAML_SITELIB}/opam/META
 ${OCAML_SITELIB}/opam/opam
+share/doc/opam-installer/CHANGES
+share/doc/opam-installer/LICENSE
+share/doc/opam-installer/README.md
 share/doc/opam/CHANGES
 share/doc/opam/LICENSE
 share/doc/opam/README.md
Index: pkgsrc/misc/ocaml-opam/buildlink3.mk
diff -u pkgsrc/misc/ocaml-opam/buildlink3.mk:1.4 pkgsrc/misc/ocaml-opam/buildlink3.mk:1.5
--- pkgsrc/misc/ocaml-opam/buildlink3.mk:1.4    Fri Sep  8 16:50:46 2017
+++ pkgsrc/misc/ocaml-opam/buildlink3.mk        Wed Jan 10 16:33:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2017/09/08 16:50:46 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/01/10 16:33:23 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-opam
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-opam
 OCAML_OPAM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-opam+=     ocaml-opam>=1.2.2
-BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0_beta4
+BUILDLINK_ABI_DEPENDS.ocaml-opam+=     ocaml-opam>=2.0.0_beta5
 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.5 pkgsrc/misc/ocaml-opam/distinfo:1.6
--- pkgsrc/misc/ocaml-opam/distinfo:1.5 Fri Sep  8 16:50:46 2017
+++ pkgsrc/misc/ocaml-opam/distinfo     Wed Jan 10 16:33:23 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/09/08 16:50:46 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/01/10 16:33:23 jaapb Exp $
 
-SHA1 (opam-2.0.0_beta4.tar.gz) = 23c23fc4812500c26d64b50dc8c39d67954f1c9e
-RMD160 (opam-2.0.0_beta4.tar.gz) = f9bf916e1e33771953f22f68c070a6379f60d481
-SHA512 (opam-2.0.0_beta4.tar.gz) = 6c2f3fef029904fcfdf75d14764c59c3ff51998dfbc12fc6846d18c38f900b5e27f3db4440e1a9874cc74bce9be23b2964aa8b9759ab554c72b5e905768415eb
-Size (opam-2.0.0_beta4.tar.gz) = 764440 bytes
+SHA1 (opam-2.0.0_beta5.tar.gz) = 35bea9b3ecd59c9e878705bf6481a3c9c96bcc65
+RMD160 (opam-2.0.0_beta5.tar.gz) = 0978ea3701a898c4f7d5e0fdc4c9052d5e11f5b7
+SHA512 (opam-2.0.0_beta5.tar.gz) = 39db31528b62e7de12c2c8097d4ab14dd36ca540cc32a4d8d70589922b1b9311abd459e8e2ae1e010c84e881040cba9ecba86782b43def7f3fa666c0a9a3d7e8
+Size (opam-2.0.0_beta5.tar.gz) = 777587 bytes