[pkgsrc/trunk]: pkgsrc/meta-pkgs/modular-xorg avoid-duplicate.mk: Rework to n...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/087869f5a4fa
branches:  trunk
changeset: 376611:087869f5a4fa
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Apr 10 08:52:01 2022 +0000

description:
avoid-duplicate.mk: Rework to not include builtin.mk

diffstat:

 meta-pkgs/modular-xorg/avoid-duplicate.mk |  24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 74c3c98dac28 -r 087869f5a4fa meta-pkgs/modular-xorg/avoid-duplicate.mk
--- a/meta-pkgs/modular-xorg/avoid-duplicate.mk Sun Apr 10 08:09:31 2022 +0000
+++ b/meta-pkgs/modular-xorg/avoid-duplicate.mk Sun Apr 10 08:52:01 2022 +0000
@@ -1,9 +1,19 @@
-# $NetBSD: avoid-duplicate.mk,v 1.3 2022/03/26 19:48:21 nia Exp $
+# $NetBSD: avoid-duplicate.mk,v 1.4 2022/04/10 08:52:01 nia Exp $
 
-BUILTIN_PKG=           ${X11_BUILTIN_NAME}
+.include "../../mk/bsd.fast.prefs.mk"
 
-#.include "${.INCLUDEDFROMDIR}/builtin.mk"
-
-#.if ${X11_TYPE} == "native" && ${USE_BUILTIN.${X11_BUILTIN_NAME}} == "yes"
-#PKG_SKIP_REASON+=     "Package set is using native X11 component"
-#.endif
+.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"
+.    endif
+.  elif !empty(X11_LIB_NAME)
+.    if exists(${X11BASE}/lib/${X11_LIB_NAME}.so)
+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"
+.    endif
+.  endif
+.endif