[pkgsrc/trunk]: pkgsrc/devel/ocaml-ppx_optcomp Updated devel/ppx_optcomp to l...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4edcfc398ef
branches:  trunk
changeset: 365606:d4edcfc398ef
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Fri Jul 21 13:34:18 2017 +0000

description:
Updated devel/ppx_optcomp to latest version, 0.9.0 (caution: new versioning
scheme!). There does not seem to be a changelog, but one change is in the
build system: ocaml-jbuilder is used now.

diffstat:

 devel/ocaml-ppx_optcomp/Makefile                         |  24 +++-----
 devel/ocaml-ppx_optcomp/PLIST                            |   8 ++-
 devel/ocaml-ppx_optcomp/buildlink3.mk                    |   6 +-
 devel/ocaml-ppx_optcomp/distinfo                         |  13 +---
 devel/ocaml-ppx_optcomp/patches/patch-_oasis             |  14 -----
 devel/ocaml-ppx_optcomp/patches/patch-src_META.ab        |  17 ------
 devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml |  41 ----------------
 7 files changed, 23 insertions(+), 100 deletions(-)

diffs (183 lines):

diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/Makefile
--- a/devel/ocaml-ppx_optcomp/Makefile  Fri Jul 21 13:28:14 2017 +0000
+++ b/devel/ocaml-ppx_optcomp/Makefile  Fri Jul 21 13:34:18 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2017/07/11 14:15:50 jaapb Exp $
+# $NetBSD: Makefile,v 1.8 2017/07/21 13:34:18 jaapb Exp $
 
-VERSION=       114.08.89
-PKGREVISION=   2
+VERSION=       0.9.0
 GITHUB_PROJECT=        ppx_optcomp
-GITHUB_TAG=    6f1ce80
+GITHUB_TAG=    v${VERSION}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 PKGNAME=       ocaml-${DISTNAME}
 CATEGORIES=    devel
@@ -14,18 +13,13 @@
 COMMENT=       Optional compilation for OCaml
 LICENSE=       apache-2.0
 
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-6f1ce80b1e9dff9b02a1579209e9655994151e15
-HAS_CONFIGURE= yes
-USE_LANGUAGES= # none
-OCAML_USE_OASIS_DYNRUN=        yes
-CONFIGURE_ARGS+=       --bindir ${DESTDIR}${PREFIX}/bin
-
-post-extract:
-       ${MV} ${WRKSRC}/META.ab ${WRKSRC}/src
+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-ppx_deriving/buildlink3.mk"
-.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
-.include "../../devel/ocamlbuild/buildlink3.mk"
+#.include "../../devel/ocaml-ppx_deriving/buildlink3.mk"
+#.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
+#.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/PLIST
--- a/devel/ocaml-ppx_optcomp/PLIST     Fri Jul 21 13:28:14 2017 +0000
+++ b/devel/ocaml-ppx_optcomp/PLIST     Fri Jul 21 13:34:18 2017 +0000
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2017/07/11 14:15:50 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/07/21 13:34:18 jaapb Exp $
+bin/ppx-optcomp
 ${OCAML_SITELIB}/ppx_optcomp/META
