Module Name: src
Committed By: cjep
Date: Wed Jun 2 14:46:25 UTC 2021
Modified Files:
src/external/mit/xorg/bin/bitmap [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/editres [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-cache [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-cat [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-conflist [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-list [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-match [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-pattern [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-query [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-scan [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fc-validate [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/fstobdf [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/ico [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/listres [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/oclock [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/proxymngr [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/setxkbmap [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/smproxy [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/transset [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/twm [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xcmsdb [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xconsole [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xcutsel [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xedit/xedit [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xev [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xf86dga [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xfindproxy [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xfontsel [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xgc [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xhost [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xinit [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xkbcomp [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xkbevd [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xkbprint [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xkill [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xload [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xlsatoms [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xlsclients [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xlsfonts [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xmag [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xman [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xmessage [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xmh [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xmodmap [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xmore [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xprop [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xrandr [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xrdb [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xrefresh [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xsetmode [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xsetpointer [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xsetwallpaper [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xsm [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xstdcmap [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xvinfo [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xwd [cjep_sun2x]: Makefile
src/external/mit/xorg/bin/xwud [cjep_sun2x]: Makefile
Log Message:
Use x11 variables for LDADD and DPADD. Now builds on sun2.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.36.1 src/external/mit/xorg/bin/bitmap/Makefile
cvs rdiff -u -r1.3 -r1.3.36.1 src/external/mit/xorg/bin/editres/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/bin/fc-cache/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/mit/xorg/bin/fc-cat/Makefile
cvs rdiff -u -r1.1 -r1.1.10.1 src/external/mit/xorg/bin/fc-conflist/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/mit/xorg/bin/fc-list/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/bin/fc-match/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/mit/xorg/bin/fc-pattern/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/bin/fc-query/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 src/external/mit/xorg/bin/fc-scan/Makefile
cvs rdiff -u -r1.2 -r1.2.8.1 src/external/mit/xorg/bin/fc-validate/Makefile
cvs rdiff -u -r1.3 -r1.3.24.1 src/external/mit/xorg/bin/fstobdf/Makefile
cvs rdiff -u -r1.3 -r1.3.10.1 src/external/mit/xorg/bin/ico/Makefile
cvs rdiff -u -r1.2 -r1.2.36.1 src/external/mit/xorg/bin/listres/Makefile
cvs rdiff -u -r1.3 -r1.3.36.1 src/external/mit/xorg/bin/oclock/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/bin/proxymngr/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/setxkbmap/Makefile
cvs rdiff -u -r1.6 -r1.6.24.1 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.1 -r1.1.10.1 src/external/mit/xorg/bin/transset/Makefile
cvs rdiff -u -r1.8 -r1.8.6.1 src/external/mit/xorg/bin/twm/Makefile
cvs rdiff -u -r1.3 -r1.3.24.1 src/external/mit/xorg/bin/xcmsdb/Makefile
cvs rdiff -u -r1.5 -r1.5.6.1 src/external/mit/xorg/bin/xconsole/Makefile
cvs rdiff -u -r1.2 -r1.2.36.1 src/external/mit/xorg/bin/xcutsel/Makefile
cvs rdiff -u -r1.5 -r1.5.24.1 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xev/Makefile
cvs rdiff -u -r1.2 -r1.2.54.1 src/external/mit/xorg/bin/xf86dga/Makefile
cvs rdiff -u -r1.2 -r1.2.24.1 src/external/mit/xorg/bin/xfindproxy/Makefile
cvs rdiff -u -r1.3 -r1.3.36.1 src/external/mit/xorg/bin/xfontsel/Makefile
cvs rdiff -u -r1.4 -r1.4.36.1 src/external/mit/xorg/bin/xgc/Makefile
cvs rdiff -u -r1.4 -r1.4.8.1 src/external/mit/xorg/bin/xhost/Makefile
cvs rdiff -u -r1.11 -r1.11.4.1 src/external/mit/xorg/bin/xinit/Makefile
cvs rdiff -u -r1.11 -r1.11.4.1 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs rdiff -u -r1.3 -r1.3.24.1 src/external/mit/xorg/bin/xkbevd/Makefile
cvs rdiff -u -r1.2 -r1.2.24.1 src/external/mit/xorg/bin/xkbprint/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.5 -r1.5.36.1 src/external/mit/xorg/bin/xload/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xlsatoms/Makefile
cvs rdiff -u -r1.8 -r1.8.24.1 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.3 -r1.3.24.1 src/external/mit/xorg/bin/xlsfonts/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xmag/Makefile
cvs rdiff -u -r1.9 -r1.9.8.1 src/external/mit/xorg/bin/xman/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xmessage/Makefile
cvs rdiff -u -r1.8 -r1.8.6.1 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.5 -r1.5.24.1 src/external/mit/xorg/bin/xmodmap/Makefile
cvs rdiff -u -r1.5 -r1.5.8.1 src/external/mit/xorg/bin/xmore/Makefile
cvs rdiff -u -r1.5 -r1.5.36.1 src/external/mit/xorg/bin/xprop/Makefile
cvs rdiff -u -r1.7 -r1.7.24.1 src/external/mit/xorg/bin/xrandr/Makefile
cvs rdiff -u -r1.8 -r1.8.24.1 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.3 -r1.3.10.1 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.72.1 \
src/external/mit/xorg/bin/xsetmode/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.72.1 \
src/external/mit/xorg/bin/xsetpointer/Makefile
cvs rdiff -u -r1.2 -r1.2.40.1 \
src/external/mit/xorg/bin/xsetwallpaper/Makefile
cvs rdiff -u -r1.4 -r1.4.4.1 src/external/mit/xorg/bin/xsm/Makefile
cvs rdiff -u -r1.4 -r1.4.24.1 src/external/mit/xorg/bin/xstdcmap/Makefile
cvs rdiff -u -r1.5 -r1.5.24.1 src/external/mit/xorg/bin/xvinfo/Makefile
cvs rdiff -u -r1.5 -r1.5.10.1 src/external/mit/xorg/bin/xwd/Makefile
cvs rdiff -u -r1.3 -r1.3.10.1 src/external/mit/xorg/bin/xwud/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bitmap/Makefile
diff -u src/external/mit/xorg/bin/bitmap/Makefile:1.4 src/external/mit/xorg/bin/bitmap/Makefile:1.4.36.1
--- src/external/mit/xorg/bin/bitmap/Makefile:1.4 Fri May 31 09:14:18 2013
+++ src/external/mit/xorg/bin/bitmap/Makefile Wed Jun 2 14:46:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4.36.1 2021/06/02 14:46:17 cjep Exp $
.include <bsd.own.mk>
@@ -14,9 +14,8 @@ FILESDIR=${X11INCDIR}/X11/bitmaps
CPPFLAGS+= -DHAVE_MKSTEMP -DHAVE_LRINT
-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}
SUBDIR= bmtoa atobm app-defaults
Index: src/external/mit/xorg/bin/editres/Makefile
diff -u src/external/mit/xorg/bin/editres/Makefile:1.3 src/external/mit/xorg/bin/editres/Makefile:1.3.36.1
--- src/external/mit/xorg/bin/editres/Makefile:1.3 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/editres/Makefile Wed Jun 2 14:46:17 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.3.36.1 2021/06/02 14:46:17 cjep Exp $
.include <bsd.own.mk>
@@ -8,9 +8,8 @@ SRCS= actions.c comm.c editres.c geometr
APPDEFS=Editres.ad Editres-color.ad
-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}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/fc-cache/Makefile
diff -u src/external/mit/xorg/bin/fc-cache/Makefile:1.4 src/external/mit/xorg/bin/fc-cache/Makefile:1.4.8.1
--- src/external/mit/xorg/bin/fc-cache/Makefile:1.4 Wed Jul 4 12:25:48 2018
+++ src/external/mit/xorg/bin/fc-cache/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/04 12:25:48 maya Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -8,8 +8,8 @@ CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.fontconfig}/../include
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-cat/Makefile
diff -u src/external/mit/xorg/bin/fc-cat/Makefile:1.3 src/external/mit/xorg/bin/fc-cat/Makefile:1.3.8.1
--- src/external/mit/xorg/bin/fc-cat/Makefile:1.3 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-cat/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-cat
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-conflist/Makefile
diff -u src/external/mit/xorg/bin/fc-conflist/Makefile:1.1 src/external/mit/xorg/bin/fc-conflist/Makefile:1.1.10.1
--- src/external/mit/xorg/bin/fc-conflist/Makefile:1.1 Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/bin/fc-conflist/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.1.10.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-conflist
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-list/Makefile
diff -u src/external/mit/xorg/bin/fc-list/Makefile:1.3 src/external/mit/xorg/bin/fc-list/Makefile:1.3.8.1
--- src/external/mit/xorg/bin/fc-list/Makefile:1.3 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-list/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-list
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-match/Makefile
diff -u src/external/mit/xorg/bin/fc-match/Makefile:1.4 src/external/mit/xorg/bin/fc-match/Makefile:1.4.8.1
--- src/external/mit/xorg/bin/fc-match/Makefile:1.4 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-match/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-match
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat -lbz2 -lz
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBBZ2} ${LIBZ}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-pattern/Makefile
diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.3 src/external/mit/xorg/bin/fc-pattern/Makefile:1.3.8.1
--- src/external/mit/xorg/bin/fc-pattern/Makefile:1.3 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-pattern/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-pattern
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-query/Makefile
diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.4 src/external/mit/xorg/bin/fc-query/Makefile:1.4.8.1
--- src/external/mit/xorg/bin/fc-query/Makefile:1.4 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-query/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-query
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-scan/Makefile
diff -u src/external/mit/xorg/bin/fc-scan/Makefile:1.3 src/external/mit/xorg/bin/fc-scan/Makefile:1.3.8.1
--- src/external/mit/xorg/bin/fc-scan/Makefile:1.3 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-scan/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-scan
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fc-validate/Makefile
diff -u src/external/mit/xorg/bin/fc-validate/Makefile:1.2 src/external/mit/xorg/bin/fc-validate/Makefile:1.2.8.1
--- src/external/mit/xorg/bin/fc-validate/Makefile:1.2 Wed Jul 4 12:25:49 2018
+++ src/external/mit/xorg/bin/fc-validate/Makefile Wed Jun 2 14:46:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/07/04 12:25:49 maya Exp $
+# $NetBSD: Makefile,v 1.2.8.1 2021/06/02 14:46:18 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= fc-validate
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+= -DHAVE_GETOPT_LONG=1
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= ${XLIBLDADD_FC}
+DPADD+= ${XLIBDPADD_FC}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
Index: src/external/mit/xorg/bin/fstobdf/Makefile
diff -u src/external/mit/xorg/bin/fstobdf/Makefile:1.3 src/external/mit/xorg/bin/fstobdf/Makefile:1.3.24.1
--- src/external/mit/xorg/bin/fstobdf/Makefile:1.3 Wed Jul 22 07:58:00 2015
+++ src/external/mit/xorg/bin/fstobdf/Makefile Wed Jun 2 14:46:19 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
PROG= fstobdf
SRCS= chars.c fstobdf.c header.c props.c
-LDADD+= -lFS -lXext -lX11
-DPADD+= ${LIBFS} ${LIBXEXT} ${LIBX11}
+LDADD+= -lFS ${XLIBLDADD_XEXT}
+DPADD+= ${LIBFS} ${XLIBDPADD_XEXT}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/ico/Makefile
diff -u src/external/mit/xorg/bin/ico/Makefile:1.3 src/external/mit/xorg/bin/ico/Makefile:1.3.10.1
--- src/external/mit/xorg/bin/ico/Makefile:1.3 Sun Mar 11 08:03:20 2018
+++ src/external/mit/xorg/bin/ico/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/03/11 08:03:20 mrg Exp $
+# $NetBSD: Makefile,v 1.3.10.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -6,8 +6,8 @@ PROG= ico
CPPFLAGS+=-DMULTITHREAD ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION}
-LDADD+= -lXext -lX11 -lpthread -lm
-DPADD+= ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
+LDADD+= ${XLIBLDADD_XEXT} -lpthread -lm
+DPADD+= ${XLIBDPADD_XEXT} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/listres/Makefile
diff -u src/external/mit/xorg/bin/listres/Makefile:1.2 src/external/mit/xorg/bin/listres/Makefile:1.2.36.1
--- src/external/mit/xorg/bin/listres/Makefile:1.2 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/listres/Makefile Wed Jun 2 14:46:19 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.2.36.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
PROG= listres
-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}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/oclock/Makefile
diff -u src/external/mit/xorg/bin/oclock/Makefile:1.3 src/external/mit/xorg/bin/oclock/Makefile:1.3.36.1
--- src/external/mit/xorg/bin/oclock/Makefile:1.3 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/oclock/Makefile Wed Jun 2 14:46:19 2021
@@ -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:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ SRCS= oclock.c Clock.c transform.c
APPDEFS=Clock-color
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+= ${XLIBLDADD_XMU} -lm
+DPADD+= ${XLIBDPADD_XMU} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/proxymngr/Makefile
diff -u src/external/mit/xorg/bin/proxymngr/Makefile:1.4 src/external/mit/xorg/bin/proxymngr/Makefile:1.4.8.1
--- src/external/mit/xorg/bin/proxymngr/Makefile:1.4 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/bin/proxymngr/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -20,8 +20,8 @@ CPPSCRIPTFLAGS= -DLBXPROXY=${X11BINDIR}/
CONFIGFILES= pmconfig
FILESDIR= ${PROXYMANAGERDIR}
-LDADD+= -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XT}
+DPADD+= ${XLIBDPADD_XT}
.if (${USE_INET6} != "no")
CPPFLAGS+= -DIPv6
Index: src/external/mit/xorg/bin/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.4 src/external/mit/xorg/bin/setxkbmap/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.4 Sun Jul 19 22:30:58 2015
+++ src/external/mit/xorg/bin/setxkbmap/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 22:30:58 mrg Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= setxkbmap
CPPFLAGS+= -DDFLT_XKB_CONFIG_ROOT=\"${X11LIBDIR}/xkb\" \
-D__XKBDEFRULES__=${__XKBDEFRULES__}
-LDADD+= -lxkbfile -lXext -lX11
-DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_KDFILE}
+DPADD+= ${XLIBDPADD_KDFILE}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.6 src/external/mit/xorg/bin/smproxy/Makefile:1.6.24.1
--- src/external/mit/xorg/bin/smproxy/Makefile:1.6 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/smproxy/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.6.24.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMU}
+DPADD+= ${XLIBDPADD_XMU}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/transset/Makefile
diff -u src/external/mit/xorg/bin/transset/Makefile:1.1 src/external/mit/xorg/bin/transset/Makefile:1.1.10.1
--- src/external/mit/xorg/bin/transset/Makefile:1.1 Mon Mar 11 09:20:13 2019
+++ src/external/mit/xorg/bin/transset/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: Makefile,v 1.1.10.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ SRCS= dsimple.c transSet.c
CPPFLAGS+=${X11FLAGS.EXTENSION}
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= ${XLIBLDADD_X11}
+DPADD+= ${XLIBDPADD_X11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/twm/Makefile
diff -u src/external/mit/xorg/bin/twm/Makefile:1.8 src/external/mit/xorg/bin/twm/Makefile:1.8.6.1
--- src/external/mit/xorg/bin/twm/Makefile:1.8 Fri Sep 13 10:31:46 2019
+++ src/external/mit/xorg/bin/twm/Makefile Wed Jun 2 14:46:19 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/09/13 10:31:46 maya Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2021/06/02 14:46:19 cjep Exp $
.include <bsd.own.mk>
@@ -39,8 +39,8 @@ deftwmrc.c: system.twmrc deftwmrc.sed
echo ' (char *) 0 };' >>$@
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMU}
+DPADD+= ${XLIBDPADD_XMU}
.PATH: ${TWMDIR}/src ${TWMDIR}/man
Index: src/external/mit/xorg/bin/xcmsdb/Makefile
diff -u src/external/mit/xorg/bin/xcmsdb/Makefile:1.3 src/external/mit/xorg/bin/xcmsdb/Makefile:1.3.24.1
--- src/external/mit/xorg/bin/xcmsdb/Makefile:1.3 Sun Jul 19 22:30:58 2015
+++ src/external/mit/xorg/bin/xcmsdb/Makefile Wed Jun 2 14:46:20 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2015/07/19 22:30:58 mrg Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
PROG= xcmsdb
SRCS= xcmsdb.c loadData.c
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= ${XLIBLDADD_X11}
+DPADD+= ${XLIBDPADD_X11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xconsole/Makefile
diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.5 src/external/mit/xorg/bin/xconsole/Makefile:1.5.6.1
--- src/external/mit/xorg/bin/xconsole/Makefile:1.5 Sun Oct 13 07:28:08 2019
+++ src/external/mit/xorg/bin/xconsole/Makefile Wed Jun 2 14:46:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5.6.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
@@ -6,9 +6,8 @@ PROG= xconsole
APPDEFS=XConsole
-LDADD+= -lutil -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
-DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11}
+LDADD+= -lutil ${XLIBLDADD_XAW}
+DPADD+= ${LIBUTIL} ${XLIBDPADD_XAW}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xcutsel/Makefile
diff -u src/external/mit/xorg/bin/xcutsel/Makefile:1.2 src/external/mit/xorg/bin/xcutsel/Makefile:1.2.36.1
--- src/external/mit/xorg/bin/xcutsel/Makefile:1.2 Fri May 31 06:46:55 2013
+++ src/external/mit/xorg/bin/xcutsel/Makefile Wed Jun 2 14:46:20 2021
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:46:55 mrg Exp $
+# $NetBSD: Makefile,v 1.2.36.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
PROG= xcutsel
-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.xclipboard}
.PATH: ${X11SRCDIR.xclipboard}/man
Index: src/external/mit/xorg/bin/xedit/xedit/Makefile
diff -u src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5 src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5.24.1
--- src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5 Sun Jul 19 19:49:18 2015
+++ src/external/mit/xorg/bin/xedit/xedit/Makefile Wed Jun 2 14:46:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
+# $NetBSD: Makefile,v 1.5.24.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
@@ -17,9 +17,8 @@ DPADD+= ${LIB.${_L}}/lib${_L}.a
LDADD+= -L${LIB.${_L}} -l${_L}
.endfor
-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}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xev/Makefile
diff -u src/external/mit/xorg/bin/xev/Makefile:1.4 src/external/mit/xorg/bin/xev/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xev/Makefile:1.4 Sun Jul 19 19:49:18 2015
+++ src/external/mit/xorg/bin/xev/Makefile Wed Jun 2 14:46:20 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 19:49:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
PROG= xev
-LDADD+= -lX11 -lXrandr
-DPADD+= ${LIBX11} ${LIBXRANDR}
+LDADD+= ${XLIBLDADD_XRANDR}
+DPADD+= ${XLIBDPADD_XRANDR}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xf86dga/Makefile
diff -u src/external/mit/xorg/bin/xf86dga/Makefile:1.2 src/external/mit/xorg/bin/xf86dga/Makefile:1.2.54.1
--- src/external/mit/xorg/bin/xf86dga/Makefile:1.2 Sat May 22 02:40:40 2010
+++ src/external/mit/xorg/bin/xf86dga/Makefile Wed Jun 2 14:46:20 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2010/05/22 02:40:40 mrg Exp $
+# $NetBSD: Makefile,v 1.2.54.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
PROG= dga
-LDADD+= -lXxf86dga -lXext -lX11
-DPADD+= ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XF86DGA}
+DPADD+= ${XLIBDPADD_XF86DGA}
.PATH: ${X11SRCDIR.xf86dga}
Index: src/external/mit/xorg/bin/xfindproxy/Makefile
diff -u src/external/mit/xorg/bin/xfindproxy/Makefile:1.2 src/external/mit/xorg/bin/xfindproxy/Makefile:1.2.24.1
--- src/external/mit/xorg/bin/xfindproxy/Makefile:1.2 Sun Jul 19 22:43:26 2015
+++ src/external/mit/xorg/bin/xfindproxy/Makefile Wed Jun 2 14:46:20 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2015/07/19 22:43:26 mrg Exp $
+# $NetBSD: Makefile,v 1.2.24.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
PROG= xfindproxy
-LDADD+= -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XT}
+DPADD+= ${XLIBDPADD_XT}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/bin/xfontsel/Makefile
diff -u src/external/mit/xorg/bin/xfontsel/Makefile:1.3 src/external/mit/xorg/bin/xfontsel/Makefile:1.3.36.1
--- src/external/mit/xorg/bin/xfontsel/Makefile:1.3 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xfontsel/Makefile Wed Jun 2 14:46:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3.36.1 2021/06/02 14:46:20 cjep Exp $
.include <bsd.own.mk>
@@ -7,9 +7,8 @@ SRCS= xfontsel.c ULabel.c
APPDEFS=XFontSel
-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
Index: src/external/mit/xorg/bin/xgc/Makefile
diff -u src/external/mit/xorg/bin/xgc/Makefile:1.4 src/external/mit/xorg/bin/xgc/Makefile:1.4.36.1
--- src/external/mit/xorg/bin/xgc/Makefile:1.4 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xgc/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.4.36.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -11,9 +11,8 @@ CPPFLAGS+=-I. -I${X11SRCDIR.${PROG}}
APPDEFS=Xgc Xgc-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}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.4 src/external/mit/xorg/bin/xhost/Makefile:1.4.8.1
--- src/external/mit/xorg/bin/xhost/Makefile:1.4 Sun Mar 3 09:19:02 2019
+++ src/external/mit/xorg/bin/xhost/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/03/03 09:19:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -11,8 +11,8 @@ CPPFLAGS+=-DHAVE_INET_ATON
CPPFLAGS+= -DIPv6
.endif
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.11 src/external/mit/xorg/bin/xinit/Makefile:1.11.4.1
--- src/external/mit/xorg/bin/xinit/Makefile:1.11 Mon Oct 12 11:43:11 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -30,8 +30,8 @@ SCRIPTS= startx
CONFIGFILES= xinitrc
FILESDIR= ${XINITDIR}
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
X11EXTRAMANTRANSFORMS+= \
__xinitdir__ ${XINITDIR} \
Index: src/external/mit/xorg/bin/xkbcomp/Makefile
diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.11 src/external/mit/xorg/bin/xkbcomp/Makefile:1.11.4.1
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.11 Mon Apr 20 13:04:10 2020
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/04/20 13:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
.include "Makefile.common"
@@ -22,8 +22,8 @@ FILES= README
SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR}
-LDADD+= -lxkbfile -lXext -lX11
-DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_KDFILE}
+DPADD+= ${XLIBDPADD_KDFILE}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xkbevd/Makefile
diff -u src/external/mit/xorg/bin/xkbevd/Makefile:1.3 src/external/mit/xorg/bin/xkbevd/Makefile:1.3.24.1
--- src/external/mit/xorg/bin/xkbevd/Makefile:1.3 Wed Jul 22 08:35:26 2015
+++ src/external/mit/xorg/bin/xkbevd/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -10,8 +10,8 @@ CPPFLAGS+=-DDFLT_SOUND_CMD='"/usr/bin/au
CPPFLAGS+=-DDFLT_SOUND_DIR='"${X11ROOTDIR}/share/sounds/"'
CPPFLAGS+=-DHAVE_STRCASECMP
CPPFLAGS+=-I${X11SRCDIR.${PROG}}
-LDADD+= -lxkbfile -lXext -lX11
-DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_KDFILE}
+DPADD+= ${XLIBDPADD_KDFILE}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xkbprint/Makefile
diff -u src/external/mit/xorg/bin/xkbprint/Makefile:1.2 src/external/mit/xorg/bin/xkbprint/Makefile:1.2.24.1
--- src/external/mit/xorg/bin/xkbprint/Makefile:1.2 Sun Jul 19 22:42:24 2015
+++ src/external/mit/xorg/bin/xkbprint/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/19 22:42:24 mrg Exp $
+# $NetBSD: Makefile,v 1.2.24.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ SRCS= xkbprint.c utils.c psgeom.c
CPPFLAGS+= -DHAVE_ASPRINTF
-LDADD+= -lxkbfile -lXext -lX11
-DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_KDFILE}
+DPADD+= ${XLIBDPADD_KDFILE}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.4 src/external/mit/xorg/bin/xkill/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xkill/Makefile:1.4 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xkill/Makefile Wed Jun 2 14:46:21 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
PROG= xkill
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xload/Makefile
diff -u src/external/mit/xorg/bin/xload/Makefile:1.5 src/external/mit/xorg/bin/xload/Makefile:1.5.36.1
--- src/external/mit/xorg/bin/xload/Makefile:1.5 Thu Jun 13 11:25:18 2013
+++ src/external/mit/xorg/bin/xload/Makefile Wed Jun 2 14:46:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/06/13 11:25:18 christos Exp $
+# $NetBSD: Makefile,v 1.5.36.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
@@ -9,9 +9,8 @@ CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_GET
APPDEFS=XLoad
-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
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.4 src/external/mit/xorg/bin/xlsatoms/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.4 Sun Jul 19 23:15:05 2015
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Wed Jun 2 14:46:21 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 23:15:05 mrg Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:21 cjep Exp $
.include <bsd.own.mk>
PROG= xlsatoms
-LDADD+= -lxcb
-DPADD+= ${LIBXCB}
+LDADD+= ${XLIBLDADD_XCB}
+DPADD+= ${XLIBDPADD_XCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.8 src/external/mit/xorg/bin/xlsclients/Makefile:1.8.24.1
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.8 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xlsclients/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.8.24.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -8,8 +8,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHA
#BUILDSYMLINKS= xlscli.man xlsclients.man
-LDADD+= -lxcb -lxcb-atom
-DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
+LDADD+= ${XLIBLDADD_XCB_ATOM}
+DPADD+= ${XLIBDPADD_XCB_ATOM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.3 src/external/mit/xorg/bin/xlsfonts/Makefile:1.3.24.1
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.3 Mon Jul 20 03:12:57 2015
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Wed Jun 2 14:46:22 2021
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2015/07/20 03:12:57 mrg Exp $
+# $NetBSD: Makefile,v 1.3.24.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
PROG= xlsfonts
SRCS= xlsfonts.c dsimple.c
-LDADD+= -lXext -lX11
-DPADD+= ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XEXT}
+DPADD+= ${XLIBDPADD_XEXT}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xmag/Makefile
diff -u src/external/mit/xorg/bin/xmag/Makefile:1.4 src/external/mit/xorg/bin/xmag/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xmag/Makefile:1.4 Mon Jul 20 23:50:23 2015
+++ src/external/mit/xorg/bin/xmag/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/20 23:50:23 mrg Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -9,9 +9,8 @@ APPDEFS=Xmag
CPPFLAGS+= -DHAVE_LRINT -DHAVE_NANOSLEEP
-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}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.9 src/external/mit/xorg/bin/xman/Makefile:1.9.8.1
--- src/external/mit/xorg/bin/xman/Makefile:1.9 Mon Jul 15 05:41:17 2019
+++ src/external/mit/xorg/bin/xman/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/07/15 05:41:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9.8.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -16,9 +16,8 @@ APPDEFS=Xman
FILES= xman.help
FILESDIR=${X11LIBDIR}
-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 ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xmessage/Makefile
diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.4 src/external/mit/xorg/bin/xmessage/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xmessage/Makefile:1.4 Wed Jul 22 08:46:51 2015
+++ src/external/mit/xorg/bin/xmessage/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/22 08:46:51 mrg Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -7,9 +7,8 @@ SRCS= xmessage.c makeform.c readfile.c
APPDEFS=Xmessage Xmessage-color
-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}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.8 src/external/mit/xorg/bin/xmh/Makefile:1.8.6.1
--- src/external/mit/xorg/bin/xmh/Makefile:1.8 Sun Oct 13 07:28:08 2019
+++ src/external/mit/xorg/bin/xmh/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.8.6.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -14,9 +14,8 @@ CPPFLAGS+= -DHAS_VFORK -DXVENDORNAME=${X
APPDEFS=Xmh
-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
Index: src/external/mit/xorg/bin/xmodmap/Makefile
diff -u src/external/mit/xorg/bin/xmodmap/Makefile:1.5 src/external/mit/xorg/bin/xmodmap/Makefile:1.5.24.1
--- src/external/mit/xorg/bin/xmodmap/Makefile:1.5 Sun Jul 19 23:15:06 2015
+++ src/external/mit/xorg/bin/xmodmap/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5.24.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ SRCS= xmodmap.c pf.c handle.c exec.c
CPPFLAGS+= -DHAVE_ASPRINTF -DHAVE_STRNCASECMP
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= ${XLIBLDADD_X11}
+DPADD+= ${XLIBDPADD_X11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xmore/Makefile
diff -u src/external/mit/xorg/bin/xmore/Makefile:1.5 src/external/mit/xorg/bin/xmore/Makefile:1.5.8.1
--- src/external/mit/xorg/bin/xmore/Makefile:1.5 Mon Mar 4 09:25:04 2019
+++ src/external/mit/xorg/bin/xmore/Makefile Wed Jun 2 14:46:22 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/03/04 09:25:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5.8.1 2021/06/02 14:46:22 cjep Exp $
.include <bsd.own.mk>
@@ -9,9 +9,8 @@ SRCS= xmore.c
CPPFLAGS+= -DXMORE
-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 ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xprop/Makefile
diff -u src/external/mit/xorg/bin/xprop/Makefile:1.5 src/external/mit/xorg/bin/xprop/Makefile:1.5.36.1
--- src/external/mit/xorg/bin/xprop/Makefile:1.5 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/bin/xprop/Makefile Wed Jun 2 14:46:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.5.36.1 2021/06/02 14:46:23 cjep Exp $
.include <bsd.own.mk>
@@ -8,8 +8,8 @@ SRCS= xprop.c dsimple.c clientwin.c
CPPFLAGS+=-DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H
CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.7 src/external/mit/xorg/bin/xrandr/Makefile:1.7.24.1
--- src/external/mit/xorg/bin/xrandr/Makefile:1.7 Tue Jun 7 23:33:45 2016
+++ src/external/mit/xorg/bin/xrandr/Makefile Wed Jun 2 14:46:23 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2016/06/07 23:33:45 christos Exp $
+# $NetBSD: Makefile,v 1.7.24.1 2021/06/02 14:46:23 cjep Exp $
.include <bsd.own.mk>
PROG= xrandr
-LDADD+= -lXrandr -lXrender -lXext -lX11 -lm
-DPADD+= ${LIBXRANDR} ${LIBXRENDER} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+= ${XLIBLDADD_XRANDR} -lm
+DPADD+= ${XLIBDPADD_XRANDR} ${LIBM}
CPPFLAGS+= -DVERSION=\"1.4.0\"
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.8 src/external/mit/xorg/bin/xrdb/Makefile:1.8.24.1
--- src/external/mit/xorg/bin/xrdb/Makefile:1.8 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xrdb/Makefile Wed Jun 2 14:46:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.8.24.1 2021/06/02 14:46:23 cjep Exp $
.include <bsd.own.mk>
@@ -7,8 +7,8 @@ PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX
CPPFLAGS+=-DHAVE_ASPRINTF
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xrefresh/Makefile
diff -u src/external/mit/xorg/bin/xrefresh/Makefile:1.3 src/external/mit/xorg/bin/xrefresh/Makefile:1.3.10.1
--- src/external/mit/xorg/bin/xrefresh/Makefile:1.3 Sun Mar 11 08:46:31 2018
+++ src/external/mit/xorg/bin/xrefresh/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/03/11 08:46:31 mrg Exp $
+# $NetBSD: Makefile,v 1.3.10.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xrefresh
-LDADD+= -lXext -lX11
-DPADD+= ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XEXT}
+DPADD+= ${XLIBDPADD_XEXT}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xsetmode/Makefile
diff -u src/external/mit/xorg/bin/xsetmode/Makefile:1.1.1.1 src/external/mit/xorg/bin/xsetmode/Makefile:1.1.1.1.72.1
--- src/external/mit/xorg/bin/xsetmode/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xsetmode/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.1.1.1.72.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xsetmode
-LDADD+= -lXi -lXext -lX11
-DPADD+= ${LIBXI} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XI}
+DPADD+= ${XLIBDPADD_XI}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/bin/xsetpointer/Makefile
diff -u src/external/mit/xorg/bin/xsetpointer/Makefile:1.1.1.1 src/external/mit/xorg/bin/xsetpointer/Makefile:1.1.1.1.72.1
--- src/external/mit/xorg/bin/xsetpointer/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xsetpointer/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.1.1.1.72.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xsetpointer
-LDADD+= -lXi -lXext -lX11
-DPADD+= ${LIBXI} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XI}
+DPADD+= ${XLIBDPADD_XI}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/bin/xsetwallpaper/Makefile
diff -u src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.2 src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.2.40.1
--- src/external/mit/xorg/bin/xsetwallpaper/Makefile:1.2 Thu Mar 22 23:46:26 2012
+++ src/external/mit/xorg/bin/xsetwallpaper/Makefile Wed Jun 2 14:46:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:26 joerg Exp $
+# $NetBSD: Makefile,v 1.2.40.1 2021/06/02 14:46:24 cjep Exp $
NOMAN= # defined
@@ -12,8 +12,8 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${NET
SRCPATH= ${X11SRCDIR.local}/programs/xsetwallpaper
-LDADD+= -lm -lX11
-DPADD+= ${LIBM} ${LIBX11}
+LDADD+= -lm ${XLIBLDADD_X11}
+DPADD+= ${LIBM} ${XLIBDPADD_X11}
.PATH: ${X11SRCDIR.local}/programs/xsetwallpaper
.PATH: ${NETBSDSRCDIR}/sys/dev/stbi
Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.4 src/external/mit/xorg/bin/xsm/Makefile:1.4.4.1
--- src/external/mit/xorg/bin/xsm/Makefile:1.4 Mon Apr 26 22:04:51 2021
+++ src/external/mit/xorg/bin/xsm/Makefile Wed Jun 2 14:46:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
@@ -19,9 +19,8 @@ FILESDIR= ${XSMDIR}
.PATH: ${X11SRCDIR.${PROG}}/app-defaults
APPDEFS=XSm
-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}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xstdcmap/Makefile
diff -u src/external/mit/xorg/bin/xstdcmap/Makefile:1.4 src/external/mit/xorg/bin/xstdcmap/Makefile:1.4.24.1
--- src/external/mit/xorg/bin/xstdcmap/Makefile:1.4 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xstdcmap/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.4.24.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xstdcmap
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMU}
+DPADD+= ${XLIBDPADD_XMU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.5 src/external/mit/xorg/bin/xvinfo/Makefile:1.5.24.1
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.5 Sun Jul 19 23:15:06 2015
+++ src/external/mit/xorg/bin/xvinfo/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
+# $NetBSD: Makefile,v 1.5.24.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xvinfo
-LDADD+= -lXv -lXext -lX11
-DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XV}
+DPADD+= ${XLIBDPADD_XV}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.5 src/external/mit/xorg/bin/xwd/Makefile:1.5.10.1
--- src/external/mit/xorg/bin/xwd/Makefile:1.5 Sun Mar 11 09:03:04 2018
+++ src/external/mit/xorg/bin/xwd/Makefile Wed Jun 2 14:46:24 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/03/11 09:03:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5.10.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
@@ -8,8 +8,8 @@ SRCS= xwd.c clientwin.c dsimple.c list.c
CPPFLAGS+=-I${X11SRCDIR./xlsfonts} -DXKB
.PATH: ${X11SRCDIR./xlsfonts}
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XMUU}
+DPADD+= ${XLIBDPADD_XMUU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xwud/Makefile
diff -u src/external/mit/xorg/bin/xwud/Makefile:1.3 src/external/mit/xorg/bin/xwud/Makefile:1.3.10.1
--- src/external/mit/xorg/bin/xwud/Makefile:1.3 Sun Mar 11 08:59:52 2018
+++ src/external/mit/xorg/bin/xwud/Makefile Wed Jun 2 14:46:24 2021
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2018/03/11 08:59:52 mrg Exp $
+# $NetBSD: Makefile,v 1.3.10.1 2021/06/02 14:46:24 cjep Exp $
.include <bsd.own.mk>
PROG= xwud
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= ${XLIBLDADD_X11}
+DPADD+= ${XLIBDPADD_X11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
