[src/trunk]: src/external/mit/xorg build updates for various x11 apps being u...

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

details:   https://anonhg.NetBSD.org/src/rev/0d5a6620a0e1
branches:  trunk
changeset: 339391:0d5a6620a0e1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 19 19:49:17 2015 +0000

description:
build updates for various x11 apps being updated.

diffstat:

 external/mit/xorg/bin/smproxy/Makefile     |   7 +++++--
 external/mit/xorg/bin/xdpyinfo/Makefile    |   4 +++-
 external/mit/xorg/bin/xdriinfo/Makefile    |   6 ++++--
 external/mit/xorg/bin/xedit/lisp/Makefile  |   6 +++++-
 external/mit/xorg/bin/xedit/xedit/Makefile |   3 ++-
 external/mit/xorg/bin/xev/Makefile         |   4 +++-
 external/mit/xorg/xorg-pkg-ver.mk          |  29 +++++++++++++++++++++++++++++
 7 files changed, 51 insertions(+), 8 deletions(-)

diffs (143 lines):

diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/smproxy/Makefile
--- a/external/mit/xorg/bin/smproxy/Makefile    Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/smproxy/Makefile    Sun Jul 19 19:49:17 2015 +0000
@@ -1,11 +1,14 @@
-#      $NetBSD: Makefile,v 1.3 2011/07/23 06:06:40 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/19 19:49:17 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  smproxy
 SRCS=  smproxy.c save.c
 
-CPPFLAGS+=-DHAVE_MKSTEMP
+CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
+
+STRING!=       ${PRINT_PACKAGE_STRING}
+CPPFLAGS+=     -DPACKAGE_STRING=\"${STRING}\"
 
 LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/xdpyinfo/Makefile
--- a/external/mit/xorg/bin/xdpyinfo/Makefile   Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/xdpyinfo/Makefile   Sun Jul 19 19:49:17 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/09/29 14:34:30 christos Exp $
+#      $NetBSD: Makefile,v 1.7 2015/07/19 19:49:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -20,5 +20,7 @@
 
 COPTS.xdpyinfo.c+=     -Wno-error      # xf86vmstr.h
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/xdriinfo/Makefile
--- a/external/mit/xorg/bin/xdriinfo/Makefile   Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/xdriinfo/Makefile   Sun Jul 19 19:49:17 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 19:49:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,9 @@
 LDADD+=        -lGL -lXext -lX11 -lpthread
 DPADD+=        ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
 
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/xedit/lisp/Makefile
--- a/external/mit/xorg/bin/xedit/lisp/Makefile Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/xedit/lisp/Makefile Sun Jul 19 19:49:17 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2015/06/27 17:03:30 matt Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -25,5 +25,9 @@
 
 CWARNFLAGS.clang+=     -Wno-format
 
+# Ugh. writes to const char *
+COPTS.format.c+=       -Wno-error
+COPTS.lisp.c+=         -Wno-error
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/xedit/xedit/Makefile
--- a/external/mit/xorg/bin/xedit/xedit/Makefile        Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/xedit/xedit/Makefile        Sun Jul 19 19:49:17 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,6 +7,7 @@
                tags.c hash.c
 
 CPPFLAGS+=     -I${X11SRCDIR.xedit}/lisp/re
+CPPFLAGS+=     -DHAVE_GETPAGESIZE
 
 APPDEFS=       Xedit Xedit-color
 
diff -r ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/bin/xev/Makefile
--- a/external/mit/xorg/bin/xev/Makefile        Sun Jul 19 13:22:42 2015 +0000
+++ b/external/mit/xorg/bin/xev/Makefile        Sun Jul 19 19:49:17 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 06:47:07 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/19 19:49:18 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 ae8504fe855c -r 0d5a6620a0e1 external/mit/xorg/xorg-pkg-ver.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/xorg-pkg-ver.mk Sun Jul 19 19:49:17 2015 +0000
@@ -0,0 +1,29 @@
+#      $NetBSD: xorg-pkg-ver.mk,v 1.1 2015/07/19 19:49:17 mrg Exp $
+
+# when including this make sure PROG is set so that $X11SRCDIR.$PROG
+# is a valid setting.
+
+.if exists(${X11SRCDIR.${PROG}}/configure)
+XORG_PKG_PACKAGE_VERSION!= \
+       awk -F= '/^PACKAGE_VERSION=/ {                          \
+            match($$2, "([0-9]+\\.)+[0-9]+");                  \
+            version = substr($$2, RSTART, RLENGTH);            \
+            print version;                                     \
+            exit 0;                                            \
+       }' ${X11SRCDIR.${PROG}}/configure
+.if !empty(XORG_PKG_PACKAGE_VERSION)
+CPPFLAGS+=     -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
+.endif
+
+XORG_PKG_PACKAGE_STRING!= \
+       awk -F= '/^PACKAGE_STRING=/ {                           \
+            match($$2, "[a-zA-Z-_]+[   ]+([0-9]+\\.)+[0-9]+"); \
+            string = substr($$2, RSTART, RLENGTH);             \
+            print string;                                      \
+            exit 0;                                            \
+       }' ${X11SRCDIR.${PROG}}/configure
+.if !empty(XORG_PKG_PACKAGE_STRING)
+CPPFLAGS+=     -DPACKAGE_STRING=\"${XORG_PKG_PACKAGE_STRING:Q}\"
+.endif
+
+.endif