Module Name: src
Committed By: nakayama
Date: Sat Jul 12 20:31:04 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkill: Makefile
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
Log Message:
Restore package names to PACKAGE_STRING.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xvinfo/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/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.2 src/external/mit/xorg/bin/xkill/Makefile:1.3
--- src/external/mit/xorg/bin/xkill/Makefile:1.2 Wed Mar 19 23:46:22 2014
+++ src/external/mit/xorg/bin/xkill/Makefile Sat Jul 12 20:31:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/19 23:46:22 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING=\"1.0.4\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xkill 1.0.4\""
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.6 src/external/mit/xorg/bin/xlsclients/Makefile:1.7
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.6 Mon Mar 17 09:46:10 2014
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2014/03/17 09:46:10 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
.include <bsd.own.mk>
PROG= xlsclients
CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
- -DPACKAGE_STRING=\"1.1.3\"
+ -DPACKAGE_STRING="\"xlsclients 1.1.3\""
#BUILDSYMLINKS= xlscli.man xlsclients.man
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.5 src/external/mit/xorg/bin/xrdb/Makefile:1.6
--- src/external/mit/xorg/bin/xrdb/Makefile:1.5 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xrdb/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/12 20:31:04 nakayama Exp $
.include <bsd.own.mk>
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING=\"1.1.0\"
+CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 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.3 src/external/mit/xorg/bin/xset/Makefile:1.4
--- src/external/mit/xorg/bin/xset/Makefile:1.3 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xset/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
.include <bsd.own.mk>
PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
-CPPFLAGS+= -DPACKAGE_STRING=\"1.2.3\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xset 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.3 src/external/mit/xorg/bin/xvinfo/Makefile:1.4
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.3 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xvinfo/Makefile Sat Jul 12 20:31:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@ PROG= xvinfo
LDADD+= -lXv -lXext -lX11
DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING=\"1.1.2\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xvinfo 1.1.2\""
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
