CVS commit: pkgsrc/mk/tools

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Jul 19 09:55:04 UTC 2021

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
mk: Fix PR pkg/56299

Add a test to check that an xbase set is installed when a tool depends on
X11 and X11_TYPE=native.
Thanks to Greg and Edgar for their comments and suggestions!


To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 pkgsrc/mk/tools/replace.mk

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

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.291 pkgsrc/mk/tools/replace.mk:1.292
--- pkgsrc/mk/tools/replace.mk:1.291    Tue Oct  6 17:36:50 2020
+++ pkgsrc/mk/tools/replace.mk  Mon Jul 19 09:55:04 2021
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.291 2020/10/06 17:36:50 rillig Exp $
+# $NetBSD: replace.mk,v 1.292 2021/07/19 09:55:04 triaxx Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1276,6 +1276,16 @@ TOOLS_PATH.makedepend=   ${X11BASE}/bin/ma
 ######################################################################
 
 .for _t_ in ${_USE_TOOLS}
+###
+### For each tool that depends on X11 for its native version, make
+### sure it is really installed (i.e. xbase has been installed).
+###
+.  if defined(TOOLS_PATH.${_t_}) && !empty(X11_TYPE:Mnative)
+.    if !exists(${TOOLS_PATH.${_t_}}) && !empty(TOOLS_PATH.${_t_}:M${X11BASE}*)
+_tmiss_+=      ${_t_}
+.    endif
+.  endif
+
 .  if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
       !defined(TOOLS_IGNORE.${_t_})
 #####
@@ -1336,6 +1346,10 @@ ${_v_}?= ${TOOLS_CMDLINE_${_TOOLS_VARNAM
 .  endif
 .endfor
 
+.if !empty(_tmiss_)
+PKG_FAIL_REASON+=      "${X11BASE}: X11_TYPE=native but xbase set is not installed (missing: ${_tmiss_}).  Either set X11_TYPE to modular or install xbase."
+.endif
+
 ######################################################################
 
 # For each tool that pkgsrc requires, make sure that the "TOOL" name