diff options
author | jaapb <jaapb> | 2017-01-04 00:10:43 +0000 |
---|---|---|
committer | jaapb <jaapb> | 2017-01-04 00:10:43 +0000 |
commit | f238c854f9430024a8040909b5f59b8b10d4980d (patch) | |
tree | ec4c494ec99e28499287d9bf39ab8ce2bffddd85 /devel/ocaml-ppx_optcomp | |
parent | cf5cd72f250d44fd2ca0b3789289727e68647716 (diff) | |
download | pkgsrc-f238c854f9430024a8040909b5f59b8b10d4980d.tar.gz |
Added two uncommitted patches & increased revision.
Diffstat (limited to 'devel/ocaml-ppx_optcomp')
-rw-r--r-- | devel/ocaml-ppx_optcomp/Makefile | 3 | ||||
-rw-r--r-- | devel/ocaml-ppx_optcomp/patches/patch-src_META.ab | 17 | ||||
-rw-r--r-- | devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml | 41 |
3 files changed, 60 insertions, 1 deletions
diff --git a/devel/ocaml-ppx_optcomp/Makefile b/devel/ocaml-ppx_optcomp/Makefile index a970834bb70..a68e32e1536 100644 --- a/devel/ocaml-ppx_optcomp/Makefile +++ b/devel/ocaml-ppx_optcomp/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2016/12/30 11:25:33 jaapb Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/04 00:10:43 jaapb Exp $ VERSION= 114.08+89 +PKGREVISION= 1 GITHUB_PROJECT= ppx_optcomp GITHUB_TAG= 6f1ce80 DISTNAME= ${GITHUB_PROJECT}-${VERSION} diff --git a/devel/ocaml-ppx_optcomp/patches/patch-src_META.ab b/devel/ocaml-ppx_optcomp/patches/patch-src_META.ab new file mode 100644 index 00000000000..7bad42e16ca --- /dev/null +++ b/devel/ocaml-ppx_optcomp/patches/patch-src_META.ab @@ -0,0 +1,17 @@ +$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 --git a/devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml b/devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml new file mode 100644 index 00000000000..25373889c80 --- /dev/null +++ b/devel/ocaml-ppx_optcomp/patches/patch-src_ppx_optcomp.ml @@ -0,0 +1,41 @@ +$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 |