From 0f09dd054b00b56c4e29928fc014eb3f30505051 Mon Sep 17 00:00:00 2001
From: nia <nia@NetBSD.org>
Date: Sat, 15 Mar 2025 12:59:08 +0100
Subject: [PATCH 1/2] ocaml-async_extra: Remove.

---
 devel/Makefile                            |  1 -
 devel/ocaml-async_extra/DESCR             |  1 -
 devel/ocaml-async_extra/Makefile          | 23 ----------------------
 devel/ocaml-async_extra/PLIST             | 24 -----------------------
 devel/ocaml-async_extra/buildlink3.mk     | 14 -------------
 devel/ocaml-async_extra/distinfo          |  5 -----
 meta-pkgs/modular-xorg/avoid-duplicate.mk |  6 +++---
 7 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 devel/ocaml-async_extra/DESCR
 delete mode 100644 devel/ocaml-async_extra/Makefile
 delete mode 100644 devel/ocaml-async_extra/PLIST
 delete mode 100644 devel/ocaml-async_extra/buildlink3.mk
 delete mode 100644 devel/ocaml-async_extra/distinfo

diff --git a/devel/Makefile b/devel/Makefile
index e2e5a64b86ea..c2ba6c849e2d 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1183,7 +1183,6 @@ SUBDIR+=	objfw
 SUBDIR+=	ocaml-angstrom
 SUBDIR+=	ocaml-astring
 SUBDIR+=	ocaml-async
-SUBDIR+=	ocaml-async_extra
 SUBDIR+=	ocaml-async_kernel
 SUBDIR+=	ocaml-async_rpc_kernel
 SUBDIR+=	ocaml-async_unix
diff --git a/devel/ocaml-async_extra/DESCR b/devel/ocaml-async_extra/DESCR
deleted file mode 100644
index 392bb3e49bcb..000000000000
--- a/devel/ocaml-async_extra/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Extra functions for the Async library.
diff --git a/devel/ocaml-async_extra/Makefile b/devel/ocaml-async_extra/Makefile
deleted file mode 100644
index a4edaa1d3303..000000000000
--- a/devel/ocaml-async_extra/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2022/05/24 18:59:21 jaapb Exp $
-
-DISTNAME=	${GITHUB_PROJECT}-0.15.0
-PKGNAME=	ocaml-${DISTNAME}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=janestreet/}
-GITHUB_PROJECT=	async_extra
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	https://github.com/janestreet/async_extra/
-COMMENT=	Asynchronous execution library from Jane Street (extra)
-LICENSE=	mit
-
-USE_LANGUAGES=	# none
-OCAML_USE_DUNE=	yes
-
-.include "../../lang/ocaml/ocaml.mk"
-.include "../../devel/ocaml-async_kernel/buildlink3.mk"
-.include "../../devel/ocaml-core/buildlink3.mk"
-.include "../../devel/ocaml-core_kernel/buildlink3.mk"
-.include "../../devel/ocaml-ppx_jane/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-async_extra/PLIST b/devel/ocaml-async_extra/PLIST
deleted file mode 100644
index 066cf6228a0f..000000000000
--- a/devel/ocaml-async_extra/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/08 11:29:05 jaapb Exp $
-${OCAML_SITELIB}/async_extra/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus.a
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.cma
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmi
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmt
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus.cmxs
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.ml
-${OCAML_SITELIB}/async_extra/async_bus/async_bus.mli
-${OCAML_SITELIB}/async_extra/async_bus/async_bus__.cmi
-${OCAML_SITELIB}/async_extra/async_bus/async_bus__.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus__.cmx
-${OCAML_SITELIB}/async_extra/async_bus/async_bus__.ml
-${OCAML_SITELIB}/async_extra/async_bus/async_bus__Import.cmi
-${OCAML_SITELIB}/async_extra/async_bus/async_bus__Import.cmt
-${PLIST.ocaml-opt}${OCAML_SITELIB}/async_extra/async_bus/async_bus__Import.cmx
-${OCAML_SITELIB}/async_extra/async_bus/import.ml
-${OCAML_SITELIB}/async_extra/dune-package
-${OCAML_SITELIB}/async_extra/opam
-share/doc/async_extra/CHANGES.md
-share/doc/async_extra/LICENSE.md
diff --git a/devel/ocaml-async_extra/buildlink3.mk b/devel/ocaml-async_extra/buildlink3.mk
deleted file mode 100644
index b29b734592d2..000000000000
--- a/devel/ocaml-async_extra/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.4 2022/05/05 10:53:17 jaapb Exp $
-
-BUILDLINK_TREE+=	ocaml-async_extra
-
-.if !defined(OCAML_ASYNC_EXTRA_BUILDLINK3_MK)
-OCAML_ASYNC_EXTRA_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ocaml-async_extra+=	ocaml-async_extra>=0.12.0
-BUILDLINK_ABI_DEPENDS.ocaml-async_extra+=	ocaml-async_extra>=0.15.0
-BUILDLINK_PKGSRCDIR.ocaml-async_extra?=		../../devel/ocaml-async_extra
-
-.endif	# OCAML_ASYNC_EXTRA_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ocaml-async_extra
diff --git a/devel/ocaml-async_extra/distinfo b/devel/ocaml-async_extra/distinfo
deleted file mode 100644
index acd235641c6d..000000000000
--- a/devel/ocaml-async_extra/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2022/05/05 10:53:17 jaapb Exp $
-
-BLAKE2s (async_extra-0.15.0.tar.gz) = 9a2177e219a3e8c1c8d9bc437ddccb0cb6ab551930b9976061cb43f6dd4c20b5
-SHA512 (async_extra-0.15.0.tar.gz) = d54c324b615dd6575024a1694790e247f1982949399aaab4b75a8918d819798c64c6d3a5fafd17274d3a3b0b45b7e3b022b4e263aad9701c2eecce3c25d032b7
-Size (async_extra-0.15.0.tar.gz) = 18236 bytes
diff --git a/meta-pkgs/modular-xorg/avoid-duplicate.mk b/meta-pkgs/modular-xorg/avoid-duplicate.mk
index 5209491208b6..b748e5bc0ff1 100644
--- a/meta-pkgs/modular-xorg/avoid-duplicate.mk
+++ b/meta-pkgs/modular-xorg/avoid-duplicate.mk
@@ -5,15 +5,15 @@
 .if ${X11_TYPE} == "native"
 .  if !empty(X11_BIN_NAME)
 .    if exists(${X11BASE}/bin/${X11_BIN_NAME})
-PKG_SKIP_REASON+=	"Package set is using native X11 component"
+#PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  elif !empty(X11_LIB_NAME)
 .    if exists(${X11BASE}/lib/${X11_LIB_NAME}.so)
-PKG_SKIP_REASON+=	"Package set is using native X11 component"
+#PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  elif !empty(X11_DRV_NAME)
 .    if exists(${X11BASE}/lib/modules/drivers/${X11_DRV_NAME}_drv.so)
-PKG_SKIP_REASON+=	"Package set is using native X11 component"
+#PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  endif
 .endif

From 101148657b8eb2b89ec0019ee806f551b0d5be06 Mon Sep 17 00:00:00 2001
From: nia <nia@NetBSD.org>
Date: Sat, 15 Mar 2025 13:16:29 +0100
Subject: [PATCH 2/2] ocaml-mirage-flow: Remove.

---
 devel/Makefile                            |  1 -
 devel/ocaml-mirage-flow/DESCR             |  1 -
 devel/ocaml-mirage-flow/Makefile          | 28 -------------
 devel/ocaml-mirage-flow/PLIST             | 49 -----------------------
 devel/ocaml-mirage-flow/buildlink3.mk     | 13 ------
 devel/ocaml-mirage-flow/distinfo          |  5 ---
 meta-pkgs/modular-xorg/avoid-duplicate.mk |  6 +--
 7 files changed, 3 insertions(+), 100 deletions(-)
 delete mode 100644 devel/ocaml-mirage-flow/DESCR
 delete mode 100644 devel/ocaml-mirage-flow/Makefile
 delete mode 100644 devel/ocaml-mirage-flow/PLIST
 delete mode 100644 devel/ocaml-mirage-flow/buildlink3.mk
 delete mode 100644 devel/ocaml-mirage-flow/distinfo

