pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/ocaml-biniou Revert previous and update to 1.2.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/18785f7b408b
branches: trunk
changeset: 376907:18785f7b408b
user: dholland <dholland%pkgsrc.org@localhost>
date: Sun Mar 11 03:30:41 2018 +0000
description:
Revert previous and update to 1.2.0.
diffstat:
devel/ocaml-biniou/Makefile | 7 +-
devel/ocaml-biniou/PLIST | 38 ++----
devel/ocaml-biniou/distinfo | 19 +--
devel/ocaml-biniou/patches/patch-Makefile | 17 --
devel/ocaml-biniou/patches/patch-bi__inbuf.ml | 81 -------------
devel/ocaml-biniou/patches/patch-bi__inbuf.mli | 33 -----
devel/ocaml-biniou/patches/patch-bi__io.ml | 141 ------------------------
devel/ocaml-biniou/patches/patch-bi__outbuf.ml | 82 -------------
devel/ocaml-biniou/patches/patch-bi__outbuf.mli | 24 ----
devel/ocaml-biniou/patches/patch-bi__stream.ml | 18 ---
devel/ocaml-biniou/patches/patch-bi__util.ml | 52 --------
devel/ocaml-biniou/patches/patch-bi__vint.ml | 15 --
12 files changed, 22 insertions(+), 505 deletions(-)
diffs (truncated from 625 to 300 lines):
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/Makefile
--- a/devel/ocaml-biniou/Makefile Sun Mar 11 02:30:34 2018 +0000
+++ b/devel/ocaml-biniou/Makefile Sun Mar 11 03:30:41 2018 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2018/03/11 02:30:34 dholland Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/11 03:30:41 dholland Exp $
GITHUB_PROJECT= biniou
GITHUB_TAG= v${PKGVERSION_NOREV}
-DISTNAME= ${GITHUB_PROJECT}-1.0.13
+DISTNAME= ${GITHUB_PROJECT}-1.2.0
PKGNAME= ocaml-${DISTNAME}
-PKGREVISION= 4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mjambon/}
@@ -16,7 +15,7 @@
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake
BUILD_TARGET= byte doc META
-OCAML_USE_FINDLIB= yes
+OCAML_USE_JBUILDER= yes
INSTALLATION_DIRS+= bin
.include "../../mk/ocaml.mk"
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/PLIST
--- a/devel/ocaml-biniou/PLIST Sun Mar 11 02:30:34 2018 +0000
+++ b/devel/ocaml-biniou/PLIST Sun Mar 11 03:30:41 2018 +0000
@@ -1,59 +1,49 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/13 10:41:33 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/03/11 03:30:41 dholland Exp $
bin/bdump
${OCAML_SITELIB}/biniou/META
-${OCAML_SITELIB}/biniou/bi_dump.cmo
+${OCAML_SITELIB}/biniou/bi_dump.cmi
+${OCAML_SITELIB}/biniou/bi_dump.cmt
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_dump.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_dump.o
-${OCAML_SITELIB}/biniou/bi_inbuf.annot
+${OCAML_SITELIB}/biniou/bi_dump.ml
${OCAML_SITELIB}/biniou/bi_inbuf.cmi
-${OCAML_SITELIB}/biniou/bi_inbuf.cmo
${OCAML_SITELIB}/biniou/bi_inbuf.cmt
+${OCAML_SITELIB}/biniou/bi_inbuf.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_inbuf.cmx
${OCAML_SITELIB}/biniou/bi_inbuf.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_inbuf.o
-${OCAML_SITELIB}/biniou/bi_io.annot
${OCAML_SITELIB}/biniou/bi_io.cmi
-${OCAML_SITELIB}/biniou/bi_io.cmo
${OCAML_SITELIB}/biniou/bi_io.cmt
+${OCAML_SITELIB}/biniou/bi_io.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_io.cmx
${OCAML_SITELIB}/biniou/bi_io.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_io.o
-${OCAML_SITELIB}/biniou/bi_outbuf.annot
${OCAML_SITELIB}/biniou/bi_outbuf.cmi
-${OCAML_SITELIB}/biniou/bi_outbuf.cmo
${OCAML_SITELIB}/biniou/bi_outbuf.cmt
+${OCAML_SITELIB}/biniou/bi_outbuf.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_outbuf.cmx
${OCAML_SITELIB}/biniou/bi_outbuf.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_outbuf.o
-${OCAML_SITELIB}/biniou/bi_share.annot
${OCAML_SITELIB}/biniou/bi_share.cmi
-${OCAML_SITELIB}/biniou/bi_share.cmo
${OCAML_SITELIB}/biniou/bi_share.cmt
+${OCAML_SITELIB}/biniou/bi_share.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_share.cmx
${OCAML_SITELIB}/biniou/bi_share.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_share.o
-${OCAML_SITELIB}/biniou/bi_stream.annot
${OCAML_SITELIB}/biniou/bi_stream.cmi
-${OCAML_SITELIB}/biniou/bi_stream.cmo
${OCAML_SITELIB}/biniou/bi_stream.cmt
+${OCAML_SITELIB}/biniou/bi_stream.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_stream.cmx
${OCAML_SITELIB}/biniou/bi_stream.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_stream.o
-${OCAML_SITELIB}/biniou/bi_util.annot
${OCAML_SITELIB}/biniou/bi_util.cmi
-${OCAML_SITELIB}/biniou/bi_util.cmo
${OCAML_SITELIB}/biniou/bi_util.cmt
+${OCAML_SITELIB}/biniou/bi_util.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_util.cmx
${OCAML_SITELIB}/biniou/bi_util.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_util.o
-${OCAML_SITELIB}/biniou/bi_vint.annot
${OCAML_SITELIB}/biniou/bi_vint.cmi
-${OCAML_SITELIB}/biniou/bi_vint.cmo
${OCAML_SITELIB}/biniou/bi_vint.cmt
+${OCAML_SITELIB}/biniou/bi_vint.cmti
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_vint.cmx
${OCAML_SITELIB}/biniou/bi_vint.mli
-${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/bi_vint.o
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/biniou.a
${OCAML_SITELIB}/biniou/biniou.cma
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/biniou.cmxa
${PLIST.ocaml-opt}${OCAML_SITELIB}/biniou/biniou.cmxs
+${OCAML_SITELIB}/biniou/opam
+share/doc/biniou/LICENSE
+share/doc/biniou/README.md
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/distinfo
--- a/devel/ocaml-biniou/distinfo Sun Mar 11 02:30:34 2018 +0000
+++ b/devel/ocaml-biniou/distinfo Sun Mar 11 03:30:41 2018 +0000
@@ -1,15 +1,6 @@
-$NetBSD: distinfo,v 1.3 2018/03/11 02:30:34 dholland Exp $
+$NetBSD: distinfo,v 1.4 2018/03/11 03:30:41 dholland Exp $
-SHA1 (biniou-1.0.13.tar.gz) = 87d62aeb15437f7ba26654b774b3106f374aad3c
-RMD160 (biniou-1.0.13.tar.gz) = 7b3306894c3407190acb707d53078ebd7118e82d
-SHA512 (biniou-1.0.13.tar.gz) = 2fe109e83260f546181dd26ea175d2c4f63d0f6604c6d26fa44ee31925ba1fdaac0139a436cd0271a31294de9cd8ea65f8dde0981403c652d31de721ef696788
-Size (biniou-1.0.13.tar.gz) = 24327 bytes
-SHA1 (patch-Makefile) = b9cf0685ae977211ebcc45b3f0e67408ae16162c
-SHA1 (patch-bi__inbuf.ml) = 3e62d15239d101323070655545e411a31f2dcda0
-SHA1 (patch-bi__inbuf.mli) = 7d493ce921bab96647117afe8ff554782259d85f
-SHA1 (patch-bi__io.ml) = 1330f33bd377d31f3bdf3d308b86e51ab77705bd
-SHA1 (patch-bi__outbuf.ml) = 7aa79eaccfd22b722b6d81f63c2fb74f6494eaa2
-SHA1 (patch-bi__outbuf.mli) = 21ce049e4133d2420c436e6021de99e0812f3456
-SHA1 (patch-bi__stream.ml) = 4e4d0c25d66bf83de682f353f8becc5fe25bf87f
-SHA1 (patch-bi__util.ml) = 1065354c10392255e1eedf2e5326c6c00bd6b8ff
-SHA1 (patch-bi__vint.ml) = 488d439585b4895174fb5434c6e3f5033e207828
+SHA1 (biniou-1.2.0.tar.gz) = c887736810d16f3366b92a69532c1e28a4db6463
+RMD160 (biniou-1.2.0.tar.gz) = d9e9fbef273ad82bdb578bdd221e505b3a18cd7e
+SHA512 (biniou-1.2.0.tar.gz) = 04c04c2dd5e3e1237106db257567ba6900bd94759b07b02ba2e0d9209d1bbdc9ed629864e06d44a8b61f72d46fbcc7a0ffc86f82feb223d9d99ca41afc625fab
+Size (biniou-1.2.0.tar.gz) = 23611 bytes
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/patches/patch-Makefile
--- a/devel/ocaml-biniou/patches/patch-Makefile Sun Mar 11 02:30:34 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2017/07/13 10:41:33 jaapb Exp $
-
-Install bdump using BSD install commands
---- Makefile.orig 2017-05-04 17:38:05.000000000 +0000
-+++ Makefile
-@@ -109,9 +109,9 @@ doc/index.html: $(MLI)
-
- install: META byte
- if [ -f bdump.native ]; then \
-- cp bdump.native $(BINDIR)/bdump$(EXE); \
-+ $(BSD_INSTALL_PROGRAM) bdump.native $(DESTDIR)$(BINDIR)/bdump$(EXE); \
- else \
-- cp bdump.byte $(BINDIR)/bdump$(EXE); \
-+ $(BSD_INSTALL_SCRIPT) bdump.byte $(DESTDIR)$(BINDIR)/bdump$(EXE); \
- fi
- ocamlfind install biniou META \
- $(MLI) $(CMI) $(CMT) $(ANNOT) $(CMO) biniou.cma \
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/patches/patch-bi__inbuf.ml
--- a/devel/ocaml-biniou/patches/patch-bi__inbuf.ml Sun Mar 11 02:30:34 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-$NetBSD: patch-bi__inbuf.ml,v 1.1 2018/03/11 02:30:34 dholland Exp $
-
-Fix up mutable strings to make it build with ocaml 4.06.
-
---- bi_inbuf.ml~ 2017-05-04 17:38:05.000000000 +0000
-+++ bi_inbuf.ml
-@@ -1,5 +1,5 @@
- type t = {
-- mutable i_s : string;
-+ mutable i_s : bytes;
- mutable i_pos : int;
- mutable i_len : int;
- mutable i_offs : int;
-@@ -35,14 +35,14 @@ let read ib n =
- let read_char ib =
- let pos = ib.i_pos in
- if ib.i_len - pos > 0 then (
-- let c = String.unsafe_get ib.i_s pos in
-+ let c = Bytes.unsafe_get ib.i_s pos in
- ib.i_pos <- pos + 1;
- c
- )
- else
- if try_preread ib 1 > 0 then
- let pos = ib.i_pos in
-- let c = String.unsafe_get ib.i_s pos in
-+ let c = Bytes.unsafe_get ib.i_s pos in
- ib.i_pos <- pos + 1;
- c
- else
-@@ -51,24 +51,27 @@ let read_char ib =
- let peek ib =
- let pos = ib.i_pos in
- if ib.i_len - pos > 0 then (
-- String.unsafe_get ib.i_s pos
-+ Bytes.unsafe_get ib.i_s pos
- )
- else
- if try_preread ib 1 > 0 then
-- String.unsafe_get ib.i_s ib.i_pos
-+ Bytes.unsafe_get ib.i_s ib.i_pos
- else
- raise End_of_input
-
--let from_string ?(pos = 0) ?(shrlen = 16) s = {
-+let from_bytes ?(pos = 0) ?(shrlen = 16) s = {
- i_s = s;
- i_pos = pos;
-- i_len = String.length s;
-+ i_len = Bytes.length s;
- i_offs = -pos;
-- i_max_len = String.length s;
-+ i_max_len = Bytes.length s;
- i_refill = (fun ib n -> ());
- i_shared = Bi_share.Rd.create shrlen;
- }
-
-+let from_string ?(pos = 0) ?(shrlen = 16) s =
-+ from_bytes ~pos ~shrlen (Bytes.of_string s)
-+
- (*
- Like Pervasives.really_input but returns the number of bytes
- read instead of raising End_of_file when the end of file is reached.
-@@ -87,7 +90,7 @@ let refill_from_channel ic ib n =
- let rem_len = ib.i_len - ib.i_pos in
- if rem_len < n then
- let s = ib.i_s in
-- String.blit s ib.i_pos s 0 rem_len;
-+ Bytes.blit s ib.i_pos s 0 rem_len;
- let to_read = n - rem_len in
- let really_read = not_really_input ic s rem_len to_read 0 in
- ib.i_offs <- ib.i_offs + ib.i_pos;
-@@ -96,7 +99,7 @@ let refill_from_channel ic ib n =
- )
-
- let from_channel ?(len = 4096) ?(shrlen = 16) ic = {
-- i_s = String.create len;
-+ i_s = Bytes.create len;
- i_pos = 0;
- i_len = 0;
- i_offs = 0;
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/patches/patch-bi__inbuf.mli
--- a/devel/ocaml-biniou/patches/patch-bi__inbuf.mli Sun Mar 11 02:30:34 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-bi__inbuf.mli,v 1.1 2018/03/11 02:30:34 dholland Exp $
-
-Fix up mutable strings to make it build with ocaml 4.06.
-
---- bi_inbuf.mli~ 2017-05-04 17:38:05.000000000 +0000
-+++ bi_inbuf.mli
-@@ -1,7 +1,7 @@
- (** Input buffer *)
-
- type t = {
-- mutable i_s : string;
-+ mutable i_s : bytes;
- (** This is the buffer string.
- It can be accessed for reading but should normally only
- be written to or replaced only by the [i_refill] function.
-@@ -92,9 +92,17 @@ val peek : t -> char
- @raise End_of_input if the end of input has already been reached.
- *)
-
-+val from_bytes : ?pos:int -> ?shrlen:int -> bytes -> t
-+ (**
-+ Create an input buffer from a byte buffer.
-+ @param pos position to start from. Default: 0.
-+ @param shrlen initial length of the table used to store shared values.
-+ *)
-+
- val from_string : ?pos:int -> ?shrlen:int -> string -> t
- (**
- Create an input buffer from a string.
-+ The string is copied into the internal buffer.
- @param pos position to start from. Default: 0.
- @param shrlen initial length of the table used to store shared values.
- *)
diff -r f449632d058c -r 18785f7b408b devel/ocaml-biniou/patches/patch-bi__io.ml
--- a/devel/ocaml-biniou/patches/patch-bi__io.ml Sun Mar 11 02:30:34 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-$NetBSD: patch-bi__io.ml,v 1.1 2018/03/11 02:30:34 dholland Exp $
-
-Fix up mutable strings to make it build with ocaml 4.06.
-
---- bi_io.ml~ 2017-05-04 17:38:05.000000000 +0000
-+++ bi_io.ml
-@@ -89,13 +89,13 @@ let write_hashtag ob h has_arg =
- let h = mask_31bit h in
- let pos = Bi_outbuf.alloc ob 4 in
- let s = ob.o_s in
-- String.unsafe_set s (pos+3) (Char.chr (h land 0xff));
-+ Bytes.unsafe_set s (pos+3) (Char.chr (h land 0xff));
- let h = h lsr 8 in
-- String.unsafe_set s (pos+2) (Char.chr (h land 0xff));
-+ Bytes.unsafe_set s (pos+2) (Char.chr (h land 0xff));
- let h = h lsr 8 in
-- String.unsafe_set s (pos+1) (Char.chr (h land 0xff));
-+ Bytes.unsafe_set s (pos+1) (Char.chr (h land 0xff));
- let h = h lsr 8 in
-- String.unsafe_set s pos (
-+ Bytes.unsafe_set s pos (
- Char.chr (
- if has_arg then h lor 0x80
- else h
-@@ -110,12 +110,12 @@ let string_of_hashtag h has_arg =
- let read_hashtag ib cont =
- let i = Bi_inbuf.read ib 4 in
Home |
Main Index |
Thread Index |
Old Index