[src/netbsd-9]: src/external/mit/xorg/bin/xinit Pull up following revision(s)...

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

details:   https://anonhg.NetBSD.org/src/rev/6b720a05d701
branches:  netbsd-9
changeset: 941099:6b720a05d701
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 18 18:08:46 2020 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1115):

        external/mit/xorg/bin/xinit/Makefile: revision 1.8
        external/mit/xorg/bin/xinit/Makefile: revision 1.9

Define CTWM when building xinit
This will allow ctwm to eventually be used in the default xinitrc.

also allow uxterm to be used in the default xinitrc

diffstat:

 external/mit/xorg/bin/xinit/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 6fc7e7f45a47 -r 6b720a05d701 external/mit/xorg/bin/xinit/Makefile
--- a/external/mit/xorg/bin/xinit/Makefile      Fri Oct 16 08:17:09 2020 +0000
+++ b/external/mit/xorg/bin/xinit/Makefile      Sun Oct 18 18:08:46 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
+#      $NetBSD: Makefile,v 1.7.2.1 2020/10/18 18:08:46 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -13,10 +13,14 @@
 CPPSCRIPTS=    startx xinitrc
 CPPSCRIPTFLAGS_xinitrc=        -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
                -DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-               -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
+               -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+               -DUXTERM=${X11BINDIR}/uxterm \
+               -DCTWM=${X11BINDIR}/ctwm
 CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
                -DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
                -DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+               -DUXTERM=${X11BINDIR}/uxterm \
+               -DCTWM=${X11BINDIR}/ctwm \
                -DHAS_COOKIE_MAKER \
                -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'