Module Name: src Committed By: mrg Date: Thu Jul 4 00:33:28 UTC 2024
Modified Files: src/external/mit/xorg/bin/xbiff: Makefile src/external/mit/xorg/bin/xconsole: Makefile src/external/mit/xorg/bin/xditview: Makefile src/external/mit/xorg/bin/xedit/xedit: Makefile src/external/mit/xorg/bin/xeyes: Makefile src/external/mit/xorg/bin/xload: Makefile src/external/mit/xorg/bin/xmessage: Makefile src/external/mit/xorg/bin/xmore: Makefile Log Message: updates for xbiff 1.0.5, xconsole 1.1.0, xditview 1.0.7, xedit 1.2.4, xev 1.2.6, xeyes 1.3.0, xload 1.2.0, xmessage 1.0.7, and xmore 1.0.4. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xbiff/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xconsole/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xditview/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xedit/xedit/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xeyes/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xload/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xmessage/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xmore/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.3 src/external/mit/xorg/bin/xbiff/Makefile:1.4 --- src/external/mit/xorg/bin/xbiff/Makefile:1.3 Mon Jul 15 05:41:16 2019 +++ src/external/mit/xorg/bin/xbiff/Makefile Thu Jul 4 00:33:27 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/07/15 05:41:16 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2024/07/04 00:33:27 mrg Exp $ .include <bsd.own.mk> @@ -11,6 +11,7 @@ DPADD+= ${LIBXEXT} ${LIBXAW} ${LIBXMU} $ CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include CPPFLAGS+= -D_CONST_X_STRING +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/man Index: src/external/mit/xorg/bin/xconsole/Makefile diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.6 src/external/mit/xorg/bin/xconsole/Makefile:1.7 --- src/external/mit/xorg/bin/xconsole/Makefile:1.6 Sat Jun 3 09:09:07 2023 +++ src/external/mit/xorg/bin/xconsole/Makefile Thu Jul 4 00:33:27 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:07 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2024/07/04 00:33:27 mrg Exp $ .include <bsd.own.mk> @@ -14,6 +14,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} $ .PATH: ${X11SRCDIR.${PROG}}/man CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H +CPPFLAGS+=-DPACKAGE_STRING=\"${PACKAGE_STRING}\" COPTS.xconsole.c+= ${CC_WNO_STRINGOP_OVERFLOW} Index: src/external/mit/xorg/bin/xditview/Makefile diff -u src/external/mit/xorg/bin/xditview/Makefile:1.5 src/external/mit/xorg/bin/xditview/Makefile:1.6 --- src/external/mit/xorg/bin/xditview/Makefile:1.5 Sun Oct 16 23:38:02 2022 +++ src/external/mit/xorg/bin/xditview/Makefile Thu Jul 4 00:33:28 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/10/16 23:38:02 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> @@ -10,6 +10,7 @@ CPPFLAGS+= -D_CONST_X_STRING CPPFLAGS+= -DHAS_MKSTEMP CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2/freetype +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" APPDEFS=Xditview Xditview-chrtr Index: src/external/mit/xorg/bin/xedit/xedit/Makefile diff -u src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5 src/external/mit/xorg/bin/xedit/xedit/Makefile:1.6 --- src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5 Sun Jul 19 19:49:18 2015 +++ src/external/mit/xorg/bin/xedit/xedit/Makefile Thu Jul 4 00:33:28 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> @@ -8,6 +8,7 @@ SRCS= xedit.c commands.c util.c ispell. CPPFLAGS+= -I${X11SRCDIR.xedit}/lisp/re CPPFLAGS+= -DHAVE_GETPAGESIZE +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" APPDEFS= Xedit Xedit-color Index: src/external/mit/xorg/bin/xeyes/Makefile diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.5 src/external/mit/xorg/bin/xeyes/Makefile:1.6 --- src/external/mit/xorg/bin/xeyes/Makefile:1.5 Sun Dec 25 23:05:58 2022 +++ src/external/mit/xorg/bin/xeyes/Makefile Thu Jul 4 00:33:28 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2022/12/25 23:05:58 christos Exp $ +# $NetBSD: Makefile,v 1.6 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> @@ -13,6 +13,8 @@ DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LI ${LIBXCB_XFIXES} ${LIBXCB_DAMAGE} ${LIBXCB_PRESENT} ${LIBX11_XCB} \ ${LIBXCB} +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" + .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/man Index: src/external/mit/xorg/bin/xload/Makefile diff -u src/external/mit/xorg/bin/xload/Makefile:1.5 src/external/mit/xorg/bin/xload/Makefile:1.6 --- src/external/mit/xorg/bin/xload/Makefile:1.5 Thu Jun 13 11:25:18 2013 +++ src/external/mit/xorg/bin/xload/Makefile Thu Jul 4 00:33:28 2024 @@ -1,17 +1,23 @@ -# $NetBSD: Makefile,v 1.5 2013/06/13 11:25:18 christos Exp $ +# $NetBSD: Makefile,v 1.6 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> PROG= xload SRCS= xload.c get_load.c get_rload.c -CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_GETLOADAVG +CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_GETLOADAVG \ + -DHAVE_ASPRINTF \ + -DHAVE_PROTOCOLS_RWHOD_H \ + -DPACKAGE_STRING=\"${PACKAGE_STRING}\" +#CPPFLAGS+=-DUSE_GETTEXT APPDEFS=XLoad LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 +#LDADD+= -lintl DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} +#DPADD+= ${LIBINTL} .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults .PATH: ${X11SRCDIR.${PROG}}/man Index: src/external/mit/xorg/bin/xmessage/Makefile diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.4 src/external/mit/xorg/bin/xmessage/Makefile:1.5 --- src/external/mit/xorg/bin/xmessage/Makefile:1.4 Wed Jul 22 08:46:51 2015 +++ src/external/mit/xorg/bin/xmessage/Makefile Thu Jul 4 00:33:28 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2015/07/22 08:46:51 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> @@ -11,6 +11,8 @@ LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXp DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ ${LIBXPM} ${LIBXEXT} ${LIBX11} +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" + .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/man .PATH: ${X11SRCDIR.${PROG}}/app-defaults Index: src/external/mit/xorg/bin/xmore/Makefile diff -u src/external/mit/xorg/bin/xmore/Makefile:1.5 src/external/mit/xorg/bin/xmore/Makefile:1.6 --- src/external/mit/xorg/bin/xmore/Makefile:1.5 Mon Mar 4 09:25:04 2019 +++ src/external/mit/xorg/bin/xmore/Makefile Thu Jul 4 00:33:28 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/03/04 09:25:04 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2024/07/04 00:33:28 mrg Exp $ .include <bsd.own.mk> @@ -8,6 +8,7 @@ APPDEFS= XMore SRCS= xmore.c CPPFLAGS+= -DXMORE +CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\" LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \