Module Name: src
Committed By: mrg
Date: Sun Mar 9 06:36:42 UTC 2025
Modified Files:
src/external/mit/xorg/bin/oclock: Makefile
src/external/mit/xorg/bin/transset: Makefile
src/external/mit/xorg/bin/xkbevd: Makefile
Log Message:
use xorg-pkg-ver.mk for PACKAGE_STRING, add new sources, and remove
no longer necessary -DHAVE_STRCASECMP.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/oclock/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/transset/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkbevd/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/oclock/Makefile
diff -u src/external/mit/xorg/bin/oclock/Makefile:1.4 src/external/mit/xorg/bin/oclock/Makefile:1.5
--- src/external/mit/xorg/bin/oclock/Makefile:1.4 Sun Sep 11 05:50:41 2022
+++ src/external/mit/xorg/bin/oclock/Makefile Sun Mar 9 06:36:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/09/11 05:50:41 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2025/03/09 06:36:42 mrg Exp $
.include <bsd.own.mk>
@@ -15,5 +15,7 @@ DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LI
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/bin/transset/Makefile
diff -u src/external/mit/xorg/bin/transset/Makefile:1.1 src/external/mit/xorg/bin/transset/Makefile:1.2
--- src/external/mit/xorg/bin/transset/Makefile:1.1 Mon Mar 11 09:20:13 2019
+++ src/external/mit/xorg/bin/transset/Makefile Sun Mar 9 06:36:42 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2019/03/11 09:20:13 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2025/03/09 06:36:42 mrg Exp $
.include <bsd.own.mk>
PROG= transset
-SRCS= dsimple.c transSet.c
+SRCS= dsimple.c transSet.c clientwin.c
CPPFLAGS+=${X11FLAGS.EXTENSION}
Index: src/external/mit/xorg/bin/xkbevd/Makefile
diff -u src/external/mit/xorg/bin/xkbevd/Makefile:1.3 src/external/mit/xorg/bin/xkbevd/Makefile:1.4
--- src/external/mit/xorg/bin/xkbevd/Makefile:1.3 Wed Jul 22 08:35:26 2015
+++ src/external/mit/xorg/bin/xkbevd/Makefile Sun Mar 9 06:36:42 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2025/03/09 06:36:42 mrg Exp $
.include <bsd.own.mk>
@@ -8,7 +8,6 @@ SRCS= xkbevd.c cfgscan.c cfgparse.y evar
CPPFLAGS+=-DDFLT_XKB_CONFIG_ROOT='"${X11ROOTDIR}/lib/X11/xkb"'
CPPFLAGS+=-DDFLT_SOUND_CMD='"/usr/bin/audioplay"'
CPPFLAGS+=-DDFLT_SOUND_DIR='"${X11ROOTDIR}/share/sounds/"'
-CPPFLAGS+=-DHAVE_STRCASECMP
CPPFLAGS+=-I${X11SRCDIR.${PROG}}
LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
