Updated devel/ocaml-ppx_optcomp to version 0.11.0.

This change involves depending on ppxlib rather than its constituent parts
and changing the syntax so that it is a proper ppx extension.

4 files changed, 29 insertions, 18 deletions

diff --git a/devel/ocaml-ppx_optcomp/Makefile b/devel/ocaml-ppx_optcomp/Makefile
index 4f26e31b01f..d758be579e2 100644
--- a/devel/ocaml-ppx_optcomp/Makefile
+++ b/devel/ocaml-ppx_optcomp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2018/04/04 19:26:12 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/09 15:08:38 jaapb Exp $
 
 GITHUB_PROJECT=	ppx_optcomp
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	${GITHUB_PROJECT}-0.9.0
+DISTNAME=	${GITHUB_PROJECT}-0.11.0
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
 
@@ -17,6 +16,7 @@ OCAML_USE_FINDLIB=	yes
 OCAML_USE_JBUILDER=	yes
 
 .include "../../mk/ocaml.mk"
-.include "../../devel/ocaml-compiler-libs/buildlink3.mk"
-.include "../../devel/ocaml-ppx_core/buildlink3.mk"
+.include "../../devel/ocaml-base/buildlink3.mk"
+.include "../../devel/ocaml-stdio/buildlink3.mk"
+.include "../../devel/ocaml-ppxlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-ppx_optcomp/PLIST b/devel/ocaml-ppx_optcomp/PLIST
index 4ed4babd017..9bef3ec8554 100644
--- a/devel/ocaml-ppx_optcomp/PLIST
+++ b/devel/ocaml-ppx_optcomp/PLIST
@@ -1,18 +1,31 @@
-@comment $NetBSD: PLIST,v 1.6 2018/04/04 19:26:12 jaapb Exp $
-bin/ppx-optcomp
+@comment $NetBSD: PLIST,v 1.7 2018/05/09 15:08:38 jaapb Exp $
 ${OCAML_SITELIB}/ppx_optcomp/META
+${OCAML_SITELIB}/ppx_optcomp/cparser.ml
+${OCAML_SITELIB}/ppx_optcomp/interpreter.ml
 ${OCAML_SITELIB}/ppx_optcomp/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.a
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cma
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmi
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmt
-${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxs
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.dune
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.ml
-${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.mli
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__.cmi
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__.cmx
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__.ml-gen
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Cparser.cmi
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Cparser.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Cparser.cmx
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Interpreter.cmi
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Interpreter.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Interpreter.cmx
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Token.cmi
+${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Token.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp__Token.cmx
+${OCAML_SITELIB}/ppx_optcomp/token.ml
 share/doc/ppx_optcomp/CHANGES.md
 share/doc/ppx_optcomp/LICENSE.txt
 share/doc/ppx_optcomp/README.md
diff --git a/devel/ocaml-ppx_optcomp/buildlink3.mk b/devel/ocaml-ppx_optcomp/buildlink3.mk
index 57b4cad3a9b..227172cb64c 100644
--- a/devel/ocaml-ppx_optcomp/buildlink3.mk
+++ b/devel/ocaml-ppx_optcomp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/04/04 19:26:12 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/05/09 15:08:38 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ppx_optcomp
 
@@ -6,11 +6,9 @@ BUILDLINK_TREE+=	ocaml-ppx_optcomp
 OCAML_PPX_OPTCOMP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ppx_optcomp+=	ocaml-ppx_optcomp>=0.9.0
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+=	ocaml-ppx_optcomp>=0.9.0nb3
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+=	ocaml-ppx_optcomp>=0.11.0
 BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?=		../../devel/ocaml-ppx_optcomp
 
-.include "../../devel/ocaml-ppx_core/buildlink3.mk"
-#.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .endif	# OCAML_PPX_OPTCOMP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-ppx_optcomp
diff --git a/devel/ocaml-ppx_optcomp/distinfo b/devel/ocaml-ppx_optcomp/distinfo
index 0451a95428c..d3835efa547 100644
--- a/devel/ocaml-ppx_optcomp/distinfo
+++ b/devel/ocaml-ppx_optcomp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2017/07/21 13:34:18 jaapb Exp $
+$NetBSD: distinfo,v 1.6 2018/05/09 15:08:38 jaapb Exp $
 
-SHA1 (ppx_optcomp-0.9.0.tar.gz) = 62e0edd7d47bc2797e3f0bdcc1212c8c9cabd9cf
-RMD160 (ppx_optcomp-0.9.0.tar.gz) = 40f016c8211a241935fffec213cd0b7e71495a2b
-SHA512 (ppx_optcomp-0.9.0.tar.gz) = ce4a5049045458533b783b99b7569e72e074bd425a81315d43fcab26dbc2a4b141cfda2b2365c69b3d0251f2bf0b8c8f0d14fc8883f1a0f4edae824776565a9c
-Size (ppx_optcomp-0.9.0.tar.gz) = 14611 bytes
+SHA1 (ppx_optcomp-0.11.0.tar.gz) = 7cf26e83348168e5b062b898b4ea087b0a90bc12
+RMD160 (ppx_optcomp-0.11.0.tar.gz) = 59d8f1ed4c0c07ad01f8617d80b143fc8460e4c2
+SHA512 (ppx_optcomp-0.11.0.tar.gz) = 382961916fd5876e7a46f75ff1fb043c5802a88f4b4665717587b2243903a4e1567febf1bfb5ef9e56f361e552ee092ab2d4a6c8f3112e8e89d06a25271c56d1
+Size (ppx_optcomp-0.11.0.tar.gz) = 18789 bytes