[src/trunk]: src/external/mit/xorg/bin merge xrdb 1.1.0, xset 1.2.3, xvinfo 1...

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

details:   https://anonhg.NetBSD.org/src/rev/09b174411d17
branches:  trunk
changeset: 327812:09b174411d17
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 17 10:09:18 2014 +0000

description:
merge xrdb 1.1.0, xset 1.2.3, xvinfo 1.1.2, and xwd 1.0.6.

diffstat:

 external/mit/xorg/bin/xrdb/Makefile   |  4 ++--
 external/mit/xorg/bin/xset/Makefile   |  3 ++-
 external/mit/xorg/bin/xvinfo/Makefile |  6 ++++--
 external/mit/xorg/bin/xwd/Makefile    |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 3d8949ab9e75 -r 09b174411d17 external/mit/xorg/bin/xrdb/Makefile
--- a/external/mit/xorg/bin/xrdb/Makefile       Mon Mar 17 09:46:10 2014 +0000
+++ b/external/mit/xorg/bin/xrdb/Makefile       Mon Mar 17 10:09:18 2014 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/17 10:09:18 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xrdb
 
 CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP  # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF
+CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING=\"1.1.0\"
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff -r 3d8949ab9e75 -r 09b174411d17 external/mit/xorg/bin/xset/Makefile
--- a/external/mit/xorg/bin/xset/Makefile       Mon Mar 17 09:46:10 2014 +0000
+++ b/external/mit/xorg/bin/xset/Makefile       Mon Mar 17 10:09:18 2014 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2011/08/03 02:57:23 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xset
 
 CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+=     -DPACKAGE_STRING=\"1.2.3\"
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
 DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
diff -r 3d8949ab9e75 -r 09b174411d17 external/mit/xorg/bin/xvinfo/Makefile
--- a/external/mit/xorg/bin/xvinfo/Makefile     Mon Mar 17 09:46:10 2014 +0000
+++ b/external/mit/xorg/bin/xvinfo/Makefile     Mon Mar 17 10:09:18 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2012/03/22 23:46:27 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,9 @@
 LDADD+=        -lXv -lXext -lX11
 DPADD+=        ${LIBXV} ${LIBXEXT} ${LIBX11}
 
-.PATH: ${X11SRCDIR.${PROG}}
+CPPFLAGS+=     -DPACKAGE_STRING=\"1.1.2\"
+
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
 CWARNFLAGS.clang+=     -Wno-dangling-else
 
diff -r 3d8949ab9e75 -r 09b174411d17 external/mit/xorg/bin/xwd/Makefile
--- a/external/mit/xorg/bin/xwd/Makefile        Mon Mar 17 09:46:10 2014 +0000
+++ b/external/mit/xorg/bin/xwd/Makefile        Mon Mar 17 10:09:18 2014 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2014/03/17 10:09:18 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xwd
 SRCS=  xwd.c clientwin.c dsimple.c list.c multiVis.c
 
-CPPFLAGS+=-I${X11SRCDIR./xlsfonts}
+CPPFLAGS+=-I${X11SRCDIR./xlsfonts} -DXKB
 .PATH: ${X11SRCDIR./xlsfonts}
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11