Module Name: src
Committed By: mrg
Date: Sun Mar 11 08:46:31 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xrefresh: Makefile
src/external/mit/xorg/bin/xset: Makefile
Log Message:
use xorg-pkg-ver.mk and define HAVE_USLEEP.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xset/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/xrefresh/Makefile
diff -u src/external/mit/xorg/bin/xrefresh/Makefile:1.2 src/external/mit/xorg/bin/xrefresh/Makefile:1.3
--- src/external/mit/xorg/bin/xrefresh/Makefile:1.2 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xrefresh/Makefile Sun Mar 11 08:46:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/11 08:46:31 mrg Exp $
.include <bsd.own.mk>
@@ -10,5 +10,7 @@ DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.6 src/external/mit/xorg/bin/xset/Makefile:1.7
--- src/external/mit/xorg/bin/xset/Makefile:1.6 Sat Mar 3 03:34:17 2018
+++ src/external/mit/xorg/bin/xset/Makefile Sun Mar 11 08:46:31 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/11 08:46:31 mrg Exp $
.include <bsd.own.mk>
PROG= xset
-CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB -DHAVE_USLEEP
LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}