From 22daf9461ffc4925e304e19e9d8454d485b9d0a5 Mon Sep 17 00:00:00 2001
From: Taylor R Campbell <riastradh@NetBSD.org>
Date: Fri, 15 Apr 2022 23:36:31 +0000
Subject: [PATCH] x11/motif: Work around another quirk in build-time
 tool-building.

See comments for details.  Tidy up variable definitions while here.
---
 x11/motif/Makefile | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/x11/motif/Makefile b/x11/motif/Makefile
index 171c1d73f903..9e5d5437bd9d 100644
--- a/x11/motif/Makefile
+++ b/x11/motif/Makefile
@@ -50,16 +50,40 @@ 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+=		CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD:Q}
+MAKE_FLAGS+=		LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD:Q}
 MAKE_FLAGS+=		LIBS_FOR_BUILD=-lXt
 
+# wml.c has
+#
+#	#ifdef HAVE_CONFIG_H
+#	#include <config.h>
+#	#endif
+#	...
+#	#ifdef HAVE_FCNTL_H
+#	#include <fcntl.h>
+#	#else
+#	#include <sys/file.h>
+#	#endif
+#
+# Using config.h doesn't make sense for cross-builds because it
+# describes the target system, not the native system.  But, <fcntl.h>
+# is in POSIX and has been for a very long time.  If there are any
+# systems that _don't_ have it and really need <sys/file.h>, and still
+# run pkgsrc, we can make this conditional or find another way to do
+# it.
+#
+CPPFLAGS_FOR_BUILD+=	-DHAVE_FCNTL_H
+
 .if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-MAKE_FLAGS+=	CPPFLAGS_FOR_BUILD=${BUILDLINK_CPPFLAGS:Q}
-MAKE_FLAGS+=	LDFLAGS_FOR_BUILD=${BUILDLINK_LDFLAGS:Q}
+CPPFLAGS_FOR_BUILD+=	${BUILDLINK_CPPFLAGS:Q}
+LDFLAGS_FOR_BUILD+=	${BUILDLINK_LDFLAGS:Q}
 .else
+MAKE_FLAGS+=		CROSS_COMPILING=yes
 # XXX should support independent cross PREFIX
-MAKE_FLAGS+=	CROSS_COMPILING=yes \
-		CPPFLAGS_FOR_BUILD=-I${PREFIX:Q}/include \
-		LDFLAGS_FOR_BUILD=-L${PREFIX:Q}/lib\ ${COMPILER_RPATH_FLAG:Q}${PREFIX:Q}/lib
+CPPFLAGS_FOR_BUILD+=	-I${PREFIX:Q}/include
+LDFLAGS_FOR_BUILD+=	-L${PREFIX:Q}/lib
+LDFLAGS_FOR_BUILD+=	${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
 .endif