[src/trunk]: src/external/mit/xorg/bin build updates for xlsatoms 1.1.2, xlsf...

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

details:   https://anonhg.NetBSD.org/src/rev/a58e63b228e4
branches:  trunk
changeset: 809537:a58e63b228e4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 19 23:15:05 2015 +0000

description:
build updates for xlsatoms 1.1.2, xlsfonts 1.0.4, xman 1.1.4, xmh 1.0.03
xmodmap 1.0.9 and xvinfo 1.1.3.

diffstat:

 external/mit/xorg/bin/xlsatoms/Makefile |  4 +++-
 external/mit/xorg/bin/xlsfonts/Makefile |  5 ++++-
 external/mit/xorg/bin/xman/Makefile     |  6 ++++--
 external/mit/xorg/bin/xmh/Makefile      |  3 ++-
 external/mit/xorg/bin/xmodmap/Makefile  |  6 ++++--
 external/mit/xorg/bin/xvinfo/Makefile   |  6 +++---
 6 files changed, 20 insertions(+), 10 deletions(-)

diffs (127 lines):

diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xlsatoms/Makefile
--- a/external/mit/xorg/bin/xlsatoms/Makefile   Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xlsatoms/Makefile   Sun Jul 19 23:15:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/19 23:15:05 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -10,5 +10,7 @@
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xlsfonts/Makefile
--- a/external/mit/xorg/bin/xlsfonts/Makefile   Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xlsfonts/Makefile   Sun Jul 19 23:15:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,9 @@
 DPADD+=        ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+COPTS.xlsfonts.c+=      -Wno-error
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xman/Makefile
--- a/external/mit/xorg/bin/xman/Makefile       Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xman/Makefile       Sun Jul 19 23:15:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/07/23 06:06:40 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2015/07/19 23:15:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 CPPFLAGS+=${X11FLAGS.VERSION}
 CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
 CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
-CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
+#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
 
 APPDEFS=Xman
 
@@ -22,5 +22,7 @@
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xmh/Makefile
--- a/external/mit/xorg/bin/xmh/Makefile        Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xmh/Makefile        Sun Jul 19 23:15:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $
+#      $NetBSD: Makefile,v 1.7 2015/07/19 23:15:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,7 @@
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
 
 CWARNFLAGS.clang+=     -Wno-format
 
diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xmodmap/Makefile
--- a/external/mit/xorg/bin/xmodmap/Makefile    Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xmodmap/Makefile    Sun Jul 19 23:15:05 2015 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  xmodmap
 SRCS=  xmodmap.c pf.c handle.c exec.c
 
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+=     -DHAVE_ASPRINTF -DHAVE_STRNCASECMP
 
 LDADD+=        -lX11
 DPADD+=        ${LIBX11}
@@ -15,5 +15,7 @@
 COPTS.handle.c+=-Wno-error     # uses XKeycodeToKeysym
 COPTS.exec.c+= -Wno-error      # uses XKeycodeToKeysym
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 2dc872544ce5 -r a58e63b228e4 external/mit/xorg/bin/xvinfo/Makefile
--- a/external/mit/xorg/bin/xvinfo/Makefile     Sun Jul 19 22:43:26 2015 +0000
+++ b/external/mit/xorg/bin/xvinfo/Makefile     Sun Jul 19 23:15:05 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,11 +7,11 @@
 LDADD+=        -lXv -lXext -lX11
 DPADD+=        ${LIBXV} ${LIBXEXT} ${LIBX11}
 
-CPPFLAGS+=     -DPACKAGE_STRING="\"xvinfo 1.1.2\""
-
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
 CWARNFLAGS.clang+=     -Wno-dangling-else
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>