[src/cjep_sun2x]: src/external/mit/xorg/bin Use x11 variables for LDADD and D...

[cjep <cjep%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/39ba30decf62
branches:  cjep_sun2x
changeset: 983702:39ba30decf62
user:      cjep <cjep%NetBSD.org@localhost>
date:      Wed Jun 02 14:55:47 2021 +0000

description:
Use x11 variables for LDADD and DPADD. Now builds on sun2.

diffstat:

 external/mit/xorg/bin/xbiff/Makefile      |  7 +++----
 external/mit/xorg/bin/xcalc/Makefile      |  7 +++----
 external/mit/xorg/bin/xclipboard/Makefile |  7 +++----
 external/mit/xorg/bin/xcompmgr/Makefile   |  6 +++---
 4 files changed, 12 insertions(+), 15 deletions(-)

diffs (82 lines):

diff -r fe458a27c86d -r 39ba30decf62 external/mit/xorg/bin/xbiff/Makefile
--- a/external/mit/xorg/bin/xbiff/Makefile      Wed Jun 02 14:46:17 2021 +0000
+++ b/external/mit/xorg/bin/xbiff/Makefile      Wed Jun 02 14:55:47 2021 +0000
@@ -1,13 +1,12 @@
-#      $NetBSD: Makefile,v 1.3 2019/07/15 05:41:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2021/06/02 15:04:23 cjep Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xbiff
 SRCS=  xbiff.c Mailbox.c
 
-LDADD+=        -lXext -lXaw -lXmu -lXt -lX11 -lSM -lICE -lXau
-DPADD+=        ${LIBXEXT} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBX11} ${LIBSM} ${LIBICE} \
-       ${LIBXAU}
+LDADD+=        ${XLIBLDADD_XAW}
+DPADD+=        ${XLIBDPADD_XAW}
 
 CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include
 CPPFLAGS+=     -D_CONST_X_STRING
diff -r fe458a27c86d -r 39ba30decf62 external/mit/xorg/bin/xcalc/Makefile
--- a/external/mit/xorg/bin/xcalc/Makefile      Wed Jun 02 14:46:17 2021 +0000
+++ b/external/mit/xorg/bin/xcalc/Makefile      Wed Jun 02 14:55:47 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2019/07/08 20:37:33 mrg Exp $
+#      $NetBSD: Makefile,v 1.5.8.1 2021/06/02 15:03:56 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,9 +7,8 @@
 
 APPDEFS=XCalc XCalc-color
 
-LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
-DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-       ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+=        ${XLIBLDADD_XAW} -lm
+DPADD+=        ${XLIBDPADD_XAW} ${LIBM}
 
 CPPFLAGS+=     -DHAVE_STRLCPY -D_CONST_X_STRING
 
diff -r fe458a27c86d -r 39ba30decf62 external/mit/xorg/bin/xclipboard/Makefile
--- a/external/mit/xorg/bin/xclipboard/Makefile Wed Jun 02 14:46:17 2021 +0000
+++ b/external/mit/xorg/bin/xclipboard/Makefile Wed Jun 02 14:55:47 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.36.1 2021/06/02 14:55:47 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -6,9 +6,8 @@
 
 APPDEFS=XClipboard
 
-LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
-DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-       ${LIBXPM} ${LIBXEXT} ${LIBX11}
+LDADD+=        ${XLIBLDADD_XAW}
+DPADD+=        ${XLIBDPADD_XAW}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 .PATH: ${X11SRCDIR.${PROG}}/man
diff -r fe458a27c86d -r 39ba30decf62 external/mit/xorg/bin/xcompmgr/Makefile
--- a/external/mit/xorg/bin/xcompmgr/Makefile   Wed Jun 02 14:46:17 2021 +0000
+++ b/external/mit/xorg/bin/xcompmgr/Makefile   Wed Jun 02 14:55:47 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2020/10/16 08:28:17 nia Exp $
+#      $NetBSD: Makefile,v 1.1.4.1 2021/06/02 15:02:43 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,8 @@
 
 LDADD+=        -lm -lXcomposite -lXdamage -lXfixes -lXrender
 DPADD+=        ${LIBM} ${LIBXCOMPOSITE} ${LIBXDAMAGE} ${LIBXFIXES} ${LIBXRENDER}
-LDADD+=        -lX11 -lXext
-DPADD+=        ${LIBX11} ${LIBXEXT}
+LDADD+=        ${XLIBLDADD_XEXT}
+DPADD+=        ${XLIBDPADD_XEXT}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man