[src/trunk]: src/external/mit/xorg/bin/twm updates for twm 1.0.12.

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

details:   https://anonhg.NetBSD.org/src/rev/b4086ebd2d16
branches:  trunk
changeset: 368436:b4086ebd2d16
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 11 09:16:06 2022 +0000

description:
updates for twm 1.0.12.

diffstat:

 external/mit/xorg/bin/twm/Makefile |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (50 lines):

diff -r 4e7f09f47046 -r b4086ebd2d16 external/mit/xorg/bin/twm/Makefile
--- a/external/mit/xorg/bin/twm/Makefile        Mon Jul 11 08:51:22 2022 +0000
+++ b/external/mit/xorg/bin/twm/Makefile        Mon Jul 11 09:16:06 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2019/09/13 10:31:46 maya Exp $
+#      $NetBSD: Makefile,v 1.9 2022/07/11 09:16:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -16,8 +16,13 @@
 TWMDIR=                        ${X11SRCDIR.${PROG}}
 
 CPPFLAGS+=             -I. -I${TWMDIR}/src
-CPPFLAGS+=             -DHAVE_MKSTEMP -DXORG_RELEASE=${XORG_RELEASE} \
-                       -DXVENDORNAME=${XVENDORNAME}
+CPPFLAGS+=             -DHAVE_MKSTEMP \
+                       -DHAVE_XRANDR \
+                       -DXORG_RELEASE=${XORG_RELEASE} \
+                       -DXVENDORNAME=${XVENDORNAME} \
+                       -DAPP_NAME=\"twm\" \
+                       -DAPP_CLASS=\"twm\" \
+                       -DAPP_VERSION=\"$(VERSION)\"
 
 CPPFLAGS.parse.c=      -DSYSTEM_INIT_FILE=\"${TWMCONFIGDIR}/system.twmrc\"
 
@@ -33,14 +38,14 @@
        echo ' * This file is generated automatically from the default' >>$@
        echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@
        echo ' */' >>$@
-       echo 'char *defTwmrc[] = {' >>$@
+       echo 'const unsigned char *defTwmrc[] = {' >>$@
        ${TOOL_SED} -f ${TWMDIR}/src/deftwmrc.sed \
             < ${TWMDIR}/src/system.twmrc >>$@
        echo '    (char *) 0 };' >>$@
 
 
-LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
-DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+=        -lXrandr -lXmu -lXt -lSM -lICE -lXext -lX11
+DPADD+=        ${LIBXRANDR} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${TWMDIR}/src ${TWMDIR}/man
 
@@ -52,3 +57,6 @@
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
+
+# Needs bsd.x11.mk
+VERSION!=              ${PRINT_PACKAGE_VERSION} ${X11SRCDIR.twm}/configure