Module Name: src
Committed By: mrg
Date: Mon Apr 26 22:04:51 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xdm/chooser: Makefile
src/external/mit/xorg/bin/xsm: Makefile
Log Message:
make build with new libXt.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsm/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/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.6
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/26 22:04:51 mrg Exp $
NOMAN= 1
@@ -6,7 +6,8 @@ NOMAN= 1
PROG= chooser
-CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+= -D_CONST_X_STRING=1
APPDEFS=Chooser
@@ -21,3 +22,6 @@ BINDIR= ${XDMCHOOSERPATH:H}
.include <bsd.prog.mk>
.PATH: ${X11SRCDIR.xdm}/app-defaults
+
+# XXX libXt
+COPTS.chooser.c+= -Wno-incompatible-pointer-types
Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.3 src/external/mit/xorg/bin/xsm/Makefile:1.4
--- src/external/mit/xorg/bin/xsm/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xsm/Makefile Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
.include <bsd.own.mk>
@@ -26,5 +26,8 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+# XXX libXt
+COPTS+= -Wno-incompatible-pointer-types
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