+${OCAML_SITELIB}/ppx_optcomp/opam
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.a
-${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.annot
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cma
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmi
 ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmt
@@ -10,3 +11,6 @@
 ${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.mli
+share/doc/ppx_optcomp/CHANGES.md
+share/doc/ppx_optcomp/LICENSE.txt
+share/doc/ppx_optcomp/README.md
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/buildlink3.mk
--- a/devel/ocaml-ppx_optcomp/buildlink3.mk     Fri Jul 21 13:28:14 2017 +0000
+++ b/devel/ocaml-ppx_optcomp/buildlink3.mk     Fri Jul 21 13:34:18 2017 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 14:15:50 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/07/21 13:34:18 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-ppx_optcomp
 
 .if !defined(OCAML_PPX_OPTCOMP_BUILDLINK3_MK)
 OCAML_PPX_OPTCOMP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=113.24.00
-BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=114.08.09nb2
+BUILDLINK_API_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=0.9.0
+BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+=      ocaml-ppx_optcomp>=0.9.0
 BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?=        ../../devel/ocaml-ppx_optcomp
 
 .include "../../devel/ocaml-ppx_core/buildlink3.mk"
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/distinfo
--- a/devel/ocaml-ppx_optcomp/distinfo  Fri Jul 21 13:28:14 2017 +0000
+++ b/devel/ocaml-ppx_optcomp/distinfo  Fri Jul 21 13:34:18 2017 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2017/07/11 14:15:50 jaapb Exp $
+$NetBSD: distinfo,v 1.5 2017/07/21 13:34:18 jaapb Exp $
 
-SHA1 (ppx_optcomp-114.08.89-6f1ce80.tar.gz) = 29ce4c9c79205500b10b4b135b93e04d25df7f97
-RMD160 (ppx_optcomp-114.08.89-6f1ce80.tar.gz) = 51ecd6f20acd5ada0dc7f0879f15fb9ba8aee092
-SHA512 (ppx_optcomp-114.08.89-6f1ce80.tar.gz) = eff277acf93fdfdbea5401e86fe4619436683174ddfedebcf18746b74c431e51cd2471550d248f55ab2e0d60e1f4aba636b1d950611d9ca4136c134c9dce6490
-Size (ppx_optcomp-114.08.89-6f1ce80.tar.gz) = 16081 bytes
-SHA1 (patch-_oasis) = 3c642c3efa3bf30d32d37d40c5e826c9ecc0bb30
-SHA1 (patch-src_META.ab) = 76a214c2c2ead0178df9e68a719a2ad06bb0b7df
-SHA1 (patch-src_ppx_optcomp.ml) = c6b2878cbf19fe9487ec9c9641c7385343cf4bb8
+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
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/patches/patch-_oasis
--- a/devel/ocaml-ppx_optcomp/patches/patch-_oasis      Fri Jul 21 13:28:14 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-_oasis,v 1.1 2016/12/30 11:25:34 jaapb Exp $
-
-Properly detect and generate META files
---- _oasis.orig        2016-09-02 10:02:01.000000000 +0000
-+++ _oasis
-@@ -17,7 +17,7 @@ BuildTools:            ocamlbuild
- BetaFeatures:          section_object
- AlphaFeatures:         ocamlbuild_more_args
- XOCamlbuildPluginTags: package(js-build-tools.ocamlbuild_goodies)
--FilesAB:               META.ab
-+FilesAB:               src/META.ab
- Description:
-   Part of the Jane Street's PPX rewriters collection.
- 
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/patches/patch-src_META.ab
--- a/devel/ocaml-ppx_optcomp/patches/patch-src_META.ab Fri Jul 21 13:28:14 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_META.ab,v 1.1 2017/01/04 00:10:43 jaapb Exp $
-
-Add deriving bit - patch from 4.04 branch
---- src/META.ab.orig   2016-09-02 10:02:01.000000000 +0000
-+++ src/META.ab
-@@ -6,3 +6,11 @@ archive(native) = "ppx_optcomp.cmxa"
- plugin(byte  ) = "ppx_optcomp.cma"
- plugin(native) = "ppx_optcomp.cmxs"
- exists_if = "ppx_optcomp.cma"
-+
-+package "for_ppx_deriving" (
-+  description = "Don't use this directly"
-+  error(ppx_driver) = "Cannot use ppx_optcomp.for_ppx_deriving when ppx_driver is set"
-+  requires = "ppx_core.for_ppx_deriving ppx_deriving"
-+  exists_if = "ppx_optcomp.cma"
-+  ppxopt = "ppx_deriving,./ppx_optcomp.cma"
-+)
diff -r 3c3326655e58 -r d4edcfc398ef devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml
--- a/devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml  Fri Jul 21 13:28:14 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-src_ppx_optcomp.ml,v 1.1 2017/01/04 00:10:43 jaapb Exp $
-
-Changes to do with OCaml 4.04 (from 4.04 branch)
---- src/ppx_optcomp.ml.orig    2016-09-02 10:02:01.000000000 +0000
-+++ src/ppx_optcomp.ml
-@@ -617,7 +617,7 @@ end = struct
- 
-   let rec next_directive (lexer : lexer) lexbuf =
-     match lexer lexbuf with
--    | SHARP -> parse_directive lexer lexbuf
-+    | HASH -> parse_directive lexer lexbuf
-     | EOL -> next_directive lexer lexbuf
-     | EOF -> endif_missing lexbuf
-     | _ -> skip_line lexer lexbuf; next_directive lexer lexbuf
-@@ -712,7 +712,7 @@ end = struct
-   (* Return the next token from a stream, interpreting directives. *)
-   let rec lexer_internal (lexer : lexer) lexbuf : Parser.token =
-     match lexer lexbuf with
--    | SHARP when at_bol lexbuf ->
-+    | HASH when at_bol lexbuf ->
-       interpret_directive lexer lexbuf (parse_directive lexer lexbuf);
-       lexer_internal lexer lexbuf
-     | EOF -> Stack.check_eof lexbuf; EOF
-@@ -740,7 +740,7 @@ end = struct
-         (* Special case for ifndef + define. If we fallback to [interpret_if], it will
-            raise, because the variable is not defined. *)
-         match lexer lexbuf with
--        | SHARP when at_bol lexbuf -> begin
-+        | HASH when at_bol lexbuf -> begin
-             match (parse_directive lexer lexbuf).txt with
-             | Define (var', expr) when var'.txt = var.txt ->
-               Stack.enqueue dir;
-@@ -847,7 +847,7 @@ end = struct
-     Location.init lexbuf fn;
-     let rec loop pos acc =
-       match Lexer.token lexbuf with
--      | SHARP when at_bol lexbuf ->
-+      | HASH when at_bol lexbuf ->
-         let acc = (pos, Lexing.lexeme_start lexbuf) :: acc in
-         interpret_directive Lexer.token lexbuf (parse_directive Lexer.token lexbuf);
-         loop (Lexing.lexeme_end lexbuf) acc