Module Name: src
Committed By: mrg
Date: Sun Jul 19 19:49:18 UTC 2015
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
src/external/mit/xorg/bin/xdpyinfo: Makefile
src/external/mit/xorg/bin/xdriinfo: Makefile
src/external/mit/xorg/bin/xedit/lisp: Makefile
src/external/mit/xorg/bin/xedit/xedit: Makefile
src/external/mit/xorg/bin/xev: Makefile
Added Files:
src/external/mit/xorg: xorg-pkg-ver.mk
Log Message:
build updates for various x11 apps being updated.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xdriinfo/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xedit/lisp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xev/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/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.3 src/external/mit/xorg/bin/smproxy/Makefile:1.4
--- src/external/mit/xorg/bin/smproxy/Makefile:1.3 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/smproxy/Makefile Sun Jul 19 19:49:17 2015
@@ -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}
Index: src/external/mit/xorg/bin/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.6 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.7
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.6 Sun Sep 29 14:34:30 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Sun Jul 19 19:49:18 2015
@@ -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 @@ DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER
COPTS.xdpyinfo.c+= -Wno-error # xf86vmstr.h
+.include "../../xorg-pkg-ver.mk"
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/xdriinfo/Makefile
diff -u src/external/mit/xorg/bin/xdriinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xdriinfo/Makefile:1.2
--- src/external/mit/xorg/bin/xdriinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xdriinfo/Makefile Sun Jul 19 19:49:18 2015
@@ -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 @@ SRCS= xdriinfo.c
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>
Index: src/external/mit/xorg/bin/xedit/lisp/Makefile
diff -u src/external/mit/xorg/bin/xedit/lisp/Makefile:1.4 src/external/mit/xorg/bin/xedit/lisp/Makefile:1.5
--- src/external/mit/xorg/bin/xedit/lisp/Makefile:1.4 Sat Jun 27 17:03:30 2015
+++ src/external/mit/xorg/bin/xedit/lisp/Makefile Sun Jul 19 19:49:18 2015
@@ -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 @@ CPPFLAGS+= -DANSI_SOURCE
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>
Index: src/external/mit/xorg/bin/xedit/xedit/Makefile
diff -u src/external/mit/xorg/bin/xedit/xedit/Makefile:1.4 src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5
--- src/external/mit/xorg/bin/xedit/xedit/Makefile:1.4 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xedit/xedit/Makefile Sun Jul 19 19:49:18 2015
@@ -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 @@ SRCS= xedit.c commands.c util.c ispell.
tags.c hash.c
CPPFLAGS+= -I${X11SRCDIR.xedit}/lisp/re
+CPPFLAGS+= -DHAVE_GETPAGESIZE
APPDEFS= Xedit Xedit-color
Index: src/external/mit/xorg/bin/xev/Makefile
diff -u src/external/mit/xorg/bin/xev/Makefile:1.3 src/external/mit/xorg/bin/xev/Makefile:1.4
--- src/external/mit/xorg/bin/xev/Makefile:1.3 Fri May 31 06:47:07 2013
+++ src/external/mit/xorg/bin/xev/Makefile Sun Jul 19 19:49:18 2015
@@ -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 @@ DPADD+= ${LIBX11} ${LIBXRANDR}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Added files:
Index: src/external/mit/xorg/xorg-pkg-ver.mk
diff -u /dev/null src/external/mit/xorg/xorg-pkg-ver.mk:1.1
--- /dev/null Sun Jul 19 19:49:18 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Sun Jul 19 19:49:17 2015
@@ -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