diff --git a/devel/Makefile b/devel/Makefile
index c2ba6c849e2d..a4c04e1120c3 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1232,7 +1232,6 @@ SUBDIR+=	ocaml-lwt_ppx
 SUBDIR+=	ocaml-lwt_react
 SUBDIR+=	ocaml-lwt_ssl
 SUBDIR+=	ocaml-migrate-parsetree
-SUBDIR+=	ocaml-mirage-flow
 SUBDIR+=	ocaml-oasis
 SUBDIR+=	ocaml-ocplib-endian
 SUBDIR+=	ocaml-optint
diff --git a/devel/ocaml-mirage-flow/DESCR b/devel/ocaml-mirage-flow/DESCR
deleted file mode 100644
index bd107dd89bd8..000000000000
--- a/devel/ocaml-mirage-flow/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-This package contains generic operations over Mirage `FLOW` implementations.
diff --git a/devel/ocaml-mirage-flow/Makefile b/devel/ocaml-mirage-flow/Makefile
deleted file mode 100644
index 95d2a0ae6bcd..000000000000
--- a/devel/ocaml-mirage-flow/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2022/06/13 08:12:02 jaapb Exp $
-
-PKGNAME=	ocaml-${DISTNAME}
-DISTNAME=	${GITHUB_PROJECT}-3.0.0
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=mirage/}
-GITHUB_PROJECT=	mirage-flow
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	https://github.com/mirage/mirage-flow/
-COMMENT=	Flow implementations for Mirage
-LICENSE=	isc
-
-USE_LANGUAGES=	# none
-OCAML_USE_DUNE=	yes
-
-DUNE_BUILD_PACKAGES=	mirage-flow mirage-flow-unix mirage-flow-combinators
-OPAM_INSTALL_FILES=	${DUNE_BUILD_PACKAGES}
-OCAML_FINDLIB_DIRS=	${DUNE_BUILD_PACKAGES}
-
-.include "../../lang/ocaml/ocaml.mk"
-.include "../../devel/ocaml-cstruct/buildlink3.mk"
-.include "../../devel/ocaml-fmt/buildlink3.mk"
-.include "../../devel/ocaml-logs/buildlink3.mk"
-.include "../../devel/ocaml-lwt/buildlink3.mk"
-.include "../../time/ocaml-mirage-clock/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-mirage-flow/PLIST b/devel/ocaml-mirage-flow/PLIST
deleted file mode 100644
index 88383a47b87f..000000000000
--- a/devel/ocaml-mirage-flow/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2022/06/13 08:12:02 jaapb Exp $
-${OCAML_SITELIB}/mirage-flow-combinators/META
-${OCAML_SITELIB}/mirage-flow-combinators/dune-package
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.a
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cma
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmi
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmt
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.cmxs
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.ml
-${OCAML_SITELIB}/mirage-flow-combinators/mirage_flow_combinators.mli
-${OCAML_SITELIB}/mirage-flow-combinators/opam
-${OCAML_SITELIB}/mirage-flow-unix/META
-${OCAML_SITELIB}/mirage-flow-unix/dune-package
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.a
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cma
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmi
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmt
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.cmxs
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.ml
-${OCAML_SITELIB}/mirage-flow-unix/mirage_flow_unix.mli
-${OCAML_SITELIB}/mirage-flow-unix/opam
-${OCAML_SITELIB}/mirage-flow/META
-${OCAML_SITELIB}/mirage-flow/dune-package
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow/mirage_flow.a
-${OCAML_SITELIB}/mirage-flow/mirage_flow.cma
-${OCAML_SITELIB}/mirage-flow/mirage_flow.cmi
-${OCAML_SITELIB}/mirage-flow/mirage_flow.cmt
-${OCAML_SITELIB}/mirage-flow/mirage_flow.cmti
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow/mirage_flow.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow/mirage_flow.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/mirage-flow/mirage_flow.cmxs
-${OCAML_SITELIB}/mirage-flow/mirage_flow.ml
-${OCAML_SITELIB}/mirage-flow/mirage_flow.mli
-${OCAML_SITELIB}/mirage-flow/opam
-share/doc/mirage-flow-combinators/CHANGES.md
-share/doc/mirage-flow-combinators/LICENSE.md
-share/doc/mirage-flow-combinators/README.md
-share/doc/mirage-flow-unix/CHANGES.md
-share/doc/mirage-flow-unix/LICENSE.md
-share/doc/mirage-flow-unix/README.md
-share/doc/mirage-flow/CHANGES.md
-share/doc/mirage-flow/LICENSE.md
-share/doc/mirage-flow/README.md
diff --git a/devel/ocaml-mirage-flow/buildlink3.mk b/devel/ocaml-mirage-flow/buildlink3.mk
deleted file mode 100644
index 6ac435133ea6..000000000000
--- a/devel/ocaml-mirage-flow/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2022/06/13 08:12:02 jaapb Exp $
-
-BUILDLINK_TREE+=	ocaml-mirage-flow
-
-.if !defined(OCAML_MIRAGE_FLOW_BUILDLINK3_MK)
-OCAML_MIRAGE_FLOW_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.ocaml-mirage-flow+=	ocaml-mirage-flow>=3.0.0
-BUILDLINK_PKGSRCDIR.ocaml-mirage-flow?=		../../devel/ocaml-mirage-flow
-
-.endif	# OCAML_MIRAGE_FLOW_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-ocaml-mirage-flow
diff --git a/devel/ocaml-mirage-flow/distinfo b/devel/ocaml-mirage-flow/distinfo
deleted file mode 100644
index de5740a0ed35..000000000000
--- a/devel/ocaml-mirage-flow/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1 2022/06/13 08:12:02 jaapb Exp $
-
-BLAKE2s (mirage-flow-3.0.0.tar.gz) = 15fe99c7474a1e76b18828348525dff6c25cc2c62088c225db7677c773ad3016
-SHA512 (mirage-flow-3.0.0.tar.gz) = 0397bf5a1bea5ae91c498fe0a56f5b5e863b59709938bca91ae75c998435a221199ffb9a26ab06bf238fce0a34e06a3c3f3794bca5ad9d95114eca03b5ff7e8c
-Size (mirage-flow-3.0.0.tar.gz) = 11463 bytes
diff --git a/meta-pkgs/modular-xorg/avoid-duplicate.mk b/meta-pkgs/modular-xorg/avoid-duplicate.mk
index b748e5bc0ff1..5209491208b6 100644
--- a/meta-pkgs/modular-xorg/avoid-duplicate.mk
+++ b/meta-pkgs/modular-xorg/avoid-duplicate.mk
@@ -5,15 +5,15 @@
 .if ${X11_TYPE} == "native"
 .  if !empty(X11_BIN_NAME)
 .    if exists(${X11BASE}/bin/${X11_BIN_NAME})
-#PKG_SKIP_REASON+=	"Package set is using native X11 component"
+PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  elif !empty(X11_LIB_NAME)
 .    if exists(${X11BASE}/lib/${X11_LIB_NAME}.so)
-#PKG_SKIP_REASON+=	"Package set is using native X11 component"
+PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  elif !empty(X11_DRV_NAME)
 .    if exists(${X11BASE}/lib/modules/drivers/${X11_DRV_NAME}_drv.so)
-#PKG_SKIP_REASON+=	"Package set is using native X11 component"
+PKG_SKIP_REASON+=	"Package set is using native X11 component"
 .    endif
 .  endif
 .endif