summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2022-06-29 07:54:38 +0000
committerwiz <wiz@pkgsrc.org>2022-06-29 07:54:38 +0000
commit74fe70c55235afcd2fbff0301c006af09dc1e84e (patch)
treeaeabc24ce706303c56caa52427318ca074d70afa /devel
parentbf03d7255e4433cabe0273897950d4d33cf7bc64 (diff)
downloadpkgsrc-74fe70c55235afcd2fbff0301c006af09dc1e84e.tar.gz
camlp4: remove
camlp4 is an outdated way to build packages with caml and does not work with pkgsrc ocaml versions for more than a year. Remove camlp4 and all packages using it. Ok jaapb@
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile8
-rw-r--r--devel/monotone-viz/DESCR2
-rw-r--r--devel/monotone-viz/Makefile34
-rw-r--r--devel/monotone-viz/PLIST3
-rw-r--r--devel/monotone-viz/distinfo13
-rw-r--r--devel/monotone-viz/patches/patch-Makefile23
-rw-r--r--devel/monotone-viz/patches/patch-app.ml63
-rw-r--r--devel/monotone-viz/patches/patch-app.mli60
-rw-r--r--devel/monotone-viz/patches/patch-app_types.mli57
-rw-r--r--devel/monotone-viz/patches/patch-query.mli12
-rw-r--r--devel/monotone-viz/patches/patch-ui.mli52
-rw-r--r--devel/monotone-viz/patches/patch-unidiff.mli8
-rw-r--r--devel/monotone-viz/patches/patch-view.mli60
-rw-r--r--devel/ocaml-deriving-ocsigen/DESCR3
-rw-r--r--devel/ocaml-deriving-ocsigen/Makefile24
-rw-r--r--devel/ocaml-deriving-ocsigen/PLIST170
-rw-r--r--devel/ocaml-deriving-ocsigen/distinfo5
-rw-r--r--devel/ocaml-lwt_camlp4/DESCR1
-rw-r--r--devel/ocaml-lwt_camlp4/Makefile26
-rw-r--r--devel/ocaml-lwt_camlp4/PLIST34
-rw-r--r--devel/ocaml-lwt_camlp4/buildlink3.mk16
-rw-r--r--devel/ocaml-lwt_camlp4/distinfo5
-rw-r--r--devel/ocaml-optcomp/DESCR2
-rw-r--r--devel/ocaml-optcomp/Makefile26
-rw-r--r--devel/ocaml-optcomp/PLIST14
-rw-r--r--devel/ocaml-optcomp/buildlink3.mk15
-rw-r--r--devel/ocaml-optcomp/distinfo6
-rw-r--r--devel/ocaml-optcomp/patches/patch-src_optcomp.ml18
-rw-r--r--devel/ocaml-type_conv/DESCR2
-rw-r--r--devel/ocaml-type_conv/Makefile24
-rw-r--r--devel/ocaml-type_conv/PLIST12
-rw-r--r--devel/ocaml-type_conv/buildlink3.mk15
-rw-r--r--devel/ocaml-type_conv/distinfo5
-rw-r--r--devel/verifast/DESCR4
-rw-r--r--devel/verifast/Makefile47
-rw-r--r--devel/verifast/PLIST86
-rw-r--r--devel/verifast/distinfo6
-rw-r--r--devel/verifast/files/GNUmakefile.settings16
-rw-r--r--devel/verifast/patches/patch-src_GNUmakefile119
39 files changed, 1 insertions, 1095 deletions
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 \