Tue Nov 27 16:43:05 2018 UTC ()
Updated devel/ocaml-topkg to version 1.0.0.

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


(jaapb)
diff -r1.6 -r1.7 pkgsrc/misc/ocaml-topkg/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/ocaml-topkg/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/misc/ocaml-topkg/distinfo

cvs diff -r1.6 -r1.7 pkgsrc/misc/ocaml-topkg/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/ocaml-topkg/Makefile 2018/11/12 16:10:25 1.6
+++ pkgsrc/misc/ocaml-topkg/Makefile 2018/11/27 16:43:05 1.7
@@ -1,48 +1,23 @@ @@ -1,48 +1,23 @@
1# $NetBSD: Makefile,v 1.6 2018/11/12 16:10:25 jaapb Exp $ 1# $NetBSD: Makefile,v 1.7 2018/11/27 16:43:05 jaapb Exp $
2 2
3DISTNAME= topkg-0.9.1 3DISTNAME= topkg-1.0.0
4PKGNAME= ocaml-${DISTNAME} 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 3 
6CATEGORIES= misc 5CATEGORIES= misc
7MASTER_SITES= http://erratique.ch/software/topkg/releases/ 6MASTER_SITES= http://erratique.ch/software/topkg/releases/
8EXTRACT_SUFX= .tbz 7EXTRACT_SUFX= .tbz
9 8
10MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://erratique.ch/software/topkg/ 10HOMEPAGE= http://erratique.ch/software/topkg/
12COMMENT= Transitory OCaml software packager 11COMMENT= Transitory OCaml software packager
13LICENSE= isc 12LICENSE= isc
14 13
15OCAML_USE_TOPKG= yes 14OCAML_USE_TOPKG= yes
 15OCAML_USE_OPAM= yes
 16
16INSTALLATION_DIRS+= share/doc/topkg 17INSTALLATION_DIRS+= share/doc/topkg
17 18
18.include "../../mk/ocaml.mk" 19.include "../../mk/ocaml.mk"
19 20
20# Normally, we'd do this using opam-installer, but that requires 
21# devel/ocaml-cmdliner, which requires this package. 
22do-install: 
23 for i in CHANGES.md LICENSE.md README.md; do \ 
24 ${INSTALL_DATA} ${WRKSRC}/_build/$$i \ 
25 ${DESTDIR}${PREFIX}/share/doc/topkg; \ 
26 done 
27 ${INSTALL_DATA} ${WRKSRC}/_build/topkg.opam \ 
28 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg/opam 
29 for i in pkg/META src/topkg.cma src/topkg.cmi src/topkg.cmti \ 
30 src/topkg.mli; do \ 
31 ${INSTALL_DATA} ${WRKSRC}/_build/$$i \ 
32 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg; \ 
33 done 
34.if ${OCAML_USE_OPT_COMPILER} == "yes" 
35 for i in topkg.a topkg.cmx topkg.cmxa topkg.cmxs topkg_build.cmx \ 
36 topkg_cmd.cmx topkg_codec.cmx topkg_conf.cmx topkg_distrib.cmx \ 
37 topkg_fexts.cmx topkg_fpath.cmx topkg_install.cmx \ 
38 topkg_ipc.cmx topkg_log.cmx topkg_main.cmx topkg_opam.cmx \ 
39 topkg_os.cmx topkg_pkg.cmx topkg_publish.cmx topkg_result.cmx \ 
40 topkg_string.cmx topkg_test.cmx topkg_vcs.cmx; do \ 
41 ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \ 
42 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/topkg; \ 
43 done 
44.endif 
45 
46.include "../../devel/ocaml-result/buildlink3.mk" 21.include "../../devel/ocaml-result/buildlink3.mk"
47.include "../../devel/ocamlbuild/buildlink3.mk" 22.include "../../devel/ocamlbuild/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"

cvs diff -r1.3 -r1.4 pkgsrc/misc/ocaml-topkg/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/misc/ocaml-topkg/buildlink3.mk 2018/07/19 15:15:27 1.3
+++ pkgsrc/misc/ocaml-topkg/buildlink3.mk 2018/11/27 16:43:05 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.3 2018/07/19 15:15:27 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2018/11/27 16:43:05 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-topkg 3BUILDLINK_TREE+= ocaml-topkg
4 4
5.if !defined(OCAML_TOPKG_BUILDLINK3_MK) 5.if !defined(OCAML_TOPKG_BUILDLINK3_MK)
6OCAML_TOPKG_BUILDLINK3_MK:= 6OCAML_TOPKG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-topkg+= ocaml-topkg>=0.9.0 8BUILDLINK_API_DEPENDS.ocaml-topkg+= ocaml-topkg>=1.0.0
9BUILDLINK_ABI_DEPENDS.ocaml-topkg+= ocaml-topkg>=0.9.1nb2 9BUILDLINK_ABI_DEPENDS.ocaml-topkg+= ocaml-topkg>=1.0.0
10BUILDLINK_PKGSRCDIR.ocaml-topkg?= ../../misc/ocaml-topkg 10BUILDLINK_PKGSRCDIR.ocaml-topkg?= ../../misc/ocaml-topkg
11 11
12.endif # OCAML_TOPKG_BUILDLINK3_MK 12.endif # OCAML_TOPKG_BUILDLINK3_MK
13 13
14BUILDLINK_TREE+= -ocaml-topkg 14BUILDLINK_TREE+= -ocaml-topkg

cvs diff -r1.2 -r1.3 pkgsrc/misc/ocaml-topkg/distinfo (expand / switch to unified diff)

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