Sun Apr 10 08:52:01 2022 UTC ()
avoid-duplicate.mk: Rework to not include builtin.mk


(nia)
diff -r1.3 -r1.4 pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk
cvs diff -r1.3 -r1.4 pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk 2022/03/26 19:48:21 1.3
+++ pkgsrc/meta-pkgs/modular-xorg/avoid-duplicate.mk 2022/04/10 08:52:01 1.4
@@ -1,9 +1,19 @@ @@ -1,9 +1,19 @@
1# $NetBSD: avoid-duplicate.mk,v 1.3 2022/03/26 19:48:21 nia Exp $ 1# $NetBSD: avoid-duplicate.mk,v 1.4 2022/04/10 08:52:01 nia Exp $
2 2
3BUILTIN_PKG= ${X11_BUILTIN_NAME} 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5#.include "${.INCLUDEDFROMDIR}/builtin.mk" 5.if ${X11_TYPE} == "native"
6 6. if !empty(X11_BIN_NAME)
7#.if ${X11_TYPE} == "native" && ${USE_BUILTIN.${X11_BUILTIN_NAME}} == "yes" 7. if exists(${X11BASE}/bin/${X11_BIN_NAME})
8#PKG_SKIP_REASON+= "Package set is using native X11 component" 8PKG_SKIP_REASON+= "Package set is using native X11 component"
9#.endif 9. endif
 10. elif !empty(X11_LIB_NAME)
 11. if exists(${X11BASE}/lib/${X11_LIB_NAME}.so)
 12PKG_SKIP_REASON+= "Package set is using native X11 component"
 13. endif
 14. elif !empty(X11_DRV_NAME)
 15. if exists(${X11BASE}/lib/modules/drivers/${X11_DRV_NAME}_drv.so)
 16PKG_SKIP_REASON+= "Package set is using native X11 component"
 17. endif
 18. endif
 19.endif