diff options
151 files changed, 24 insertions, 5312 deletions
diff --git a/databases/Makefile b/databases/Makefile index 2cf59f2d355..0dfa605baad 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.663 2022/05/20 10:42:18 jaapb Exp $ +# $NetBSD: Makefile,v 1.664 2022/06/29 07:54:38 wiz Exp $ COMMENT= Databases @@ -125,7 +125,6 @@ SUBDIR+= nss-pgsql SUBDIR+= nss_ldap SUBDIR+= ocaml-dbm SUBDIR+= ocaml-ldap -SUBDIR+= ocaml-macaque SUBDIR+= ocaml-mysql SUBDIR+= ocaml-sqlite3 SUBDIR+= ocsipersist diff --git a/databases/ocaml-macaque/DESCR b/databases/ocaml-macaque/DESCR deleted file mode 100644 index be090a97f85..00000000000 --- a/databases/ocaml-macaque/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -MaCaQue (or macaque) is a DSL for SQL Queries in Caml. - -It has the following objectives : -- be highly compositional -- use expressive types to avoid runtime errors diff --git a/databases/ocaml-macaque/Makefile b/databases/ocaml-macaque/Makefile deleted file mode 100644 index 47ab160f41b..00000000000 --- a/databases/ocaml-macaque/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2022/05/24 18:51:47 jaapb Exp $ - -GITHUB_PROJECT= macaque -DISTNAME= ${GITHUB_PROJECT}-0.7.4 -PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 4 -CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/ocsigen/macaque/ -COMMENT= Language for SQL queries in OCaml -LICENSE= gnu-lgpl-v2.1 - -HAS_CONFIGURE= yes -USE_LANGUAGES= c -OCAML_USE_FINDLIB= yes -OCAML_USE_OASIS_DYNRUN= yes - -.include "../../databases/pgocaml/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../lang/ocaml/ocaml.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/databases/ocaml-macaque/PLIST b/databases/ocaml-macaque/PLIST deleted file mode 100644 index 88f2e354514..00000000000 --- a/databases/ocaml-macaque/PLIST +++ /dev/null @@ -1,79 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2018/06/05 15:37:21 jaapb Exp $ -${OCAML_SITELIB}/macaque/META -${OCAML_SITELIB}/macaque/check.annot -${OCAML_SITELIB}/macaque/check.cmi -${OCAML_SITELIB}/macaque/check.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/check.cmx -${OCAML_SITELIB}/macaque/check.ml -${OCAML_SITELIB}/macaque/inner_sql.annot -${OCAML_SITELIB}/macaque/inner_sql.cmi -${OCAML_SITELIB}/macaque/inner_sql.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/inner_sql.cmx -${OCAML_SITELIB}/macaque/inner_sql.ml -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/macaque.a -${OCAML_SITELIB}/macaque/macaque.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/macaque.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/macaque.cmxs -${OCAML_SITELIB}/macaque/pa_bananas.annot -${OCAML_SITELIB}/macaque/pa_bananas.cmi -${OCAML_SITELIB}/macaque/pa_bananas.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/pa_bananas.cmx -${OCAML_SITELIB}/macaque/pa_bananas.ml -${OCAML_SITELIB}/macaque/pa_macaque.annot -${OCAML_SITELIB}/macaque/pa_macaque.cmi -${OCAML_SITELIB}/macaque/pa_macaque.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/pa_macaque.cmx -${OCAML_SITELIB}/macaque/pa_macaque.ml -${OCAML_SITELIB}/macaque/query.annot -${OCAML_SITELIB}/macaque/query.cmi -${OCAML_SITELIB}/macaque/query.cmt -${OCAML_SITELIB}/macaque/query.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/query.cmx -${OCAML_SITELIB}/macaque/query.mli -${OCAML_SITELIB}/macaque/sql.annot -${OCAML_SITELIB}/macaque/sql.cmi -${OCAML_SITELIB}/macaque/sql.cmt -${OCAML_SITELIB}/macaque/sql.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql.cmx -${OCAML_SITELIB}/macaque/sql.mli -${OCAML_SITELIB}/macaque/sql_base.annot -${OCAML_SITELIB}/macaque/sql_base.cmi -${OCAML_SITELIB}/macaque/sql_base.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_base.cmx -${OCAML_SITELIB}/macaque/sql_base.ml -${OCAML_SITELIB}/macaque/sql_builders.annot -${OCAML_SITELIB}/macaque/sql_builders.cmi -${OCAML_SITELIB}/macaque/sql_builders.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_builders.cmx -${OCAML_SITELIB}/macaque/sql_builders.ml -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_flatten.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_internals.cmx -${OCAML_SITELIB}/macaque/sql_keywords.annot -${OCAML_SITELIB}/macaque/sql_keywords.cmi -${OCAML_SITELIB}/macaque/sql_keywords.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_keywords.cmx -${OCAML_SITELIB}/macaque/sql_keywords.ml -${OCAML_SITELIB}/macaque/sql_parsers.annot -${OCAML_SITELIB}/macaque/sql_parsers.cmi -${OCAML_SITELIB}/macaque/sql_parsers.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_parsers.cmx -${OCAML_SITELIB}/macaque/sql_parsers.ml -${OCAML_SITELIB}/macaque/sql_printers.annot -${OCAML_SITELIB}/macaque/sql_printers.cmi -${OCAML_SITELIB}/macaque/sql_printers.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_printers.cmx -${OCAML_SITELIB}/macaque/sql_printers.ml -${OCAML_SITELIB}/macaque/sql_public.annot -${OCAML_SITELIB}/macaque/sql_public.cmi -${OCAML_SITELIB}/macaque/sql_public.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_public.cmx -${OCAML_SITELIB}/macaque/sql_public.ml -${OCAML_SITELIB}/macaque/sql_types.annot -${OCAML_SITELIB}/macaque/sql_types.cmi -${OCAML_SITELIB}/macaque/sql_types.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/sql_types.cmx -${OCAML_SITELIB}/macaque/sql_types.ml -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/syntax.a -${OCAML_SITELIB}/macaque/syntax.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/syntax.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/macaque/syntax.cmxs diff --git a/databases/ocaml-macaque/buildlink3.mk b/databases/ocaml-macaque/buildlink3.mk deleted file mode 100644 index 7cbc8436eb8..00000000000 --- a/databases/ocaml-macaque/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.3 2022/05/24 18:51:47 jaapb Exp $ - -BUILDLINK_TREE+= ocaml-macaque - -.if !defined(OCAML_MACAQUE_BUILDLINK3_MK) -OCAML_MACAQUE_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.ocaml-macaque+= ocaml-macaque>=0.7.4 -BUILDLINK_ABI_DEPENDS.ocaml-macaque+= ocaml-macaque>=0.7.4nb4 -BUILDLINK_PKGSRCDIR.ocaml-macaque?= ../../databases/ocaml-macaque - -.include "../../databases/pgocaml/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.endif # OCAML_MACAQUE_BUILDLINK3_MK - -BUILDLINK_TREE+= -ocaml-macaque diff --git a/databases/ocaml-macaque/distinfo b/databases/ocaml-macaque/distinfo deleted file mode 100644 index 99896b198f4..00000000000 --- a/databases/ocaml-macaque/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 10:09:26 nia Exp $ - -BLAKE2s (macaque-0.7.4.tar.gz) = bee031588c45f6d6db71a152d93f2914ec973356dd05074cd8e45f83c9fc5fc6 -SHA512 (macaque-0.7.4.tar.gz) = db664226e58ad3db2dc00e920dcc757242b0bcc8d1b6406e6743afe6cdbe789546af131a00c07a5e2e63ed39b9017c2d8e2f5bbce63a741df58bf14633aae89a -Size (macaque-0.7.4.tar.gz) = 64896 bytes diff --git a/devel/Makefile b/devel/Makefile index 09c04e28b02..4003ba642c3 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3755 2022/06/20 08:18:02 jaapb Exp $ +# $NetBSD: Makefile,v 1.3756 2022/06/29 07:54:38 wiz Exp $ # COMMENT= Development utilities @@ -1057,7 +1057,6 @@ SUBDIR+= mob SUBDIR+= mold SUBDIR+= monotone SUBDIR+= monotone-server -SUBDIR+= monotone-viz SUBDIR+= mph SUBDIR+= msgpack SUBDIR+= mustach @@ -1112,7 +1111,6 @@ SUBDIR+= ocaml-core_unix SUBDIR+= ocaml-cppo SUBDIR+= ocaml-csexp SUBDIR+= ocaml-cstruct -SUBDIR+= ocaml-deriving-ocsigen SUBDIR+= ocaml-digestif SUBDIR+= ocaml-duff SUBDIR+= ocaml-dune @@ -1138,7 +1136,6 @@ SUBDIR+= ocaml-ke SUBDIR+= ocaml-logs SUBDIR+= ocaml-lru SUBDIR+= ocaml-lwt -SUBDIR+= ocaml-lwt_camlp4 SUBDIR+= ocaml-lwt_glib SUBDIR+= ocaml-lwt_log SUBDIR+= ocaml-lwt_ppx @@ -1149,7 +1146,6 @@ SUBDIR+= ocaml-mirage-flow SUBDIR+= ocaml-mmap SUBDIR+= ocaml-oasis SUBDIR+= ocaml-ocplib-endian -SUBDIR+= ocaml-optcomp SUBDIR+= ocaml-optint SUBDIR+= ocaml-parsexp SUBDIR+= ocaml-ppx_assert @@ -1203,7 +1199,6 @@ SUBDIR+= ocaml-splittable_random SUBDIR+= ocaml-stdio SUBDIR+= ocaml-stdlib-shims SUBDIR+= ocaml-stringext -SUBDIR+= ocaml-type_conv SUBDIR+= ocaml-typerep SUBDIR+= ocaml-variantslib SUBDIR+= ocaml-yojson @@ -3302,7 +3297,6 @@ SUBDIR+= vanessa_adt SUBDIR+= vanessa_logger SUBDIR+= vanessa_socket SUBDIR+= vera++ -SUBDIR+= verifast SUBDIR+= visualvm SUBDIR+= vtcl SUBDIR+= wabt diff --git a/devel/monotone-viz/DESCR b/devel/monotone-viz/DESCR deleted file mode 100644 index 78dce3c4156..00000000000 --- a/devel/monotone-viz/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -This is a small GNOME application to visualize monotone ancestry -graphs. diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile deleted file mode 100644 index ddae744affa..00000000000 --- a/devel/monotone-viz/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: Makefile,v 1.121 2022/05/24 18:51:47 jaapb Exp $ -# - -DISTNAME= monotone-viz-1.0.2-nolablgtk -PKGNAME= ${DISTNAME:S/-nolablgtk//} -PKGREVISION= 48 -CATEGORIES= devel scm -#MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/ - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://oandrieu.nerim.net/monotone-viz/ -COMMENT= Visualize monotone ancestry graphs - -BUILD_TARGET= monotone-viz -GNU_CONFIGURE= yes -USE_TOOLS+= gmake pkg-config - -AUTO_MKDIRS= yes -EGDIR= ${PREFIX}/share/examples/${PKGBASE} -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/monotone-viz ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/monotone-viz.style.sample ${DESTDIR}${EGDIR} - -.include "../../graphics/graphviz/buildlink3.mk" -.include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/ocaml-lablgtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/monotone-viz/PLIST b/devel/monotone-viz/PLIST deleted file mode 100644 index ef834dc2a22..00000000000 --- a/devel/monotone-viz/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:48:59 joerg Exp $ -bin/monotone-viz -share/examples/monotone-viz/monotone-viz.style.sample diff --git a/devel/monotone-viz/distinfo b/devel/monotone-viz/distinfo deleted file mode 100644 index df736496bb7..00000000000 --- a/devel/monotone-viz/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 10:15:41 nia Exp $ - -BLAKE2s (monotone-viz-1.0.2-nolablgtk.tar.gz) = e976510dfaa6523e3ac3f2d80f82141c2ea979b1d0be9630654e85dcf2b380c7 -SHA512 (monotone-viz-1.0.2-nolablgtk.tar.gz) = dc446cefb224ba33ac11e05a249d660fb6a1c2c06921f90c8e0bc313ac5140fe56671469c1c77502858ea1f4488a0440a5e3c4927b2964b122ae64a11015bbe2 -Size (monotone-viz-1.0.2-nolablgtk.tar.gz) = 99263 bytes -SHA1 (patch-Makefile) = c84d9c567a331e71ce2b06d01e3c2c124ac0f48b -SHA1 (patch-app.ml) = 80e0f9459d6170989e687da9c54c576cb24f1be9 -SHA1 (patch-app.mli) = 3c2074c7f65b98c814cfacc85e30cbb9193b0e9a -SHA1 (patch-app_types.mli) = 84916b04f1360f4fc6aa9e73be6f910ea455afed -SHA1 (patch-query.mli) = a661d6a17f3a18eeecdcc68260dbe8bf72fa56dd -SHA1 (patch-ui.mli) = afc7e413ba7a9eac946cad3286de6c121403f0c7 -SHA1 (patch-unidiff.mli) = a8a6666b71e0bd31bcc363906170b346a7d51ead -SHA1 (patch-view.mli) = d994ff3d2bce5865399a7ff5ec4c556a25e98f8f diff --git a/devel/monotone-viz/patches/patch-Makefile b/devel/monotone-viz/patches/patch-Makefile deleted file mode 100644 index 521ec6e3647..00000000000 --- a/devel/monotone-viz/patches/patch-Makefile +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Added app_types module. ---- Makefile.orig 2009-12-07 23:43:26.000000000 +0000 -+++ Makefile -@@ -19,7 +19,7 @@ SRC = glib/gspawn.ml glib/gspawn.mli gli - agraph.ml agraph.mli \ - autocolor.ml autocolor.mli viz_style.ml viz_style.mli \ - version.ml icon.ml ui.ml ui.mli unidiff.ml unidiff.mli \ -- view.ml view.mli query.ml query.mli app.ml app.mli main.ml -+ view.ml view.mli query.ml query.mli app.ml app.mli app_types.mli main.ml - - C_OBJ = glib/ocaml-gspawn.o glib/ocaml-giochannel.o \ - glib/ocaml-misc.o glib/ocaml-gdate.o glib/ocaml-gpattern.o \ -@@ -39,7 +39,7 @@ DISTSRC = Makefile configure.ac config.m - basic_io_lexer.mll basic_io_lexer.mli revision.mli revision.ml \ - components.ml automate.mli automate.ml monotone.mli monotone.ml agraph.ml agraph.mli \ - unidiff.ml unidiff.mli gnomecanvas_hack.c view.ml view.mli \ -- query.ml query.mli app.mli app.ml main.ml \ -+ query.ml query.mli app.mli app.ml app_types.mli main.ml \ - glib/gspawn.ml glib/gspawn.mli glib/giochannel.ml glib/giochannel.mli \ - glib/viz_gmisc.ml glib/gpattern.ml \ - glib/ocaml-gspawn.c glib/ocaml-giochannel.c \ diff --git a/devel/monotone-viz/patches/patch-app.ml b/devel/monotone-viz/patches/patch-app.ml deleted file mode 100644 index 25383e09ce5..00000000000 --- a/devel/monotone-viz/patches/patch-app.ml +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-app.ml,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- app.ml.orig 2007-05-14 20:25:49.000000000 +0000 -+++ app.ml -@@ -1,56 +1,4 @@ --class type status = -- object -- method push : string -> unit -- method pop : unit -> unit -- method progress_start : string -> int -> unit -- method progress : int -> unit -- method progress_end : unit -> unit -- method with_status : string -> (unit -> 'a) -> 'a -- end -- --class type t = -- object -- method get_mtn : Monotone.t option -- method get_agraph : Agraph.t option -- method get_prefs : Viz_style.prefs -- method get_toplevel : GWindow.window -- -- method set_prefs : Viz_style.prefs -> unit -- -- method open_db : ?id:string -> ?branch:string -> string -> unit -- method close_db : unit -> unit -- method finalize : unit -> unit -- method display_certs : string -> unit -- method focus_find_entry : unit -> unit -- method get_current_cert_value : string option -- method reload : unit -> unit -- method zoom_in : unit -> unit -- method zoom_out : unit -> unit -- method re_layout : unit -> unit -- method redraw : unit -> unit -- method query : Viz_types.select_info -> unit -- method get_selected_node : string option -- method find : string -> unit -- method switch_branch : string * string -> unit -- method update_begin : unit -- method update_end : unit -- method center_on :string * Viz_types.c_node -> unit -- method center_on_by_id : string -> unit -- method view_popup : string * int -> unit -- method cert_popup : int -> unit -- -- method show_open : unit -> unit -- method show_view : unit -> unit -- method show_search : unit -> unit -- method show_prefs : unit -> unit -- method show_diff : string -> string -> unit -- -- method status : string -> status -- -- method error_notice : string -> unit -- end -- -- -+open App_types - open Viz_misc - - class ctrl w ~prefs ~manager ~status ~view : t = diff --git a/devel/monotone-viz/patches/patch-app.mli b/devel/monotone-viz/patches/patch-app.mli deleted file mode 100644 index 2a0a83fb78f..00000000000 --- a/devel/monotone-viz/patches/patch-app.mli +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-app.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- app.mli.orig 2007-05-14 20:25:42.000000000 +0000 -+++ app.mli -@@ -1,53 +1,3 @@ --class type status = -- object -- method push : string -> unit -- method pop : unit -> unit -- method progress_start : string -> int -> unit -- method progress : int -> unit -- method progress_end : unit -> unit -- method with_status : string -> (unit -> 'a) -> 'a -- end -- --class type t = -- object -- method get_mtn : Monotone.t option -- method get_agraph : Agraph.t option -- method get_prefs : Viz_style.prefs -- method get_toplevel : GWindow.window -- -- method set_prefs : Viz_style.prefs -> unit -- -- method open_db : ?id:string -> ?branch:string -> string -> unit -- method close_db : unit -> unit -- method finalize : unit -> unit -- method display_certs : string -> unit -- method focus_find_entry : unit -> unit -- method get_current_cert_value : string option -- method reload : unit -> unit -- method zoom_in : unit -> unit -- method zoom_out : unit -> unit -- method re_layout : unit -> unit -- method redraw : unit -> unit -- method query : Viz_types.select_info -> unit -- method get_selected_node : string option -- method find : string -> unit -- method switch_branch : string * string -> unit -- method update_begin : unit -- method update_end : unit -- method center_on :string * Viz_types.c_node -> unit -- method center_on_by_id : string -> unit -- method view_popup : string * int -> unit -- method cert_popup : int -> unit -- -- method show_open : unit -> unit -- method show_view : unit -> unit -- method show_search : unit -> unit -- method show_prefs : unit -> unit -- method show_diff : string -> string -> unit -- -- method status : string -> status -- -- method error_notice : string -> unit -- end -+open App_types - - val make : GWindow.window -> aa:bool -> prefs:Viz_style.prefs -> t diff --git a/devel/monotone-viz/patches/patch-app_types.mli b/devel/monotone-viz/patches/patch-app_types.mli deleted file mode 100644 index 53a6ba056c3..00000000000 --- a/devel/monotone-viz/patches/patch-app_types.mli +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-app_types.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- /dev/null 2015-08-09 12:54:30.000000000 +0000 -+++ app_types.mli -@@ -0,0 +1,51 @@ -+class type status = -+ object -+ method push : string -> unit -+ method pop : unit -> unit -+ method progress_start : string -> int -> unit -+ method progress : int -> unit -+ method progress_end : unit -> unit -+ method with_status : string -> (unit -> 'a) -> 'a -+ end -+ -+class type t = -+ object -+ method get_mtn : Monotone.t option -+ method get_agraph : Agraph.t option -+ method get_prefs : Viz_style.prefs -+ method get_toplevel : GWindow.window -+ -+ method set_prefs : Viz_style.prefs -> unit -+ -+ method open_db : ?id:string -> ?branch:string -> string -> unit -+ method close_db : unit -> unit -+ method finalize : unit -> unit -+ method display_certs : string -> unit -+ method focus_find_entry : unit -> unit -+ method get_current_cert_value : string option -+ method reload : unit -> unit -+ method zoom_in : unit -> unit -+ method zoom_out : unit -> unit -+ method re_layout : unit -> unit -+ method redraw : unit -> unit -+ method query : Viz_types.select_info -> unit -+ method get_selected_node : string option -+ method find : string -> unit -+ method switch_branch : string * string -> unit -+ method update_begin : unit -+ method update_end : unit -+ method center_on :string * Viz_types.c_node -> unit -+ method center_on_by_id : string -> unit -+ method view_popup : string * int -> unit -+ method cert_popup : int -> unit -+ -+ method show_open : unit -> unit -+ method show_view : unit -> unit -+ method show_search : unit -> unit -+ method show_prefs : unit -> unit -+ method show_diff : string -> string -> unit -+ -+ method status : string -> status -+ -+ method error_notice : string -> unit -+ end diff --git a/devel/monotone-viz/patches/patch-query.mli b/devel/monotone-viz/patches/patch-query.mli deleted file mode 100644 index 99ca435b1c4..00000000000 --- a/devel/monotone-viz/patches/patch-query.mli +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-query.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- query.mli.orig 2007-03-07 21:53:54.000000000 +0000 -+++ query.mli -@@ -1,5 +1,5 @@ - type t --val make : #App.t -> t -+val make : #App_types.t -> t - - val clear : t -> unit - val activate : t -> unit diff --git a/devel/monotone-viz/patches/patch-ui.mli b/devel/monotone-viz/patches/patch-ui.mli deleted file mode 100644 index 0cad45b1613..00000000000 --- a/devel/monotone-viz/patches/patch-ui.mli +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-ui.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- ui.mli.orig 2007-03-07 21:53:54.000000000 +0000 -+++ ui.mli -@@ -26,37 +26,37 @@ val category : - class status_bar : - packing:(GObj.widget -> unit) -> - string -> -- App.status -+ App_types.status - - module Prefs : sig - val update_prefs : -- #App.t -> -+ #App_types.t -> - Viz_style.prefs -> Viz_style.prefs -> unit -- val show : #App.t -> unit -> unit -+ val show : #App_types.t -> unit -> unit - end - - module Open : sig - type t -- val make : #App.t -> t -+ val make : #App_types.t -> t - val show : t -> string option - end - - (* - module LockedDB : sig -- val show : #App.t -> [`FAIL | `RETRY] -+ val show : #App_types.t -> [`FAIL | `RETRY] - end - *) - - type manager - val make : unit -> manager * GObj.widget * GObj.widget --val setup : manager -> #App.t -> unit -+val setup : manager -> #App_types.t -> unit - - val popup : -- manager -> #App.t -> -+ manager -> #App_types.t -> - popup_id:string -> int -> unit - val popup_cert : manager -> int -> unit --val open_db : manager -> #App.t -> unit --val close_db : manager -> #App.t -> unit -+val open_db : manager -> #App_types.t -> unit -+val close_db : manager -> #App_types.t -> unit - val clear : manager -> unit - val update_begin : manager -> unit - diff --git a/devel/monotone-viz/patches/patch-unidiff.mli b/devel/monotone-viz/patches/patch-unidiff.mli deleted file mode 100644 index 04a323dfcbc..00000000000 --- a/devel/monotone-viz/patches/patch-unidiff.mli +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: patch-unidiff.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- unidiff.mli.orig 2007-03-07 21:53:54.000000000 +0000 -+++ unidiff.mli -@@ -1 +1 @@ --val show : #App.t -> string -> string -> unit -+val show : #App_types.t -> string -> string -> unit diff --git a/devel/monotone-viz/patches/patch-view.mli b/devel/monotone-viz/patches/patch-view.mli deleted file mode 100644 index 51231c7275a..00000000000 --- a/devel/monotone-viz/patches/patch-view.mli +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-view.mli,v 1.1 2015/08/09 13:21:42 jaapb Exp $ - -Moved classes to separate module for ocaml 4.02. ---- view.mli.orig 2007-03-07 21:53:54.000000000 +0000 -+++ view.mli -@@ -1,7 +1,7 @@ - module Info_Display : - sig - type t -- val fetch_and_display_data : t -> #App.t -> string -> unit -+ val fetch_and_display_data : t -> #App_types.t -> string -> unit - val get_current_cert_value : t -> string option - end - -@@ -10,23 +10,23 @@ module Branch_selector : - type t - type state - val get_state : t -> state -- val set_state : t -> #App.t -> ?id:string -> state -> unit -- val set_branch : t -> #App.t -> ?id:string -> string -> unit -+ val set_state : t -> #App_types.t -> ?id:string -> state -> unit -+ val set_branch : t -> #App_types.t -> ?id:string -> string -> unit - val present_dialog : t -> unit - end - - module Canvas : - sig - type t -- val zoom : t -> #App.t -> [< `IN | `OUT ] -> unit -> unit -- val id_size : t -> #App.t -> int * int * int -- val center_on : t -> #App.t -> string * Viz_types.c_node -> unit -+ val zoom : t -> #App_types.t -> [< `IN | `OUT ] -> unit -> unit -+ val id_size : t -> #App_types.t -> int * int * int -+ val center_on : t -> #App_types.t -> string * Viz_types.c_node -> unit - end - - module Find : - sig - type t -- val locate : t -> #App.t -> string -> unit -+ val locate : t -> #App_types.t -> string -> unit - val focus_find_entry : t -> unit - end - -@@ -42,10 +42,10 @@ val make : - parent:#GWindow.window_skel -> - pack_find_entry:(GObj.widget -> unit) -> - pack_canvas:(GObj.widget -> unit) -> t --val setup : t -> #App.t -> unit -+val setup : t -> #App_types.t -> unit - --val clear : t -> #App.t -> unit --val close_db : t -> #App.t -> unit --val open_db : t -> #App.t -> unit --val update : t -> #App.t -> string option -> unit -+val clear : t -> #App_types.t -> unit -+val close_db : t -> #App_types.t -> unit -+val open_db : t -> #App_types.t -> unit -+val update : t -> #App_types.t -> string option -> unit - val get_selected_node : t -> string option diff --git a/devel/ocaml-deriving-ocsigen/DESCR b/devel/ocaml-deriving-ocsigen/DESCR deleted file mode 100644 index 3055748f623..00000000000 --- a/devel/ocaml-deriving-ocsigen/DESCR +++ /dev/null @@ -1,3 +0,0 @@ -Extension to OCaml for deriving functions from type declarations. Includes -derivers for pretty-printing, type-safe marshalling with structure-sharing, -dynamic typing, equality, and more. diff --git a/devel/ocaml-deriving-ocsigen/Makefile b/devel/ocaml-deriving-ocsigen/Makefile deleted file mode 100644 index 03d47172597..00000000000 --- a/devel/ocaml-deriving-ocsigen/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2022/05/24 18:51:48 jaapb Exp $ -# - -VERSION= 0.8.1 -GITHUB_PROJECT= deriving -DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGNAME= ocaml-${GITHUB_PROJECT}-ocsigen-${VERSION} -PKGREVISION= 4 -COMMENT= Extension to OCaml for deriving functions from type declarations -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/ocsigen/deriving -LICENSE= mit - -USE_TOOLS= gmake -OCAML_USE_OASIS_DYNRUN= yes -OCAML_FINDLIB_DIRS= deriving - -.include "../../lang/camlp4/buildlink3.mk" -.include "../../math/ocaml-num/buildlink3.mk" -.include "../../lang/ocaml/ocaml.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-deriving-ocsigen/PLIST b/devel/ocaml-deriving-ocsigen/PLIST deleted file mode 100644 index f1339a09e83..00000000000 --- a/devel/ocaml-deriving-ocsigen/PLIST +++ /dev/null @@ -1,170 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2016/06/17 10:48:57 jaapb Exp $ -${OCAML_SITELIB}/deriving/META -${OCAML_SITELIB}/deriving/base.annot -${OCAML_SITELIB}/deriving/base.cmt -${OCAML_SITELIB}/deriving/base.cmti -${OCAML_SITELIB}/deriving/base.mli -${OCAML_SITELIB}/deriving/bounded_class.annot -${OCAML_SITELIB}/deriving/bounded_class.cmi -${OCAML_SITELIB}/deriving/bounded_class.cmt -${OCAML_SITELIB}/deriving/bounded_class.cmx -${OCAML_SITELIB}/deriving/bounded_class.ml -${OCAML_SITELIB}/deriving/clusters.annot -${OCAML_SITELIB}/deriving/clusters.cmt -${OCAML_SITELIB}/deriving/clusters.cmti -${OCAML_SITELIB}/deriving/clusters.mli -${OCAML_SITELIB}/deriving/default_class.annot -${OCAML_SITELIB}/deriving/default_class.cmi -${OCAML_SITELIB}/deriving/default_class.cmt -${OCAML_SITELIB}/deriving/default_class.cmx -${OCAML_SITELIB}/deriving/default_class.ml -${OCAML_SITELIB}/deriving/defs.annot -${OCAML_SITELIB}/deriving/defs.cmt -${OCAML_SITELIB}/deriving/defs.cmti -${OCAML_SITELIB}/deriving/defs.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving.a -${OCAML_SITELIB}/deriving/deriving.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving.cmxs -${OCAML_SITELIB}/deriving/deriving_Bounded.annot -${OCAML_SITELIB}/deriving/deriving_Bounded.cmi -${OCAML_SITELIB}/deriving/deriving_Bounded.cmt -${OCAML_SITELIB}/deriving/deriving_Bounded.cmti -${OCAML_SITELIB}/deriving/deriving_Bounded.cmx -${OCAML_SITELIB}/deriving/deriving_Bounded.mli -${OCAML_SITELIB}/deriving/deriving_Default.annot -${OCAML_SITELIB}/deriving/deriving_Default.cmi -${OCAML_SITELIB}/deriving/deriving_Default.cmt -${OCAML_SITELIB}/deriving/deriving_Default.cmti -${OCAML_SITELIB}/deriving/deriving_Default.cmx -${OCAML_SITELIB}/deriving/deriving_Default.mli -${OCAML_SITELIB}/deriving/deriving_Dump.annot -${OCAML_SITELIB}/deriving/deriving_Dump.cmi -${OCAML_SITELIB}/deriving/deriving_Dump.cmt -${OCAML_SITELIB}/deriving/deriving_Dump.cmti -${OCAML_SITELIB}/deriving/deriving_Dump.cmx -${OCAML_SITELIB}/deriving/deriving_Dump.mli -${OCAML_SITELIB}/deriving/deriving_Enum.annot -${OCAML_SITELIB}/deriving/deriving_Enum.cmi -${OCAML_SITELIB}/deriving/deriving_Enum.cmt -${OCAML_SITELIB}/deriving/deriving_Enum.cmti -${OCAML_SITELIB}/deriving/deriving_Enum.cmx -${OCAML_SITELIB}/deriving/deriving_Enum.mli -${OCAML_SITELIB}/deriving/deriving_Eq.annot -${OCAML_SITELIB}/deriving/deriving_Eq.cmi -${OCAML_SITELIB}/deriving/deriving_Eq.cmt -${OCAML_SITELIB}/deriving/deriving_Eq.cmti -${OCAML_SITELIB}/deriving/deriving_Eq.cmx -${OCAML_SITELIB}/deriving/deriving_Eq.mli -${OCAML_SITELIB}/deriving/deriving_Functor.annot -${OCAML_SITELIB}/deriving/deriving_Functor.cmi -${OCAML_SITELIB}/deriving/deriving_Functor.cmt -${OCAML_SITELIB}/deriving/deriving_Functor.cmti -${OCAML_SITELIB}/deriving/deriving_Functor.cmx -${OCAML_SITELIB}/deriving/deriving_Functor.mli -${OCAML_SITELIB}/deriving/deriving_Pickle.annot -${OCAML_SITELIB}/deriving/deriving_Pickle.cmi -${OCAML_SITELIB}/deriving/deriving_Pickle.cmt -${OCAML_SITELIB}/deriving/deriving_Pickle.cmti -${OCAML_SITELIB}/deriving/deriving_Pickle.cmx -${OCAML_SITELIB}/deriving/deriving_Pickle.mli -${OCAML_SITELIB}/deriving/deriving_Show.annot -${OCAML_SITELIB}/deriving/deriving_Show.cmi -${OCAML_SITELIB}/deriving/deriving_Show.cmt -${OCAML_SITELIB}/deriving/deriving_Show.cmti -${OCAML_SITELIB}/deriving/deriving_Show.cmx -${OCAML_SITELIB}/deriving/deriving_Show.mli -${OCAML_SITELIB}/deriving/deriving_Typeable.annot -${OCAML_SITELIB}/deriving/deriving_Typeable.cmi -${OCAML_SITELIB}/deriving/deriving_Typeable.cmt -${OCAML_SITELIB}/deriving/deriving_Typeable.cmti -${OCAML_SITELIB}/deriving/deriving_Typeable.cmx -${OCAML_SITELIB}/deriving/deriving_Typeable.mli -${OCAML_SITELIB}/deriving/deriving_dynmap.cmx -${OCAML_SITELIB}/deriving/deriving_interned.cmx -${OCAML_SITELIB}/deriving/deriving_monad.annot -${OCAML_SITELIB}/deriving/deriving_monad.cmi -${OCAML_SITELIB}/deriving/deriving_monad.cmt -${OCAML_SITELIB}/deriving/deriving_monad.cmti -${OCAML_SITELIB}/deriving/deriving_monad.cmx -${OCAML_SITELIB}/deriving/deriving_monad.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving_num.a -${OCAML_SITELIB}/deriving/deriving_num.annot -${OCAML_SITELIB}/deriving/deriving_num.cma -${OCAML_SITELIB}/deriving/deriving_num.cmi -${OCAML_SITELIB}/deriving/deriving_num.cmt -${OCAML_SITELIB}/deriving/deriving_num.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving_num.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving_num.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/deriving_num.cmxs -${OCAML_SITELIB}/deriving/deriving_num.mli -${OCAML_SITELIB}/deriving/dump_class.annot -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/dump_class.cmi -${OCAML_SITELIB}/deriving/dump_class.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/dump_class.cmx -${OCAML_SITELIB}/deriving/dump_class.ml -${OCAML_SITELIB}/deriving/enum_class.annot -${OCAML_SITELIB}/deriving/enum_class.cmi -${OCAML_SITELIB}/deriving/enum_class.cmt -${OCAML_SITELIB}/deriving/enum_class.cmx -${OCAML_SITELIB}/deriving/enum_class.ml -${OCAML_SITELIB}/deriving/eq_class.annot -${OCAML_SITELIB}/deriving/eq_class.cmi -${OCAML_SITELIB}/deriving/eq_class.cmt -${OCAML_SITELIB}/deriving/eq_class.cmx -${OCAML_SITELIB}/deriving/eq_class.ml -${OCAML_SITELIB}/deriving/extend.annot -${OCAML_SITELIB}/deriving/extend.cmt -${OCAML_SITELIB}/deriving/extend.cmti -${OCAML_SITELIB}/deriving/extend.mli -${OCAML_SITELIB}/deriving/functor_class.annot -${OCAML_SITELIB}/deriving/functor_class.cmi -${OCAML_SITELIB}/deriving/functor_class.cmt -${OCAML_SITELIB}/deriving/functor_class.cmx -${OCAML_SITELIB}/deriving/functor_class.ml -${OCAML_SITELIB}/deriving/id.annot -${OCAML_SITELIB}/deriving/id.cmt -${OCAML_SITELIB}/deriving/id.ml -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_classes.a -${OCAML_SITELIB}/deriving/pa_deriving_classes.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_classes.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_classes.cmxs -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_common.a -${OCAML_SITELIB}/deriving/pa_deriving_common.cma -${OCAML_SITELIB}/deriving/pa_deriving_common.cmi -${OCAML_SITELIB}/deriving/pa_deriving_common.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_common.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_common.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_common.cmxs -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_std.a -${OCAML_SITELIB}/deriving/pa_deriving_std.annot -${OCAML_SITELIB}/deriving/pa_deriving_std.cma -${OCAML_SITELIB}/deriving/pa_deriving_std.cmi -${OCAML_SITELIB}/deriving/pa_deriving_std.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_std.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_std.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/deriving/pa_deriving_std.cmxs -${OCAML_SITELIB}/deriving/pa_deriving_std.ml -${OCAML_SITELIB}/deriving/pickle_class.annot -${OCAML_SITELIB}/deriving/pickle_class.cmi -${OCAML_SITELIB}/deriving/pickle_class.cmt -${OCAML_SITELIB}/deriving/pickle_class.cmx -${OCAML_SITELIB}/deriving/pickle_class.ml -${OCAML_SITELIB}/deriving/show_class.annot -${OCAML_SITELIB}/deriving/show_class.cmi -${OCAML_SITELIB}/deriving/show_class.cmt -${OCAML_SITELIB}/deriving/show_class.cmx -${OCAML_SITELIB}/deriving/show_class.ml -${OCAML_SITELIB}/deriving/type.annot -${OCAML_SITELIB}/deriving/type.cmt -${OCAML_SITELIB}/deriving/type.cmti -${OCAML_SITELIB}/deriving/type.mli -${OCAML_SITELIB}/deriving/typeable_class.annot -${OCAML_SITELIB}/deriving/typeable_class.cmi -${OCAML_SITELIB}/deriving/typeable_class.cmt -${OCAML_SITELIB}/deriving/typeable_class.cmx -${OCAML_SITELIB}/deriving/typeable_class.ml -${OCAML_SITELIB}/deriving/utils.annot -${OCAML_SITELIB}/deriving/utils.cmt -${OCAML_SITELIB}/deriving/utils.cmti -${OCAML_SITELIB}/deriving/utils.mli diff --git a/devel/ocaml-deriving-ocsigen/distinfo b/devel/ocaml-deriving-ocsigen/distinfo deleted file mode 100644 index 3f9ab1374c9..00000000000 --- a/devel/ocaml-deriving-ocsigen/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.11 2021/10/26 10:15:48 nia Exp $ - -BLAKE2s (deriving-0.8.1.tar.gz) = 539d2162dc686e533e1de20ea8183c33decd6993b0ce1e363e7e27dee39620c9 -SHA512 (deriving-0.8.1.tar.gz) = c12eba7044cd28166b02c23f51a3244878a056285ebe7ae00fe4d432675d82fb7a9b630f5f1e5bc96408f928e6ba6ce8de38ca15e9651d89eb80616a3afb1f66 -Size (deriving-0.8.1.tar.gz) = 68596 bytes diff --git a/devel/ocaml-lwt_camlp4/DESCR b/devel/ocaml-lwt_camlp4/DESCR deleted file mode 100644 index c98a14b8797..00000000000 --- a/devel/ocaml-lwt_camlp4/DESCR +++ /dev/null @@ -1 +0,0 @@ -This is a package with Camlp4 syntax extensions for Lwt. diff --git a/devel/ocaml-lwt_camlp4/Makefile b/devel/ocaml-lwt_camlp4/Makefile deleted file mode 100644 index 859630af943..00000000000 --- a/devel/ocaml-lwt_camlp4/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: Makefile,v 1.8 2022/05/24 18:51:50 jaapb Exp $ - -GITHUB_PROJECT= lwt_camlp4 -GITHUB_TAG= 45f25a0 -DISTNAME= lwt_camlp4-20180325 -PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 6 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=aantron/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/aantron/lwt_camlp4/ -COMMENT= Camlp4 module for ocaml-lwt -LICENSE= gnu-lgpl-v2.1 - -CONFLICTS= ocaml-lwt<3.0.0 - -WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-45f25a081e01071ab566924b48ba5f7553bb33ac - -OCAML_USE_DUNE= yes -DUNE_BUILD_PACKAGES= lwt_camlp4 - -.include "../../lang/ocaml/ocaml.mk" -.include "../../devel/ocaml-lwt/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-lwt_camlp4/PLIST b/devel/ocaml-lwt_camlp4/PLIST deleted file mode 100644 index d2c4550d77b..00000000000 --- a/devel/ocaml-lwt_camlp4/PLIST +++ /dev/null @@ -1,34 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2019/03/05 17:41:04 jaapb Exp $ -${OCAML_SITELIB}/lwt_camlp4/META -${OCAML_SITELIB}/lwt_camlp4/dune-package -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.a -${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/lwt_camlp4_log.cmxs -${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.cmi -${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.cmt -${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.cmx -${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.ml -${OCAML_SITELIB}/lwt_camlp4/log/pa_lwt_log.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.a -${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/lwt_camlp4.cmxs -${OCAML_SITELIB}/lwt_camlp4/opam -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.a -${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.cmxa -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/lwt_camlp4_options.cmxs -${OCAML_SITELIB}/lwt_camlp4/options/pa_lwt_options.cmi -${OCAML_SITELIB}/lwt_camlp4/options/pa_lwt_options.cmt -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/options/pa_lwt_options.cmx -${OCAML_SITELIB}/lwt_camlp4/options/pa_lwt_options.ml -${OCAML_SITELIB}/lwt_camlp4/pa_lwt.cmi -${OCAML_SITELIB}/lwt_camlp4/pa_lwt.cmt -${OCAML_SITELIB}/lwt_camlp4/pa_lwt.cmti -${PLIST.ocaml-opt}${OCAML_SITELIB}/lwt_camlp4/pa_lwt.cmx -${OCAML_SITELIB}/lwt_camlp4/pa_lwt.ml -${OCAML_SITELIB}/lwt_camlp4/pa_lwt.mli -share/doc/lwt_camlp4/CHANGES -share/doc/lwt_camlp4/README.md diff --git a/devel/ocaml-lwt_camlp4/buildlink3.mk b/devel/ocaml-lwt_camlp4/buildlink3.mk deleted file mode 100644 index 60436854c6f..00000000000 --- a/devel/ocaml-lwt_camlp4/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2022/05/24 18:59:26 jaapb Exp $ - -BUILDLINK_TREE+= ocaml-lwt_camlp4 - -.if !defined(OCAML_LWT_CAMLP4_BUILDLINK3_MK) -OCAML_LWT_CAMLP4_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb4 -BUILDLINK_ABI_DEPENDS.ocaml-lwt_camlp4+= ocaml-lwt_camlp4>=20180325nb6 -BUILDLINK_PKGSRCDIR.ocaml-lwt_camlp4?= ../../devel/ocaml-lwt_camlp4 - -.include "../../devel/ocaml-lwt/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.endif # OCAML_LWT_CAMLP4_BUILDLINK3_MK - -BUILDLINK_TREE+= -ocaml-lwt_camlp4 diff --git a/devel/ocaml-lwt_camlp4/distinfo b/devel/ocaml-lwt_camlp4/distinfo deleted file mode 100644 index 8bca0db7624..00000000000 --- a/devel/ocaml-lwt_camlp4/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.3 2021/10/26 10:15:50 nia Exp $ - -BLAKE2s (lwt_camlp4-20180325-45f25a0.tar.gz) = a0b141133e765e883ea2a5f3cf6f353060019dbed53a5909ed4ac4cb2dc16bca -SHA512 (lwt_camlp4-20180325-45f25a0.tar.gz) = 7dc5bbde9c77cfd5d289b4df823ad2548c155add3cea55a1a3fa3a1b8be2caec142c1bea661c777339cc46eb46a153c6a5217238b74968bb915bcf5648013006 -Size (lwt_camlp4-20180325-45f25a0.tar.gz) = 16669 bytes diff --git a/devel/ocaml-optcomp/DESCR b/devel/ocaml-optcomp/DESCR deleted file mode 100644 index bf24fccdc57..00000000000 --- a/devel/ocaml-optcomp/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -optcomp is an OCaml/Camlp4 syntax extension for optional compilation with -cpp-like directives. diff --git a/devel/ocaml-optcomp/Makefile b/devel/ocaml-optcomp/Makefile deleted file mode 100644 index 098b6761865..00000000000 --- a/devel/ocaml-optcomp/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:50 jaapb Exp $ - -VERSION= 1.6 -GITHUB_PROJECT= optcomp -DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 14 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=diml/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/diml/optcomp/ -COMMENT= OCaml syntax extension for optional compilation -LICENSE= modified-bsd - -SUPERSEDES= optcomp-[0-9]* - -OCAML_USE_OASIS= yes - -pre-configure: - ${RUN} cd ${WRKSRC} && oasis setup - -.include "../../lang/ocaml/ocaml.mk" -.include "../../devel/ocaml-oasis/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-optcomp/PLIST b/devel/ocaml-optcomp/PLIST deleted file mode 100644 index 2430e52c6d7..00000000000 --- a/devel/ocaml-optcomp/PLIST +++ /dev/null @@ -1,14 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2018/01/10 15:47:30 jaapb Exp $ -bin/optcomp-o -bin/optcomp-r -lib/ocaml/site-lib/optcomp/META -${PLIST.ocaml-opt}lib/ocaml/site-lib/optcomp/optcomp.a -lib/ocaml/site-lib/optcomp/optcomp.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/optcomp/optcomp.cmxa -${PLIST.ocaml-opt}lib/ocaml/site-lib/optcomp/optcomp.cmxs -lib/ocaml/site-lib/optcomp/pa_optcomp.annot -lib/ocaml/site-lib/optcomp/pa_optcomp.cmi -lib/ocaml/site-lib/optcomp/pa_optcomp.cmt -lib/ocaml/site-lib/optcomp/pa_optcomp.cmti -${PLIST.ocaml-opt}lib/ocaml/site-lib/optcomp/pa_optcomp.cmx -lib/ocaml/site-lib/optcomp/pa_optcomp.mli diff --git a/devel/ocaml-optcomp/buildlink3.mk b/devel/ocaml-optcomp/buildlink3.mk deleted file mode 100644 index 397efdc2656..00000000000 --- a/devel/ocaml-optcomp/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2022/05/24 18:59:26 jaapb Exp $ - -BUILDLINK_TREE+= ocaml-optcomp - -.if !defined(OCAML_OPTCOMP_BUILDLINK3_MK) -OCAML_OPTCOMP_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6nb1 -BUILDLINK_ABI_DEPENDS.ocaml-optcomp+= ocaml-optcomp>=1.6nb14 -BUILDLINK_PKGSRCDIR.ocaml-optcomp?= ../../devel/ocaml-optcomp - -.include "../../lang/camlp4/buildlink3.mk" -.endif # OCAML_OPTCOMP_BUILDLINK3_MK - -BUILDLINK_TREE+= -ocaml-optcomp diff --git a/devel/ocaml-optcomp/distinfo b/devel/ocaml-optcomp/distinfo deleted file mode 100644 index a999d130ec0..00000000000 --- a/devel/ocaml-optcomp/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.7 2021/10/26 10:15:51 nia Exp $ - -BLAKE2s (optcomp-1.6.tar.gz) = 6d929f333ac2e427ec9df6ae3f78785b41891ca8c1744a2cfd2a5bafe4bc691f -SHA512 (optcomp-1.6.tar.gz) = 19fa04a42e5ed589979647469759017442598d170bf82d49c3b720d1b1b6bbe3066ae3ffee77a3f15dcbf51be5d7a8934300873391ebce423f3a0f3878250c18 -Size (optcomp-1.6.tar.gz) = 56370 bytes -SHA1 (patch-src_optcomp.ml) = 2463996a335a15a59328a3b63cb2f8e4a2e614c0 diff --git a/devel/ocaml-optcomp/patches/patch-src_optcomp.ml b/devel/ocaml-optcomp/patches/patch-src_optcomp.ml deleted file mode 100644 index e805ea7fb61..00000000000 --- a/devel/ocaml-optcomp/patches/patch-src_optcomp.ml +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-src_optcomp.ml,v 1.1 2018/01/22 11:22:40 jaapb Exp $ - -Compatibility fix with OCaml 4.06 (upstream pull request) ---- src/optcomp.ml.orig 2014-05-13 08:24:26.000000000 +0000 -+++ src/optcomp.ml -@@ -84,9 +84,9 @@ let rec print mode current_fname current - (* Go to the right position in the input. *) - if pos_in ic <> off then seek_in ic off; - (* Read the part to copy. *) -- let str = String.create len in -- really_input ic str 0 len; -- (str, Loc.stop_line loc, Loc.stop_off loc - Loc.stop_bol loc) -+ let buf = Bytes.create len in -+ really_input ic buf 0 len; -+ (Bytes.to_string buf, Loc.stop_line loc, Loc.stop_off loc - Loc.stop_bol loc) - in - if current_fname = fname && current_line = line && current_col = col then - (* If we at the right position, just print the string. *) diff --git a/devel/ocaml-type_conv/DESCR b/devel/ocaml-type_conv/DESCR deleted file mode 100644 index 5df3bb08ccf..00000000000 --- a/devel/ocaml-type_conv/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -The type_conv mini-library factors out functionality needed by different -OCaml preprocessors that generate code from type specifications. diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile deleted file mode 100644 index ef23ef8a81c..00000000000 --- a/devel/ocaml-type_conv/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# $NetBSD: Makefile,v 1.18 2022/05/24 18:51:51 jaapb Exp $ - - -VERSION= 113.00.02 -GITHUB_PROJECT= type_conv -DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 12 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/janestreet/type_conv/ -COMMENT= Support library for OCaml preprocessor type conversions -LICENSE= apache-2.0 AND modified-bsd - -USE_TOOLS+= gmake - -OCAML_USE_FINDLIB= yes - -.include "../../devel/ocamlbuild/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../lang/ocaml/ocaml.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-type_conv/PLIST b/devel/ocaml-type_conv/PLIST deleted file mode 100644 index f10f582f370..00000000000 --- a/devel/ocaml-type_conv/PLIST +++ /dev/null @@ -1,12 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2016/04/12 16:05:21 jaapb Exp $ -lib/ocaml/site-lib/type_conv/META -${PLIST.ocaml-opt}lib/ocaml/site-lib/type_conv/pa_type_conv.a -lib/ocaml/site-lib/type_conv/pa_type_conv.annot -lib/ocaml/site-lib/type_conv/pa_type_conv.cma -lib/ocaml/site-lib/type_conv/pa_type_conv.cmi -lib/ocaml/site-lib/type_conv/pa_type_conv.cmt -lib/ocaml/site-lib/type_conv/pa_type_conv.cmti -${PLIST.ocaml-opt}lib/ocaml/site-lib/type_conv/pa_type_conv.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/type_conv/pa_type_conv.cmxa -${PLIST.ocaml-opt}lib/ocaml/site-lib/type_conv/pa_type_conv.cmxs -lib/ocaml/site-lib/type_conv/pa_type_conv.mli diff --git a/devel/ocaml-type_conv/buildlink3.mk b/devel/ocaml-type_conv/buildlink3.mk deleted file mode 100644 index 28c24798c3f..00000000000 --- a/devel/ocaml-type_conv/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.17 2022/05/24 18:51:51 jaapb Exp $ - -BUILDLINK_TREE+= ocaml-type_conv - -.if !defined(OCAML_TYPE_CONV_BUILDLINK3_MK) -OCAML_TYPE_CONV_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.ocaml-type_conv+= ocaml-type_conv>=109.60.01 -BUILDLINK_ABI_DEPENDS.ocaml-type_conv?= ocaml-type_conv>=113.00.02nb12 -BUILDLINK_PKGSRCDIR.ocaml-type_conv?= ../../devel/ocaml-type_conv - -.include "../../lang/ocaml/buildlink3.mk" -.endif # OCAML_TYPE_CONV_BUILDLINK3_MK - -BUILDLINK_TREE+= -ocaml-type_conv diff --git a/devel/ocaml-type_conv/distinfo b/devel/ocaml-type_conv/distinfo deleted file mode 100644 index ab02536b3f8..00000000000 --- a/devel/ocaml-type_conv/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 10:15:57 nia Exp $ - -BLAKE2s (type_conv-113.00.02.tar.gz) = 660def2170a740d98ca863d7c08786ca1d23b6067626474375dbd418d93564a2 -SHA512 (type_conv-113.00.02.tar.gz) = 6bc6db0e5a36fa4150941155290d137552d9e19aac7cf3aff107f0a7eaa47749c7044c4a4e475827d739784b99ef2103e9c9c03191c6aaa55c51585e71553559 -Size (type_conv-113.00.02.tar.gz) = 64174 bytes diff --git a/devel/verifast/DESCR b/devel/verifast/DESCR deleted file mode 100644 index b762ef1e1a7..00000000000 --- a/devel/verifast/DESCR +++ /dev/null @@ -1,4 +0,0 @@ -VeriFast is a research prototype of a tool for modular formal -verification of correctness properties of single-threaded and -multithreaded C and Java programs annotated with preconditions and -postconditions written in separation logic. diff --git a/devel/verifast/Makefile b/devel/verifast/Makefile deleted file mode 100644 index 9c4efbab1ad..00000000000 --- a/devel/verifast/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:52 jaapb Exp $ - -DISTNAME= verifast-18.02 -PKGREVISION= 28 -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GITHUB:=verifast/} -GITHUB_PROJECT= verifast -GITHUB_TAG= ${PKGVERSION_NOREV} - -MAINTAINER= ryoon@NetBSD.org -HOMEPAGE= https://people.cs.kuleuven.be/~bart.jacobs/verifast/ -COMMENT= VeriFast code verifier in separation logic -LICENSE= mit - -USE_TOOLS+= gmake pax pkg-config -MAKE_FILE= GNUmakefile -BUILD_MAKE_FLAGS+= -C src NUMCPU=${MAKE_JOBS} - -BUILD_DEPENDS+= vala-[0-9]*:../../lang/vala -BUILD_DEPENDS+= camlp4-[0-9]*:../../lang/camlp4 - -VF_DIR= share/verifast -INSTALLATION_DIRS= ${VF_DIR} bin -OCAML_USE_FINDLIB= yes - -do-configure: - ${CP} ${FILESDIR}/GNUmakefile.settings ${WRKSRC}/ -SUBST_CLASSES+= conf -SUBST_FILES.conf= GNUmakefile.settings -SUBST_VARS.conf= PREFIX OCAML_SITELIBDIR PKGVERSION_NOREV -SUBST_STAGE.conf= post-configure - -do-install: - cd ${WRKSRC}/bin && ${FIND} . -type f -print | \ - pax -rw -pmp ${DESTDIR}${PREFIX}/${VF_DIR} - ${ECHO} "#! ${SH}" > ${DESTDIR}${PREFIX}/bin/vfide - ${ECHO} '${PREFIX}/${VF_DIR}/vfide "$$@"' \ - >> ${DESTDIR}${PREFIX}/bin/vfide - ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/vfide - -.include "../../lang/ocaml/ocaml.mk" - -.include "../../lang/camlp4/buildlink3.mk" -.include "../../math/ocaml-num/buildlink3.mk" -.include "../../math/z3/buildlink3.mk" -.include "../../x11/ocaml-lablgtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/verifast/PLIST b/devel/verifast/PLIST deleted file mode 100644 index 10789711bff..00000000000 --- a/devel/verifast/PLIST +++ /dev/null @@ -1,86 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2017/07/12 01:54:16 ryoon Exp $ -bin/vfide -share/verifast/arpa/inet.h -share/verifast/arrays.c -share/verifast/arrays.gh -share/verifast/arrays.vfmanifest -share/verifast/assoclist.c -share/verifast/assoclist.gh -share/verifast/assoclist.vfmanifest -share/verifast/assume.dll.vfmanifest -share/verifast/bigstar.gh -share/verifast/bigstar.vfmanifest -share/verifast/bits/pthreadtypes.h -share/verifast/counting.gh -share/verifast/crt.dll.vfmanifest -share/verifast/crt.vfmanifest -share/verifast/dlsymtool -share/verifast/ghost_cells.gh -share/verifast/io.gh -share/verifast/io.vfmanifest -share/verifast/java_card_applet -share/verifast/list.c -share/verifast/list.gh -share/verifast/list.vfmanifest -share/verifast/listex.c -share/verifast/listex.gh -share/verifast/listex.vfmanifest -share/verifast/lseg.gh -share/verifast/main_class -share/verifast/malloc.h -share/verifast/maps.gh -share/verifast/math.h -share/verifast/mysh -share/verifast/nat.gh -share/verifast/permutations.c -share/verifast/permutations.gh -share/verifast/permutations.vfmanifest -share/verifast/prelude.h -share/verifast/prelude_core.gh -share/verifast/pthread.h -share/verifast/pthread.vfmanifest -share/verifast/quantifiers.c -share/verifast/quantifiers.gh -share/verifast/quantifiers.vfmanifest -share/verifast/raw_ghost_lists.c -share/verifast/raw_ghost_lists.gh -share/verifast/raw_ghost_lists.vfmanifest -share/verifast/rt/_assume.javaspec -share/verifast/rt/_atomics.javaspec -share/verifast/rt/_bitops.javaspec -share/verifast/rt/_list.java -share/verifast/rt/_list.javaspec -share/verifast/rt/_nat.javaspec -share/verifast/rt/_quantifiers.javaspec -share/verifast/rt/java.io.javaspec -share/verifast/rt/java.lang.javaspec -share/verifast/rt/java.lang_verified.javaspec -share/verifast/rt/java.net.javaspec -share/verifast/rt/java.nio.channels.javaspec -share/verifast/rt/java.nio.javaspec -share/verifast/rt/java.util.concurrent.javaspec -share/verifast/rt/java.util.javaspec -share/verifast/rt/javacard.framework.javaspec -share/verifast/rt/javacard.security.javaspec -share/verifast/rt/javacardx.crypto.javaspec -share/verifast/rt/org.globalplatform.javaspec -share/verifast/rt/rt.jarspec -share/verifast/rt/rt_verified.jarspec -share/verifast/rt/rt_verified.jarsrc -share/verifast/stdbool.h -share/verifast/stddef.h -share/verifast/stdint.h -share/verifast/stdio.h -share/verifast/stdio_simple.h -share/verifast/stdio_simple.vfmanifest -share/verifast/stdlib.h -share/verifast/string.h -share/verifast/threading.c -share/verifast/threading.h -share/verifast/threading.vfmanifest -share/verifast/unistd.h -share/verifast/verifast -share/verifast/vf__floating_point.h -share/verifast/vfide -share/verifast/vfidedemo.bat -share/verifast/vfstrip diff --git a/devel/verifast/distinfo b/devel/verifast/distinfo deleted file mode 100644 index 578578f43ac..00000000000 --- a/devel/verifast/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 10:20:08 nia Exp $ - -BLAKE2s (verifast-18.02.tar.gz) = aea9735793d72a657219288c0feef82a6ebad1dc0387b2d4f3eb982fa898d63a -SHA512 (verifast-18.02.tar.gz) = 5f1c6203d9db4556a00402e56b6699cb00e75c388f2de6f957558cf7611ddabddccfc4ae1235a1cd8fabc4ec5673df6588e475328ed562799f1fa687ad5c38aa -Size (verifast-18.02.tar.gz) = 1732020 bytes -SHA1 (patch-src_GNUmakefile) = 880a8369c92eaf3162e62b104ee2a3755f3d6055 diff --git a/devel/verifast/files/GNUmakefile.settings b/devel/verifast/files/GNUmakefile.settings deleted file mode 100644 index 51492e26dc8..00000000000 --- a/devel/verifast/files/GNUmakefile.settings +++ /dev/null @@ -1,16 +0,0 @@ -# Path to Z3 (optional) -# Note: if you actually set this, the build explodes. -#Z3 = @PREFIX@/bin/z3 -# but it does need this: -Z3_DLL_DIR = @PREFIX@/lib - -# lablgtk2 installation directories -LABLGTK2 = @PREFIX@/@OCAML_SITELIBDIR@/lablgtk2/ -LABLLIBS = @PREFIX@/@OCAML_SITELIBDIR@/lablgtk2/ - -# stick in the package version to work around its own method -# (which only works for git clones) -VFVERSION = @PKGVERSION_NOREV@ - -# also without this the super-fragile build system is undebuggable -VERBOSE=yes diff --git a/devel/verifast/patches/patch-src_GNUmakefile b/devel/verifast/patches/patch-src_GNUmakefile deleted file mode 100644 index 393fe0cc68b..00000000000 --- a/devel/verifast/patches/patch-src_GNUmakefile +++ /dev/null @@ -1,119 +0,0 @@ -$NetBSD: patch-src_GNUmakefile,v 1.3 2018/03/13 05:45:25 dholland Exp $ - -* Fix build under NetBSD and SunOS - ---- src/GNUmakefile.orig 2018-03-05 10:56:03.000000000 +0000 -+++ src/GNUmakefile -@@ -42,17 +42,26 @@ else - OS = Darwin - else ifeq ($(shell uname -o), Cygwin) - OS = Windows_NT -+ else ifeq ($(shell uname -s), NetBSD) -+ OS = NetBSD -+ else ifeq ($(shell uname -s), SunOS) -+ OS = SunOS - else - $(error "Could not recognize your platform") - endif - endif - -+# what is the point of this extra copy? - ifeq ($(OS), Linux) - PLATFORM = Linux - else ifeq ($(OS), Darwin) - PLATFORM = MacOS - else ifeq ($(OS), Windows_NT) - PLATFORM = Windows -+else ifeq ($(OS), NetBSD) -+ PLATFORM = NetBSD -+else ifeq ($(OS), SunOS) -+ PLATFORM = SunOS - endif - - # Lablgtk configuration -@@ -180,23 +189,21 @@ OCAML = ${OCAMLBIN}/ocaml - OCAMLC = $(firstword $(wildcard ${OCAMLBIN}/ocamlc.opt ${OCAMLBIN}/ocamlc)) - OCAMLOPT = $(firstword $(wildcard ${OCAMLBIN}/ocamlopt.opt ${OCAMLBIN}/ocamlopt)) - OCAMLDEP = $(firstword $(wildcard ${OCAMLBIN}/ocamldep.opt ${OCAMLBIN}/ocamldep)) --ifeq ($(OS), Windows_NT) -- CAMLP4O = camlp4o.opt --else -- CAMLP4O = $(firstword $(wildcard ${OCAMLBIN}/camlp4o.opt ${OCAMLBIN}/camlp4o)) --endif -+CAMLP4O = camlp4o.opt - - # Do we build with "-I ./linux" or "-I ./win": - ifeq ($(OS), Windows_NT) - INCLUDE_OS_DIR = win - else --# Also for mac. -+# Also for mac, bsd, etc. - INCLUDE_OS_DIR = linux - endif - - # Number of CPUs - ifeq ($(OS), Darwin) - NUMCPU ?= $(shell sysctl -n hw.ncpu) -+else ifeq ($(OS), NetBSD) -+ NUMCPU ?= $(shell sysctl -n hw.ncpu) - else - # Works on Linux and Cygwin (Cygwin has no /sys). - NUMCPU ?= $(shell cat /proc/cpuinfo | grep 'processor' | wc -l) -@@ -244,6 +251,12 @@ endif - ifeq ($(OS), Windows_NT) - include win/GNUmakefile - endif -+ifeq ($(OS), NetBSD) -+ include linux/GNUmakefile -+endif -+ifeq ($(OS), SunOS) -+ include linux/GNUmakefile -+endif - - include java_frontend/GNUmakefile - -@@ -304,7 +317,7 @@ clean:: - - %.cmx: %.ml $(INCLUDE_OS_DIR)/Perf.cmxa - @echo " OCAMLOPT " $@ -- ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} nums.cmxa $*.ml -+ ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} $*.ml - clean:: - rm -f *.cmx - rm -f *.o -@@ -340,7 +353,7 @@ clean:: - rm -f vfversion.ml - AUTOGENERATE_TARGETS += vfversion_autogen - --VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux;; let platform = $(PLATFORM) -+VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux | NetBSD | SunOS;; let platform = $(PLATFORM) - vfconfig_autogen: - if [ ! -e vfconfig.ml ] || [ "$$(cat vfconfig.ml)" != "$(VFCONFIG_CONTENT)" ]; then \ - echo "$(VFCONFIG_CONTENT)" > vfconfig.ml ;\ -@@ -389,7 +402,7 @@ clean:: - ifndef WITHOUT_LABLGTK - - clean:: -- cd linemarks; make clean -+ cd linemarks; $(MAKE) clean - - branchleft_png.ml: branch-left.png - gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml -@@ -407,7 +420,7 @@ branchright_png.cmx: branchright_png.ml - vfide.cmx: branchleft_png.cmx branchright_png.cmx vfide.ml $(GTKSOURCEVIEW_DEPS) - @echo " OCAMLOPT " $@ - ifndef WITHOUT_GTKSOURCEVIEW -- make -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa -+ $(MAKE) -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa - endif - $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \ - -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml -@@ -423,7 +436,7 @@ endif - ../bin/vfide$(DOTEXE): vfide.cmx $(VERIFAST_PLUGINS:%=verifastPlugin%.cmx) $(Z3DEPS) $(GTKSOURCEVIEW_DEPS) - @echo " OCAMLOPT " $@ - ifndef WITHOUT_GTKSOURCEVIEW -- cd linemarks; make linemarks.cmxa -+ cd linemarks; $(MAKE) linemarks.cmxa - endif - $(SET_LDD); ${OCAMLOPT} $(OCAMLOPT_LINKFLAGS) $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE) \ - $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) unix.cmxa \ diff --git a/doc/CHANGES-2022 b/doc/CHANGES-2022 index 623a44949ad..85dced4c045 100644 --- a/doc/CHANGES-2022 +++ b/doc/CHANGES-2022 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2022,v 1.3139 2022/06/28 22:36:51 gdt Exp $ +$NetBSD: CHANGES-2022,v 1.3140 2022/06/29 07:54:38 wiz Exp $ Changes to the packages collection and infrastructure in 2022: @@ -4714,3 +4714,18 @@ Changes to the packages collection and infrastructure in 2022: Updated chat/element-web to 1.10.15 [gdt 2022-06-28] Updated archivers/libzip to 1.9.2 [wiz 2022-06-28] Updated geography/qgis to 3.22.8 [gdt 2022-06-28] + Removed databases/ocaml-macaque [wiz 2022-06-29] + Removed devel/monotone-viz [wiz 2022-06-29] + Removed devel/ocaml-deriving-ocsigen [wiz 2022-06-29] + Removed devel/ocaml-lwt_camlp4 [wiz 2022-06-29] + Removed devel/ocaml-optcomp [wiz 2022-06-29] + Removed devel/ocaml-type_conv [wiz 2022-06-29] + Removed devel/verifast [wiz 2022-06-29] + Removed lang/camlp4 [wiz 2022-06-29] + Removed net/mldonkey [wiz 2022-06-29] + Removed net/mldonkey-gui [wiz 2022-06-29] + Removed security/sks [wiz 2022-06-29] + Removed textproc/pxp [wiz 2022-06-29] + Removed textproc/harmony [wiz 2022-06-29] + Removed time/wyrd [wiz 2022-06-29] + Removed www/ocaml-http [wiz 2022-06-29] diff --git a/lang/Makefile b/lang/Makefile index 3cd5200eb3e..8ea01367db9 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.650 2022/06/16 15:43:54 adam Exp $ +# $NetBSD: Makefile,v 1.651 2022/06/29 07:54:40 wiz Exp $ # COMMENT= Programming languages @@ -20,7 +20,6 @@ SUBDIR+= boomerang SUBDIR+= brandybasic SUBDIR+= bwbasic SUBDIR+= caml-light -SUBDIR+= camlp4 SUBDIR+= camlp5 SUBDIR+= cbmbasic SUBDIR+= ccsh diff --git a/lang/camlp4/DESCR b/lang/camlp4/DESCR deleted file mode 100644 index 41dd45cf581..00000000000 --- a/lang/camlp4/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -Camlp4 is a software system for writing extensible parsers for programming -languages. It provides a set of OCaml libraries that are used to define -grammars as well as loadable syntax extensions of such grammars. Camlp4 stands -for Caml Preprocessor and Pretty-Printer and one of its most important -applications is the definition of domain-specific extensions of the syntax of -OCaml. - -This package is obsolete and no longer supported by OCaml 4.09 and over. -Users should switch to the new PPX infrastructure or use Camlp5. diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile deleted file mode 100644 index 9e08dc908cf..00000000000 --- a/lang/camlp4/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $NetBSD: Makefile,v 1.24 2022/05/24 18:51:53 jaapb Exp $ - -GITHUB_PROJECT= camlp4 -DISTNAME= ${GITHUB_PROJECT}-4.08+1 -PKGREVISION= 2 -CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/} - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://github.com/ocaml/camlp4/ -COMMENT= Preprocessor and pretty printer for OCaml -LICENSE= gnu-lgpl-v2 - -HAS_CONFIGURE= yes -WRKSRC= ${WRKDIR}/camlp4-4.08-1 -MAKE_JOBS_SAFE= no - -BROKEN= "Obsolete package, no longer supported by OCaml 4.09" - -.include "../../lang/ocaml/ocaml.mk" - -BUILD_TARGET= byte camlp4/META -.if ${OCAML_USE_OPT_COMPILER} == "yes" -BUILD_TARGET+= native -.endif -INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/camlp4 - -do-install: - cd ${WRKSRC} && BINDIR="${DESTDIR}${PREFIX}/bin" \ - LIBDIR="${DESTDIR}${PREFIX}/lib/ocaml" ${SH} build/install.sh - ${INSTALL_DATA} ${WRKSRC}/camlp4/META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlp4 - -.include "../../devel/ocamlbuild/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/lang/camlp4/PLIST b/lang/camlp4/PLIST deleted file mode 100644 index 71e02677f58..00000000000 --- a/lang/camlp4/PLIST +++ /dev/null @@ -1,162 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2014/10/09 20:39:27 jaapb Exp $ -bin/camlp4 -bin/camlp4boot -bin/camlp4o -bin/camlp4o.opt -bin/camlp4of -bin/camlp4of.opt -bin/camlp4oof -bin/camlp4oof.opt -bin/camlp4orf -bin/camlp4orf.opt -bin/camlp4prof -bin/camlp4r -bin/camlp4r.opt -bin/camlp4rf -bin/camlp4rf.opt -bin/mkcamlp4 -lib/ocaml/camlp4/Camlp4.cmi -lib/ocaml/camlp4/Camlp4Bin.cmi -lib/ocaml/camlp4/Camlp4Bin.cmo -lib/ocaml/camlp4/Camlp4Bin.cmx -lib/ocaml/camlp4/Camlp4Bin.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmi -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmo -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx -lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlReloadedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedParserParser.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlRevisedQuotationExpander.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationCommon.o -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmi -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmo -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.cmx -lib/ocaml/camlp4/Camlp4Parsers/Camlp4QuotationExpander.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4AstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4AutoPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4NullDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlAstDumper.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlPrinter.o -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmi -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmo -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.cmx -lib/ocaml/camlp4/Camlp4Printers/Camlp4OCamlRevisedPrinter.o -lib/ocaml/camlp4/Camlp4Top.cmi -lib/ocaml/camlp4/Camlp4Top.cmo -lib/ocaml/camlp4/Camlp4Top/Rprint.cmi -lib/ocaml/camlp4/Camlp4Top/Rprint.cmo -lib/ocaml/camlp4/Camlp4Top/Rprint.cmx -lib/ocaml/camlp4/Camlp4Top/Rprint.o -lib/ocaml/camlp4/Camlp4Top/Top.cmi -lib/ocaml/camlp4/Camlp4Top/Top.cmo -lib/ocaml/camlp4/Camlp4Top/Top.cmx -lib/ocaml/camlp4/Camlp4Top/Top.o -lib/ocaml/camlp4/Camlp4_config.cmi -lib/ocaml/camlp4/camlp4fulllib.a -lib/ocaml/camlp4/camlp4fulllib.cma -lib/ocaml/camlp4/camlp4fulllib.cmxa -lib/ocaml/camlp4/camlp4lib.a -lib/ocaml/camlp4/camlp4lib.cma -lib/ocaml/camlp4/camlp4lib.cmxa -lib/ocaml/camlp4/camlp4o.cma -lib/ocaml/camlp4/camlp4of.cma -lib/ocaml/camlp4/camlp4oof.cma -lib/ocaml/camlp4/camlp4orf.cma -lib/ocaml/camlp4/camlp4prof.cmi -lib/ocaml/camlp4/camlp4prof.cmo -lib/ocaml/camlp4/camlp4prof.cmx -lib/ocaml/camlp4/camlp4prof.o -lib/ocaml/camlp4/camlp4r.cma -lib/ocaml/camlp4/camlp4rf.cma -${OCAML_SITELIB}/camlp4/META diff --git a/lang/camlp4/buildlink3.mk b/lang/camlp4/buildlink3.mk deleted file mode 100644 index 187d5feb70d..00000000000 --- a/lang/camlp4/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.7 2018/07/19 12:18:03 jaapb Exp $ - -BUILDLINK_TREE+= camlp4 - -.if !defined(CAMLP4_BUILDLINK3_MK) -CAMLP4_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.camlp4+= camlp4>=4.07 -BUILDLINK_ABI_DEPENDS.camlp4+= camlp4>=4.07 -BUILDLINK_PKGSRCDIR.camlp4?= ../../lang/camlp4 -.endif # CAMLP4_BUILDLINK3_MK - -BUILDLINK_TREE+= -camlp4 diff --git a/lang/camlp4/distinfo b/lang/camlp4/distinfo deleted file mode 100644 index acb65f03043..00000000000 --- a/lang/camlp4/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: distinfo,v 1.15 2021/10/26 10:51:30 nia Exp $ - -BLAKE2s (camlp4-4.08+1.tar.gz) = ef65caa49ce6dd21ad1bf25e00ed509b7f08d09b9e8d3d8d174639e7ff0d2110 -SHA512 (camlp4-4.08+1.tar.gz) = 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075 -Size (camlp4-4.08+1.tar.gz) = 649830 bytes diff --git a/net/Makefile b/net/Makefile index f128e0ef6fb..4d7779d8c5a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1468 2022/06/18 10:07:10 pin Exp $ +# $NetBSD: Makefile,v 1.1469 2022/06/29 07:54:40 wiz Exp $ # COMMENT= Networking tools @@ -381,8 +381,6 @@ SUBDIR+= mirror SUBDIR+= miruo SUBDIR+= mitmproxy SUBDIR+= mkvserver_mk2 -SUBDIR+= mldonkey -SUBDIR+= mldonkey-gui SUBDIR+= modpcap SUBDIR+= mono-nat SUBDIR+= monotorrent diff --git a/net/mldonkey-gui/DESCR b/net/mldonkey-gui/DESCR deleted file mode 100644 index 6eb1706b732..00000000000 --- a/net/mldonkey-gui/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -mldonkey is a client to access the eDonkey network, a peer-to-peer network -particularly efficient for big files thanks to a multi-sources download -protocol. It is written in Objective-Caml, and comes with its own GTK GUI, -an HTTP interface and a telnet interface. It works on most UNIX platforms. - -This package provides the GTK GUI interface, but not the core. You will -have to install it (using the mldonkey package) in the same machine or -another one. diff --git a/net/mldonkey-gui/Makefile b/net/mldonkey-gui/Makefile deleted file mode 100644 index f0c492c62d8..00000000000 --- a/net/mldonkey-gui/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# $NetBSD: Makefile,v 1.139 2022/05/24 18:51:54 jaapb Exp $ - -PKGREVISION= 52 -.include "../../net/mldonkey/Makefile.common" - -PKGNAME= ${DISTNAME:S/mldonkey/mldonkey-gui/} - -COMMENT+= (GTK interface) - -DEPENDS+= mldonkey-[0-9]*:../../net/mldonkey - -USE_TOOLS+= pkg-config - -INSTALLATION_DIRS= bin libexec/mldonkey - -CONFIGURE_ARGS+= --enable-gui=newgui2 -CONFIGURE_ARGS+= --disable-option-checking - -do-install: - ${RM} -f ${DESTDIR}${PREFIX}/bin/mlgui - cd ${DESTDIR}${PREFIX}/bin && ${LN} -s ../libexec/mldonkey/mlgui mlgui - ${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${DESTDIR}${PREFIX}/libexec/mldonkey - ${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter \ - ${DESTDIR}${PREFIX}/libexec/mldonkey - ${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui \ - ${DESTDIR}${PREFIX}/libexec/mldonkey - -.include "../../graphics/librsvg/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -# 2.16.0 is the first version that installs in the right location -BUILDLINK_API_DEPENDS.ocaml-lablgtk+= ocaml-lablgtk>=2.16.0 -.include "../../x11/ocaml-lablgtk/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/mldonkey-gui/PLIST b/net/mldonkey-gui/PLIST deleted file mode 100644 index 143d088cc6e..00000000000 --- a/net/mldonkey-gui/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2006/09/16 06:21:40 wiz Exp $ -bin/mlgui -libexec/mldonkey/mlgui -libexec/mldonkey/mlguistarter -libexec/mldonkey/mlnet+gui diff --git a/net/mldonkey/DESCR b/net/mldonkey/DESCR deleted file mode 100644 index 5ae0a362942..00000000000 --- a/net/mldonkey/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -mldonkey is a client to access the eDonkey network, a peer-to-peer -network particularly efficient for big files thanks to a multi-sources -download protocol. It is written in Objective-Caml, and comes with -its own GTK GUI, an HTTP interface and a telnet interface. It -works on most UNIX platforms. - -This package provides mldonkey's core, which can be accessed through -a web browser. You may want to install the mldonkey-gui package -which provides a nice graphical interface for mldonkey. diff --git a/net/mldonkey/MESSAGE b/net/mldonkey/MESSAGE deleted file mode 100644 index 5bd2fef759e..00000000000 --- a/net/mldonkey/MESSAGE +++ /dev/null @@ -1,13 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.3 2004/12/25 19:19:21 wiz Exp $ - -This package only installs mldonkey's core program, which does not have a -GUI frontend. To ease its management, it includes an rc.d startup script -that will safely start the daemon as an independent and unprivileged user. -Once started, you will be able to access it at a later time by accessing -http://localhost:4080/. - -However, if you want a GUI, install the mldonkey-gui package, which will -be able to connect to a local core as well as a remote one. - -=========================================================================== diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile deleted file mode 100644 index a1278db0e91..00000000000 --- a/net/mldonkey/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.104 2022/06/28 11:35:02 wiz Exp $ - -PKGREVISION= 22 -.include "Makefile.common" - -RCD_SCRIPTS= mldonkey - -PKG_GROUPS_VARS+= MLDONKEY_GROUP -PKG_USERS_VARS+= MLDONKEY_USER - -BUILD_DEFS+= MLDONKEY_HOME VARBASE - -INSTALLATION_DIRS= libexec/mldonkey - -OWN_DIRS_PERMS= ${MLDONKEY_HOME} ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 -OWN_DIRS_PERMS+= ${VARBASE}/log/mldonkey \ - ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 -OWN_DIRS_PERMS+= ${VARBASE}/run/mldonkey \ - ${MLDONKEY_USER} ${MLDONKEY_GROUP} 0700 - -PKG_GROUPS= ${MLDONKEY_GROUP} -PKG_USERS= ${MLDONKEY_USER}:${MLDONKEY_GROUP} - -PKG_GECOS.${MLDONKEY_USER}= Dedicated mldonkey server -PKG_HOME.${MLDONKEY_USER}= ${MLDONKEY_HOME} -PKG_SHELL.${MLDONKEY_USER}= ${SH} - -FILES_SUBST+= MLDONKEY_GROUP=${MLDONKEY_GROUP:Q} -FILES_SUBST+= MLDONKEY_HOME=${MLDONKEY_HOME:Q} -FILES_SUBST+= MLDONKEY_USER=${MLDONKEY_USER:Q} - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${DESTDIR}${PREFIX}/libexec/mldonkey - -.include "../../lang/camlp4/buildlink3.mk" -.include "../../sysutils/file/buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common deleted file mode 100644 index 736fcbefacc..00000000000 --- a/net/mldonkey/Makefile.common +++ /dev/null @@ -1,44 +0,0 @@ -# $NetBSD: Makefile.common,v 1.54 2020/03/20 11:58:08 nia Exp $ -# -# used by net/mldonkey/Makefile -# used by net/mldonkey-gui/Makefile - -DISTNAME= mldonkey-3.1.5 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mldonkey/} -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://mldonkey.sourceforge.net/Main_Page -COMMENT= Free peer-to-peer client with eDonkey support and more -LICENSE= gnu-gpl-v2 - -DISTINFO_FILE= ${.CURDIR}/../../net/mldonkey/distinfo -PATCHDIR= ${.CURDIR}/../../net/mldonkey/patches - -GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake perl autoconf -MAKE_JOBS_SAFE= no - -CONFIGURE_ENV+= WGET="" -CONFIGURE_ENV+= ac_cv_prog_WGET="no" -CONFIGURE_ARGS+= --enable-directconnect -LDFLAGS+= ${PTHREAD_LDFLAGS} -MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread} -CONFIGURE_ARGS+= --enable-pthread-lib - -UNLIMIT_RESOURCES= stacksize - -# needs 3.10.1 or newer to work correctly on NetBSD/amd64 -BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10.1 - -pre-configure: - cd ${WRKSRC}/config && autoconf - -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/gd/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" -.include "../../math/ocaml-num/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" diff --git a/net/mldonkey/PLIST b/net/mldonkey/PLIST deleted file mode 100644 index 5f30ba4ea6d..00000000000 --- a/net/mldonkey/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST,v 1.6 2014/03/11 14:05:09 jperkin Exp $ -libexec/mldonkey/mlnet diff --git a/net/mldonkey/distinfo b/net/mldonkey/distinfo deleted file mode 100644 index 21f1fd0a1e2..00000000000 --- a/net/mldonkey/distinfo +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: distinfo,v 1.67 2021/10/26 11:06:00 nia Exp $ - -BLAKE2s (mldonkey-3.1.5.tar.bz2) = 4d0a6d475147de0e8c2054a566c90affee9bbfb299724dc395fa484c3a15e09a -SHA512 (mldonkey-3.1.5.tar.bz2) = 96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3 -Size (mldonkey-3.1.5.tar.bz2) = 2847382 bytes -SHA1 (patch-config_Makefile.in) = 84f235f7ad4e6a9cdec807a24d3f11f769a01399 -SHA1 (patch-config_configure.in) = 0f187754d590a565b22ef402351dbe18c456a8c5 -SHA1 (patch-src_config_unix_os_stubs.c.c) = 6abe8ef9a040be0716e3d6c88b48764b6dd7ed55 -SHA1 (patch-src_networks_donkey_donkeyGlobals.ml) = 5f0b36213b6e6185077cd5c8d82b314b1c50c8c2 -SHA1 (patch-src_utils_cdk_bzip2.ml) = 77f7b96a12930df3843c38baa69a90ad73a26f8d -SHA1 (patch-src_utils_cdk_bzip2.mli) = c54fcf33541ada525d33d6485a9362bb1cb5c8cf -SHA1 (patch-src_utils_cdk_bzlib.ml) = fd13e153d484ed6d07dfeaaf5e19560cac92e0a2 -SHA1 (patch-src_utils_cdk_bzlib.mli) = 2057ae8479851ad49b5fd5630e51c63f5c3d08f3 -SHA1 (patch-src_utils_cdk_filename2.ml) = 08c1da16ee18c32b2efe4342030054a8e396960b -SHA1 (patch-src_utils_cdk_gdstubs.c) = 9d8ef81fcf3515ab5337769aef12c6aacbb4eb81 -SHA1 (patch-src_utils_cdk_genlex2.ml) = 679554178ef641ae573523599ecb0587c4cefb78 -SHA1 (patch-src_utils_cdk_gzip.ml) = c044e15df645f3262664ca136fddabf7e5e2a0d1 -SHA1 (patch-src_utils_cdk_gzip.mli) = 9eaef0cfae3844742ca14a1aca3c900ae22e813c -SHA1 (patch-src_utils_cdk_string2.ml) = 8f73f9be699dfa92e2360c1ce94b26d4d5e1e62c -SHA1 (patch-src_utils_cdk_string2.mli) = 5ed5cdc6fb12b964bb65d861a33901e9ec68d504 -SHA1 (patch-src_utils_cdk_tar.mlcpp) = 75e2cab5d1e3d1e880a13bd0f7b2e29f7c0ca2be -SHA1 (patch-src_utils_cdk_unix2.ml) = 3893de3d70704fc625b6cb2e2e405911b92a32ab -SHA1 (patch-src_utils_cdk_zip.ml) = a875053a90c911e2f07fcfc75aa307e6ba7cd5b4 -SHA1 (patch-src_utils_cdk_zlib.ml) = a2ad3cdde37fe9ee329c1e9193e7744bda167a4a -SHA1 (patch-src_utils_cdk_zlib.mli) = bf6125e1812ece75d48ee3a7fda88ef9f172bd26 -SHA1 (patch-src_utils_cdk_zlibstubs.c) = cd005903f050e2c9fee1f745ada40f5dad2e3985 -SHA1 (patch-src_utils_extlib_IO.ml) = 8d889c88345ba5e622200558760b221abde4ab7a -SHA1 (patch-src_utils_extlib_IO.mli) = 8f41b20aa762f7ba22fec958862015f81adc2952 -SHA1 (patch-src_utils_lib_fst_hash.c) = c96999a09d392293fc6dc997f3a2d5465bd2e8d8 -SHA1 (patch-src_utils_lib_md4.ml) = 3d283d01ff1a95cb2893b52bccefd63d1c28f6c6 -SHA1 (patch-src_utils_lib_md4.mli) = ad6c4085f6ef803e0e97be15ad7380bc6f24555e -SHA1 (patch-src_utils_lib_misc.ml) = 947a8f24d1ea2a05b8a83d2d7da84c7f9d991602 -SHA1 (patch-src_utils_lib_misc2.mlcpp) = 077de6829a0d7367352c5b6ea5562c42e441a396 -SHA1 (patch-src_utils_lib_options.ml4) = aa7a752f894a09d2a1fe3f69e1796d560f241e24 -SHA1 (patch-src_utils_lib_os_stubs.h) = a6707829311c46dd598d269c465a02f0fa8fc701 -SHA1 (patch-src_utils_lib_syslog.ml) = e3993e6a3a008bc7e52eb414e980afb41658dafb -SHA1 (patch-src_utils_lib_tiger.c) = d4b3b9a3de0a64dee442911a4d9b30d075091a7e -SHA1 (patch-src_utils_lib_unix32.ml) = 81f4b15ece553bb7a46a046026bb3d2f74d5d2b2 -SHA1 (patch-src_utils_lib_unix32.mli) = 39ae8385f2b43bcb961476c639acfbace4774197 -SHA1 (patch-src_utils_lib_url.ml) = aa1194997f44e7437ada3012058455964c4573f2 -SHA1 (patch-src_utils_lib_verificationBitmap.ml) = f8d7af0eff1674ca83a98a800e53e2a41da9922a -SHA1 (patch-src_utils_net_terminal.ml) = f601ea7facc3f31f9f288567a094fbd3e1bda70c diff --git a/net/mldonkey/files/mldonkey.sh b/net/mldonkey/files/mldonkey.sh deleted file mode 100644 index a25ede20171..00000000000 --- a/net/mldonkey/files/mldonkey.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: mldonkey.sh,v 1.7 2006/08/10 11:35:26 jmmv Exp $ -# -# KEYWORD: shutdown -# PROVIDE: mldonkey -# REQUIRE: DAEMON -# - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -: ${mldonkey_group=@MLDONKEY_GROUP@} -: ${mldonkey_home=@MLDONKEY_HOME@} -: ${mldonkey_logdir=@VARBASE@/log/mldonkey} -: ${mldonkey_rundir=@VARBASE@/run/mldonkey} -: ${mldonkey_user=@MLDONKEY_USER@} - -name="mldonkey" -rcvar=${name} -command="@PREFIX@/libexec/mldonkey/mlnet" -command_args="-pid ${mldonkey_rundir} >${mldonkey_logdir}/mlnet.log 2>&1 &" -pidfile="${mldonkey_rundir}/mlnet.pid" -required_dirs="${mldonkey_home}" -start_cmd="mldonkey_start" - -mldonkey_start() { - if [ -f /etc/rc.subr ]; then - @ECHO@ "Starting mldonkey." - else - @ECHO@ " ${name}" - fi - - if [ ! -d ${mldonkey_logdir} ]; then - mkdir -p ${mldonkey_logdir} - chown ${mldonkey_user}:${mldonkey_group} ${mldonkey_logdir} - chmod 0700 ${mldonkey_logdir} - fi - - if [ ! -d ${mldonkey_rundir} ]; then - mkdir -p ${mldonkey_rundir} - chown ${mldonkey_user}:${mldonkey_group} ${mldonkey_rundir} - chmod 0700 ${mldonkey_rundir} - fi - - @SU@ -l ${mldonkey_user} -c \ - "HOME=${mldonkey_home} \ - ${command} ${mldonkey_flags} ${command_args}" -} - -if [ -f /etc/rc.subr ]; then - load_rc_config ${name} - run_rc_command "${1}" -else - mldonkey_start -fi diff --git a/net/mldonkey/patches/patch-config_Makefile.in b/net/mldonkey/patches/patch-config_Makefile.in deleted file mode 100644 index e91eb986ae3..00000000000 --- a/net/mldonkey/patches/patch-config_Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-config_Makefile.in,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Correct include paths for lablgtk 2.16 - ---- config/Makefile.in.orig 2012-07-01 17:47:41.000000000 +0000 -+++ config/Makefile.in -@@ -655,15 +655,18 @@ install:: opt - - ifneq ("$(GUI)" , "no") - ifeq ("$(GUI)", "newgui2") -- SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 -- GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma -- GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa -- GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa -+ SL_DIR=$(OCAMLLIB)/site-lib -+ SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) $(SL_DIR)/lablgtk2 -+ GTK_LIBS_byte=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma -+ GTK_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa -+ GTK_STATIC_LIBS_opt=-ccopt "$(GTKLLIBS)" -cclib "$(GTKLFLAGS)" -I $(SL_DIR)/lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa -+ LIBS_flags+=-ccopt "-I $(SL_DIR)" - else -- SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) +lablgtk $(SRC_PROGRESS) -- GTK_LIBS_byte=-I +lablgtk $(LABLGL_CMA) lablgtk.cma -- GTK_LIBS_opt=-I +lablgtk $(LABLGL_CMXA) lablgtk.cmxa -- GTK_STATIC_LIBS_opt=-I +lablgtk lablgtk.cmxa -+ SUBDIRS += $(SRC_GUI) $(CONFIGWIN) $(OKEY) $(GPATTERN) $(ICONS_CHOICE) $(SL_DIR)/lablgtk $(SRC_PROGRESS) -+ GTK_LIBS_byte=-I $(SL_DIR)/lablgtk $(LABLGL_CMA) lablgtk.cma -+ GTK_LIBS_opt=-I $(SL_DIR)/lablgtk $(LABLGL_CMXA) lablgtk.cmxa -+ GTK_STATIC_LIBS_opt=-I $(SL_DIR)/lablgtk lablgtk.cmxa -+ LIBS_flags+=-ccopt "-I $(SL_DIR)" - endif - - SVG_CONVERTER_SRCS = \ -@@ -1561,9 +1564,9 @@ resfile.o: - - depend: $(RESFILE) \ - $(PA_ZOG) $(LIB)/http_lexer.ml $(TMPSOURCES) -- @$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend -+ @$(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I $(OCAMLLIB)/site-lib/labl$(GTK),,$(INCLUDES)) *.ml *.mli > .depend - @(for i in $(SUBDIRS); do \ -- $(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli >> .depend; \ -+ $(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I $(OCAMLLIB)/site-lib/labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli >> .depend; \ - $(OCAMLPP) $$i/*.mlt >> .depend; \ - done) - @if test "$(GUI)" = "newgui2"; then \ diff --git a/net/mldonkey/patches/patch-config_configure.in b/net/mldonkey/patches/patch-config_configure.in deleted file mode 100644 index 6f4207142c7..00000000000 --- a/net/mldonkey/patches/patch-config_configure.in +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-config_configure.in,v 1.7 2018/03/14 14:05:37 dholland Exp $ - -Correct include paths for lablgtk 2.16 - ---- config/configure.in.orig 2012-08-05 15:49:02.000000000 +0000 -+++ config/configure.in -@@ -1347,15 +1364,15 @@ if test "$GTK_CONFIG" = "no"; then - LABLGTK_CONFIG=no - else - AC_MSG_CHECKING(for native code $LABLGTK_NAME) -- if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then -+ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then - if test "$GUI" = "newgui2"; then -- if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then -+ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then - AC_MSG_RESULT(yes) - LABLGTK_CONFIG=yes - else - AC_MSG_RESULT(no) - LABLGTK_CONFIG=no -- if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.cma; then -+ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.cma; then - echo "---------------------------------------------------------" - echo "lablrsvg is not installed properly. See the INSTALL.txt" - echo "file of mldonkey to see how to compile $LABLGTK_NAME. You" -@@ -1376,7 +1393,7 @@ else - else - AC_MSG_RESULT(no) - LABLGTK_CONFIG=no -- if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.cma; then -+ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.cma; then - echo "-------------------------------------------------------------" - echo "$LABLGTK_NAME is not installed properly. See the INSTALL.txt" - echo "file of mldonkey to see how to compile $LABLGTK_NAME. You" diff --git a/net/mldonkey/patches/patch-src_config_unix_os_stubs.c.c b/net/mldonkey/patches/patch-src_config_unix_os_stubs.c.c deleted file mode 100644 index 7f701c06846..00000000000 --- a/net/mldonkey/patches/patch-src_config_unix_os_stubs.c.c +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-src_config_unix_os_stubs.c.c,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 - ---- src/config/unix/os_stubs_c.c.orig 2010-07-16 13:56:35.000000000 +0000 -+++ src/config/unix/os_stubs_c.c -@@ -66,7 +66,7 @@ ssize_t os_read(OS_FD fd, char *buf, siz - - void os_ftruncate(OS_FD fd, OFF_T len, /* bool */ int sparse) - { -- int64 cursize; -+ int64_t cursize; - if(!fd) failwith("ftruncate32: file is closed"); - - cursize = os_getfdsize(fd); -@@ -109,7 +109,7 @@ int os_getdtablesize() - - *******************************************************************/ - --int64 os_getfdsize(OS_FD fd) -+int64_t os_getfdsize(OS_FD fd) - { - struct stat buf; - -@@ -127,7 +127,7 @@ int64 os_getfdsize(OS_FD fd) - - *******************************************************************/ - --int64 os_getfilesize(char *path) -+int64_t os_getfilesize(char *path) - { - struct stat buf; - diff --git a/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals.ml b/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals.ml deleted file mode 100644 index 8c81b09068b..00000000000 --- a/net/mldonkey/patches/patch-src_networks_donkey_donkeyGlobals.ml +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_networks_donkey_donkeyGlobals.ml,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 - ---- src/networks/donkey/donkeyGlobals.ml.orig 2011-10-25 17:33:21.000000000 +0000 -+++ src/networks/donkey/donkeyGlobals.ml -@@ -781,7 +781,6 @@ let set_client_name c name md4 = - c.client_md4 <- md4; - end - --exception ClientFound of client - let find_client_by_name name = - try - H.iter (fun c -> diff --git a/net/mldonkey/patches/patch-src_utils_cdk_bzip2.ml b/net/mldonkey/patches/patch-src_utils_cdk_bzip2.ml deleted file mode 100644 index ed2158f096b..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_bzip2.ml +++ /dev/null @@ -1,126 +0,0 @@ -$NetBSD: patch-src_utils_cdk_bzip2.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/bzip2.ml~ 2006-03-05 10:41:06.000000000 +0000 -+++ src/utils/cdk/bzip2.ml -@@ -7,7 +7,7 @@ let buffer_size = 1024 - - type in_channel = - { in_chan: Pervasives.in_channel; -- in_buffer: string; -+ in_buffer: bytes; - mutable in_pos: int; - mutable in_avail: int; - mutable in_eof: bool; -@@ -16,7 +16,7 @@ type in_channel = - - let open_in_chan ic = - { in_chan = ic; -- in_buffer = String.create buffer_size; -+ in_buffer = Bytes.create buffer_size; - in_pos = 0; - in_avail = 0; - in_eof = false; -@@ -32,12 +32,12 @@ let open_in filename = - let read_byte iz = - if iz.in_avail = 0 then begin - let n = Pervasives.input iz.in_chan iz.in_buffer 0 -- (String.length iz.in_buffer) in -+ (Bytes.length iz.in_buffer) in - if n = 0 then raise End_of_file; - iz.in_pos <- 0; - iz.in_avail <- n - end; -- let c = iz.in_buffer.[iz.in_pos] in -+ let c = Bytes.get iz.in_buffer iz.in_pos in - iz.in_pos <- iz.in_pos + 1; - iz.in_avail <- iz.in_avail - 1; - Char.code c -@@ -53,19 +53,19 @@ let read_int32 iz = - (Int32.shift_left (Int32.of_int b4) 24))) - - let rec input iz buf pos len = -- if pos < 0 || len < 0 || pos + len > String.length buf then -+ if pos < 0 || len < 0 || pos + len > Bytes.length buf then - invalid_arg "Bzip2.input"; - if iz.in_eof then 0 else begin - if iz.in_avail = 0 then begin - let n = Pervasives.input iz.in_chan iz.in_buffer 0 -- (String.length iz.in_buffer) in -+ (Bytes.length iz.in_buffer) in - if n = 0 then raise(Error("truncated file")); - iz.in_pos <- 0; - iz.in_avail <- n - end; - let (finished, used_in, used_out) = - try -- Bzlib.decompress iz.in_stream iz.in_buffer iz.in_pos iz.in_avail -+ Bzlib.decompress iz.in_stream (Bytes.to_string iz.in_buffer) iz.in_pos iz.in_avail - buf pos len - with Bzlib.Error(_, e) -> - raise(Error(Bzlib.string_of_error e)) in -@@ -88,10 +88,10 @@ let rec really_input iz buf pos len = - really_input iz buf (pos + n) (len - n) - end - --let char_buffer = String.create 1 -+let char_buffer = Bytes.create 1 - - let input_char iz = -- if input iz char_buffer 0 1 = 0 then raise End_of_file else char_buffer.[0] -+ if input iz char_buffer 0 1 = 0 then raise End_of_file else Bytes.get char_buffer 0 - - let input_byte iz = - Char.code (input_char iz) -@@ -106,7 +106,7 @@ let close_in iz = - - type out_channel = - { out_chan: Pervasives.out_channel; -- out_buffer: string; -+ out_buffer: bytes; - mutable out_pos: int; - mutable out_avail: int; - out_stream: Bzlib.stream; -@@ -115,7 +115,7 @@ type out_channel = - let open_out_chan ?(level = 6) oc = - if level < 1 || level > 9 then invalid_arg "Bzip2.open_out: bad level"; - { out_chan = oc; -- out_buffer = String.create buffer_size; -+ out_buffer = Bytes.create buffer_size; - out_pos = 0; - out_avail = buffer_size; - out_stream = Bzlib.compress_init level 0 0; -@@ -132,7 +132,7 @@ let rec output oz buf pos len = - (* Printf.printf "Flushing out_avail\n"; *) - Pervasives.output oz.out_chan oz.out_buffer 0 oz.out_pos; - oz.out_pos <- 0; -- oz.out_avail <- String.length oz.out_buffer -+ oz.out_avail <- Bytes.length oz.out_buffer - end; - let (_, used_in, used_out) = - try -@@ -147,8 +147,8 @@ let rec output oz buf pos len = - if used_in < len then output oz buf (pos + used_in) (len - used_in) - - let output_char oz c = -- char_buffer.[0] <- c; -- output oz char_buffer 0 1 -+ let s = String.make 1 c in -+ output oz s 0 1 - - let output_byte oz b = - output_char oz (Char.unsafe_chr b) -@@ -159,10 +159,10 @@ let flush oz = - if oz.out_avail = 0 then begin - Pervasives.output oz.out_chan oz.out_buffer 0 oz.out_pos; - oz.out_pos <- 0; -- oz.out_avail <- String.length oz.out_buffer -+ oz.out_avail <- Bytes.length oz.out_buffer - end; - let (finished, _, used_out) = -- Bzlib.compress oz.out_stream oz.out_buffer 0 0 -+ Bzlib.compress oz.out_stream (Bytes.to_string oz.out_buffer) 0 0 - oz.out_buffer oz.out_pos oz.out_avail - Bzlib.BZ_FINISH in - oz.out_pos <- oz.out_pos + used_out; diff --git a/net/mldonkey/patches/patch-src_utils_cdk_bzip2.mli b/net/mldonkey/patches/patch-src_utils_cdk_bzip2.mli deleted file mode 100644 index 75575e67e0c..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_bzip2.mli +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_utils_cdk_bzip2.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/bzip2.mli~ 2005-09-13 09:49:40.000000000 +0000 -+++ src/utils/cdk/bzip2.mli -@@ -22,7 +22,7 @@ val input_byte: in_channel -> int - (* Same as [Bzip2.input_char], but return the 8-bit integer representing - the character. - Raise [End_of_file] if no more compressed data is available. *) --val input: in_channel -> string -> int -> int -> int -+val input: in_channel -> bytes -> int -> int -> int - (* [input ic buf pos len] uncompresses up to [len] characters - from the given channel [ic], - storing them in string [buf], starting at character number [pos]. -@@ -38,7 +38,7 @@ val input: in_channel -> string -> int - - exactly [len] characters.) - Exception [Invalid_argument "Bzip2.input"] is raised if - [pos] and [len] do not designate a valid substring of [buf]. *) --val really_input: in_channel -> string -> int -> int -> unit -+val really_input: in_channel -> bytes -> int -> int -> unit - (* [really_input ic buf pos len] uncompresses [len] characters - from the given channel, storing them in - string [buf], starting at character number [pos]. diff --git a/net/mldonkey/patches/patch-src_utils_cdk_bzlib.ml b/net/mldonkey/patches/patch-src_utils_cdk_bzlib.ml deleted file mode 100644 index e57cba5f4de..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_bzlib.ml +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_utils_cdk_bzlib.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/bzlib.ml~ 2005-08-01 20:09:13.000000000 +0000 -+++ src/utils/cdk/bzlib.ml -@@ -23,7 +23,7 @@ type action = BZ_RUN | BZ_FLUSH | BZ_FIN - - external compress_init: int -> int -> int -> stream = "camlzip_bzCompressInit" - external compress: -- stream -> string -> int -> int -> string -> int -> int -> action -+ stream -> string -> int -> int -> bytes -> int -> int -> action - -> bool * int * int - = "camlzip_bzCompress_bytecode" "camlzip_bzCompress" - external compress_end: stream -> unit = "camlzip_bzCompressEnd" -@@ -31,7 +31,7 @@ external compress_end: stream -> unit = - - external decompress_init: int -> bool -> stream = "camlzip_bzDecompressInit" - external decompress: -- stream -> string -> int -> int -> string -> int -> int -> bool * int * int -+ stream -> string -> int -> int -> bytes -> int -> int -> bool * int * int - = "camlzip_bzDecompress_bytecode" "camlzip_bzDecompress" - external decompress_end: stream -> unit = "camlzip_bzDecompressEnd" - diff --git a/net/mldonkey/patches/patch-src_utils_cdk_bzlib.mli b/net/mldonkey/patches/patch-src_utils_cdk_bzlib.mli deleted file mode 100644 index 8da73662ba9..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_bzlib.mli +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_utils_cdk_bzlib.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/bzlib.mli~ 2005-08-01 20:09:13.000000000 +0000 -+++ src/utils/cdk/bzlib.mli -@@ -10,7 +10,7 @@ type action = BZ_RUN | BZ_FLUSH | BZ_FIN - - external compress_init: int -> int -> int -> stream = "camlzip_bzCompressInit" - external compress: -- stream -> string -> int -> int -> string -> int -> int -> action -+ stream -> string -> int -> int -> bytes -> int -> int -> action - -> bool * int * int - = "camlzip_bzCompress_bytecode" "camlzip_bzCompress" - external compress_end: stream -> unit = "camlzip_bzCompressEnd" -@@ -18,7 +18,7 @@ external compress_end: stream -> unit = - - external decompress_init: int -> bool -> stream = "camlzip_bzDecompressInit" - external decompress: -- stream -> string -> int -> int -> string -> int -> int -> bool * int * int -+ stream -> string -> int -> int -> bytes -> int -> int -> bool * int * int - = "camlzip_bzDecompress_bytecode" "camlzip_bzDecompress" - external decompress_end: stream -> unit = "camlzip_bzDecompressEnd" - diff --git a/net/mldonkey/patches/patch-src_utils_cdk_filename2.ml b/net/mldonkey/patches/patch-src_utils_cdk_filename2.ml deleted file mode 100644 index 7a6d21da808..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_filename2.ml +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-src_utils_cdk_filename2.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/filename2.ml~ 2012-06-24 07:59:41.000000000 +0000 -+++ src/utils/cdk/filename2.ml -@@ -116,11 +116,11 @@ let to_string filename = - List.fold_left (fun file f -> f file) filename !to_strings - - let path_of_filename filename = -- let filename = String.copy filename in -+ let change c = -+ if c = '\\' then '/' else c -+ in -+ let filename = String.map change filename in - let len = String.length filename in -- for i = 0 to len - 1 do -- if filename.[i] = '\\' then filename.[i] <- '/'; -- done; - let filename = - if len > 2 && filename.[1] = ':' && - match filename.[0] with -@@ -142,11 +142,11 @@ let filesystem_compliant name fs namemax - (* replace all illegal characters with a valid one. - assumes all filesystems accept '_'s in filenames *) - let escape_chars p filename = -- let s = String.copy filename in -- for i = 0 to String.length filename - 1 do -- if p s.[i] then s.[i] <- '_' -- done; -- s in -+ let change c = -+ if p c then '_' else c -+ in -+ String.map change filename -+ in - - (* remove all illegal characters at the beginning of filename *) - let trim_left p filename = diff --git a/net/mldonkey/patches/patch-src_utils_cdk_gdstubs.c b/net/mldonkey/patches/patch-src_utils_cdk_gdstubs.c deleted file mode 100644 index bf379f8d9a0..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_gdstubs.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_utils_cdk_gdstubs.c,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 - ---- src/utils/cdk/gdstubs.c.orig 2012-06-24 07:59:41.000000000 +0000 -+++ src/utils/cdk/gdstubs.c -@@ -489,7 +489,7 @@ int ml_image_pngversion(void) - CAMLlocal1 (v); - #ifdef HAVE_PNGVERSION - #include <png.h> -- v = copy_int32 ((int32)png_access_version_number()); -+ v = copy_int32 ((int32_t)png_access_version_number()); - CAMLreturn (v); - #else - raise_constant(*(value *)caml_named_value("gd type not supported")); diff --git a/net/mldonkey/patches/patch-src_utils_cdk_genlex2.ml b/net/mldonkey/patches/patch-src_utils_cdk_genlex2.ml deleted file mode 100644 index a192a33af4a..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_genlex2.ml +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-src_utils_cdk_genlex2.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/genlex2.ml~ 2003-04-22 22:33:39.000000000 +0000 -+++ src/utils/cdk/genlex2.ml -@@ -28,7 +28,7 @@ type token = - - (* The string buffering machinery *) - --let initial_buffer = String.create 32 -+let initial_buffer = Bytes.create 32 - - let buffer = ref initial_buffer - let bufpos = ref 0 -@@ -36,16 +36,18 @@ let bufpos = ref 0 - let reset_buffer () = buffer := initial_buffer; bufpos := 0 - - let store c = -- if !bufpos >= String.length !buffer then -+ if !bufpos >= Bytes.length !buffer then - begin -- let newbuffer = String.create (2 * !bufpos) in -- String.blit !buffer 0 newbuffer 0 !bufpos; buffer := newbuffer -+ let newbuffer = Bytes.create (2 * !bufpos) in -+ Bytes.blit !buffer 0 newbuffer 0 !bufpos; buffer := newbuffer - end; -- String.set !buffer !bufpos c; -+ Bytes.set !buffer !bufpos c; - incr bufpos - - let get_string () = -- let s = String.sub !buffer 0 !bufpos in buffer := initial_buffer; s -+ let s = Bytes.to_string (Bytes.sub !buffer 0 !bufpos) in -+ buffer := initial_buffer; -+ s - - (* The lexer *) - diff --git a/net/mldonkey/patches/patch-src_utils_cdk_gzip.ml b/net/mldonkey/patches/patch-src_utils_cdk_gzip.ml deleted file mode 100644 index 1869c3b206d..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_gzip.ml +++ /dev/null @@ -1,180 +0,0 @@ -$NetBSD: patch-src_utils_cdk_gzip.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/gzip.ml~ 2010-11-07 15:01:40.000000000 +0000 -+++ src/utils/cdk/gzip.ml -@@ -21,14 +21,14 @@ let buffer_size = 1024 - - type in_channel = - { in_chan: IO.input; -- in_buffer: string; -+ in_buffer: bytes; - mutable in_pos: int; - mutable in_avail: int; - mutable in_eof: bool; - in_stream: Zlib.stream; - mutable in_size: int32; - mutable in_crc: int32; -- char_buffer: string } -+ char_buffer: bytes } - - let open_in ic = - (* Superficial parsing of header *) -@@ -66,14 +66,14 @@ let open_in ic = - raise(Error("premature end of input, not a gzip stream")) - end; - { in_chan = ic; -- in_buffer = String.create buffer_size; -+ in_buffer = Bytes.create buffer_size; - in_pos = 0; - in_avail = 0; - in_eof = false; - in_stream = Zlib.inflate_init false; - in_size = Int32.zero; - in_crc = Int32.zero; -- char_buffer = String.create 1 } -+ char_buffer = Bytes.create 1 } - - let open_in_file filename = - let ic = Pervasives.open_in_bin filename in -@@ -84,11 +84,11 @@ let open_in_file filename = - let read_byte iz = - if iz.in_avail = 0 then begin - let n = IO.input iz.in_chan iz.in_buffer 0 -- (String.length iz.in_buffer) in -+ (Bytes.length iz.in_buffer) in - iz.in_pos <- 0; - iz.in_avail <- n - end; -- let c = iz.in_buffer.[iz.in_pos] in -+ let c = Bytes.get iz.in_buffer iz.in_pos in - iz.in_pos <- iz.in_pos + 1; - iz.in_avail <- iz.in_avail - 1; - Char.code c -@@ -104,12 +104,12 @@ let read_int32 iz = - (Int32.shift_left (Int32.of_int b4) 24))) - - let rec input iz buf pos len = -- if pos < 0 || len < 0 || pos + len > String.length buf then -+ if pos < 0 || len < 0 || pos + len > Bytes.length buf then - invalid_arg "Gzip_stream.input"; - if iz.in_eof then 0 else begin - if iz.in_avail = 0 then begin - let n = try IO.input iz.in_chan iz.in_buffer 0 -- (String.length iz.in_buffer) -+ (Bytes.length iz.in_buffer) - with IO.No_more_input -> raise(Error("truncated stream")) - in - iz.in_pos <- 0; -@@ -123,7 +123,7 @@ let rec input iz buf pos len = - raise(Error("error during decompression")) in - iz.in_pos <- iz.in_pos + used_in; - iz.in_avail <- iz.in_avail - used_in; -- iz.in_crc <- Zlib.update_crc iz.in_crc buf pos used_out; -+ iz.in_crc <- Zlib.update_crc iz.in_crc (Bytes.to_string buf) pos used_out; - iz.in_size <- Int32.add iz.in_size (Int32.of_int used_out); - if finished then begin - try -@@ -152,7 +152,7 @@ let rec really_input iz buf pos len = - end - - let input_char iz = -- if input iz iz.char_buffer 0 1 = 0 then raise End_of_file else iz.char_buffer.[0] -+ if input iz iz.char_buffer 0 1 = 0 then raise End_of_file else Bytes.get iz.char_buffer 0 - - let input_byte iz = - Char.code (input_char iz) -@@ -167,13 +167,13 @@ let close_in iz = - - type 'a out_channel = - { out_chan: 'a IO.output; -- out_buffer: string; -+ out_buffer: bytes; - mutable out_pos: int; - mutable out_avail: int; - out_stream: Zlib.stream; - mutable out_size: int32; - mutable out_crc: int32; -- char_buffer: string } -+ char_buffer: bytes } - - let open_out ?(level = 6) oc = - if level < 1 || level > 9 then invalid_arg "Gzip_stream.open_output: bad level"; -@@ -186,13 +186,13 @@ let open_out ?(level = 6) oc = - IO.write_byte oc 0; (* xflags *) - IO.write_byte oc 0xFF; (* OS (unknown) *) - { out_chan = oc; -- out_buffer = String.create buffer_size; -+ out_buffer = Bytes.create buffer_size; - out_pos = 0; - out_avail = buffer_size; - out_stream = Zlib.deflate_init level false; - out_size = Int32.zero; - out_crc = Int32.zero; -- char_buffer = String.create 1 } -+ char_buffer = Bytes.create 1 } - - let open_out_file ?level filename = - let oc = Pervasives.open_out_bin filename in -@@ -202,13 +202,13 @@ let open_out_file ?level filename = - exn -> Pervasives.close_out oc; raise exn - - let rec output oz buf pos len = -- if pos < 0 || len < 0 || pos + len > String.length buf then -+ if pos < 0 || len < 0 || pos + len > Bytes.length buf then - invalid_arg "Gzip_stream.output"; - (* If output buffer is full, flush it *) - if oz.out_avail = 0 then begin -- ignore (IO.really_output oz.out_chan oz.out_buffer 0 oz.out_pos); -+ ignore (IO.really_output oz.out_chan (Bytes.to_string oz.out_buffer) 0 oz.out_pos); - oz.out_pos <- 0; -- oz.out_avail <- String.length oz.out_buffer -+ oz.out_avail <- Bytes.length oz.out_buffer - end; - let (_, used_in, used_out) = - try -@@ -220,11 +220,11 @@ let rec output oz buf pos len = - oz.out_pos <- oz.out_pos + used_out; - oz.out_avail <- oz.out_avail - used_out; - oz.out_size <- Int32.add oz.out_size (Int32.of_int used_in); -- oz.out_crc <- Zlib.update_crc oz.out_crc buf pos used_in; -+ oz.out_crc <- Zlib.update_crc oz.out_crc (Bytes.to_string buf) pos used_in; - if used_in < len then output oz buf (pos + used_in) (len - used_in) - - let output_char oz c = -- oz.char_buffer.[0] <- c; -+ Bytes.set oz.char_buffer 0 c; - output oz oz.char_buffer 0 1 - - let output_byte oz b = -@@ -241,9 +241,9 @@ let flush oz = - let rec do_flush () = - (* If output buffer is full, flush it *) - if oz.out_avail = 0 then begin -- ignore (IO.really_output oz.out_chan oz.out_buffer 0 oz.out_pos); -+ ignore (IO.really_output oz.out_chan (Bytes.to_string oz.out_buffer) 0 oz.out_pos); - oz.out_pos <- 0; -- oz.out_avail <- String.length oz.out_buffer -+ oz.out_avail <- Bytes.length oz.out_buffer - end; - let (finished, _, used_out) = - Zlib.deflate oz.out_stream oz.out_buffer 0 0 -@@ -255,7 +255,7 @@ let flush oz = - do_flush(); - (* Final data flush *) - if oz.out_pos > 0 then -- ignore (IO.really_output oz.out_chan oz.out_buffer 0 oz.out_pos); -+ ignore (IO.really_output oz.out_chan (Bytes.to_string oz.out_buffer) 0 oz.out_pos); - (* Write CRC and size *) - write_int32 oz.out_chan oz.out_crc; - write_int32 oz.out_chan oz.out_size; -@@ -277,7 +277,7 @@ let output_io io = - let oz = open_out io in - IO.create_out - ~write:(output_char oz) -- ~output:(fun s o l -> output oz s o l; l) -+ ~output:(fun s o l -> output oz (Bytes.of_string s) o l; l) - ~flush:(fun () -> IO.flush io) - ~close:(fun () -> close_out oz) - diff --git a/net/mldonkey/patches/patch-src_utils_cdk_gzip.mli b/net/mldonkey/patches/patch-src_utils_cdk_gzip.mli deleted file mode 100644 index d04f5c4029d..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_gzip.mli +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-src_utils_cdk_gzip.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/gzip.mli~ 2010-11-07 15:01:40.000000000 +0000 -+++ src/utils/cdk/gzip.mli -@@ -35,7 +35,7 @@ val input_byte: in_channel -> int - (* Same as [Gzip.input_char], but return the 8-bit integer representing - the character. - Raise [End_of_file] if no more compressed data is available. *) --val input: in_channel -> string -> int -> int -> int -+val input: in_channel -> bytes -> int -> int -> int - (* [input ic buf pos len] uncompresses up to [len] characters - from the given channel [ic], - storing them in string [buf], starting at character number [pos]. -@@ -51,7 +51,7 @@ val input: in_channel -> string -> int - - exactly [len] characters.) - Exception [Invalid_argument "Gzip.input"] is raised if - [pos] and [len] do not designate a valid substring of [buf]. *) --val really_input: in_channel -> string -> int -> int -> unit -+val really_input: in_channel -> bytes -> int -> int -> unit - (* [really_input ic buf pos len] uncompresses [len] characters - from the given channel, storing them in - string [buf], starting at character number [pos]. -@@ -95,7 +95,7 @@ val output_char: 'a out_channel -> char - val output_byte: 'a out_channel -> int -> unit - (* Same as [Gzip.output_char], but the output character is given - by its code. The given integer is taken modulo 256. *) --val output: 'a out_channel -> string -> int -> int -> unit -+val output: 'a out_channel -> bytes -> int -> int -> unit - (* [output oc buf pos len] compresses and writes [len] characters - from string [buf], starting at offset [pos], and writes the - compressed data to the channel [oc]. diff --git a/net/mldonkey/patches/patch-src_utils_cdk_string2.ml b/net/mldonkey/patches/patch-src_utils_cdk_string2.ml deleted file mode 100644 index e78d40d5f5e..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_string2.ml +++ /dev/null @@ -1,102 +0,0 @@ -$NetBSD: patch-src_utils_cdk_string2.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/string2.ml~ 2007-01-28 20:39:59.000000000 +0000 -+++ src/utils/cdk/string2.ml -@@ -163,11 +163,10 @@ let check_suffix s suffix = - len >= slen && String.sub s (len - slen) slen = suffix - - let upp_initial s = -- if String.length s > 0 then -- let s = String.copy s in -- s.[0] <- Char.uppercase s.[0]; s -- else -- s -+ let change i c = -+ if i = 0 then Char.uppercase_ascii c else c -+ in -+ String.mapi change s - - (* not optimal !*) - let rec subequal s1 pos1 s2 pos2 len = -@@ -195,7 +194,7 @@ let subcontains s sub = - - let of_char c = String.make 1 c - -- -+(* problematic with immutable strings - let resize s newlen = - let len = String.length s in - if len > newlen then String.sub s 0 newlen -@@ -203,13 +202,10 @@ let resize s newlen = - let str = String.create newlen in - String.blit s 0 str 0 len; - str -+*) - - let init len f = -- let s = String.create len in -- for i = 0 to len - 1 do -- s.[i] <- f i -- done; -- s -+ String.init len f - - let is_space c = c = ' ' || c = '\n' || c = '\r' || c = '\t' - -@@ -266,30 +262,24 @@ let starts_with s1 s2 = - let len2 = String.length s2 in - len2 <= len1 && strneql s1 s2 len2 - --let replace_char s c1 c2 = -- for i = 0 to String.length s - 1 do -- if s.[i] == c1 then s.[i] <- c2 -- done -+let replace_char' s c1 c2 = -+ let change i c = -+ if c = c1 then c2 else c -+ in -+ String.mapi change s - - let stem s = -- let s = String.lowercase (String.copy s) in -- for i = 0 to String.length s - 1 do -- let c = s.[i] in -+ let munge i c = - match c with -- 'a'..'z' | '0' .. '9' -> () -- | _ -> s.[i] <- ' '; -- done; -+ 'a'..'z' | '0' .. '9' -> c -+ | _ -> ' ' -+ in -+ let s = String.mapi munge (String.lowercase_ascii s) in - split_simplify s ' ' - - let map f s = - let len = String.length s in -- if len = 0 then [||] else -- let v = f s.[0] in -- let array = Array.create len v in -- for i = 1 to len -1 do -- array.(i) <- f s.[i] -- done; -- array -+ Array.init len (fun i -> f s.[i]) - - let iteri f s = - let len = String.length s in -@@ -298,11 +288,7 @@ let iteri f s = - done - - let init n f = -- let s = String.create n in -- for i = 0 to n - 1 do -- s.[i] <- f i -- done; -- s -+ String.init n f - - let exists p s = - let l = String.length s in diff --git a/net/mldonkey/patches/patch-src_utils_cdk_string2.mli b/net/mldonkey/patches/patch-src_utils_cdk_string2.mli deleted file mode 100644 index 6d0d54453d3..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_string2.mli +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-src_utils_cdk_string2.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/string2.mli~ 2007-01-28 20:39:59.000000000 +0000 -+++ src/utils/cdk/string2.mli -@@ -79,7 +79,9 @@ val subcontains : string -> string -> bo - val of_char : char -> string - (*d [of_char c] returns the string containing one [c]. *) - -+(* problematic with immutable strings - val resize : string -> int -> string -+*) - (*d [resize s len] returns a string of length [len] starting with [s]. *) - - val init : int -> (int -> char) -> string -@@ -93,7 +95,11 @@ external contains : string -> string -> - val starts_with : (* string *) string -> (* start *) string -> bool - - (* [replace_char s c1 c2] replaces char [c1] by char [c2] in [s] *) -+(* problematic with immutable strings - val replace_char : string -> char -> char -> unit -+*) -+(* [replace_char' s c1 c2] makes a new string with [c1] replaced with [c2] *) -+val replace_char' : string -> char -> char -> string - - (* [stem s] cuts the string [s] in small words, for indexation eg *) - val stem : string -> string list diff --git a/net/mldonkey/patches/patch-src_utils_cdk_tar.mlcpp b/net/mldonkey/patches/patch-src_utils_cdk_tar.mlcpp deleted file mode 100644 index 83515d76e79..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_tar.mlcpp +++ /dev/null @@ -1,112 +0,0 @@ -$NetBSD: patch-src_utils_cdk_tar.mlcpp,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/tar.mlcpp.orig 2010-12-19 10:10:24.000000000 +0000 -+++ src/utils/cdk/tar.mlcpp -@@ -169,7 +169,7 @@ let align_at_header t = - | None -> () - | Some h -> - let entry_size = ((h.t_size/blocksize) + 1) * blocksize -- and buf = String.create blocksize -+ and buf = Bytes.create blocksize - and discarded = ref 0 in - while !discarded < entry_size do - let read = t.chan#input buf 0 blocksize in -@@ -177,7 +177,7 @@ let align_at_header t = - done; - t.last_header <- None - --let empty_block = String.make blocksize '\000' -+let empty_block = Bytes.make blocksize '\000' - - let compute_chksum buf = - let chksum = ref 256 in (* 256 is the sum of 8 ' ' characters for the chksum field *) -@@ -206,8 +206,9 @@ let read_oldgnu_header header = - } - - let read_gnu_header t = -- let buf = String.create blocksize in -+ let buf = Bytes.create blocksize in - t.chan#really_input buf 0 blocksize; -+ let buf = Bytes.to_string buf in - { t_atime = extract_int32 buf 0 12; - t_ctime = extract_int32 buf 12 12; - t_offset = extract_int32 buf 24 12; -@@ -216,9 +217,10 @@ let read_gnu_header t = - - let read_header t = - align_at_header t; -- let buf = String.create blocksize in -+ let buf = Bytes.create blocksize in - t.chan#really_input buf 0 blocksize; - if buf = empty_block then raise End_of_file; -+ let buf = Bytes.to_string buf in - let head1 = { t_name = c_string buf 0; - t_mode = extract_num buf 100 8; - t_uid = extract_num buf 108 8; -@@ -264,14 +266,14 @@ let read_body t = - let header = get_header t in - t.last_header <- None; - if header.t_size = 0 then "" -- else let buf = String.create header.t_size in -+ else let buf = Bytes.create header.t_size in - t.chan#really_input buf 0 header.t_size; - let align = blocksize - (header.t_size mod blocksize) in - if align <> blocksize then begin -- let leftover = String.create blocksize in -+ let leftover = Bytes.create blocksize in - t.chan#really_input leftover 0 align - end; -- buf -+ Bytes.to_string buf - - let read_entry t = - let head = read_header t in -@@ -291,7 +293,7 @@ end - - #ifdef USE_BZIP2 - class bzout_chan o = object -- method output str pos len = Bzip2.output o str pos len -+ method output str pos len = Bzip2.output o (Bytes.to_string str) pos len - method flush () = Bzip2.flush o - method close () = Bzip2.close_out o - end -@@ -390,14 +392,14 @@ let write_gnu_header t buf = - - let output t head body = - let size = String.length body in -- let buf = String.copy empty_block in -+ let buf = Bytes.copy empty_block in - write_str buf 0 100 head.t_name; - write_num8 buf 100 head.t_mode; - write_num8 buf 108 head.t_uid; - write_num8 buf 116 head.t_gid; - write_num12 buf 124 size; - write_int32 buf 136 head.t_mtime; -- buf.[156] <- typeflag_to_char head.t_typeflag; -+ Bytes.set buf 156 (typeflag_to_char head.t_typeflag); - write_str buf 157 100 head.t_linkname; - write_magic buf 257 head.t_format; - write_str buf 265 32 head.t_uname; -@@ -407,16 +409,16 @@ let output t head body = - write_str buf 345 155 head.t_prefix; - if head.t_format = OLDGNU_FORMAT then - write_oldgnu_header head buf; -- let chksum = compute_chksum buf in -+ let chksum = compute_chksum (Bytes.to_string buf) in - write_padded_num buf 148 chksum; - t.ochan#output buf 0 blocksize; -- if head.t_format = GNU_FORMAT && isdigit buf.[156] then begin -- let buf2 = String.copy empty_block in -+ if head.t_format = GNU_FORMAT && isdigit (Bytes.get buf 156) then begin -+ let buf2 = Bytes.copy empty_block in - write_gnu_header head buf2; - t.ochan#output buf2 0 blocksize - end; - if size > 0 then begin -- t.ochan#output body 0 size; -+ t.ochan#output (Bytes.of_string body) 0 size; - let align = blocksize - (size mod blocksize) in - if align > 0 && align < blocksize then - t.ochan#output empty_block 0 align diff --git a/net/mldonkey/patches/patch-src_utils_cdk_unix2.ml b/net/mldonkey/patches/patch-src_utils_cdk_unix2.ml deleted file mode 100644 index 9b08d154149..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_unix2.ml +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-src_utils_cdk_unix2.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/unix2.ml~ 2013-07-07 10:53:52.000000000 +0000 -+++ src/utils/cdk/unix2.ml -@@ -156,7 +156,7 @@ let copy oldname newname = - (try Unix.fchmod descr stats.Unix.LargeFile.st_perm - with e -> lprintf_nl "copy: failed to preserve mode")); - let buffer_len = 8192 in -- let buffer = String.create buffer_len in -+ let buffer = Bytes.create buffer_len in - let rec copy_file () = - let n = input ic buffer 0 buffer_len in - if n = 0 then () else begin -@@ -205,18 +205,18 @@ let rec remove_all_directory dirname = - Unix.rmdir dirname - - let random () = -- let s = String.create 7 in -+ let s = Bytes.create 7 in - for i = 0 to 6 do -- s.[i] <- char_of_int (97 + Random.int 26) -+ Bytes.set s i (char_of_int (97 + Random.int 26)) - done; -- s -+ Bytes.to_string s - - let can_write_to_directory dirname = - let temp_file = Filename.concat dirname "tmp_" ^ random () ^ "_mld.tmp" in - let check () = with_remove temp_file (fun _ -> - tryopen_openfile temp_file [O_WRONLY; O_CREAT] 0o600 (fun fd -> - let test_string = "mldonkey accesstest - this file can be deleted\n" in -- really_write fd test_string 0 (String.length test_string))) -+ really_write fd (Bytes.of_string test_string) 0 (String.length test_string))) - in - try - check () diff --git a/net/mldonkey/patches/patch-src_utils_cdk_zip.ml b/net/mldonkey/patches/patch-src_utils_cdk_zip.ml deleted file mode 100644 index dff85120a66..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_zip.ml +++ /dev/null @@ -1,193 +0,0 @@ -$NetBSD: patch-src_utils_cdk_zip.ml,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 (the exception Error block) -and again with 4.06 (the rest) - ---- src/utils/cdk/zip.ml.orig 2007-02-06 22:26:59.000000000 +0000 -+++ src/utils/cdk/zip.ml -@@ -27,8 +27,8 @@ let read4_int ic = - if hw > max_int lsr 16 then raise (Error("", "", "32-bit data too large")); - lw lor (hw lsl 16) - let readstring ic n = -- let s = String.create n in -- really_input ic s 0 n; s -+ let s = Bytes.create n in -+ really_input ic s 0 n; Bytes.to_string s - - let write1 = output_byte - let write2 oc n = -@@ -40,7 +40,7 @@ let write4_int oc n = - write2 oc n; - write2 oc (n lsr 16) - let writestring oc s = -- output oc s 0 (String.length s) -+ output oc (Bytes.of_string s) 0 (String.length s) - - type compression_method = Stored | Deflated - -@@ -72,8 +72,6 @@ type out_file = - mutable of_entries: entry list; - of_comment: string } - --exception Error of string * string * string -- - (* Return the position of the last occurrence of s1 in s2, or -1 if not - found. *) - -@@ -81,7 +79,7 @@ let strrstr pattern buf ofs len = - let rec search i j = - if i < ofs then -1 - else if j >= String.length pattern then i -- else if pattern.[j] = buf.[i + j] then search i (j+1) -+ else if pattern.[j] = Bytes.get buf (i + j) then search i (j+1) - else search (i-1) 0 - in search (ofs + len - String.length pattern) 0 - -@@ -116,7 +114,7 @@ let dostime_of_unixtime t = - (* Read end of central directory record *) - - let read_ecd filename ic = -- let buf = String.create 256 in -+ let buf = Bytes.create 256 in - let filelen = in_channel_length ic in - let rec find_ecd pos len = - (* On input, bytes 0 ... len - 1 of buf reflect what is at pos in ic *) -@@ -125,7 +123,7 @@ let read_ecd filename ic = - "end of central directory not found, not a ZIP file")); - let toread = min pos 128 in - (* Make room for "toread" extra bytes, and read them *) -- String.blit buf 0 buf toread (256 - toread); -+ Bytes.blit buf 0 buf toread (256 - toread); - let newpos = pos - toread in - seek_in ic newpos; - really_input ic buf 0 toread; -@@ -134,7 +132,7 @@ let read_ecd filename ic = - let ofs = strrstr "PK\005\006" buf 0 newlen in - if ofs < 0 || newlen < 22 || - (let comment_len = -- Char.code buf.[ofs + 20] lor (Char.code buf.[ofs + 21] lsl 8) in -+ Char.code (Bytes.get buf (ofs + 20)) lor (Char.code (Bytes.get buf (ofs + 21)) lsl 8) in - newpos + ofs + 22 + comment_len <> filelen) then - find_ecd newpos newlen - else -@@ -268,14 +266,14 @@ let goto_entry ifile e = - let read_entry ifile e = - try - goto_entry ifile e; -- let res = String.create e.uncompressed_size in -+ let res = Bytes.create e.uncompressed_size in - match e.methd with - Stored -> - if e.compressed_size <> e.uncompressed_size then - raise (Error(ifile.if_filename, e.filename, - "wrong size for stored entry")); - really_input ifile.if_channel res 0 e.uncompressed_size; -- res -+ Bytes.to_string res - | Deflated -> - let in_avail = ref e.compressed_size in - let out_pos = ref 0 in -@@ -283,25 +281,25 @@ let read_entry ifile e = - Zlib.uncompress ~header:false - (fun buf -> - let read = input ifile.if_channel buf 0 -- (min !in_avail (String.length buf)) in -+ (min !in_avail (Bytes.length buf)) in - in_avail := !in_avail - read; - read) - (fun buf len -> -- if !out_pos + len > String.length res then -+ if !out_pos + len > Bytes.length res then - raise (Error(ifile.if_filename, e.filename, - "wrong size for deflated entry (too much data)")); -- String.blit buf 0 res !out_pos len; -+ Bytes.blit buf 0 res !out_pos len; - out_pos := !out_pos + len) - with Zlib.Error(_, _) -> - raise (Error(ifile.if_filename, e.filename, "decompression error")) - end; -- if !out_pos <> String.length res then -+ if !out_pos <> Bytes.length res then - raise (Error(ifile.if_filename, e.filename, - "wrong size for deflated entry (not enough data)")); -- let crc = Zlib.update_crc Int32.zero res 0 (String.length res) in -+ let crc = Zlib.update_crc Int32.zero (Bytes.to_string res) 0 (Bytes.length res) in - if crc <> e.crc then - raise (Error(ifile.if_filename, e.filename, "CRC mismatch")); -- res -+ Bytes.to_string res - with End_of_file -> - raise (Error(ifile.if_filename, e.filename, "truncated data")) - -@@ -315,10 +313,10 @@ let copy_entry_to_channel ifile e oc = - if e.compressed_size <> e.uncompressed_size then - raise (Error(ifile.if_filename, e.filename, - "wrong size for stored entry")); -- let buf = String.create 4096 in -+ let buf = Bytes.create 4096 in - let rec copy n = - if n > 0 then begin -- let r = input ifile.if_channel buf 0 (min n (String.length buf)) in -+ let r = input ifile.if_channel buf 0 (min n (Bytes.length buf)) in - output oc buf 0 r; - copy (n - r) - end in -@@ -330,12 +328,12 @@ let copy_entry_to_channel ifile e oc = - Zlib.uncompress ~header:false - (fun buf -> - let read = input ifile.if_channel buf 0 -- (min !in_avail (String.length buf)) in -+ (min !in_avail (Bytes.length buf)) in - in_avail := !in_avail - read; - read) - (fun buf len -> - output oc buf 0 len; -- crc := Zlib.update_crc !crc buf 0 len) -+ crc := Zlib.update_crc !crc (Bytes.to_string buf) 0 len) - with Zlib.Error(_, _) -> - raise (Error(ifile.if_filename, e.filename, "decompression error")) - end; -@@ -475,7 +473,7 @@ let add_entry data ofile ?(extra = "") ? - let compr_size = - match level with - 0 -> -- output ofile.of_channel data 0 (String.length data); -+ output ofile.of_channel (Bytes.of_string data) 0 (String.length data); - String.length data - | _ -> - let in_pos = ref 0 in -@@ -484,7 +482,7 @@ let add_entry data ofile ?(extra = "") ? - Zlib.compress ~header:false - (fun buf -> - let n = min (String.length data - !in_pos) -- (String.length buf) in -+ (Bytes.length buf) in - String.blit data !in_pos buf 0 n; - in_pos := !in_pos + n; - n) -@@ -506,11 +504,11 @@ let copy_channel_to_entry ic ofile ?(ext - let (compr_size, uncompr_size) = - match level with - 0 -> -- let buf = String.create 4096 in -+ let buf = Bytes.create 4096 in - let rec copy sz = -- let r = input ic buf 0 (String.length buf) in -+ let r = input ic buf 0 (Bytes.length buf) in - if r = 0 then sz else begin -- crc := Zlib.update_crc !crc buf 0 r; -+ crc := Zlib.update_crc !crc (Bytes.to_string buf) 0 r; - output ofile.of_channel buf 0 r; - copy (sz + r) - end in -@@ -522,8 +520,8 @@ let copy_channel_to_entry ic ofile ?(ext - try - Zlib.compress ~header:false - (fun buf -> -- let r = input ic buf 0 (String.length buf) in -- crc := Zlib.update_crc !crc buf 0 r; -+ let r = input ic buf 0 (Bytes.length buf) in -+ crc := Zlib.update_crc !crc (Bytes.to_string buf) 0 r; - in_pos := !in_pos + r; - r) - (fun buf n -> diff --git a/net/mldonkey/patches/patch-src_utils_cdk_zlib.ml b/net/mldonkey/patches/patch-src_utils_cdk_zlib.ml deleted file mode 100644 index 7fae540dd10..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_zlib.ml +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-src_utils_cdk_zlib.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/zlib.mli~ 2005-08-01 20:09:13.000000000 +0000 -+++ src/utils/cdk/zlib.mli -@@ -2,10 +2,10 @@ exception Error of string * string - - val compress: - ?level: int -> ?header: bool -> -- (string -> int) -> (string -> int -> unit) -> unit -+ (bytes -> int) -> (bytes -> int -> unit) -> unit - - val uncompress: -- ?header: bool -> (string -> int) -> (string -> int -> unit) -> unit -+ ?header: bool -> (bytes -> int) -> (bytes -> int -> unit) -> unit - - type stream - -@@ -17,14 +17,14 @@ type flush_command = - - external deflate_init: int -> bool -> stream = "camlzip_deflateInit" - external deflate: -- stream -> string -> int -> int -> string -> int -> int -> flush_command -+ stream -> bytes -> int -> int -> bytes -> int -> int -> flush_command - -> bool * int * int - = "camlzip_deflate_bytecode" "camlzip_deflate" - external deflate_end: stream -> unit = "camlzip_deflateEnd" - - external inflate_init: bool -> stream = "camlzip_inflateInit" - external inflate: -- stream -> string -> int -> int -> string -> int -> int -> flush_command -+ stream -> bytes -> int -> int -> bytes -> int -> int -> flush_command - -> bool * int * int - = "camlzip_inflate_bytecode" "camlzip_inflate" - external inflate_end: stream -> unit = "camlzip_inflateEnd" -@@ -33,8 +33,8 @@ external update_crc: int32 -> string -> - = "camlzip_update_crc32" - - val uncompress_string : string -> string --val uncompress_string2 : string -> string --val compress_string : ?level:int -> string -> string -+val uncompress_string2 : bytes -> bytes -+val compress_string : ?level:int -> bytes -> bytes - val gzip_string : ?level:int -> string -> string - - val zlib_version_num : unit -> string diff --git a/net/mldonkey/patches/patch-src_utils_cdk_zlib.mli b/net/mldonkey/patches/patch-src_utils_cdk_zlib.mli deleted file mode 100644 index fd0c6ec4f5e..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_zlib.mli +++ /dev/null @@ -1,153 +0,0 @@ -$NetBSD: patch-src_utils_cdk_zlib.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/cdk/zlib.ml~ 2007-02-11 13:15:49.000000000 +0000 -+++ src/utils/cdk/zlib.ml -@@ -13,14 +13,14 @@ type flush_command = - - external deflate_init: int -> bool -> stream = "camlzip_deflateInit" - external deflate: -- stream -> string -> int -> int -> string -> int -> int -> flush_command -+ stream -> bytes -> int -> int -> bytes -> int -> int -> flush_command - -> bool * int * int - = "camlzip_deflate_bytecode" "camlzip_deflate" - external deflate_end: stream -> unit = "camlzip_deflateEnd" - - external inflate_init: bool -> stream = "camlzip_inflateInit" - external inflate: -- stream -> string -> int -> int -> string -> int -> int -> flush_command -+ stream -> bytes -> int -> int -> bytes -> int -> int -> flush_command - -> bool * int * int - = "camlzip_inflate_bytecode" "camlzip_inflate" - external inflate_end: stream -> unit = "camlzip_inflateEnd" -@@ -40,8 +40,8 @@ let zlib_version_num () = - let buffer_size = 1024 - - let compress ?(level = 6) ?(header = true) refill flush = -- let inbuf = String.create buffer_size -- and outbuf = String.create buffer_size in -+ let inbuf = Bytes.create buffer_size -+ and outbuf = Bytes.create buffer_size in - let zs = deflate_init level header in - let rec compr inpos inavail = - if inavail = 0 then begin -@@ -63,15 +63,15 @@ let compress ?(level = 6) ?(header = tru - deflate_end zs - - let grow_buffer s = -- let s' = String.create (2 * String.length s) in -- String.blit s 0 s' 0 (String.length s); -+ let s' = Bytes.create (2 * Bytes.length s) in -+ Bytes.blit s 0 s' 0 (Bytes.length s); - s' - - let compress_string ?(level = 6) inbuf = - let zs = deflate_init level true in - let rec compr inpos outbuf outpos = -- let inavail = String.length inbuf - inpos in -- let outavail = String.length outbuf - outpos in -+ let inavail = Bytes.length inbuf - inpos in -+ let outavail = Bytes.length outbuf - outpos in - if outavail = 0 - then compr inpos (grow_buffer outbuf) outpos - else begin -@@ -79,11 +79,11 @@ let compress_string ?(level = 6) inbuf = - deflate zs inbuf inpos inavail outbuf outpos outavail - (if inavail = 0 then Z_FINISH else Z_NO_FLUSH) in - if finished then -- String.sub outbuf 0 (outpos + used_out) -+ Bytes.sub outbuf 0 (outpos + used_out) - else - compr (inpos + used_in) outbuf (outpos + used_out) - end in -- let res = compr 0 (String.create (String.length inbuf)) 0 in -+ let res = compr 0 (Bytes.create (Bytes.length inbuf)) 0 in - deflate_end zs; - res - -@@ -95,22 +95,22 @@ let gzip_string ?(level = 6) inbuf = - let out_crc = ref Int32.zero in - let rec compr inpos outbuf outpos = - let inavail = String.length inbuf - inpos in -- let outavail = String.length outbuf - outpos in -+ let outavail = Bytes.length outbuf - outpos in - if outavail = 0 - then compr inpos (grow_buffer outbuf) outpos - else begin - let (finished, used_in, used_out) = -- deflate zs inbuf inpos inavail outbuf outpos outavail -+ deflate zs (Bytes.of_string inbuf) inpos inavail outbuf outpos outavail - (if inavail = 0 then Z_FINISH else Z_NO_FLUSH) in - out_crc := update_crc !out_crc inbuf inpos used_in; - if finished then -- String.sub outbuf 0 (outpos + used_out) -+ Bytes.sub outbuf 0 (outpos + used_out) - else - compr (inpos + used_in) outbuf (outpos + used_out) - end in -- let res = compr 0 (String.create (String.length inbuf)) 0 in -+ let res = compr 0 (Bytes.create (String.length inbuf)) 0 in - deflate_end zs; -- let buf = Buffer.create (18 + String.length res) in -+ let buf = Buffer.create (18 + Bytes.length res) in - let write_int wbuf n = - Buffer.add_char wbuf (char_of_int n) - in -@@ -128,15 +128,15 @@ let gzip_string ?(level = 6) inbuf = - for i = 1 to 4 do write_int buf 0 done; - write_int buf 0; - write_int buf 0xFF; -- Buffer.add_string buf res; -+ Buffer.add_bytes buf res; - write_int32 buf !out_crc; - write_int32 buf (Int32.of_int (String.length inbuf)); - Buffer.contents buf - end - - let uncompress ?(header = true) refill flush = -- let inbuf = String.create buffer_size -- and outbuf = String.create buffer_size in -+ let inbuf = Bytes.create buffer_size -+ and outbuf = Bytes.create buffer_size in - let zs = inflate_init header in - let rec uncompr inpos inavail = - if inavail = 0 then begin -@@ -164,19 +164,19 @@ let uncompress ?(header = true) refill f - let uncompress_string2 inbuf = - let zs = inflate_init true in - let rec uncompr inpos outbuf outpos = -- let inavail = String.length inbuf - inpos in -- let outavail = String.length outbuf - outpos in -+ let inavail = Bytes.length inbuf - inpos in -+ let outavail = Bytes.length outbuf - outpos in - if outavail = 0 - then uncompr inpos (grow_buffer outbuf) outpos - else begin - let (finished, used_in, used_out) = - inflate zs inbuf inpos inavail outbuf outpos outavail Z_SYNC_FLUSH in - if finished then -- String.sub outbuf 0 (outpos + used_out) -+ Bytes.sub outbuf 0 (outpos + used_out) - else - uncompr (inpos + used_in) outbuf (outpos + used_out) - end in -- let res = uncompr 0 (String.create (2 * String.length inbuf)) 0 in -+ let res = uncompr 0 (Bytes.create (2 * Bytes.length inbuf)) 0 in - inflate_end zs; - res - -@@ -185,11 +185,11 @@ let uncompress_string s = - let pos = ref 0 in - let len = String.length s in - uncompress ~header: true (fun b -> -- let n = min (String.length b) (len - !pos) in -+ let n = min (Bytes.length b) (len - !pos) in - if n < 1 then 0 else begin - String.blit s !pos b 0 n; - pos := !pos + n; - n end -- ) (fun s len -> Buffer.add_string buf (String.sub s 0 len)); -+ ) (fun s len -> Buffer.add_bytes buf (Bytes.sub s 0 len)); - Buffer.contents buf - diff --git a/net/mldonkey/patches/patch-src_utils_cdk_zlibstubs.c b/net/mldonkey/patches/patch-src_utils_cdk_zlibstubs.c deleted file mode 100644 index 7a68a46266d..00000000000 --- a/net/mldonkey/patches/patch-src_utils_cdk_zlibstubs.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_utils_cdk_zlibstubs.c,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 - ---- src/utils/cdk/zlibstubs.c.orig 2009-02-24 18:34:31.000000000 +0000 -+++ src/utils/cdk/zlibstubs.c -@@ -191,7 +191,7 @@ value camlzip_inflateEnd(value vzs) - - value camlzip_update_crc32(value crc, value buf, value pos, value len) - { -- return copy_int32(crc32((uint32) Int32_val(crc), -+ return copy_int32(crc32((uint32_t) Int32_val(crc), - &Byte_u(buf, Long_val(pos)), - Long_val(len))); - } diff --git a/net/mldonkey/patches/patch-src_utils_extlib_IO.ml b/net/mldonkey/patches/patch-src_utils_extlib_IO.ml deleted file mode 100644 index 28cfff40aad..00000000000 --- a/net/mldonkey/patches/patch-src_utils_extlib_IO.ml +++ /dev/null @@ -1,117 +0,0 @@ -$NetBSD: patch-src_utils_extlib_IO.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/extlib/IO.ml~ 2010-11-07 15:01:40.000000000 +0000 -+++ src/utils/extlib/IO.ml -@@ -20,7 +20,7 @@ - - type input = { - mutable in_read : unit -> char; -- mutable in_input : string -> int -> int -> int; -+ mutable in_input : bytes -> int -> int -> int; - mutable in_close : unit -> unit; - } - -@@ -62,7 +62,7 @@ let nread i n = - if n = 0 then - "" - else -- let s = String.create n in -+ let s = Bytes.create n in - let l = ref n in - let p = ref 0 in - try -@@ -72,11 +72,11 @@ let nread i n = - p := !p + r; - l := !l - r; - done; -- s -+ Bytes.to_string s - with - No_more_input as e -> - if !p = 0 then raise e; -- String.sub s 0 !p -+ Bytes.to_string (Bytes.sub s 0 !p) - - let really_output o s p l' = - let sl = String.length s in -@@ -92,7 +92,7 @@ let really_output o s p l' = - l' - - let input i s p l = -- let sl = String.length s in -+ let sl = Bytes.length s in - if p + l > sl || p < 0 || l < 0 then invalid_arg "IO.input"; - if l = 0 then - 0 -@@ -100,7 +100,7 @@ let input i s p l = - i.in_input s p l - - let really_input i s p l' = -- let sl = String.length s in -+ let sl = Bytes.length s in - if p + l' > sl || p < 0 || l' < 0 then invalid_arg "IO.really_input"; - let l = ref l' in - let p = ref p in -@@ -116,10 +116,10 @@ let really_nread i n = - if n < 0 then invalid_arg "IO.really_nread"; - if n = 0 then "" - else -- let s = String.create n -+ let s = Bytes.create n - in - ignore(really_input i s 0 n); -- s -+ Bytes.to_string s - - let close_in i = - let f _ = raise Input_closed in -@@ -173,11 +173,11 @@ let read_all i = - loop() - with - No_more_input -> -- let buf = String.create !pos in -+ let buf = Bytes.create !pos in - List.iter (fun (s,p) -> - String.unsafe_blit s 0 buf p (String.length s) - ) !str; -- buf -+ Bytes.to_string buf - - let pos_in i = - let p = ref 0 in -@@ -267,7 +267,7 @@ let input_channel ch = - let output_channel ch = - { - out_write = (fun c -> output_char ch c); -- out_output = (fun s p l -> Pervasives.output ch s p l; l); -+ out_output = (fun s p l -> Pervasives.output ch (Bytes.of_string s) p l; l); - out_close = (fun () -> Pervasives.close_out ch); - out_flush = (fun () -> Pervasives.flush ch); - } -@@ -708,11 +708,11 @@ class out_chars ch = - end - - let from_in_channel ch = -- let cbuf = String.create 1 in -+ let cbuf = Bytes.create 1 in - let read() = - try - if ch#input cbuf 0 1 = 0 then raise Sys_blocked_io; -- String.unsafe_get cbuf 0 -+ Bytes.unsafe_get cbuf 0 - with - End_of_file -> raise No_more_input - in -@@ -725,9 +725,8 @@ let from_in_channel ch = - ~close:ch#close_in - - let from_out_channel ch = -- let cbuf = String.create 1 in - let write c = -- String.unsafe_set cbuf 0 c; -+ let cbuf = String.make 1 c in - if ch#output cbuf 0 1 = 0 then raise Sys_blocked_io; - in - let output s p l = diff --git a/net/mldonkey/patches/patch-src_utils_extlib_IO.mli b/net/mldonkey/patches/patch-src_utils_extlib_IO.mli deleted file mode 100644 index 04d1e203fa5..00000000000 --- a/net/mldonkey/patches/patch-src_utils_extlib_IO.mli +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-src_utils_extlib_IO.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/extlib/IO.mli~ 2010-11-07 15:01:40.000000000 +0000 -+++ src/utils/extlib/IO.mli -@@ -59,14 +59,14 @@ val really_nread : input -> int -> strin - from the input. Raises [No_more_input] if at least [n] characters are - not available. Raises [Invalid_argument] if [n] < 0. *) - --val input : input -> string -> int -> int -> int -+val input : input -> bytes -> int -> int -> int - (** [input i s p l] reads up to [l] characters from the given input, storing - them in string [s], starting at character number [p]. It returns the actual - number of characters read or raise [No_more_input] if no character can be - read. It will raise [Invalid_argument] if [p] and [l] do not designate a - valid substring of [s]. *) - --val really_input : input -> string -> int -> int -> int -+val really_input : input -> bytes -> int -> int -> int - (** [really_input i s p l] reads exactly [l] characters from the given input, - storing them in the string [s], starting at position [p]. For consistency with - {!IO.input} it returns [l]. Raises [No_more_input] if at [l] characters are -@@ -126,7 +126,7 @@ val output_enum : unit -> char Enum.t ou - - val create_in : - read:(unit -> char) -> -- input:(string -> int -> int -> int) -> close:(unit -> unit) -> input -+ input:(bytes -> int -> int -> int) -> close:(unit -> unit) -> input - (** Fully create an input by giving all the needed functions. *) - - val create_out : -@@ -293,7 +293,7 @@ val drop_bits : in_bits -> unit - - class in_channel : input -> - object -- method input : string -> int -> int -> int -+ method input : bytes -> int -> int -> int - method close_in : unit -> unit - end - diff --git a/net/mldonkey/patches/patch-src_utils_lib_fst_hash.c b/net/mldonkey/patches/patch-src_utils_lib_fst_hash.c deleted file mode 100644 index 85633b92b29..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_fst_hash.c +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-src_utils_lib_fst_hash.c,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 (int64 -> int64_t) -and with 4.06 (string -> bytes) - ---- src/utils/lib/fst_hash.c.orig 2005-12-10 19:44:28.000000000 +0000 -+++ src/utils/lib/fst_hash.c -@@ -197,7 +197,7 @@ unsigned short fst_hash_checksum (unsign - /*****************************************************************************/ - - // hash file --int fst_hash_file (unsigned char *fth, char *file, int64 filesize) -+int fst_hash_file (unsigned char *fth, char *file, int64_t filesize) - { - FILE *fp; - unsigned char *buf; -@@ -271,7 +271,7 @@ int fst_hash_file (unsigned char *fth, c - } - - --void fst_hash_string (unsigned char *fth, unsigned char *file, int64 filesize) -+void fst_hash_string (unsigned char *fth, unsigned char *file, int64_t filesize) - { - unsigned char * buf = file; - size_t len = filesize; -@@ -323,14 +323,14 @@ void fst_hash_string (unsigned char *fth - - value fst_hash_file_ml(value digest, value filename, value filesize) - { -- if(fst_hash_file(String_val(digest), String_val(filename), -+ if(fst_hash_file(bytes_val(digest), String_val(filename), - Int64_val(filesize))) return Val_unit; - failwith("Exception during FST computation"); - } - - value fst_hash_string_ml(value digest, value s, value size) - { -- fst_hash_string(String_val(digest), String_val(s), Int_val(size)); -+ fst_hash_string(Bytes_val(digest), String_val(s), Int_val(size)); - return Val_unit; - } - diff --git a/net/mldonkey/patches/patch-src_utils_lib_md4.ml b/net/mldonkey/patches/patch-src_utils_lib_md4.ml deleted file mode 100644 index 96f99a1be70..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_md4.ml +++ /dev/null @@ -1,410 +0,0 @@ -$NetBSD: patch-src_utils_lib_md4.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/md4.ml~ 2006-02-02 00:33:28.000000000 +0000 -+++ src/utils/lib/md4.ml -@@ -46,16 +46,16 @@ module Base16 = struct - else Char.chr (Char.code '0' + x) - - let to_string hash_length s = -- let p = String.create (hash_length * 2) in -+ let p = Bytes.create (hash_length * 2) in - for i = 0 to hash_length - 1 do - let c = s.[i] in - let n = int_of_char c in - let i0 = (n/16) land 15 in - let i1 = n land 15 in -- p.[2 * i] <- hexa_digit i0; -- p.[2 * i+1] <- hexa_digit i1; -+ Bytes.set p (2 * i) (hexa_digit i0); -+ Bytes.set p (2 * i+1) (hexa_digit i1); - done; -- p -+ Bytes.to_string p - - let hexa_digit_case upper x = - if x >= 10 then Char.chr (Char.code ( -@@ -63,16 +63,16 @@ module Base16 = struct - else Char.chr (Char.code '0' + x) - - let to_string_case upper hash_length s = -- let p = String.create (hash_length * 2) in -+ let p = Bytes.create (hash_length * 2) in - for i = 0 to hash_length - 1 do - let c = s.[i] in - let n = int_of_char c in - let i0 = (n/16) land 15 in - let i1 = n land 15 in -- p.[2 * i] <- hexa_digit_case upper i0; -- p.[2 * i+1] <- hexa_digit_case upper i1; -+ Bytes.set p (2 * i) (hexa_digit_case upper i0); -+ Bytes.set p (2 * i+1) (hexa_digit_case upper i1); - done; -- p -+ Bytes.to_string p - - let digit_hexa c = - let i = int_of_char c in -@@ -83,13 +83,13 @@ module Base16 = struct - - let of_string hash_length s = - assert (String.length s = hash_length*2); -- let p = String.create hash_length in -+ let p = Bytes.create hash_length in - for i = 0 to hash_length - 1 do - let c0 = s.[2*i] in - let c1 = s.[2*i+1] in -- p.[i] <- char_of_int ((16 * digit_hexa c0) + digit_hexa c1); -+ Bytes.set p i (char_of_int ((16 * digit_hexa c0) + digit_hexa c1)); - done; -- p -+ Bytes.to_string p - - end - -@@ -108,7 +108,7 @@ module Base32 = struct - let of_string hash_length r = - let len = String.length r in - assert (len = (hash_length * 8 + 4)/5); -- let s = String.make hash_length '\000' in -+ let s = Bytes.make hash_length '\000' in - for i = 0 to len - 1 do - let pos = i * 5 in - let byte = pos / 8 in -@@ -116,20 +116,20 @@ module Base32 = struct - let c = int5_of_char r.[i] in - if bit < 3 then - let x = c lsl (3-bit) in -- s.[byte] <- char_of_int (int_of_char s.[byte] lor x); -+ Bytes.set s byte (char_of_int (int_of_char (Bytes.get s byte) lor x)); - else - let x = (c lsr (bit - 3)) land 0xff in -- s.[byte] <- char_of_int (int_of_char s.[byte] lor x); -+ Bytes.set s byte (char_of_int (int_of_char (Bytes.get s byte) lor x)); - if byte+1 < hash_length then - let y = (c lsl (11 - bit)) land 0xff in -- s.[byte+1] <- char_of_int (int_of_char s.[byte+1] lor y); -+ Bytes.set s (byte+1) (char_of_int (int_of_char (Bytes.get s (byte+1)) lor y)); - done; -- s -+ Bytes.to_string s - - let to_string hash_length s = - assert (String.length s = hash_length); - let len = (hash_length * 8 + 4)/5 in -- let r = String.create len in -+ let r = Bytes.create len in - for i = 0 to len - 1 do - let pos = i * 5 in - let byte = pos / 8 in -@@ -137,16 +137,16 @@ module Base32 = struct - if bit < 3 then - let x = int_of_char s.[byte] in - let c = (x lsr (3 - bit)) land 0x1f in -- r.[i] <- char_of_int5 c -+ Bytes.set r i (char_of_int5 c) - else - let x = int_of_char s.[byte] in - let y = if byte + 1 = hash_length then 0 else - int_of_char s.[byte+1] in - let x = (x lsl 8) + y in - let c = (x lsr (11 - bit)) land 0x1f in -- r.[i] <- char_of_int5 c -+ Bytes.set r i (char_of_int5 c) - done; -- r -+ Bytes.to_string r - - let char_of_int5 upper n = - char_of_int (if n < 26 then (if upper then 65 else 97)+n else -@@ -155,7 +155,7 @@ module Base32 = struct - let to_string_case upper hash_length s = - assert (String.length s = hash_length); - let len = (hash_length * 8 + 4)/5 in -- let r = String.create len in -+ let r = Bytes.create len in - for i = 0 to len - 1 do - let pos = i * 5 in - let byte = pos / 8 in -@@ -163,16 +163,16 @@ module Base32 = struct - if bit < 3 then - let x = int_of_char s.[byte] in - let c = (x lsr (3 - bit)) land 0x1f in -- r.[i] <- char_of_int5 upper c -+ Bytes.set r i (char_of_int5 upper c) - else - let x = int_of_char s.[byte] in - let y = if byte + 1 = hash_length then 0 else - int_of_char s.[byte+1] in - let x = (x lsl 8) + y in - let c = (x lsr (11 - bit)) land 0x1f in -- r.[i] <- char_of_int5 upper c -+ Bytes.set r i (char_of_int5 upper c) - done; -- r -+ Bytes.to_string r - - end - -@@ -182,9 +182,9 @@ module Base6427 = struct - let _ = assert (String.length base64tbl = 64) - - let to_string _ hashbin = -- let hash64 = String.create 30 in -+ let hash64 = Bytes.create 30 in - let hashbin n = int_of_char hashbin.[n] in -- hash64.[0] <- '='; -+ Bytes.set hash64 0 '='; - let j = ref 1 in - for i = 0 to 6 do - let tmp = if i < 6 then -@@ -194,24 +194,24 @@ module Base6427 = struct - ((hashbin(3*i)) lsl 16) lor ((hashbin(3*i+1)) lsl 8) - in - for k = 0 to 3 do -- hash64.[!j] <- base64tbl.[(tmp lsr ((3- k)*6)) land 0x3f]; -+ Bytes.set hash64 !j (base64tbl.[(tmp lsr ((3- k)*6)) land 0x3f]); - incr j - done - done; -- hash64.[!j-1] <- '='; -- String.sub hash64 0 !j -+ Bytes.set hash64 (!j-1) '='; -+ Bytes.to_string (Bytes.sub hash64 0 !j) - -- let base64tbl_inv = String.create 126 -+ let base64tbl_inv = Bytes.create 126 - let _ = - for i = 0 to 63 do -- base64tbl_inv.[int_of_char base64tbl.[i]] <- char_of_int i -+ Bytes.set base64tbl_inv (int_of_char base64tbl.[i]) (char_of_int i) - done - - let of_string _ hash64 = -- let hashbin = String.make 20 '\000' in -+ let hashbin = Bytes.make 20 '\000' in - let hash64 n = - let c = hash64.[n] in -- int_of_char base64tbl_inv.[int_of_char c] -+ int_of_char (Bytes.get base64tbl_inv (int_of_char c)) - in - let j = ref 0 in - for i = 0 to 6 do -@@ -220,9 +220,9 @@ module Base6427 = struct - for k = 0 to 3 do - tmp := (!tmp lsl 6) lor (hash64 (i*4+k+1)) - done; -- hashbin.[!j] <- char_of_int ((!tmp lsr 16) land 0xff); -- hashbin.[!j+1] <- char_of_int ((!tmp lsr 8) land 0xff); -- hashbin.[!j+2] <- char_of_int ((!tmp lsr 0) land 0xff); -+ Bytes.set hashbin (!j) (char_of_int ((!tmp lsr 16) land 0xff)); -+ Bytes.set hashbin (!j+1) (char_of_int ((!tmp lsr 8) land 0xff)); -+ Bytes.set hashbin (!j+2) (char_of_int ((!tmp lsr 0) land 0xff)); - j := !j + 3; - else - let tmp = ref 0 in -@@ -230,11 +230,11 @@ module Base6427 = struct - tmp := (!tmp lsl 6) lor (hash64 (i*4+k+1)) - done; - tmp := (!tmp lsl 6); -- hashbin.[!j] <- char_of_int ((!tmp lsr 16) land 0xff); -- hashbin.[!j+1] <- char_of_int ((!tmp lsr 8) land 0xff); -+ Bytes.set hashbin (!j) (char_of_int ((!tmp lsr 16) land 0xff)); -+ Bytes.set hashbin (!j+1) (char_of_int ((!tmp lsr 8) land 0xff)); - j := !j + 2; - done; -- hashbin -+ Bytes.to_string hashbin - - let to_string_case _ = to_string - end -@@ -265,7 +265,7 @@ module type Digest = sig - - val string : string -> t - (* val file : string -> t *) -- val create : unit -> t -+ val create : unit -> bytes - val direct_of_string : string -> t - val direct_to_string : t -> string - val random : unit -> t -@@ -274,7 +274,7 @@ module type Digest = sig - - val option : t Options.option_class - -- val xor : t -> t -> t -+ val xor : t -> t -> bytes - val value_to_hash : Options.option_value -> t - val hash_to_value : t -> Options.option_value - -@@ -292,12 +292,12 @@ module Make(M: sig - val hash_name : string - - (* [unsafe_string digest string string_len] *) -- val unsafe_string : string -> string -> int -> unit -+ val unsafe_string : bytes -> string -> int -> unit - - (* [unsafe_file digest filename filesize] *) -- val unsafe_file : string -> string -> int64 -> unit -+ val unsafe_file : bytes -> string -> int64 -> unit - (* [unsafe_string digest file_fd offset len] *) -- val digest_subfile : string -> Unix.file_descr -> int64 -> int64 -> unit -+ val digest_subfile : bytes -> Unix.file_descr -> int64 -> int64 -> unit - - module Base : Base - end) = struct -@@ -315,44 +315,44 @@ module Make(M: sig - - let string s = - let len = String.length s in -- let digest = String.create hash_length in -+ let digest = Bytes.create hash_length in - unsafe_string digest s len; -- digest -+ Bytes.to_string digest - - let to_bits s = - let len = String.length s in -- let digest = String.create (8*len) in -+ let digest = Bytes.create (8*len) in - for i = 0 to len-1 do - let c = int_of_char s.[i] in - for j = 7 downto 0 do -- digest.[i*8 + (7-j)] <- -+ Bytes.set digest (i*8 + (7-j)) - (if c land (1 lsl j) <> 0 then '1' else '0') - - done - done; -- digest -+ Bytes.to_string digest - -- external xor_c : t -> t -> t -> unit = "md4_xor" "noalloc" -+ external xor_c : t -> t -> bytes -> unit = "md4_xor" [@@noalloc] - - let xor m1 m2 = -- let m3 = String.create hash_length in -+ let m3 = Bytes.create hash_length in - xor_c m1 m2 m3; - m3 - - let file s = -- let digest = String.create hash_length in -+ let digest = Bytes.create hash_length in - let file_size = Unix32.getsize s in - unsafe_file digest s file_size; -- digest -+ Bytes.to_string digest - - let digest_subfile fd pos len = -- let digest = String.create hash_length in -+ let digest = Bytes.create hash_length in - Unix32.apply_on_chunk fd pos len - (fun fd pos -> - digest_subfile digest fd pos len); -- digest -+ Bytes.to_string digest - -- let create () = String.create hash_length -+ let create () = Bytes.create hash_length - - let direct_to_string s = s - let direct_of_string s = s -@@ -360,9 +360,9 @@ module Make(M: sig - let random () = - let s = create () in - for i = 0 to hash_length - 1 do -- s.[i] <- char_of_int (Random.int 256) -+ Bytes.set s i (char_of_int (Random.int 256)) - done; -- s -+ Bytes.to_string s - - let of_string = Base.of_string hash_length - let to_string = Base.to_string hash_length -@@ -397,10 +397,14 @@ module Make(M: sig - module Md4 = Make(struct - let hash_length = 16 - let hash_name = "Md4" -- -- external unsafe_string : string -> string -> int -> unit = "md4_unsafe_string" -- external unsafe_file : string -> string -> int64 -> unit = "md4_unsafe_file" -- external digest_subfile : string -> Unix.file_descr -> int64 -> int64 -> unit = -+ -+(* -+ * XXX the first arg was string and I can't find the implementation; hope -+ * this is safe enough -+ *) -+ external unsafe_string : bytes -> string -> int -> unit = "md4_unsafe_string" -+ external unsafe_file : bytes -> string -> int64 -> unit = "md4_unsafe_file" -+ external digest_subfile : bytes -> Unix.file_descr -> int64 -> int64 -> unit = - "md4_unsafe64_fd" - - module Base = Base16 -@@ -410,9 +414,13 @@ module Md5 = Make(struct - let hash_length = 16 - let hash_name = "Md5" - -- external unsafe_string : string -> string -> int -> unit = "md5_unsafe_string" -- external unsafe_file : string -> string -> int64 -> unit = "md5_unsafe_file" -- external digest_subfile : string -> Unix.file_descr -> int64 -> int64 -> unit = -+(* -+ * XXX the first arg was string and I can't find the implementation; hope -+ * this is safe enough -+ *) -+ external unsafe_string : bytes -> string -> int -> unit = "md5_unsafe_string" -+ external unsafe_file : bytes -> string -> int64 -> unit = "md5_unsafe_file" -+ external digest_subfile : bytes -> Unix.file_descr -> int64 -> int64 -> unit = - "md5_unsafe64_fd" - - module Base = Base16 -@@ -422,9 +430,13 @@ module PreSha1 = Make(struct - let hash_length = 20 - let hash_name = "Sha1" - -- external unsafe_string : string -> string -> int -> unit = "sha1_unsafe_string" -- external unsafe_file : string -> string -> int64 -> unit = "sha1_unsafe_file" -- external digest_subfile : string -> Unix.file_descr -> int64 -> int64 -> unit = -+(* -+ * XXX the first arg was string and I can't find the implementation; hope -+ * this is safe enough -+ *) -+ external unsafe_string : bytes -> string -> int -> unit = "sha1_unsafe_string" -+ external unsafe_file : bytes -> string -> int64 -> unit = "sha1_unsafe_file" -+ external digest_subfile : bytes -> Unix.file_descr -> int64 -> int64 -> unit = - "sha1_unsafe64_fd" - - module Base = Base32 -@@ -465,7 +477,7 @@ module Tiger = Make(struct - let hash_length = 24 - let hash_name = "Tiger" - -- external unsafe_string : string -> string -> int -> unit = -+ external unsafe_string : bytes -> string -> int -> unit = - "tiger_unsafe_string" - - let unsafe_file digest filename = -@@ -482,8 +494,8 @@ module PreTigerTree = Make(struct - let hash_length = 24 - let hash_name = "TigerTree" - -- external unsafe_string : string -> string -> int -> unit = "tigertree_unsafe_string" -- external digest_subfile : string -> Unix.file_descr -> int64 -> int64 -> unit = -+ external unsafe_string : bytes -> string -> int -> unit = "tigertree_unsafe_string" -+ external digest_subfile : bytes -> Unix.file_descr -> int64 -> int64 -> unit = - "tigertree_unsafe64_fd" - - let unsafe_file digest filename file_size = -@@ -531,10 +543,10 @@ module PreMd5Ext = Make(struct - let hash_length = 20 - let hash_name = "Md5Ext" - -- external unsafe_string : string -> string -> int -> unit = -+ external unsafe_string : bytes -> string -> int -> unit = - "fst_hash_string_ml" - -- external unsafe_file : string -> string -> int64 -> unit = "fst_hash_file_ml" -+ external unsafe_file : bytes -> string -> int64 -> unit = "fst_hash_file_ml" - let digest_subfile _ _ _ _ = - failwith "Md5Ext.digest_subfile not implemented" - diff --git a/net/mldonkey/patches/patch-src_utils_lib_md4.mli b/net/mldonkey/patches/patch-src_utils_lib_md4.mli deleted file mode 100644 index 6c5ac34b53d..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_md4.mli +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_utils_lib_md4.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/md4.mli~ 2004-08-04 16:59:27.000000000 +0000 -+++ src/utils/lib/md4.mli -@@ -49,7 +49,7 @@ module type Digest = sig - - val string : string -> t - (* val file : string -> t *) -- val create : unit -> t -+ val create : unit -> bytes - val direct_of_string : string -> t - val direct_to_string : t -> string - val random : unit -> t -@@ -58,7 +58,7 @@ module type Digest = sig - - val option : t Options.option_class - -- val xor : t -> t -> t -+ val xor : t -> t -> bytes - val value_to_hash : Options.option_value -> t - val hash_to_value : t -> Options.option_value - diff --git a/net/mldonkey/patches/patch-src_utils_lib_misc.ml b/net/mldonkey/patches/patch-src_utils_lib_misc.ml deleted file mode 100644 index 2841012396d..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_misc.ml +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_utils_lib_misc.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/misc.ml~ 2008-03-31 07:58:17.000000000 +0000 -+++ src/utils/lib/misc.ml -@@ -92,13 +92,13 @@ let zip_create zipfile files = - let gz_extract filename = - let file = ref "" in - try -- let buffer = String.create 4096 in -+ let buffer = Bytes.create 4096 in - let file_out = Filename2.temp_file "arch_" ".tmp" in - file := file_out; - Unix2.tryopen_read_gzip filename (fun ic -> - Unix2.tryopen_write_bin file_out (fun oc -> - let rec decompress () = -- let n = Gzip.input ic buffer 0 (String.length buffer) in -+ let n = Gzip.input ic buffer 0 (Bytes.length buffer) in - if n = 0 then () - else - begin diff --git a/net/mldonkey/patches/patch-src_utils_lib_misc2.mlcpp b/net/mldonkey/patches/patch-src_utils_lib_misc2.mlcpp deleted file mode 100644 index aabd0344049..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_misc2.mlcpp +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_utils_lib_misc2.mlcpp,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/misc2.mlcpp~ 2008-03-31 07:58:17.000000000 +0000 -+++ src/utils/lib/misc2.mlcpp -@@ -26,14 +26,14 @@ let bz2_extract filename = - else begin - let file = ref "" in - try -- let buffer = String.create 4096 in -+ let buffer = Bytes.create 4096 in - let file_out = Filename2.temp_file "arch_" ".tmp" in - file := file_out; - let ic = Bzip2.open_in filename - in - let oc = open_out_bin file_out in - let rec decompress () = -- let n = Bzip2.input ic buffer 0 (String.length buffer) in -+ let n = Bzip2.input ic buffer 0 (Bytes.length buffer) in - if n = 0 then () - else - begin diff --git a/net/mldonkey/patches/patch-src_utils_lib_options.ml4 b/net/mldonkey/patches/patch-src_utils_lib_options.ml4 deleted file mode 100644 index de8b3e24898..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_options.ml4 +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-src_utils_lib_options.ml4,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 (is_printable changes) -and 4.06 (string/bytes changes) - ---- src/utils/lib/options.ml4.dist 2013-07-07 10:56:43.000000000 +0000 -+++ src/utils/lib/options.ml4 -@@ -208,7 +208,7 @@ and parse_option = parser - | [< 'Int i >] -> IntValue i - | [< 'Float f >] -> FloatValue f - | [< 'Kwd "@"; 'Int i; v = parse_once_value i >] -> OnceValue v --| [< 'Char c >] -> StringValue (let s = String.create 1 in s.[0] <- c; s) -+| [< 'Char c >] -> StringValue (String.make 1 c) - | [< 'Kwd "["; v = parse_list [] >] -> List v - | [< 'Kwd "("; v = parse_list [] >] -> List v - -@@ -332,8 +332,7 @@ let exit_exn = Exit - - - let unsafe_get = String.unsafe_get --external is_printable : char -> bool = "caml_is_printable" --let unsafe_set = String.unsafe_set -+let unsafe_set = Bytes.unsafe_set - - let escaped s = - let n = ref 0 in -@@ -343,31 +342,22 @@ let escaped s = - (match unsafe_get s i with - '"' | '\\' -> 2 - | '\n' | '\t' -> 1 -- | c -> if is_printable c then 1 else 4) -+ | c -> 1) - done; - if !n = String.length s then s - else -- let s' = String.create !n in -+ let s' = Bytes.create !n in - n := 0; - for i = 0 to String.length s - 1 do - begin match unsafe_get s i with - '"' | '\\' as c -> unsafe_set s' !n '\\'; incr n; unsafe_set s' !n c - | '\n' | '\t' as c -> unsafe_set s' !n c - | c -> -- if is_printable c then unsafe_set s' !n c -- else -- let a = int_of_char c in -- unsafe_set s' !n '\\'; -- incr n; -- unsafe_set s' !n (char_of_int (48 + a / 100)); -- incr n; -- unsafe_set s' !n (char_of_int (48 + a / 10 mod 10)); -- incr n; -- unsafe_set s' !n (char_of_int (48 + a mod 10)) -+ unsafe_set s' !n c - end; - incr n - done; -- s' -+ Bytes.to_string s' - - let safe_string s = - if s = "" then "\"\"" diff --git a/net/mldonkey/patches/patch-src_utils_lib_os_stubs.h b/net/mldonkey/patches/patch-src_utils_lib_os_stubs.h deleted file mode 100644 index edf0f1e1f4f..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_os_stubs.h +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_utils_lib_os_stubs.h,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Compile with OCaml 4.03 - ---- src/utils/lib/os_stubs.h.orig 2010-08-01 14:05:29.000000000 +0000 -+++ src/utils/lib/os_stubs.h -@@ -155,8 +155,8 @@ extern OFF_T os_lseek(OS_FD fd, OFF_T po - extern void os_ftruncate(OS_FD fd, OFF_T len, int sparse);
- extern ssize_t os_read(OS_FD fd, char *buf, size_t len);
- extern int os_getdtablesize();
--extern int64 os_getfdsize(OS_FD fd);
--extern int64 os_getfilesize(char *path);
-+extern int64_t os_getfdsize(OS_FD fd);
-+extern int64_t os_getfilesize(char *path);
- extern void os_set_nonblock(OS_SOCKET fd);
- extern void os_uname(char buf[]);
- extern int os_os_supported();
diff --git a/net/mldonkey/patches/patch-src_utils_lib_syslog.ml b/net/mldonkey/patches/patch-src_utils_lib_syslog.ml deleted file mode 100644 index 66fc207c519..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_syslog.ml +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-src_utils_lib_syslog.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/syslog.ml~ 2007-06-17 01:24:28.000000000 +0000 -+++ src/utils/lib/syslog.ml -@@ -44,7 +44,7 @@ type level = [ `LOG_EMERG | `LOG_ALERT | - exception Syslog_error of string - - let facility_of_string s = -- match String.lowercase s with -+ match String.lowercase_ascii s with - "kern" -> `LOG_KERN - | "user" -> `LOG_USER - | "mail" -> `LOG_MAIL -@@ -194,7 +194,7 @@ let protected_write loginfo str = - in - let prev = Sys.signal Sys.sigpipe (Sys.Signal_handle fallback) in - try -- ignore (write loginfo.fd str 0 (String.length str)); -+ ignore (write loginfo.fd str 0 (Bytes.length str)); - Sys.set_signal Sys.sigpipe prev - with Unix_error (_, _, _) -> - (* on error, attempt to reconnect *) -@@ -220,16 +220,16 @@ let syslog ?fac loginfo lev str = - if String.length loginfo.tag > 0 then - Buffer.add_string msg ": "; - Buffer.add_string msg str; -- let realmsg = ref (Buffer.contents msg) in -- if String.length !realmsg > 1024 then begin -- realmsg := String.sub !realmsg 0 1024; -- String.blit "<truncated>" 0 !realmsg 1012 11 -+ let realmsg = ref (Bytes.of_string (Buffer.contents msg)) in -+ if Bytes.length !realmsg > 1024 then begin -+ realmsg := Bytes.sub !realmsg 0 1024; -+ Bytes.blit (Bytes.of_string "<truncated>") 0 !realmsg 1012 11 - end; - protected_write loginfo !realmsg; - if List.mem `LOG_PERROR loginfo.flags then begin - try -- ignore (Unix.write Unix.stderr !realmsg 0 (String.length !realmsg)); -- ignore (Unix.write Unix.stderr "\n" 0 1) -+ ignore (Unix.write Unix.stderr !realmsg 0 (Bytes.length !realmsg)); -+ ignore (Unix.write Unix.stderr (Bytes.of_string "\n") 0 1) - with _ -> () - end - diff --git a/net/mldonkey/patches/patch-src_utils_lib_tiger.c b/net/mldonkey/patches/patch-src_utils_lib_tiger.c deleted file mode 100644 index f043cc8e057..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_tiger.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_utils_lib_tiger.c,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/tiger.c~ 2012-06-24 07:59:41.000000000 +0000 -+++ src/utils/lib/tiger.c -@@ -827,7 +827,7 @@ OFF_T tiger_block_size(OFF_T len) - - value tigertree_unsafe_string(value digest_v, value string_v, value len_v) - { -- unsigned char *digest = String_val(digest_v); -+ unsigned char *digest = Bytes_val(digest_v); - unsigned char *string = String_val(string_v); - long len = Long_val(len_v); - -@@ -838,7 +838,7 @@ value tigertree_unsafe_string(value dige - - value tiger_unsafe_string(value digest_v, value string_v, value len_v) - { -- unsigned char *digest = String_val(digest_v); -+ unsigned char *digest = Bytes_val(digest_v); - unsigned char *string = String_val(string_v); - long len = Long_val(len_v); - diff --git a/net/mldonkey/patches/patch-src_utils_lib_unix32.ml b/net/mldonkey/patches/patch-src_utils_lib_unix32.ml deleted file mode 100644 index 60fc59f7dca..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_unix32.ml +++ /dev/null @@ -1,80 +0,0 @@ -$NetBSD: patch-src_utils_lib_unix32.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/unix32.ml~ 2011-03-13 17:45:32.000000000 +0000 -+++ src/utils/lib/unix32.ml -@@ -318,7 +318,7 @@ module FDCache = struct - file_pos - len - string_pos -- (String.length string) -+ (Bytes.length string) - (Printexc2.to_string e); - raise e - -@@ -327,7 +327,7 @@ module FDCache = struct - check_destroyed t2; - let buffer_len = 128 * 1024 in - let buffer_len64 = Int64.of_int buffer_len in -- let buffer = String.make buffer_len '\001' in -+ let buffer = Bytes.make buffer_len '\001' in - let rec iter remaining pos1 pos2 = - let len64 = min remaining buffer_len64 in - let len = Int64.to_int len64 in -@@ -363,8 +363,8 @@ module type File = sig - val mtime64 : t -> float - val exists : t -> bool - val remove : t -> unit -- val read : t -> int64 -> string -> int -> int -> unit -- val write : t -> int64 -> string -> int -> int -> unit -+ val read : t -> int64 -> bytes -> int -> int -> unit -+ val write : t -> int64 -> bytes -> int -> int -> unit - val destroy : t -> unit - val is_closed : t -> bool - end -@@ -648,7 +648,7 @@ module MultiFile = struct - let possible_len = Int64.to_int possible_len64 in - if possible_len64 > zero then - FDCache.read file.fd in_file_pos s in_string_pos possible_len; -- String.fill s (in_string_pos + possible_len) (len - possible_len) '\000' -+ Bytes.fill s (in_string_pos + possible_len) (len - possible_len) '\000' - - let io f t chunk_begin string string_pos len = - let (file, tail) = find_file t chunk_begin in -@@ -1039,7 +1039,7 @@ module SparseFile = struct - len = zero; - fd = fd; - } in -- let new_array = Array.create (nchunks+1) chunk in -+ let new_array = Array.make (nchunks+1) chunk in - Array.blit t.chunks 0 new_array 0 nchunks; - t.chunks <- new_array - -@@ -1055,7 +1055,7 @@ module SparseFile = struct - len = zero; - fd = fd; - } in -- let new_array = Array.create (nchunks+1) chunk in -+ let new_array = Array.make (nchunks+1) chunk in - Array.blit t.chunks 0 new_array 0 index; - Array.blit t.chunks index new_array (index+1) (nchunks-index); - t.chunks <- new_array; -@@ -1226,7 +1226,7 @@ let flush_buffer t offset = - let len = String.length s in - try - if !verbose then lprintf_nl "seek64 %Ld" offset; -- if len > 0 then write t offset s 0 len; -+ if len > 0 then write t offset (Bytes.of_string s) 0 len; - (* - let fd, offset = fd_of_chunk t offset (Int64.of_int len) in - let final_pos = Unix2.c_seek64 fd offset Unix.SEEK_SET in -@@ -1349,7 +1349,7 @@ let copy_chunk t1 t2 pos1 pos2 len = - flush_fd t1; - flush_fd t2; - let buffer_size = 128 * 1024 in -- let buffer = String.make buffer_size '\001' in -+ let buffer = Bytes.make buffer_size '\001' in - let rec iter remaining pos1 pos2 = - let len = mini remaining buffer_size in - if len > 0 then begin diff --git a/net/mldonkey/patches/patch-src_utils_lib_unix32.mli b/net/mldonkey/patches/patch-src_utils_lib_unix32.mli deleted file mode 100644 index 60ba4c452b5..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_unix32.mli +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_utils_lib_unix32.mli,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/unix32.mli~ 2011-01-31 17:17:07.000000000 +0000 -+++ src/utils/lib/unix32.mli -@@ -54,11 +54,11 @@ val flush : unit -> unit - val flush_fd : t -> unit - val buffered_write : t -> int64 -> string -> int -> int -> unit - val buffered_write_copy : t -> int64 -> string -> int -> int -> unit --val write : t -> int64 -> string -> int -> int -> unit -+val write : t -> int64 -> bytes -> int -> int -> unit - val max_buffered : int64 ref - val remove : t -> unit - --val read : t -> int64 -> string -> int -> int -> unit -+val read : t -> int64 -> bytes -> int -> int -> unit - (*val allocate_chunk : t -> int64 -> int -> unit*) - - val copy_chunk : t -> t -> int64 -> int64 -> int -> unit diff --git a/net/mldonkey/patches/patch-src_utils_lib_url.ml b/net/mldonkey/patches/patch-src_utils_lib_url.ml deleted file mode 100644 index 468952b691c..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_url.ml +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-src_utils_lib_url.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/url.ml~ 2009-02-24 18:38:34.000000000 +0000 -+++ src/utils/lib/url.ml -@@ -36,21 +36,21 @@ type url = { - let encode s = - let pos = ref 0 in - let len = String.length s in -- let res = String.create (3*len) in -+ let res = Bytes.create (3*len) in - let hexa_digit x = - if x >= 10 then Char.chr (Char.code 'A' + x - 10) - else Char.chr (Char.code '0' + x) in - for i=0 to len-1 do - match s.[i] with - | 'a'..'z' | 'A'..'Z' | '0'..'9' | '.' | '-' | '*' | '_' | '\''| '(' | ')'-> -- res.[!pos] <- s.[i]; incr pos -+ Bytes.set res !pos s.[i]; incr pos - | c -> -- res.[!pos] <- '%'; -- res.[!pos+1] <- hexa_digit (Char.code c / 16); -- res.[!pos+2] <- hexa_digit (Char.code c mod 16); -+ Bytes.set res !pos '%'; -+ Bytes.set res (!pos+1) (hexa_digit (Char.code c / 16)); -+ Bytes.set res (!pos+2) (hexa_digit (Char.code c mod 16)); - pos := !pos + 3 - done; -- String.sub res 0 !pos -+ Bytes.to_string (Bytes.sub res 0 !pos) - - (** decodes a sting according RFC 1738 - or x-www-form-urlencoded ('+' with ' ') diff --git a/net/mldonkey/patches/patch-src_utils_lib_verificationBitmap.ml b/net/mldonkey/patches/patch-src_utils_lib_verificationBitmap.ml deleted file mode 100644 index ea42136a331..00000000000 --- a/net/mldonkey/patches/patch-src_utils_lib_verificationBitmap.ml +++ /dev/null @@ -1,72 +0,0 @@ -$NetBSD: patch-src_utils_lib_verificationBitmap.ml,v 1.1 2018/03/14 14:05:37 dholland Exp $ - -Fix build with ocaml 4.06 - ---- src/utils/lib/verificationBitmap.ml~ 2006-06-11 17:39:51.000000000 +0000 -+++ src/utils/lib/verificationBitmap.ml -@@ -1,4 +1,4 @@ --type t = string -+type t = bytes - type part_state = - State_missing | State_partial | State_complete | State_verified - -@@ -15,24 +15,24 @@ let char_to_state = function - | '3' -> State_verified - | _ -> assert false - --let create n c = String.make n (state_to_char c) --let get x i = (char_to_state x.[i]) --let set x i c = x.[i] <- state_to_char c --let length = String.length -+let create n c = Bytes.make n (state_to_char c) -+let get x i = char_to_state (Bytes.get x i) -+let set x i c = Bytes.set x i (state_to_char c) -+let length = Bytes.length - let init n f = -- let s = String.create n in -+ let s = Bytes.create n in - for i = 0 to n - 1 do - set s i (f i) - done; - s --let to_string x = x --let of_string x = x -+let to_string x = Bytes.to_string x -+let of_string x = Bytes.of_string x - - let iteri f x = -- let l = String.length x in -+ let l = Bytes.length x in - let rec aux i = - if i < l then begin -- f i (char_to_state x.[i]); -+ f i (char_to_state (Bytes.get x i)); - aux (i+1) - end in - aux 0 -@@ -41,20 +41,20 @@ let mapi f x = - Array.init (length x) (fun i -> f i (get x i)) - - let fold_lefti f acc x = -- let l = String.length x in -+ let l = Bytes.length x in - let rec aux acc i = - if i = l then acc - else aux (f acc i (get x i)) (i + 1) in - aux acc 0 - - let existsi p x = -- let l = String.length x in -+ let l = Bytes.length x in - let rec aux i = -- i < l && (p i (char_to_state x.[i]) || aux (i+1)) in -+ i < l && (p i (char_to_state (Bytes.get x i)) || aux (i+1)) in - aux 0 - - let for_all p s = -- let l = String.length s in -+ let l = Bytes.length s in - let rec aux i = -- i >= l || p (char_to_state s.[i]) && aux (i+1) in -+ i >= l || p (char_to_state (Bytes.get s i)) && aux (i+1) in - aux 0 diff --git a/net/mldonkey/patches/patch-src_utils_net_terminal.ml b/net/mldonkey/patches/patch-src_utils_net_terminal.ml deleted file mode 100644 index 84bf419ce1a..00000000000 --- a/net/mldonkey/patches/patch-src_utils_net_terminal.ml +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_utils_net_terminal.ml,v 1.2 2018/03/14 14:05:37 dholland Exp $ - -Unterminated string constant cleaned up - ---- src/utils/net/terminal.ml.orig 2005-11-19 17:19:45.000000000 +0000 -+++ src/utils/net/terminal.ml -@@ -185,7 +185,7 @@ module Output = struct - let canal = List.assoc chan !chanmap in - etat.chan <- Some (chan, canal); - info (sprintf "connecte au canal '%s'" chan); -- (* {| canal ALL } *) -+ (* { | canal ALL } *) - with Not_found -> (* pas encore de recepteur pour ce canal *) - try (* on en cree un *) - let serveur = nsrecord.get_loc chan in diff --git a/security/Makefile b/security/Makefile index f75a21ad440..0a51f45ea0b 100644 --- a/security/Makefile +++ b/security/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.864 2022/05/30 16:32:47 mef Exp $ +# $NetBSD: Makefile,v 1.865 2022/06/29 07:54:41 wiz Exp $ # COMMENT= Security and cryptography tools and libraries @@ -602,7 +602,6 @@ SUBDIR+= seahorse SUBDIR+= seccure SUBDIR+= secpanel SUBDIR+= skey -SUBDIR+= sks SUBDIR+= sleuthkit SUBDIR+= smaSHeM SUBDIR+= snallygaster diff --git a/security/sks/DESCR b/security/sks/DESCR deleted file mode 100644 index 7a39682bf4d..00000000000 --- a/security/sks/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -SKS is a new OpenPGP keyserver whose goal is to provide easy to deploy, -decentralized, and highly reliable synchronization. That means that a key -submitted to one SKS server will quickly be distributed to all key servers, -and even wildly out-of-date servers, or servers that experience spotty -connectivity, can fully synchronize with rest of the system. diff --git a/security/sks/Makefile b/security/sks/Makefile deleted file mode 100644 index 1ed7ce7e139..00000000000 --- a/security/sks/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# $NetBSD: Makefile,v 1.31 2022/06/28 11:35:51 wiz Exp $ -# - -DISTNAME= sks-1.1.5 -PKGREVISION= 20 -CATEGORIES= security -MASTER_SITES= https://bitbucket.org/skskeyserver/sks-keyserver/downloads/ -EXTRACT_SUFX= .tgz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://bitbucket.org/skskeyserver/ -COMMENT= Self Replicating PGP Key Server -LICENSE= gnu-gpl-v2 - -MAKE_JOBS_SAFE= no - -BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.10.2 -BUILDLINK_API_DEPENDS.db4+= db4>=4.6.0 - -REPLACE_SH= sks_build.sh - -USE_TOOLS+= gmake perl:run tar -BDB_ACCEPTED= db4 - -EGDIR= ${PREFIX}/share/examples/sks - -MAKE_ENV+= LIBDB=-ldb4 \ - BDBINCLUDE=-I${BUILDLINK_DIR}/include \ - BDBLIB=-L${BUILDLINK_DIR}/lib \ - PREFIX=${PREFIX:Q} \ - MANDIR=${PREFIX:Q}/man - -INSTALLATION_DIRS= ${PKGMANDIR}/man8 bin ${EGDIR} - -.include "../../lang/ocaml/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../databases/db4/buildlink3.mk" - -pre-build: - cd ${WRKSRC} && ${MAKE_PROGRAM} dep - -post-install: - cd ${WRKSRC} && ${MAKE_PROGRAM} sks.8 - ${INSTALL_PROGRAM} ${WRKSRC}/sks ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/sks_add_mail ${DESTDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/sks_build.sh ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/sks.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/aliases.sample \ - ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/crontab.sample \ - ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/mailsync ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/membership ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/procmailrc ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.minimal \ - ${DESTDIR}${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/sampleConfig/sksconf.typical \ - ${DESTDIR}${EGDIR} - -.include "../../devel/zlib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/security/sks/PLIST b/security/sks/PLIST deleted file mode 100644 index 6e61ef66937..00000000000 --- a/security/sks/PLIST +++ /dev/null @@ -1,12 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2012/11/10 14:24:44 pettai Exp $ -bin/sks -bin/sks_add_mail -bin/sks_build.sh -man/man8/sks.8 -share/examples/sks/aliases.sample -share/examples/sks/crontab.sample -share/examples/sks/mailsync -share/examples/sks/membership -share/examples/sks/procmailrc -share/examples/sks/sksconf.minimal -share/examples/sks/sksconf.typical diff --git a/security/sks/distinfo b/security/sks/distinfo deleted file mode 100644 index c4f743cffbd..00000000000 --- a/security/sks/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 11:18:01 nia Exp $ - -BLAKE2s (sks-1.1.5.tgz) = 7ad9a992614e04ff02e9a7a022f77c56808eb730d7215c6182ad4e154ef3e159 -SHA512 (sks-1.1.5.tgz) = 1fc1248281b4eb6bd0bafad7f3d1600ee86905614ee5c644d532059f972040c2673bee780a414e50e9287fc74fd140ac85db9629d502cff989981904acd3710c -Size (sks-1.1.5.tgz) = 362941 bytes -SHA1 (patch-aa) = 04f74c6f141d71e3b0cd45e68896be93dffd0b7c -SHA1 (patch-ab) = 919846f9c31a89f23430081dbad853d088dcb7e5 -SHA1 (patch-ac) = 0fbe22e67681970521ae66ca1903e9e95eda52ad -SHA1 (patch-ad) = f96b913bc7ad6b5bd11a51569fc28ee042b1667c -SHA1 (patch-cryptokit-1.7-sks.patch) = 5d50af8d169df2b96a850d7ffdb67f9d51e3e955 -SHA1 (patch-eventloop.ml) = 755c33c8add74d4e93828ccfc46774ee92d55c26 -SHA1 (patch-reconComm.ml) = 1a01ab79fe9ae0727f492529d37e21e6f90b2f49 -SHA1 (patch-script.ml) = fe229100a2214484a89e20f482b4f3198818e42c -SHA1 (patch-sks__do.ml) = 078b7b49251e95ef2975172bf619db41563d6e52 -SHA1 (patch-tester.ml) = dde2d4382054de8c2e0a187b0fb8961ce530e5d1 diff --git a/security/sks/patches/patch-aa b/security/sks/patches/patch-aa deleted file mode 100644 index b1bca4ee5f3..00000000000 --- a/security/sks/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2012/11/10 14:24:45 pettai Exp $ - ---- bdb/bdb_stubs.c.orig 2012-10-07 19:59:39.000000000 +0000 -+++ bdb/bdb_stubs.c -@@ -33,7 +33,7 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <limits.h> --#include <db.h> -+#include <db4/db.h> - /* O_CREAT and others are not defined in db.h */ - #include <fcntl.h> - -@@ -1272,7 +1272,7 @@ value caml_txn_begin(value dbenv, value - - err = UW_dbenv(dbenv)->txn_begin(UW_dbenv(dbenv), parent, &newtxn, flags); - if (err != 0) { -- if (err == ENOMEM) { -+ if (err == DB_BUFFER_SMALL) { - failwith("Maximum # of concurrent transactions reached"); - } else { - UW_dbenv(dbenv)->err(UW_dbenv(dbenv), err,"caml_txn_begin"); diff --git a/security/sks/patches/patch-ab b/security/sks/patches/patch-ab deleted file mode 100644 index 73eb33afcda..00000000000 --- a/security/sks/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2012/11/10 14:24:45 pettai Exp $ - ---- bdb/dbstubs.c.orig 2002-10-01 02:10:14.000000000 +0200 -+++ bdb/dbstubs.c -@@ -22,7 +22,7 @@ - - #include <sys/types.h> - #include <limits.h> --#include <db.h> -+#include <db4/db.h> - /* O_CREAT and others are not defined in db.h */ - #include <fcntl.h> - diff --git a/security/sks/patches/patch-ac b/security/sks/patches/patch-ac deleted file mode 100644 index 2235fc6ab6b..00000000000 --- a/security/sks/patches/patch-ac +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2012/11/10 14:24:45 pettai Exp $ - ---- Makefile.orig 2012-11-10 12:39:36.000000000 +0000 -+++ Makefile -@@ -14,7 +14,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA - # --CINCLUDES=-I`ocamlc -where` -+CINCLUDES=-I${PREFIX}/lib/ocaml - CC=gcc - CXX=g++ - CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . -@@ -34,7 +34,7 @@ export OCAMLC - export OCAMLOPT - export CAMLP4O - --include Makefile.local -+#include Makefile.local - - ifndef PREFIX - PREFIX=/usr/local -@@ -126,10 +126,10 @@ keyMerge.cmx: keyMerge.ml - # Special targets - - install: -- mkdir -p $(PREFIX)/bin -- install sks_build.sh sks sks_add_mail $(PREFIX)/bin -- mkdir -p $(MANDIR)/man8 -- install sks.8.gz $(MANDIR)/man8 -+# mkdir -p $(PREFIX)/bin -+# install sks_build.sh sks sks_add_mail $(PREFIX)/bin -+# mkdir -p $(MANDIR)/man8 -+# install sks.8.gz $(MANDIR)/man8 - - install.bc: - mkdir -p $(PREFIX)/bin diff --git a/security/sks/patches/patch-ad b/security/sks/patches/patch-ad deleted file mode 100644 index 6fb7baf41fa..00000000000 --- a/security/sks/patches/patch-ad +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2012/11/10 14:24:45 pettai Exp $ - ---- bdb/Makefile.orig 2012-10-07 21:59:39.000000000 +0200 -+++ bdb/Makefile -@@ -15 +15 @@ --include ../Makefile.local -+#include ../Makefile.local -@@ -17 +17 @@ --CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE) -+CINCLUDES=-I${PREFIX}/lib/ocaml $(BDBINCLUDE) diff --git a/security/sks/patches/patch-cryptokit-1.7-sks.patch b/security/sks/patches/patch-cryptokit-1.7-sks.patch deleted file mode 100644 index 4338722ad9e..00000000000 --- a/security/sks/patches/patch-cryptokit-1.7-sks.patch +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cryptokit-1.7-sks.patch,v 1.1 2016/12/16 00:01:31 joerg Exp $ - ---- cryptokit-1.7-sks.patch.orig 2016-12-15 16:51:50.031027323 +0000 -+++ cryptokit-1.7-sks.patch -@@ -143,3 +143,17 @@ diff -urN cryptokit-1.7-orig/src/cryptok - let num_equals = - match ipos with 1 -> 2 | 2 -> 1 | _ -> 0 in - self#ensure_capacity num_equals; -+diff -urN cryptokit-1.7-orig/src/stubs-md5.c cryptokit-1.7/src/stubs-md5.c -+--- cryptokit-1.7-orig/src/stubs-md5.c 2016-12-15 16:48:54.901368026 +0000 -++++ cryptokit-1.7/src/stubs-md5.c 2016-12-15 16:48:54.901368026 +0000 -+@@ -18,8 +18,8 @@ -+ #include <caml/alloc.h> -+ -+ struct MD5Context { -+- uint32 buf[4]; -+- uint32 bits[2]; -++ uint32_t buf[4]; -++ uint32_t bits[2]; -+ unsigned char in[64]; -+ }; -+ diff --git a/security/sks/patches/patch-eventloop.ml b/security/sks/patches/patch-eventloop.ml deleted file mode 100644 index 21e66d6bcf0..00000000000 --- a/security/sks/patches/patch-eventloop.ml +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-eventloop.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $ - -Fix build with ocaml 4.05. - ---- eventloop.ml~ 2014-02-02 12:03:02.000000000 +0000 -+++ eventloop.ml -@@ -129,7 +129,7 @@ let create_sock addr = - let domain = - Unix.domain_of_sockaddr addr in - let sock = -- socket ~domain ~kind:SOCK_STREAM ~protocol:0 in -+ socket ~domain ~kind:SOCK_STREAM ~protocol:0 ~cloexec:false in - setsockopt sock SO_REUSEADDR true; - if domain = PF_INET6 then - setsockopt sock IPV6_ONLY true; diff --git a/security/sks/patches/patch-reconComm.ml b/security/sks/patches/patch-reconComm.ml deleted file mode 100644 index bb3504f15f6..00000000000 --- a/security/sks/patches/patch-reconComm.ml +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-reconComm.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $ - -Fix build with ocaml 4.05. - ---- reconComm.ml~ 2014-02-02 12:03:02.000000000 +0000 -+++ reconComm.ml -@@ -40,7 +40,8 @@ let send_dbmsg msg = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr db_command_addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:(fun () -> - Unix.connect s ~addr:db_command_addr; - let cin = Channel.sys_in_from_fd s in -@@ -57,7 +58,8 @@ let send_dbmsg_noreply msg = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr db_command_addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:(fun () -> - Unix.connect s ~addr:db_command_addr; - let cout = Channel.sys_out_from_fd s in -@@ -78,7 +80,8 @@ let get_keystrings_via_http addr hashes - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:(fun () -> - Unix.bind s ~addr:(match_client_recon_addr addr); - Unix.connect s ~addr; diff --git a/security/sks/patches/patch-script.ml b/security/sks/patches/patch-script.ml deleted file mode 100644 index acee140b73e..00000000000 --- a/security/sks/patches/patch-script.ml +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-script.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $ - -Fix build with ocaml 4.05. - ---- script.ml~ 2014-02-02 12:03:02.000000000 +0000 -+++ script.ml -@@ -66,7 +66,8 @@ let get_keystrings_via_http addr hashes - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - let () = Unix.connect s ~addr in - let cin = Channel.sys_in_from_fd s - and cout = Channel.sys_out_from_fd s in -@@ -94,7 +95,8 @@ let test addr hashes = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - let () = Unix.connect s ~addr in - let cin = Channel.sys_in_from_fd s - and cout = Channel.sys_out_from_fd s in diff --git a/security/sks/patches/patch-sks__do.ml b/security/sks/patches/patch-sks__do.ml deleted file mode 100644 index 13fb82017b4..00000000000 --- a/security/sks/patches/patch-sks__do.ml +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-sks__do.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $ - -Fix build with ocaml 4.05. - ---- sks_do.ml~ 2014-02-02 12:03:02.000000000 +0000 -+++ sks_do.ml -@@ -40,7 +40,8 @@ let send_dbmsg msg = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr db_command_addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:(fun () -> - Unix.connect s ~addr:db_command_addr; - let cin = Channel.sys_in_from_fd s in diff --git a/security/sks/patches/patch-tester.ml b/security/sks/patches/patch-tester.ml deleted file mode 100644 index 8a3445c41a5..00000000000 --- a/security/sks/patches/patch-tester.ml +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-tester.ml,v 1.1 2017/09/12 06:55:42 dholland Exp $ - -Fix build with ocaml 4.05. - ---- tester.ml~ 2014-02-02 12:03:02.000000000 +0000 -+++ tester.ml -@@ -49,7 +49,8 @@ let send_msg addr msg = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:( fun () -> - Unix.connect s ~addr:addr; - let cin = Channel.sys_in_from_fd s -@@ -66,7 +66,8 @@ let send_msg_noreply addr msg = - let s = Unix.socket - ~domain:(Unix.domain_of_sockaddr addr) - ~kind:Unix.SOCK_STREAM -- ~protocol:0 in -+ ~protocol:0 -+ ~cloexec:false in - protect ~f:(fun () -> - Unix.connect s ~addr:addr; - let cout = Channel.sys_out_from_fd s in diff --git a/textproc/Makefile b/textproc/Makefile index 16a5a8d9c23..5d760295536 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1318 2022/06/10 07:35:48 pin Exp $ +# $NetBSD: Makefile,v 1.1319 2022/06/29 07:54:41 wiz Exp $ # COMMENT= Text processing utilities (does not include desktop publishing) @@ -262,7 +262,6 @@ SUBDIR+= guile-json SUBDIR+= guile-syntax-highlight SUBDIR+= gutcheck SUBDIR+= halibut -SUBDIR+= harmony SUBDIR+= hck SUBDIR+= heirloom-bdiff SUBDIR+= heirloom-bfs @@ -963,7 +962,6 @@ SUBDIR+= postgresql-autodoc SUBDIR+= prose SUBDIR+= psgml-mode SUBDIR+= pugixml -SUBDIR+= pxp SUBDIR+= py-Excelerator SUBDIR+= py-HappyDoc SUBDIR+= py-ICU diff --git a/textproc/harmony/DESCR b/textproc/harmony/DESCR deleted file mode 100644 index cdb27fdf93a..00000000000 --- a/textproc/harmony/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -Increased reliance on optimistic data replication has led to -burgeoning interest in tools and frameworks for synchronizing -disconnected updates to replicated data. To better understand the -issues underlying the design of generic and heterogeneous synchronizers, -we have implemented an experimental framework, called Harmony, that -can be used to build synchronizers for tree-structured data stored -in a variety of concrete formats, in particular XML. diff --git a/textproc/harmony/Makefile b/textproc/harmony/Makefile deleted file mode 100644 index f4b238b6e70..00000000000 --- a/textproc/harmony/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:55 jaapb Exp $ -# - -DISTNAME= harmony-stable-${VERSION} -PKGNAME= harmony-${VERSION} -PKGREVISION= 19 -CATEGORIES= misc -MASTER_SITES= https://alliance.seas.upenn.edu/~harmony/download/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://alliance.seas.upenn.edu/~harmony/ -COMMENT= Reconciles disconnected updates to heterogeneous, replicated XML data - -VERSION= 20060526 - -WRKSRC= ${WRKDIR}/harmony-nightly-${VERSION} -USE_TOOLS+= gmake -OCAML_USE_FINDLIB= yes -MAKE_JOBS_SAFE= no -TEST_TARGET= test - -BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk -BUILD_DEPENDS+= tex-bibtex-[0-9]*:../../print/tex-bibtex -BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin -BUILD_DEPENDS+= tex-preprint-[0-9]*:../../print/tex-preprint -BUILD_DEPENDS+= tex-psnfss-[0-9]*:../../fonts/tex-psnfss -DEPENDS+= pxp-[0-9]*:../../textproc/pxp - -INSTALLATION_DIRS= bin share/doc/harmony - -# remove obsolete included copy of textproc/ocaml-csv -post-extract: - ${RM} -rf ${WRKSRC}/extern/ocaml-csv-1.0.3 - -do-install: - for file in src/harmony \ - examples/addresses/harmonize-addresses \ - examples/basics/harmonize-basics \ - examples/bookmarks/harmonize-bookmarks \ - examples/calendars/harmonize-calendars \ - examples/listexamples/harmonize-listexamples \ - examples/plist/harmonize-plist \ - examples/relational/harmonize-relational \ - examples/structuredtext/harmonize-structuredtext; do \ - ${INSTALL_PROGRAM} ${WRKSRC}/$$file ${DESTDIR}${PREFIX}/bin; \ - done - ${INSTALL_DATA} ${WRKSRC}/doc/manual.pdf ${DESTDIR}${PREFIX}/share/doc/harmony - ${INSTALL_DATA} ${WRKSRC}/doc/main.pdf ${DESTDIR}${PREFIX}/share/doc/harmony - -.include "../../lang/ocaml/ocaml.mk" - -.include "../../devel/pcre-ocaml/buildlink3.mk" -.include "../../net/ocamlnet/buildlink3.mk" -.include "../../textproc/ocaml-csv/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/textproc/harmony/PLIST b/textproc/harmony/PLIST deleted file mode 100644 index 8be5c53ce0f..00000000000 --- a/textproc/harmony/PLIST +++ /dev/null @@ -1,12 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:17 joerg Exp $ -bin/harmonize-addresses -bin/harmonize-basics -bin/harmonize-bookmarks -bin/harmonize-calendars -bin/harmonize-listexamples -bin/harmonize-plist -bin/harmonize-relational -bin/harmonize-structuredtext -bin/harmony -share/doc/harmony/main.pdf -share/doc/harmony/manual.pdf diff --git a/textproc/harmony/distinfo b/textproc/harmony/distinfo deleted file mode 100644 index 5be685e6ccb..00000000000 --- a/textproc/harmony/distinfo +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: distinfo,v 1.5 2021/10/26 11:21:56 nia Exp $ - -BLAKE2s (harmony-stable-20060526.tar.gz) = 22b47d41be46bdb7454fcc6cbe0f0ad637046a9b360ac36846a2bcd37bc6473e -SHA512 (harmony-stable-20060526.tar.gz) = a4dc20db191ade1c2117005ec3bfb59890bececa7d4871e0d506b806f6cd42bbf3c70b920a8e947019b1d448d7bdb140cb407a852f46c0d460236d479f4a87ee -Size (harmony-stable-20060526.tar.gz) = 777608 bytes -SHA1 (patch-Top.Makefile) = b4c32f3de16a16195ee8a8142b21a962a97be899 -SHA1 (patch-examples_addresses_Makefile) = d7e2c0fa0f90048fa01ee5842d1323f7783cd20d -SHA1 (patch-extern_Makefile) = 9f199932b21abdc482b10e7dd85448c05fb352b0 -SHA1 (patch-extern_iCalendar_iCalendar.ml) = 78f5f4eeed096fcac068d71b0977d86f73325cdc -SHA1 (patch-extern_iCalendar_iCalendarlex.mll) = df77063fd3abf27d2138dcdf05937c2a1f62d8c6 -SHA1 (patch-src_Makefile) = 9e40c29547e06d4791a7ff1aee36c9c483e2dfb8 -SHA1 (patch-src_baker.ml) = 0d5706df766430bd302da70c98a2c94353be13d8 -SHA1 (patch-src_misc.ml) = 70661f3c34f46d1bec116b53908b2df52b95ae11 -SHA1 (patch-src_toplevel.ml) = e62169b0dc0134c873818fa756f973c0467b625f diff --git a/textproc/harmony/patches/patch-Top.Makefile b/textproc/harmony/patches/patch-Top.Makefile deleted file mode 100644 index 3dc5df7c171..00000000000 --- a/textproc/harmony/patches/patch-Top.Makefile +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-Top.Makefile,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix energizer-bunny-makefiles. -Eliminate references to included ocaml-csv; use the pkgsrc one. - ---- Top.Makefile.orig 2006-05-21 17:18:37.000000000 +0000 -+++ Top.Makefile -@@ -48,15 +48,15 @@ OCAMLFIND_COMMANDS=$(foreach c,ocamlc oc - - OCAMLMAKEFILE = $(SRCDIR)/OCamlMakefile - --PACKS = "netstring,unix,str,pxp,pxp-engine,pxp-lex-utf8" -+PACKS = "netstring,unix,str,pxp,pxp-engine,pxp-lex-utf8,csv" - YFLAGS = -v - OCAMLFLAGS = -dtypes -rectypes - OCAMLCPFLAGS = f - - LIBS += csv - --LIBDIRS = $(SRCDIR) $(SRCDIR)/ubase $(EXTERNDIR)/ocaml-csv-1.0.3 --INCDIRS = $(SRCDIR) $(SRCDIR)/ubase $(EXTERNDIR)/ocaml-csv-1.0.3 -+LIBDIRS = $(SRCDIR) $(SRCDIR)/ubase -+INCDIRS = $(SRCDIR) $(SRCDIR)/ubase - - - $(SRCDIR)/harmony.cmxa: -@@ -104,12 +104,12 @@ clean:: tidy - rm -rf *.aux *.bbl *.blg *.log *.dvi TAGS *.cmo *.cmi *.cmx *.o - @for i in $(SUBDIRS) $(SUBDIRSCLEANONLY); do \ - echo "###### cleaning $(CWD)/$$i ######"; \ -- $(MAKE) -C $$i clean; done -+ $(MAKE) -C $$i clean || exit 1; done - - buildsubdirs: - @for i in $(SUBDIRS); do \ - echo "###### Building $(CWD)/$$i ######"; \ -- $(MAKE) -C $$i; done -+ $(MAKE) -C $$i || exit 1; done - - - tidy:: -@@ -154,5 +154,5 @@ buildtags: - - # Benjamin, please include things like this in your ~/.harmony.mk file instead :-) - # --# export BCPDEPFLAGS = -I $(SRCDIR) -I $(SRCDIR)/ubase $(EXTERNDIR)/ocaml-csv-1.0.3 -+# export BCPDEPFLAGS = -I $(SRCDIR) -I $(SRCDIR)/ubase - # diff --git a/textproc/harmony/patches/patch-examples_addresses_Makefile b/textproc/harmony/patches/patch-examples_addresses_Makefile deleted file mode 100644 index eb74b885f9f..00000000000 --- a/textproc/harmony/patches/patch-examples_addresses_Makefile +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-examples_addresses_Makefile,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Eliminate references to included ocaml-csv; use the pkgsrc one. - ---- examples/addresses/Makefile~ 2006-05-21 19:17:46.000000000 +0000 -+++ examples/addresses/Makefile -@@ -54,7 +54,6 @@ test4:: buildharmony - ../../extern/pilot-link-0.12.0-pre4/src/pilot-addresses --read=a.csv -a - - test5:: -- $(MAKE) -C ../../extern/ocaml-csv-1.0.3 - $(MAKE) buildharmony - echo 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21 > temp.csv - sed 1,1d < sample.csv >> temp.csv -@@ -62,12 +61,10 @@ test5:: - cat sampleout.csv - - test6:: -- $(MAKE) -C ../../extern/ocaml-csv-1.0.3 - $(MAKE) buildharmony - $(HARMONY) get -lens Prelude.id -concrete sample.csv -output -:meta - - test7:: -- $(MAKE) -C ../../extern/ocaml-csv-1.0.3 - $(MAKE) buildharmony - echo 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21 > temp.csv - sed 1,1d < sample.csv >> temp.csv diff --git a/textproc/harmony/patches/patch-extern_Makefile b/textproc/harmony/patches/patch-extern_Makefile deleted file mode 100644 index a440149e2e0..00000000000 --- a/textproc/harmony/patches/patch-extern_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-extern_Makefile,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Eliminate references to included ocaml-csv; use the pkgsrc one. - ---- extern/Makefile~ 2006-05-22 20:17:32.000000000 +0000 -+++ extern/Makefile -@@ -7,7 +7,7 @@ - - TOP = .. - include $(TOP)/Top.Makefile --SUBDIRSCLEANONLY = iCalendar ocaml-csv-1.0.3 -+SUBDIRSCLEANONLY = iCalendar - - all: - diff --git a/textproc/harmony/patches/patch-extern_iCalendar_iCalendar.ml b/textproc/harmony/patches/patch-extern_iCalendar_iCalendar.ml deleted file mode 100644 index 11a423d7080..00000000000 --- a/textproc/harmony/patches/patch-extern_iCalendar_iCalendar.ml +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-extern_iCalendar_iCalendar.ml,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix build with ocaml 4.06. - ---- extern/iCalendar/iCalendar.ml~ 2006-05-21 19:17:46.000000000 +0000 -+++ extern/iCalendar/iCalendar.ml -@@ -1,13 +1,13 @@ - let read get_char = - let lex_func s n = -- let l = String.length s in -+ let l = Bytes.length s in - let cur_pos = ref 0 in - let nb_chars () = !cur_pos in - let should_stop () = (n - !cur_pos) < 3 in (* enough to put \r\n c*) - let store_string_char c = - if !cur_pos >= l then failwith "string given by lexbuf is too short !" - else begin -- String.unsafe_set s (!cur_pos) c; -+ Bytes.unsafe_set s (!cur_pos) c; - incr cur_pos - end - in -@@ -102,9 +102,9 @@ let chars_from_str inc = - - let read_file inc = - let len = in_channel_length inc in -- let buf = String.create len in -+ let buf = Bytes.create len in - really_input inc buf 0 len; -- buf -+ Bytes.to_string buf - - let iCalReader inc outc = - let s = V.string_of_t (Ical.view_from_icalendar (read (chars_from_str inc))) in diff --git a/textproc/harmony/patches/patch-extern_iCalendar_iCalendarlex.mll b/textproc/harmony/patches/patch-extern_iCalendar_iCalendarlex.mll deleted file mode 100644 index 6f10c43f0c4..00000000000 --- a/textproc/harmony/patches/patch-extern_iCalendar_iCalendarlex.mll +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-extern_iCalendar_iCalendarlex.mll,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix build with ocaml 4.06. - ---- extern/iCalendar/iCalendarlex.mll~ 2006-05-21 19:17:46.000000000 +0000 -+++ extern/iCalendar/iCalendarlex.mll -@@ -11,7 +11,7 @@ - (* To buffer string literals *) - - let string_start_pos = ref 0;; --let initial_string_buffer = String.create 256 -+let initial_string_buffer = Bytes.create 256 - let string_buff = ref initial_string_buffer - let string_index = ref 0 - -@@ -20,32 +20,32 @@ let reset_string_buffer () = - string_index := 0 - - let store_string_char c = -- if !string_index >= String.length (!string_buff) then begin -- let new_buff = String.create (String.length (!string_buff) * 2) in -- String.blit (!string_buff) 0 new_buff 0 (String.length (!string_buff)); -+ if !string_index >= Bytes.length (!string_buff) then begin -+ let new_buff = Bytes.create (Bytes.length (!string_buff) * 2) in -+ Bytes.blit (!string_buff) 0 new_buff 0 (Bytes.length (!string_buff)); - string_buff := new_buff - end; -- String.unsafe_set (!string_buff) (!string_index) c; -+ Bytes.unsafe_set (!string_buff) (!string_index) c; - incr string_index - - let store_string s = - let l = String.length s in -- if !string_index + l > String.length (!string_buff) then begin -- let new_buff = String.create ((String.length (!string_buff) + l) * 2) in -- String.blit (!string_buff) 0 new_buff 0 (String.length (!string_buff)); -+ if !string_index + l > Bytes.length (!string_buff) then begin -+ let new_buff = Bytes.create ((Bytes.length (!string_buff) + l) * 2) in -+ Bytes.blit (!string_buff) 0 new_buff 0 (Bytes.length (!string_buff)); - string_buff := new_buff - end; - String.blit s 0 (!string_buff) (!string_index) l; - string_index := (!string_index) + l - - let get_stored_string () = -- let s = String.sub (!string_buff) 0 (!string_index) in -+ let s = Bytes.sub (!string_buff) 0 (!string_index) in - string_buff := initial_string_buffer; - (* - print_endline s; - flush stdout; - *) -- s -+ Bytes.to_string s - } - - let eol = "\r\n" | "\n" diff --git a/textproc/harmony/patches/patch-src_Makefile b/textproc/harmony/patches/patch-src_Makefile deleted file mode 100644 index 9b650e3efba..00000000000 --- a/textproc/harmony/patches/patch-src_Makefile +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-src_Makefile,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Eliminate references to included ocaml-csv; use the pkgsrc one. - ---- src/Makefile.orig 2006-05-15 09:18:42.000000000 +0000 -+++ src/Makefile -@@ -26,24 +26,17 @@ tags: - # EXTERNAL TOOLS AND LIBS # - ########################### - --all: $(SRCDIR)/bakery.ml \ -- $(EXTERNDIR)/ocaml-csv-1.0.3/csv.cmxa \ -+all: $(SRCDIR)/bakery.ml - --native-code: $(EXTERNDIR)/ocaml-csv-1.0.3/csv.cmxa\ -+native-code: - --native-code-library: $(EXTERNDIR)/ocaml-csv-1.0.3/csv.cmxa\ -+native-code-library: - --LIBS += $(EXTERNDIR)/ocaml-csv-1.0.3/csv -+#LIBS += - - profiling: - $(MAKE) profiling-native-code - --$(EXTERNDIR)/ocaml-csv-1.0.3/csv.cma: -- $(MAKE) -C $(EXTERNDIR)/ocaml-csv-1.0.3 -- --$(EXTERNDIR)/ocaml-csv-1.0.3/csv.cmxa: -- $(MAKE) -C $(EXTERNDIR)/ocaml-csv-1.0.3 -- - $(SRCDIR)/baker: $(SRCDIR)/baker.ml - ocamlfind ocamlopt -package unix -linkpkg -o $@ $^ - diff --git a/textproc/harmony/patches/patch-src_baker.ml b/textproc/harmony/patches/patch-src_baker.ml deleted file mode 100644 index 70fda55a237..00000000000 --- a/textproc/harmony/patches/patch-src_baker.ml +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-src_baker.ml,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix build with ocaml 4.06. - ---- src/baker.ml~ 2006-01-23 16:01:51.000000000 +0000 -+++ src/baker.ml -@@ -21,13 +21,13 @@ let rec loop = function - begin - let fc = open_in f in - let len = in_channel_length fc in -- let buf = String.create len in -+ let buf = Bytes.create len in - really_input fc buf 0 len; - close_in fc; - Hashtbl.replace - srcs - (Filename.chop_extension (Filename.basename f)) -- (String.escaped buf) -+ (String.escaped (Bytes.to_string buf)) - end; - loop rest - | Unix.S_DIR -> diff --git a/textproc/harmony/patches/patch-src_misc.ml b/textproc/harmony/patches/patch-src_misc.ml deleted file mode 100644 index 1f2b19c2d1f..00000000000 --- a/textproc/harmony/patches/patch-src_misc.ml +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-src_misc.ml,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix build with ocaml 4.06. - ---- src/misc.ml~ 2006-04-20 15:17:30.000000000 +0000 -+++ src/misc.ml -@@ -158,20 +158,20 @@ let escape (escapeChar: char -> string) - let result = - if !n = String.length s then s else - begin -- let s' = String.create !n in -+ let s' = Bytes.create !n in - n := 0; - for i = 0 to String.length s - 1 do - let c = String.get s i in - let cEscaped = escapeChar c in - if String.length cEscaped = 1 then begin -- String.set s' !n c; incr n -+ Bytes.set s' !n c; incr n - end else - for i = 0 to String.length cEscaped - 1 do begin -- String.set s' !n (String.get cEscaped i); -+ Bytes.set s' !n (String.get cEscaped i); - incr n; - end done - done; -- s' -+ Bytes.to_string s' - end - in - debug(fun () -> Format.printf "escape returns %s\n" result); -@@ -182,10 +182,10 @@ let generic_escape_char escapedchars c = - if c = '\\' then - "\\\\" - else if String.contains escapedchars c then -- let str = String.create 2 in -- String.set str 0 '\\'; -- String.set str 1 c; -- str -+ let str = Bytes.create 2 in -+ Bytes.set str 0 '\\'; -+ Bytes.set str 1 c; -+ Bytes.to_string str - else - "-" - -@@ -202,20 +202,20 @@ let generic_unescape s = - else - loop (i + 1) (n + 1) - in -- let s' = String.create (loop 0 0) in -+ let s' = Bytes.create (loop 0 0) in - let rec loop i i' = - if i >= String.length s then - () - else if s.[i] = '\\' then begin -- s'.[i'] <- s.[i+1]; (* assumes that '\' always followed by a char *) -+ Bytes.set s' i' s.[i+1]; (* assumes that '\' always followed by a char *) - loop (i + 2) (i' + 1) - end else begin -- s'.[i'] <- s.[i]; -+ Bytes.set s' i' s.[i]; - loop (i + 1) (i' + 1) - end - in - loop 0 0; -- s' -+ Bytes.to_string s' - - (* find c, skipping all the escaped characters, e.g., "\;" *) - let rec index_rec_nonescape s i c = -@@ -455,9 +455,9 @@ let rec remove_file_or_dir d = - - let read_chan chan = - let nbytes = in_channel_length chan in -- let string = String.create nbytes in -+ let string = Bytes.create nbytes in - really_input chan string 0 nbytes; -- string -+ Bytes.to_string string - - let read file = - if file = "-" then diff --git a/textproc/harmony/patches/patch-src_toplevel.ml b/textproc/harmony/patches/patch-src_toplevel.ml deleted file mode 100644 index 5ffba040c1c..00000000000 --- a/textproc/harmony/patches/patch-src_toplevel.ml +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_toplevel.ml,v 1.1 2018/03/14 06:27:21 dholland Exp $ - -Fix build with ocaml 4.06. - ---- src/toplevel.ml~ 2006-05-24 22:47:36.000000000 +0000 -+++ src/toplevel.ml -@@ -150,7 +150,7 @@ let cp_or_del f g = - (* slurp in f, write to g *) - let inc = open_in_bin f in - let len = in_channel_length inc in -- let buf = String.make len '\000' in -+ let buf = Bytes.make len '\000' in - really_input inc buf 0 len; - close_in inc; - let outc = open_out_bin g in diff --git a/textproc/pxp/DESCR b/textproc/pxp/DESCR deleted file mode 100644 index 226bec7afae..00000000000 --- a/textproc/pxp/DESCR +++ /dev/null @@ -1,22 +0,0 @@ -PXP is a validating XML parser for O'Caml. It strictly complies to -the XML-1.0 standard. - -The parser is simple to call, usually only one statement (function -call) is sufficient to parse an XML document and to represent it -as object tree. - -Once the document is parsed, it can be accessed using a class -interface. The interface allows arbitrary access including -transformations. One of the features of the document representation -is its polymorphic nature; it is simple to add custom methods to -the document classes. Furthermore, the parser can be configured -such that different XML elements are represented by objects created -from different classes. This is a very powerful feature, because -it simplifies the structure of programs processing XML documents. - -Note that the class interface does not comply to the DOM standard. -It was not a development goal to realize a standard API (industrial -developers can this much better than I); however, the API is powerful -enough to be considered as equivalent with DOM. More important, -the interface is compatible with the XML information model required -by many XML-related standards. diff --git a/textproc/pxp/Makefile b/textproc/pxp/Makefile deleted file mode 100644 index 9f41db01523..00000000000 --- a/textproc/pxp/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $NetBSD: Makefile,v 1.25 2022/05/24 18:51:56 jaapb Exp $ -# - -DISTNAME= pxp-1.2.8 -PKGREVISION= 9 -CATEGORIES= textproc -MASTER_SITES= http://download.camlcity.org/download/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://projects.camlcity.org/projects/pxp.html -COMMENT= Polymorphic XML parser, a validating XML-1.0 parser (OCaml) -LICENSE= mit - -USE_TOOLS+= gmake -HAS_CONFIGURE= yes -CONFIGURE_ARGS= -with-lex -with-wlex -lexlist utf8,iso88591 -INSTALL_ENV= OCAMLFIND_INSTALL_ARGS="install -destdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}" -BUILD_TARGET= all - -MAKE_JOBS_SAFE= no - -SUBST_CLASSES+= ocamlfind -SUBST_STAGE.ocamlfind= do-configure -SUBST_FILES.ocamlfind= \ - src/pxp/Makefile \ - src/pxp-engine/Makefile \ - gensrc/pxp-lex-iso88591/Makefile \ - gensrc/pxp-lex-utf8/Makefile \ - gensrc/pxp-wlex/Makefile -SUBST_SED.ocamlfind= -e 's|\($$(OCAMLFIND)\) install|\1 $$(OCAMLFIND_INSTALL_ARGS)|' - -INSTALLATION_DIRS= ${OCAML_SITELIBDIR}/pxp -OCAML_USE_FINDLIB= yes - -.include "../../mk/bsd.prefs.mk" -.include "../../lang/ocaml/ocaml.mk" - -.if (${OCAML_USE_OPT_COMPILER} == "yes") -BUILD_TARGET+= opt -.endif - -.include "../../lang/camlp4/buildlink3.mk" -.include "../../net/ocamlnet/buildlink3.mk" -.include "../../devel/pcre-ocaml/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/textproc/pxp/PLIST b/textproc/pxp/PLIST deleted file mode 100644 index e2e3aa94eba..00000000000 --- a/textproc/pxp/PLIST +++ /dev/null @@ -1,92 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2016/07/02 09:30:45 jaapb Exp $ -@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/pxp -@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/pxp-lex-utf8 -@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/pxp-lex-iso88591 -@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/pxp-engine -${OCAML_SITELIB}/pxp-engine/META -${OCAML_SITELIB}/pxp-engine/pxp_aux.cmi -${OCAML_SITELIB}/pxp-engine/pxp_codewriter.cmi -${OCAML_SITELIB}/pxp-engine/pxp_codewriter.mli -${OCAML_SITELIB}/pxp-engine/pxp_core_parser.cmi -${OCAML_SITELIB}/pxp-engine/pxp_core_parser.mli -${OCAML_SITELIB}/pxp-engine/pxp_core_types.cmi -${OCAML_SITELIB}/pxp-engine/pxp_core_types.mli -${OCAML_SITELIB}/pxp-engine/pxp_dfa.cmi -${OCAML_SITELIB}/pxp-engine/pxp_dfa.mli -${OCAML_SITELIB}/pxp-engine/pxp_document.cmi -${OCAML_SITELIB}/pxp-engine/pxp_document.mli -${OCAML_SITELIB}/pxp-engine/pxp_dtd.cmi -${OCAML_SITELIB}/pxp-engine/pxp_dtd.mli -${OCAML_SITELIB}/pxp-engine/pxp_dtd_parser.cmi -${OCAML_SITELIB}/pxp-engine/pxp_dtd_parser.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-engine/pxp_engine.a -${OCAML_SITELIB}/pxp-engine/pxp_engine.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-engine/pxp_engine.cmxa -${OCAML_SITELIB}/pxp-engine/pxp_entity.cmi -${OCAML_SITELIB}/pxp-engine/pxp_entity_manager.cmi -${OCAML_SITELIB}/pxp-engine/pxp_ev_parser.cmi -${OCAML_SITELIB}/pxp-engine/pxp_ev_parser.mli -${OCAML_SITELIB}/pxp-engine/pxp_event.cmi -${OCAML_SITELIB}/pxp-engine/pxp_event.mli -${OCAML_SITELIB}/pxp-engine/pxp_lex_aux.cmi -${OCAML_SITELIB}/pxp-engine/pxp_lexer_types.cmi -${OCAML_SITELIB}/pxp-engine/pxp_lexer_types.mli -${OCAML_SITELIB}/pxp-engine/pxp_lexers.cmi -${OCAML_SITELIB}/pxp-engine/pxp_lexers.mli -${OCAML_SITELIB}/pxp-engine/pxp_lexing.cmi -${OCAML_SITELIB}/pxp-engine/pxp_lexing.mli -${OCAML_SITELIB}/pxp-engine/pxp_lib.cmi -${OCAML_SITELIB}/pxp-engine/pxp_lib.mli -${OCAML_SITELIB}/pxp-engine/pxp_marshal.cmi -${OCAML_SITELIB}/pxp-engine/pxp_marshal.mli -${OCAML_SITELIB}/pxp-engine/pxp_reader.cmi -${OCAML_SITELIB}/pxp-engine/pxp_reader.mli -${OCAML_SITELIB}/pxp-engine/pxp_top.cmi -${OCAML_SITELIB}/pxp-engine/pxp_top.cmo -${OCAML_SITELIB}/pxp-engine/pxp_top.mli -${OCAML_SITELIB}/pxp-engine/pxp_tree_parser.cmi -${OCAML_SITELIB}/pxp-engine/pxp_tree_parser.mli -${OCAML_SITELIB}/pxp-engine/pxp_types.cmi -${OCAML_SITELIB}/pxp-engine/pxp_types.mli -${OCAML_SITELIB}/pxp-engine/pxp_yacc.cmi -${OCAML_SITELIB}/pxp-engine/pxp_yacc.mli -${OCAML_SITELIB}/pxp-lex-iso88591/META -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_iso88591.a -${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_iso88591.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_iso88591.cmxa -${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_iso88591_01.cmi -${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_link_iso88591.cmi -${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_link_iso88591.cmo -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_link_iso88591.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-iso88591/pxp_lex_link_iso88591.o -${OCAML_SITELIB}/pxp-lex-utf8/META -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_link_utf8.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_link_utf8.cmo -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_link_utf8.cmx -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_link_utf8.o -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8.a -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8.cmxa -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_01.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_02.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_03.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_04.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_05.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_06.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_07.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_08.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_09.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_10.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_11.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_12.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_13.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_14.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_15.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_16.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_17.cmi -${OCAML_SITELIB}/pxp-lex-utf8/pxp_lex_utf8_18.cmi -${OCAML_SITELIB}/pxp/META -@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/pxp-engine -@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/pxp-lex-iso88591 -@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/pxp-lex-utf8 -@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/pxp diff --git a/textproc/pxp/distinfo b/textproc/pxp/distinfo deleted file mode 100644 index fca6f321951..00000000000 --- a/textproc/pxp/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 11:22:58 nia Exp $ - -BLAKE2s (pxp-1.2.8.tar.gz) = 41f90920940979cb992ec9410f7ee5f4c6f8ab10f11329992b70241df5866369 -SHA512 (pxp-1.2.8.tar.gz) = 3292bfbda494066e454331a9cfc56b03f55afe8548bdf24fea09d9bc0a03c333c027f7b527983bd9b4d659458c95acf7e3fc251c72d26ab3502f52067c9f2549 -Size (pxp-1.2.8.tar.gz) = 619689 bytes -SHA1 (patch-src_pxp-engine_pxp-document.ml) = c9c4bcdb102ca44e4fc676a11059fffc46e672de -SHA1 (patch-tools_src_m2parsergen_Makefile) = 115700c42eb1a2204eb395e4840681c4663f0a76 -SHA1 (patch-tools_src_odoc_Makefile) = 1c7b769bd9d145b6e12850428af2eb61720f2334 diff --git a/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml b/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml deleted file mode 100644 index 523c488e22d..00000000000 --- a/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_pxp-engine_pxp-document.ml,v 1.1 2016/06/25 13:59:21 jaapb Exp $ - -Comment out multiply-defined exception ---- src/pxp-engine/pxp_document.ml.orig 2016-03-03 13:46:50.000000000 +0000 -+++ src/pxp-engine/pxp_document.ml -@@ -3398,7 +3398,7 @@ let find_all_elements ?deeply eltype bas - ;; - - --exception Skip;; -+(* exception Skip;; *) - - let map_tree ~pre ?(post=(fun x -> x)) base = - let rec map_rec n = diff --git a/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile b/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile deleted file mode 100644 index e1433108c33..00000000000 --- a/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-tools_src_m2parsergen_Makefile,v 1.1 2012/10/24 13:15:32 jaapb Exp $ - -Fix error with empty PACKAGES variable ---- tools/src/m2parsergen/Makefile.orig 2012-06-11 11:15:30.000000000 +0000 -+++ tools/src/m2parsergen/Makefile -@@ -10,6 +10,8 @@ include $(TOP_DIR)/Makefile.rules - SRC = ast.ml lexer.ml parser.ml generator.ml - OBJ = $(SRC:.ml=.cmo) - -+PACKAGES = stdlib -+ - #---------------------------------------------------------------------- - - .PHONY: all diff --git a/textproc/pxp/patches/patch-tools_src_odoc_Makefile b/textproc/pxp/patches/patch-tools_src_odoc_Makefile deleted file mode 100644 index 1ec5cedac99..00000000000 --- a/textproc/pxp/patches/patch-tools_src_odoc_Makefile +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-tools_src_odoc_Makefile,v 1.1 2012/10/24 13:15:32 jaapb Exp $ - -Fix error with empty PACKAGES variable ---- tools/src/odoc/Makefile.orig 2012-06-11 11:15:30.000000000 +0000 -+++ tools/src/odoc/Makefile -@@ -6,6 +6,8 @@ OBJ = $(SRC:.ml=.cmo) - OCAMLC_OPTIONS += -I +ocamldoc - CLEAN_LIST += chtml.ml - -+PACKAGES=stdlib -+ - .PHONY: all - all: chtml.cmo - diff --git a/time/Makefile b/time/Makefile index bf4294ce278..94abc6c24a5 100644 --- a/time/Makefile +++ b/time/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.233 2022/06/28 12:33:46 pin Exp $ +# $NetBSD: Makefile,v 1.234 2022/06/29 07:54:42 wiz Exp $ # COMMENT= Clocks, calendars, daily planners and other time related applications @@ -256,7 +256,6 @@ SUBDIR+= wmmoonclock SUBDIR+= wmtime SUBDIR+= wmzcalock SUBDIR+= wxRemind -SUBDIR+= wyrd SUBDIR+= xalarm SUBDIR+= xbeats SUBDIR+= xchrono diff --git a/time/wyrd/DESCR b/time/wyrd/DESCR deleted file mode 100644 index 3c2d909bc00..00000000000 --- a/time/wyrd/DESCR +++ /dev/null @@ -1,11 +0,0 @@ -Wyrd is a text-based front-end to Remind, a sophisticated calendar -and alarm program. Remind's power lies in its programmability, and -Wyrd does not hide this capability behind flashy GUI dialogs. -Rather, Wyrd is designed to make you more efficient at editing your -reminder files directly. It also offers a scrollable timetable -suitable for visualizing your schedule at a glance. - -Unlike most of the calendar applications available today, Wyrd is -designed to be both lightweight and fast. Startup time is negligible, -UI navigation is instantaneous, and the wyrd process typically -consumes less than 2MB of resident memory. diff --git a/time/wyrd/Makefile b/time/wyrd/Makefile deleted file mode 100644 index 9b8f3ee889d..00000000000 --- a/time/wyrd/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: Makefile,v 1.29 2022/05/24 18:51:56 jaapb Exp $ -# - -DISTNAME= wyrd-1.4.6 -PKGREVISION= 15 -CATEGORIES= time -#MASTER_SITES= http://pessimization.com/software/wyrd/ - -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://pessimization.com/software/wyrd/ -COMMENT= Text-based front-end to Remind -LICENSE= gnu-gpl-v2 - -DEPENDS+= remind>=3.00.24:../../time/remind - -USE_PKGLOCALEDIR= yes -USE_NCURSES= yes # chgat(), typeahead(), ... -USE_TOOLS+= gmake -CONFIGURE_ARGS+= --with-ncurses -GNU_CONFIGURE= yes -MAKE_JOBS_SAFE= no - -CONF_FILES+= ${PREFIX}/share/examples/wyrd/wyrdrc \ - ${PKG_SYSCONFDIR}/wyrdrc - -.include "../../devel/ncurses/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" -.include "../../lang/camlp4/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/time/wyrd/PLIST b/time/wyrd/PLIST deleted file mode 100644 index 2cbe2954346..00000000000 --- a/time/wyrd/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:18:01 joerg Exp $ -bin/wyrd -man/man1/wyrd.1 -man/man5/wyrdrc.5 -share/examples/wyrd/wyrdrc diff --git a/time/wyrd/distinfo b/time/wyrd/distinfo deleted file mode 100644 index 84e60dbe306..00000000000 --- a/time/wyrd/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 11:24:45 nia Exp $ - -BLAKE2s (wyrd-1.4.6.tar.gz) = 1d43b6fae6cba632ed73faa7cef83b2cdf76a33a2c19effba46a8dc2d1253f33 -SHA512 (wyrd-1.4.6.tar.gz) = fc09c4567ea8d6225638ee6851ddab716665913b7d7b2f6b5a3cc7f2af9144df617e2a95ca78c74874bec3ff355aba028c7c51eafe1426d9ae803ab77ce84477 -Size (wyrd-1.4.6.tar.gz) = 425829 bytes -SHA1 (patch-Makefile.in) = 0eb1244df49e201d23e24c4e4c4acdfac76534b0 -SHA1 (patch-curses_Makefile.in) = e99e848199238f9540d5035dec0d2935296b232f -SHA1 (patch-utility.ml) = 529b15bc306bddf41992a299001966e00f631e69 diff --git a/time/wyrd/patches/patch-Makefile.in b/time/wyrd/patches/patch-Makefile.in deleted file mode 100644 index 49660c820dd..00000000000 --- a/time/wyrd/patches/patch-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.2 2018/03/14 09:16:02 dholland Exp $ - -Correctly install configuration files - ---- Makefile.in.orig 2010-10-23 18:50:07.000000000 +0000 -+++ Makefile.in -@@ -102,10 +102,10 @@ $(CURSES_CMXA): - - install-indep: - mkdir -p $(BINDIR) -- mkdir -p $(DESTDIR)/$(sysconfdir) - mkdir -p $(MANDIR)/man1 - mkdir -p $(MANDIR)/man5 -- $(INSTALL) -m 644 wyrdrc $(DESTDIR)/$(sysconfdir) -+ mkdir -p $(DESTDIR)/$(prefix)/share/examples/wyrd -+ $(INSTALL) -m 644 wyrdrc $(DESTDIR)/$(prefix)/share/examples/wyrd - $(INSTALL) -m 644 doc/wyrd.1 $(MANDIR)/man1/wyrd.1 - $(INSTALL) -m 644 doc/wyrdrc.5 $(MANDIR)/man5/wyrdrc.5 - diff --git a/time/wyrd/patches/patch-curses_Makefile.in b/time/wyrd/patches/patch-curses_Makefile.in deleted file mode 100644 index 62dc46389cf..00000000000 --- a/time/wyrd/patches/patch-curses_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-curses_Makefile.in,v 1.2 2018/03/14 09:16:02 dholland Exp $ - -Honor pkgsrc LDFLAGS. - ---- curses/Makefile.in.orig 2015-03-22 16:58:53.000000000 +0000 -+++ curses/Makefile.in -@@ -15,6 +15,7 @@ LDFLAGS = @LDFLAGS@ - RANLIB = @RANLIB@ - LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so) - OCAMLDOCFLAGS = -stars -+OCAMLMKLIB_FLAGS+= ${LDFLAGS} - - all: byte - diff --git a/time/wyrd/patches/patch-utility.ml b/time/wyrd/patches/patch-utility.ml deleted file mode 100644 index f92f0dd5840..00000000000 --- a/time/wyrd/patches/patch-utility.ml +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-utility.ml,v 1.1 2018/03/14 09:14:05 dholland Exp $ - -Fix build with ocaml 4.06. - ---- utility.ml~ 2013-02-03 03:40:39.000000000 +0000 -+++ utility.ml -@@ -270,7 +270,7 @@ let read_all_shell_command_output shell_ - let (read_list, _, _) = Unix.select (out_lst @ err_lst) [] [] (10.0) in - if List.length read_list > 0 then begin - let chan = List.hd read_list in -- let buf = String.make 256 ' ' in -+ let buf = Bytes.make 256 ' ' in - let chars_read = Unix.read chan buf 0 256 in - if chars_read = 0 then - (* no chars read indicates EOF *) -@@ -281,7 +281,7 @@ let read_all_shell_command_output shell_ - else - (* if 1-256 characters are read, append them to the proper - * buffer and continue *) -- let s = String.sub buf 0 chars_read in -+ let s = Bytes.to_string (Bytes.sub buf 0 chars_read) in - if chan = out_read then - read_output (out_str ^ s) err_str out_done err_done - else -@@ -354,11 +354,11 @@ let utf8_string_before s n = - substr - else - let num_new_bytes = utf8_width s.[byte_pos] in -- let new_bytes = String.make num_new_bytes s.[byte_pos] in -+ let new_bytes = Bytes.make num_new_bytes s.[byte_pos] in - for i = 1 to pred num_new_bytes do -- new_bytes.[i] <- s.[byte_pos + i] -+ Bytes.set new_bytes i s.[byte_pos + i] - done; -- build_substr (substr ^ new_bytes) (succ utf8_pos) -+ build_substr (substr ^ (Bytes.to_string new_bytes)) (succ utf8_pos) - (byte_pos + num_new_bytes) - in - if Curses.Curses_config.wide_ncurses then diff --git a/www/Makefile b/www/Makefile index fdd53f80caf..439705fb310 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1630 2022/06/04 10:01:47 jaapb Exp $ +# $NetBSD: Makefile,v 1.1631 2022/06/29 07:54:42 wiz Exp $ # COMMENT= Packages related to the World Wide Web @@ -251,7 +251,6 @@ SUBDIR+= nsm SUBDIR+= nspluginwrapper SUBDIR+= ocaml-cohttp SUBDIR+= ocaml-curl -SUBDIR+= ocaml-http SUBDIR+= ocaml-uri SUBDIR+= ocsigen SUBDIR+= ocsigen-i18n diff --git a/www/ocaml-http/DESCR b/www/ocaml-http/DESCR deleted file mode 100644 index 3dd5f9dbf39..00000000000 --- a/www/ocaml-http/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -OCaml HTTP is a simple OCaml library for creating HTTP daemons. It is largely -inspired by Perl's HTTP:: modules family. diff --git a/www/ocaml-http/Makefile b/www/ocaml-http/Makefile deleted file mode 100644 index 280607e70f5..00000000000 --- a/www/ocaml-http/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.20 2022/05/24 18:51:56 jaapb Exp $ -# - -DISTNAME= ocaml-http-0.1.5 -PKGREVISION= 16 -CATEGORIES= www -MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/545/ - -MAINTAINER= jaapb@NetBSD.org -HOMEPAGE= https://forge.ocamlcore.org/frs/download.php/545/ -COMMENT= Simple OCaml HTTP daemon library -LICENSE= gnu-gpl-v2 - -WRKSRC= ${WRKDIR}/ocaml-http_0.1.5 -USE_LANGUAGES= # none -USE_TOOLS+= gmake -MAKE_ENV= PKG_DESTDIR=${DESTDIR}/${PREFIX}/${OCAML_SITELIBDIR} - -BUILD_TARGET= all - -OCAML_USE_FINDLIB= yes - -.include "../../lang/ocaml/ocaml.mk" - -.if (${OCAML_USE_OPT_COMPILER} == "yes") -BUILD_TARGET+= opt -.endif - -.include "../../lang/camlp4/buildlink3.mk" -.include "../../devel/pcre-ocaml/buildlink3.mk" -.include "../../net/ocamlnet/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/ocaml-http/PLIST b/www/ocaml-http/PLIST deleted file mode 100644 index f8cafc80d1d..00000000000 --- a/www/ocaml-http/PLIST +++ /dev/null @@ -1,22 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:32:49 jaapb Exp $ -${OCAML_SITELIB}/http/META -${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.a -${OCAML_SITELIB}/http/http.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http.cmxa -${OCAML_SITELIB}/http/http_common.cmi -${OCAML_SITELIB}/http/http_common.mli -${OCAML_SITELIB}/http/http_daemon.cmi -${OCAML_SITELIB}/http/http_daemon.mli -${OCAML_SITELIB}/http/http_message.cmi -${OCAML_SITELIB}/http/http_message.mli -${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.a -${OCAML_SITELIB}/http/http_mt.cma -${PLIST.ocaml-opt}${OCAML_SITELIB}/http/http_mt.cmxa -${OCAML_SITELIB}/http/http_request.cmi -${OCAML_SITELIB}/http/http_request.mli -${OCAML_SITELIB}/http/http_response.cmi -${OCAML_SITELIB}/http/http_response.mli -${OCAML_SITELIB}/http/http_types.cmi -${OCAML_SITELIB}/http/http_types.mli -${OCAML_SITELIB}/http/http_user_agent.cmi -${OCAML_SITELIB}/http/http_user_agent.mli diff --git a/www/ocaml-http/distinfo b/www/ocaml-http/distinfo deleted file mode 100644 index 52668e517d2..00000000000 --- a/www/ocaml-http/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:29:42 nia Exp $ - -BLAKE2s (ocaml-http-0.1.5.tar.gz) = cc1ab917920f755f8d6b1400c0c6d18a493039609cf858a981ac05fb2658f261 -SHA512 (ocaml-http-0.1.5.tar.gz) = 4d3a31c6d936346865212c72d40a6f1ad96c963fb779cb47adb1adc1006b3212ecf3946229fa3d32eb075e71595acdfb4e96f4c2623ca7082c2e397cbecbde37 -Size (ocaml-http-0.1.5.tar.gz) = 201026 bytes -SHA1 (patch-Makefile) = cd30a2461c12801bb24f30c7cc06e249ff2eba79 -SHA1 (patch-Makefile.defs) = 07f1622361029dc5c0aeb472ac71283c73272c33 diff --git a/www/ocaml-http/patches/patch-Makefile b/www/ocaml-http/patches/patch-Makefile deleted file mode 100644 index 107fdcbd241..00000000000 --- a/www/ocaml-http/patches/patch-Makefile +++ /dev/null @@ -1,77 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2012/10/10 11:23:32 jaapb Exp $ - -Remove bashisms and add DESTDIR support ---- Makefile.orig 2010-10-19 10:19:18.000000000 +0000 -+++ Makefile -@@ -1,5 +1,5 @@ - include Makefile.defs --export SHELL=/bin/bash -+#export SHELL=/bin/bash - - MODULES = \ - http_constants \ -@@ -32,7 +32,7 @@ OCAMLDOC_STUFF = *.mli - DOCDIR = doc/html - DOTDIR = doc/dot - TEXDIR = doc/latex --DESTDIR = $(shell $(OCAMLFIND) printconf destdir) -+#DESTDIR = $(shell $(OCAMLFIND) printconf destdir) - - all: all_non_mt all_mt - opt: opt_non_mt opt_mt -@@ -76,17 +76,21 @@ depend: - $(OCAMLOPT) -c $< - - non_mt/$(THREADED_SRV).cmo: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi -- cp $(THREADED_SRV).{cmi,mli} non_mt/ -+ cp $(THREADED_SRV).cmi non_mt/ -+ cp $(THREADED_SRV).mli non_mt/ - $(OCAMLC) -c $< - non_mt/$(THREADED_SRV).cmx: non_mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi -- cp $(THREADED_SRV).{cmi,mli} non_mt/ -+ cp $(THREADED_SRV).cmi non_mt/ -+ cp $(THREADED_SRV).mli non_mt/ - $(OCAMLOPT) -c $< - - mt/$(THREADED_SRV).cmo: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi -- cp $(THREADED_SRV).{cmi,mli} mt/ -+ cp $(THREADED_SRV).cmi mt/ -+ cp $(THREADED_SRV).mli mt/ - $(OCAMLC) $(THREADS_FLAGS) -c $< - mt/$(THREADED_SRV).cmx: mt/$(THREADED_SRV).ml $(THREADED_SRV).cmi -- cp $(THREADED_SRV).{cmi,mli} mt/ -+ cp $(THREADED_SRV).cmi mt/ -+ cp $(THREADED_SRV).mli mt/ - $(OCAMLOPT) $(THREADS_FLAGS) -c $< - - http.cma: $(patsubst %,%.cmo,$(MODULES_NON_MT)) -@@ -105,14 +109,18 @@ META: META.in - clean: - $(MAKE) -C examples/ clean - for d in . mt non_mt; do \ -- rm -f $$d/*.cm[ioax] $$d/*.cmxa $$d/*.[ao] $$d/test{,.opt}; \ -+ rm -f $$d/*.cm[ioax] $$d/*.cmxa $$d/*.[ao] $$d/test \ -+ $$d/test.opt; \ - done - rm -f {mt,non_mt}/$(THREADED_SRV).mli - docclean: - -rm -f \ - $(DOCDIR)/*.html $(DOCDIR)/*.css \ - $(DOTDIR)/*.dot $(DOTDIR)/*.ps \ -- $(TEXDIR)/*.{dvi,ps,ps.gz,pdf,aux,log,out,toc,tmp,haux,sty,tex} -+ $(TEXDIR)/*.dvi $(TEXDIR)/*.ps $(TEXDIR)/*.ps.gz \ -+ $(TEXDIR)/*.pdf $(TEXDIR)/*.aux $(TEXDIR)/*.log \ -+ $(TEXDIR)/*.out $(TEXDIR)/*.toc $(TEXDIR)/*.tmp \ -+ $(TEXDIR)/*.haux $(TEXDIR)/*.sty $(TEXDIR)/*.tex - distclean: clean - $(MAKE) -C examples/ distclean - rm -f META -@@ -139,7 +147,7 @@ deb: docclean distreal - (cd $(DISTDIR)/ && debuild) - rm -rf $(DISTDIR)/ - install: META -- $(OCAMLFIND) install -destdir $(DESTDIR) $(PKGNAME) \ -+ $(OCAMLFIND) install -destdir $(PKG_DESTDIR) $(PKGNAME) \ - $(patsubst %, %.mli, $(PUBLIC_MODULES)) \ - $(patsubst %, %.cmi, $(PUBLIC_MODULES)) \ - $(wildcard *.cma *.cmxa *.a) META diff --git a/www/ocaml-http/patches/patch-Makefile.defs b/www/ocaml-http/patches/patch-Makefile.defs deleted file mode 100644 index 2dce8d14d1d..00000000000 --- a/www/ocaml-http/patches/patch-Makefile.defs +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-Makefile.defs,v 1.1 2012/10/10 11:23:32 jaapb Exp $ - -Use ocamlfind's package flag correctly ---- Makefile.defs.orig 2010-10-19 10:19:18.000000000 +0000 -+++ Makefile.defs -@@ -2,8 +2,8 @@ PKGNAME = http - DISTVERSION = $(shell dpkg-parsechangelog | egrep '^Version: ' | sed 's/^Version: //' | sed 's/-.*//') - - DEBUG_FLAGS = --REQUIRES = unix str pcre netstring --COMMON_FLAGS = $(DEBUG_FLAGS) -pp camlp4o -package "$(REQUIRES)" -+REQUIRES = unix,str,pcre,netstring -+COMMON_FLAGS = $(DEBUG_FLAGS) -pp camlp4o -package $(REQUIRES) - THREADS_FLAGS = -package threads -thread - OCAMLFIND = ocamlfind - OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS) |