Module Name: src
Committed By: mrg
Date: Mon Mar 17 10:09:18 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
merge xrdb 1.1.0, xset 1.2.3, xvinfo 1.1.2, and xwd 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xvinfo/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xwd/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/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.4 src/external/mit/xorg/bin/xrdb/Makefile:1.5
--- src/external/mit/xorg/bin/xrdb/Makefile:1.4 Fri Jul 19 08:29:27 2013
+++ src/external/mit/xorg/bin/xrdb/Makefile Mon Mar 17 10:09:18 2014
@@ -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}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.2 src/external/mit/xorg/bin/xset/Makefile:1.3
--- src/external/mit/xorg/bin/xset/Makefile:1.2 Wed Aug 3 02:57:23 2011
+++ src/external/mit/xorg/bin/xset/Makefile Mon Mar 17 10:09:18 2014
@@ -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}
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.2 src/external/mit/xorg/bin/xvinfo/Makefile:1.3
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.2 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/bin/xvinfo/Makefile Mon Mar 17 10:09:18 2014
@@ -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 @@ PROG= xvinfo
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
Index: src/external/mit/xorg/bin/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.3 src/external/mit/xorg/bin/xwd/Makefile:1.4
--- src/external/mit/xorg/bin/xwd/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xwd/Makefile Mon Mar 17 10:09:18 2014
@@ -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
