Module Name: src
Committed By: mrg
Date: Mon Jul 15 05:41:17 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xbiff: Makefile
src/external/mit/xorg/bin/xclock: Makefile
src/external/mit/xorg/bin/xman: Makefile
Log Message:
define _CONST_X_STRING for newer versions.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xbiff/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xclock/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xman/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/xbiff/Makefile
diff -u src/external/mit/xorg/bin/xbiff/Makefile:1.2 src/external/mit/xorg/bin/xbiff/Makefile:1.3
--- src/external/mit/xorg/bin/xbiff/Makefile:1.2 Mon Feb 21 04:40:24 2011
+++ src/external/mit/xorg/bin/xbiff/Makefile Mon Jul 15 05:41:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/21 04:40:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/15 05:41:16 mrg Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@ DPADD+= ${LIBXEXT} ${LIBXAW} ${LIBXMU} $
${LIBXAU}
CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+= -D_CONST_X_STRING
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.4 src/external/mit/xorg/bin/xclock/Makefile:1.5
--- src/external/mit/xorg/bin/xclock/Makefile:1.4 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xclock/Makefile Mon Jul 15 05:41:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/07/15 05:41:17 mrg Exp $
.include <bsd.own.mk>
@@ -6,6 +6,7 @@ PROG= xclock
SRCS= xclock.c Clock.c
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=-D_CONST_X_STRING
CPPFLAGS+=-I${DESTDIR}${X11INCDIR}/freetype2/freetype
APPDEFS=XClock XClock-color
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.8 src/external/mit/xorg/bin/xman/Makefile:1.9
--- src/external/mit/xorg/bin/xman/Makefile:1.8 Wed Apr 13 21:54:25 2016
+++ src/external/mit/xorg/bin/xman/Makefile Mon Jul 15 05:41:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/04/13 21:54:25 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/07/15 05:41:17 mrg Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ SRCS= ScrollByL.c handler.c man.c button
CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_MKSTEMP
CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
+CPPFLAGS+=-D_CONST_X_STRING
APPDEFS=Xman