diff options
| author | nia <nia@pkgsrc.org> | 2022-04-10 08:52:01 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2022-04-10 08:52:01 +0000 |
| commit | cf78bdccf7f3a7b3af7233320c75dd7bd05bfbaf (patch) | |
| tree | 67f43b290639964fa7cccd6c45348929cdadca9a /meta-pkgs | |
| parent | 292a03d0e71f682b3e3bbbab030de271df1ddd9b (diff) | |
| download | pkgsrc-cf78bdccf7f3a7b3af7233320c75dd7bd05bfbaf.tar.gz | |
avoid-duplicate.mk: Rework to not include builtin.mk
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/modular-xorg/avoid-duplicate.mk | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/meta-pkgs/modular-xorg/avoid-duplicate.mk b/meta-pkgs/modular-xorg/avoid-duplicate.mk index 930bb5ae1ce..5209491208b 100644 --- a/meta-pkgs/modular-xorg/avoid-duplicate.mk +++ b/meta-pkgs/modular-xorg/avoid-duplicate.mk @@ -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 |