[pkgsrc/trunk]: pkgsrc/x11/motif motif: pull libXt as a tool dependency only ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a7a4c69c158
branches:  trunk
changeset: 376668:0a7a4c69c158
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Apr 11 09:04:51 2022 +0000

description:
motif: pull libXt as a tool dependency only if using modular xorg *and*
cross-compiling.

using TOOL_DEPENDS for libXt bypasses normal builtin checks, so the
pkgsrc version is pulled in, and libXt is marked unavailable when using
native x.

evidence so far indicates libxt is only needed as a tool dependency
when cross-compiling (the distinction between normal and tool depends
primarily being relevent during cross-builds anyway), but this
also confused me because libXt installs nothing tool-like? Is motif's
build system broken (it's likely!)?

diffstat:

 x11/motif/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 2aababd7b48e -r 0a7a4c69c158 x11/motif/Makefile
--- a/x11/motif/Makefile        Mon Apr 11 08:29:55 2022 +0000
+++ b/x11/motif/Makefile        Mon Apr 11 09:04:51 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/04/10 12:52:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/11 09:04:51 nia Exp $
 
 DISTNAME=              motif-2.3.8
 PKGREVISION=           1
@@ -47,8 +47,6 @@
 CONFIGURE_ARGS+=       --enable-xft
 CFLAGS.SunOS+=         -D_POSIX_PTHREAD_SEMANTICS
 
-TOOL_DEPENDS+=         libXt>=0:../../x11/libXt
-
 MAKE_FLAGS+=           CC_FOR_BUILD=${NATIVE_CC:Q:U${CC:Q}}
 MAKE_FLAGS+=           LIBS_FOR_BUILD=-lXt
 
@@ -62,6 +60,9 @@
                LDFLAGS_FOR_BUILD=-L${PREFIX:Q}/lib\ ${COMPILER_RPATH_FLAG:Q}${PREFIX:Q}/lib
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__usr_X_include_X11_X_h=no
 CONFIGURE_ARGS.NetBSD+=        ac_cv_file__usr_X11R6_include_X11_X_h=no
+.  if ${X11_TYPE} != "native"
+TOOL_DEPENDS+=         libXt>=0:../../x11/libXt
+.  endif
 .endif
 
 # 1) Fix the man pages to refer to the correct sections.