CVS commit: pkgsrc/x11/motif

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 11 09:04:51 UTC 2022

Modified Files:
        pkgsrc/x11/motif: Makefile

Log Message:
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!)?


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/motif/Makefile

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

Modified files:

Index: pkgsrc/x11/motif/Makefile
diff -u pkgsrc/x11/motif/Makefile:1.19 pkgsrc/x11/motif/Makefile:1.20
--- pkgsrc/x11/motif/Makefile:1.19      Sun Apr 10 12:52:26 2022
+++ pkgsrc/x11/motif/Makefile   Mon Apr 11 09:04:51 2022
@@ -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_ENV.NetBSD+=        ac_cv_func_setpgr
 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 @@ MAKE_FLAGS+=  CROSS_COMPILING=yes \
                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.