CVS commit: pkgsrc/devel/ocaml-cmdliner

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Apr  7 11:42:13 UTC 2018

Modified Files:
        pkgsrc/devel/ocaml-cmdliner: Makefile PLIST buildlink3.mk distinfo

Log Message:
Revbump for devel/ocaml-cmdliner.

No upstream changes, but the package now uses the provided Makefile
infrastructure instead of being installed from the main Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/ocaml-cmdliner/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-cmdliner/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-cmdliner/distinfo

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

Modified files:

Index: pkgsrc/devel/ocaml-cmdliner/Makefile
diff -u pkgsrc/devel/ocaml-cmdliner/Makefile:1.15 pkgsrc/devel/ocaml-cmdliner/Makefile:1.16
--- pkgsrc/devel/ocaml-cmdliner/Makefile:1.15   Wed Jan 10 14:46:42 2018
+++ pkgsrc/devel/ocaml-cmdliner/Makefile        Sat Apr  7 11:42:13 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2018/01/10 14:46:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2018/04/07 11:42:13 jaapb Exp $
 
 PKGNAME=       ocaml-${DISTNAME}
+PKGREVISION=   2
 DISTNAME=      cmdliner-1.0.2
 CATEGORIES=    devel
 MASTER_SITES=  http://erratique.ch/software/cmdliner/releases/
@@ -12,36 +13,14 @@ COMMENT=    Module for the declarative defi
 LICENSE=       isc
 
 USE_LANGUAGES= c
+USE_TOOLS+=    gmake
+MAKE_JOBS_SAFE=        no
+MAKE_ENV+=     PREFIX=${PREFIX} LIBDIR=${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner DOCDIR=${DESTDIR}${PREFIX}/share/doc/cmdliner
 
-OCAML_USE_TOPKG=       yes
-INSTALLATION_DIRS+=    share/doc/cmdliner
+INSTALL_TARGET=        install install-doc
 
 .include "../../mk/ocaml.mk"
 
-# Normally, we'd do this using opam-installer, but that requires
-# this package.
-do-install:
-       for i in CHANGES.md LICENSE.md README.md test/chorus.ml test/cp_ex.ml \
-               test/darcs_ex.ml test/revolt.ml test/rm_ex.ml test/tail_ex.ml; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
-               ${DESTDIR}${PREFIX}/share/doc/cmdliner; \
-       done
-       ${INSTALL_DATA} ${WRKSRC}/_build/opam \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner/opam
-       for i in pkg/META src/cmdliner.cma src/cmdliner.cmi src/cmdliner.cmti \
-               src/cmdliner.mli; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/$$i \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner; \
-       done
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-       for i in cmdliner.a cmdliner.cmx cmdliner.cmxa cmdliner.cmxs \
-               cmdliner_arg.cmx cmdliner_base.cmx cmdliner_cline.cmx cmdliner_docgen.cmx \
-               cmdliner_info.cmx cmdliner_manpage.cmx cmdliner_msg.cmx \
-               cmdliner_suggest.cmx cmdliner_term.cmx cmdliner_trie.cmx; do \
-               ${INSTALL_DATA} ${WRKSRC}/_build/src/$$i \
-               ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner; \
-       done
-.endif
-
 .include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../devel/ocaml-result/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-cmdliner/PLIST
diff -u pkgsrc/devel/ocaml-cmdliner/PLIST:1.3 pkgsrc/devel/ocaml-cmdliner/PLIST:1.4
--- pkgsrc/devel/ocaml-cmdliner/PLIST:1.3       Tue Jul 11 10:18:38 2017
+++ pkgsrc/devel/ocaml-cmdliner/PLIST   Sat Apr  7 11:42:13 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/07/11 10:18:38 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/04/07 11:42:13 jaapb Exp $
 ${OCAML_SITELIB}/cmdliner/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.a
 ${OCAML_SITELIB}/cmdliner/cmdliner.cma
@@ -22,9 +22,3 @@ ${OCAML_SITELIB}/cmdliner/opam
 share/doc/cmdliner/CHANGES.md
 share/doc/cmdliner/LICENSE.md
 share/doc/cmdliner/README.md
-share/doc/cmdliner/chorus.ml
-share/doc/cmdliner/cp_ex.ml
-share/doc/cmdliner/darcs_ex.ml
-share/doc/cmdliner/revolt.ml
-share/doc/cmdliner/rm_ex.ml
-share/doc/cmdliner/tail_ex.ml

Index: pkgsrc/devel/ocaml-cmdliner/buildlink3.mk
diff -u pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.10 pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.11
--- pkgsrc/devel/ocaml-cmdliner/buildlink3.mk:1.10      Wed Jan 10 14:46:42 2018
+++ pkgsrc/devel/ocaml-cmdliner/buildlink3.mk   Sat Apr  7 11:42:13 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/01/10 14:46:42 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2018/04/07 11:42:13 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-cmdliner
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-cmdliner
 OCAML_CMDLINER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-cmdliner+= ocaml-cmdliner>=0.9.8
-BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.0.2
+BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?= ocaml-cmdliner>=1.0.2nb2
 BUILDLINK_PKGSRCDIR.ocaml-cmdliner?=   ../../devel/ocaml-cmdliner
 
 .include "../../devel/ocaml-findlib/buildlink3.mk"

Index: pkgsrc/devel/ocaml-cmdliner/distinfo
diff -u pkgsrc/devel/ocaml-cmdliner/distinfo:1.5 pkgsrc/devel/ocaml-cmdliner/distinfo:1.6
--- pkgsrc/devel/ocaml-cmdliner/distinfo:1.5    Wed Jan 10 14:46:42 2018
+++ pkgsrc/devel/ocaml-cmdliner/distinfo        Sat Apr  7 11:42:13 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2018/01/10 14:46:42 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/04/07 11:42:13 jaapb Exp $
 
 SHA1 (cmdliner-1.0.2.tbz) = 4e54424f95ce4f805b855647d9d531dd8b5e9cae
 RMD160 (cmdliner-1.0.2.tbz) = a59d1a98f475c0bf2c51723e920c387a26921bd3
 SHA512 (cmdliner-1.0.2.tbz) = d718d9abe4fe0ea0e7453ed09e57de2a427cc450225cf2b56513d99af4b4218c3fe96ab08dcebd202b9ecf25a471bb7c67511262f35148dfe15684421be6d743
 Size (cmdliner-1.0.2.tbz) = 47350 bytes
+SHA1 (patch-Makefile) = 9dfc351c9007ca1bf7354ed8f94ab9fe0abdf6f7