CVS commit: pkgsrc/misc/ocaml-topkg

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Nov 27 16:43:05 UTC 2018

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

Log Message:
Updated devel/ocaml-topkg to version 1.0.0.

This version includes several improvements in opam support, and
bugfixes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/ocaml-topkg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/ocaml-topkg/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/ocaml-topkg/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-topkg/Makefile
diff -u pkgsrc/misc/ocaml-topkg/Makefile:1.6 pkgsrc/misc/ocaml-topkg/Makefile:1.7
--- pkgsrc/misc/ocaml-topkg/Makefile:1.6        Mon Nov 12 16:10:25 2018
+++ pkgsrc/misc/ocaml-topkg/Makefile    Tue Nov 27 16:43:05 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/11/12 16:10:25 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2018/11/27 16:43:05 jaapb Exp $
 
-DISTNAME=      topkg-0.9.1
+DISTNAME=      topkg-1.0.0
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    misc
 MASTER_SITES=  http://erratique.ch/software/topkg/releases/
 EXTRACT_SUFX=  .tbz
@@ -13,36 +12,12 @@ COMMENT=    Transitory OCaml software packa
 LICENSE=       isc
 
 OCAML_USE_TOPKG=       yes
+OCAML_USE_OPAM=        yes
+
 INSTALLATION_DIRS+=    share/doc/topkg
 
 .include "../../mk/ocaml.mk"
 
-# Normally, we'd do this using opam-installer, but that requires
-# devel/ocaml-cmdliner, which requires this package.
-do-install:
-       for i in CHANGES.md LICENSE.md README.md; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
-               ${DESTDIR}${PREFIX}/share/doc/topkg; \
-       done
-       ${INSTALL_DATA} ${WRKSRC}/_build/topkg.opam \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg/opam
-       for i in pkg/META src/topkg.cma src/topkg.cmi src/topkg.cmti \
-               src/topkg.mli; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg; \
-       done
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-       for i in topkg.a topkg.cmx topkg.cmxa topkg.cmxs topkg_build.cmx \
-               topkg_cmd.cmx topkg_codec.cmx topkg_conf.cmx topkg_distrib.cmx \
-               topkg_fexts.cmx topkg_fpath.cmx topkg_install.cmx \
-               topkg_ipc.cmx topkg_log.cmx topkg_main.cmx topkg_opam.cmx \
-               topkg_os.cmx topkg_pkg.cmx topkg_publish.cmx topkg_result.cmx \
-               topkg_string.cmx topkg_test.cmx topkg_vcs.cmx; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg; \
-       done
-.endif
-
 .include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/ocaml-topkg/buildlink3.mk
diff -u pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.3 pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.4
--- pkgsrc/misc/ocaml-topkg/buildlink3.mk:1.3   Thu Jul 19 15:15:27 2018
+++ pkgsrc/misc/ocaml-topkg/buildlink3.mk       Tue Nov 27 16:43:05 2018
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/07/19 15:15:27 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/11/27 16:43:05 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-topkg
 
 .if !defined(OCAML_TOPKG_BUILDLINK3_MK)
 OCAML_TOPKG_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-topkg+=    ocaml-topkg>=0.9.0
-BUILDLINK_ABI_DEPENDS.ocaml-topkg+=    ocaml-topkg>=0.9.1nb2
+BUILDLINK_API_DEPENDS.ocaml-topkg+=    ocaml-topkg>=1.0.0
+BUILDLINK_ABI_DEPENDS.ocaml-topkg+=    ocaml-topkg>=1.0.0
 BUILDLINK_PKGSRCDIR.ocaml-topkg?=      ../../misc/ocaml-topkg
 
 .endif # OCAML_TOPKG_BUILDLINK3_MK

Index: pkgsrc/misc/ocaml-topkg/distinfo
diff -u pkgsrc/misc/ocaml-topkg/distinfo:1.2 pkgsrc/misc/ocaml-topkg/distinfo:1.3
--- pkgsrc/misc/ocaml-topkg/distinfo:1.2        Wed Jan 10 16:34:50 2018
+++ pkgsrc/misc/ocaml-topkg/distinfo    Tue Nov 27 16:43:05 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2018/01/10 16:34:50 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2018/11/27 16:43:05 jaapb Exp $
 
-SHA1 (topkg-0.9.1.tbz) = 87a20d5256a2fa117bfabb34aef411c399a831a9
-RMD160 (topkg-0.9.1.tbz) = bab97229799429694e80d7295b39551316d6207b
-SHA512 (topkg-0.9.1.tbz) = 10c4af2dfae0757686179ca2ff843add95d6f911121a345ab7fbf2aa901e0384b2aaf5152e04328edc791fd0b9fa81886a398d80f056f9dc3fad7280916bf052
-Size (topkg-0.9.1.tbz) = 94358 bytes
+SHA1 (topkg-1.0.0.tbz) = 360edb5da78ae6a8e7c951bf2aa4a5be350232b4
+RMD160 (topkg-1.0.0.tbz) = e2e9fd34ff209a83f28beb48a8b35a1c7b55c7d0
+SHA512 (topkg-1.0.0.tbz) = 050242685862db8715450b63730c9a09f4dfa5ca3ece9dc7deab1335a40682346c495801e54523337f5939c6d928bee534ed01c872e2c89df861d9399c756dcb
+Size (topkg-1.0.0.tbz) = 95092 bytes