[src/trunk]: src/external/mit/xorg/bin Use xorg-pkg-ver.mk to retrieve PACKAG...

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

details:   https://anonhg.NetBSD.org/src/rev/05f9776b5bc6
branches:  trunk
changeset: 344759:05f9776b5bc6
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Sat Apr 16 20:52:07 2016 +0000

description:
Use xorg-pkg-ver.mk to retrieve PACKAGE_STRING.

diffstat:

 external/mit/xorg/bin/smproxy/Makefile    |  5 +++--
 external/mit/xorg/bin/xkill/Makefile      |  6 +++---
 external/mit/xorg/bin/xlsclients/Makefile |  7 ++++---
 external/mit/xorg/bin/xrdb/Makefile       |  6 ++++--
 external/mit/xorg/bin/xset/Makefile       |  5 +++--
 external/mit/xorg/bin/xsetroot/Makefile   |  6 +++---
 external/mit/xorg/bin/xstdcmap/Makefile   |  6 +++---
 7 files changed, 23 insertions(+), 18 deletions(-)

diffs (165 lines):

diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/smproxy/Makefile
--- a/external/mit/xorg/bin/smproxy/Makefile    Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/smproxy/Makefile    Sat Apr 16 20:52:07 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
+#      $NetBSD: Makefile,v 1.6 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
@@ -6,12 +6,13 @@
 SRCS=  smproxy.c save.c
 
 CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-CPPFLAGS+=     -DPACKAGE_STRING="\"smproxy 1.0.6\""
 
 LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xkill/Makefile
--- a/external/mit/xorg/bin/xkill/Makefile      Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xkill/Makefile      Sat Apr 16 20:52:07 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
+#      $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
@@ -7,9 +7,9 @@
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
-CPPFLAGS+=     -DPACKAGE_STRING="\"xkill 1.0.4\""
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
-.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xlsclients/Makefile
--- a/external/mit/xorg/bin/xlsclients/Makefile Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xlsclients/Makefile Sat Apr 16 20:52:07 2016 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
+#      $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xlsclients
 
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
-               -DPACKAGE_STRING="\"xlsclients 1.1.3\""
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
 
 #BUILDSYMLINKS=        xlscli.man xlsclients.man
 
@@ -14,5 +13,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xrdb/Makefile
--- a/external/mit/xorg/bin/xrdb/Makefile       Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xrdb/Makefile       Sat Apr 16 20:52:07 2016 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $
+#      $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xrdb
 
 CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\""
+CPPFLAGS+=-DHAVE_ASPRINTF
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +13,7 @@
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xset/Makefile
--- a/external/mit/xorg/bin/xset/Makefile       Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xset/Makefile       Sat Apr 16 20:52:07 2016 +0000
@@ -1,11 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
+#      $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xset
 
 CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
-CPPFLAGS+=     -DPACKAGE_STRING="\"xset 1.2.3\""
 
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
 DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
@@ -14,5 +13,7 @@
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xsetroot/Makefile
--- a/external/mit/xorg/bin/xsetroot/Makefile   Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xsetroot/Makefile   Sat Apr 16 20:52:07 2016 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xsetroot
 
-CPPFLAGS+=     -DPACKAGE_STRING="\"xsetroot 1.1.1\""
-
 LDADD+=        -lXmuu -lXt -lSM -lICE -lXext -lX11 -lXcursor
 DPADD+=        ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCURSOR}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r d4cb2af27ffe -r 05f9776b5bc6 external/mit/xorg/bin/xstdcmap/Makefile
--- a/external/mit/xorg/bin/xstdcmap/Makefile   Sat Apr 16 19:47:45 2016 +0000
+++ b/external/mit/xorg/bin/xstdcmap/Makefile   Sat Apr 16 20:52:07 2016 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 09:14:18 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xstdcmap
 
-CPPFLAGS+=      -DPACKAGE_STRING="\"xstdcmap 1.0.3\""
-
 LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>