CVS commit: pkgsrc/meta-pkgs/modular-xorg

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Apr 10 08:52:01 UTC 2022

Modified Files:
        pkgsrc/meta-pkgs/modular-xorg: avoid-duplicate.mk

Log Message:
avoid-duplicate.mk: Rework to not include builtin.mk


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk
diff -u pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk:1.3 pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk:1.4
--- pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk:1.3        Sat Mar 26 19:48:21 2022
+++ pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk    Sun Apr 10 08:52:01 2022
@@ -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