4 files changed, 53 insertions, 28 deletions
diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index 4b8c04e506b..8b1a2f9ef8d 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/12/30 11:16:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/11 10:18:38 jaapb Exp $
 
 PKGNAME=	ocaml-${DISTNAME}
-DISTNAME=	cmdliner-0.9.8
-PKGREVISION=	2
+DISTNAME=	cmdliner-1.0.0
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/cmdliner/releases/
 EXTRACT_SUFX=	.tbz
@@ -13,29 +12,34 @@ COMMENT=	Module for the declarative definition of command line interfaces
 LICENSE=	modified-bsd
 
 USE_LANGUAGES=	c
-OCAML_USE_FINDLIB=	yes
-INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/cmdliner
 
-.include "../../mk/ocaml.mk"
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-NATIVE=	true
-.else
-NATIVE=	false
-.endif
+OCAML_USE_TOPKG=	yes
+INSTALLATION_DIRS+=	share/doc/cmdliner
 
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml ./pkg/build.ml \
-		native=${NATIVE} native-dynlink=${NATIVE}
+.include "../../mk/ocaml.mk"
 
+# Normally, we'd do this using opam-installer, but that requires
+# this package.
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/_build/pkg/META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner
-	for i in cmdliner.mli cmdliner.cmi cmdliner.cma; do \
-		${INSTALL_DATA} ${WRKSRC}/_build/src/$$i ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner; \
+	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.cmx cmdliner.a cmdliner.cmxa cmdliner.cmxs; do \
-		${INSTALL_DATA} ${WRKSRC}/_build/src/$$i ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/cmdliner; \
+	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
 
diff --git a/devel/ocaml-cmdliner/PLIST b/devel/ocaml-cmdliner/PLIST
index 366188e644c..862c5c90b40 100644
--- a/devel/ocaml-cmdliner/PLIST
+++ b/devel/ocaml-cmdliner/PLIST
@@ -1,9 +1,30 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/17 15:33:24 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/07/11 10:18:38 jaapb Exp $
 ${OCAML_SITELIB}/cmdliner/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.a
 ${OCAML_SITELIB}/cmdliner/cmdliner.cma
 ${OCAML_SITELIB}/cmdliner/cmdliner.cmi
+${OCAML_SITELIB}/cmdliner/cmdliner.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner.cmxs
 ${OCAML_SITELIB}/cmdliner/cmdliner.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_arg.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_base.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_cline.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_docgen.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_info.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_manpage.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_msg.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_suggest.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_term.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/cmdliner/cmdliner_trie.cmx
+${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
diff --git a/devel/ocaml-cmdliner/buildlink3.mk b/devel/ocaml-cmdliner/buildlink3.mk
index ae67591605c..dc8361b540a 100644
--- a/devel/ocaml-cmdliner/buildlink3.mk
+++ b/devel/ocaml-cmdliner/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2016/12/30 11:16:56 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/07/11 10:18:38 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>=0.9.8nb2
+BUILDLINK_ABI_DEPENDS.ocaml-cmdliner?=	ocaml-cmdliner>=1.0.0
 BUILDLINK_PKGSRCDIR.ocaml-cmdliner?=	../../devel/ocaml-cmdliner
 
 .include "../../devel/ocaml-findlib/buildlink3.mk"
diff --git a/devel/ocaml-cmdliner/distinfo b/devel/ocaml-cmdliner/distinfo
index 3eac5215a2e..d5ac94c5973 100644
--- a/devel/ocaml-cmdliner/distinfo
+++ b/devel/ocaml-cmdliner/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/06/17 15:33:24 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/07/11 10:18:38 jaapb Exp $
 
-SHA1 (cmdliner-0.9.8.tbz) = 2f8af80a8d172222daf8a35ea0861ebf88e9d6d6
-RMD160 (cmdliner-0.9.8.tbz) = de19b38209faac7d39dd230a3cdec325bb09f596
-SHA512 (cmdliner-0.9.8.tbz) = 6c71c360eaba7f7127e422a71a00a830a086f1d6750897bea0ebc1cc10f8fdaf9e9532d354abd84dbc6c5fcc1878f19d3f424fd9335e7226b625b63b51c89cab
-Size (cmdliner-0.9.8.tbz) = 53249 bytes
+SHA1 (cmdliner-1.0.0.tbz) = 1d6039346e6beffe3d32dc7e2f03e3ab333113a8
+RMD160 (cmdliner-1.0.0.tbz) = a4f180a908cd8ce82c9454b597771d7b1fa59310
+SHA512 (cmdliner-1.0.0.tbz) = 3fc87e49504167864ba4d81fde7bbaa01b7d58b06e2b68b36647857590f41fdc8b3bbd547418f8159b0e76628236b5c30301404b3d8d57e2ff3f082228eee73c
+Size (cmdliner-1.0.0.tbz) = 46542 bytes