Module Name: src
Committed By: mrg
Date: Sat Oct 29 21:06:15 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libXext: Makefile
src/external/mit/xorg/lib/libXmu: Makefile
src/external/mit/xorg/lib/libXpresent: Makefile
src/external/mit/xorg/lib/libxkbfile: Makefile
Log Message:
updates for new libXext, libXmu, libXpresent and libxkbfile.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXext/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXmu/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libXpresent/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libxkbfile/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/lib/libXext/Makefile
diff -u src/external/mit/xorg/lib/libXext/Makefile:1.10 src/external/mit/xorg/lib/libXext/Makefile:1.11
--- src/external/mit/xorg/lib/libXext/Makefile:1.10 Mon Feb 21 02:13:47 2022
+++ src/external/mit/xorg/lib/libXext/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2022/02/21 02:13:47 uwe Exp $
+# $NetBSD: Makefile,v 1.11 2022/10/29 21:06:15 mrg Exp $
.include <bsd.own.mk>
@@ -25,7 +25,7 @@ SRCS= DPMS.c \
globals.c
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-CPPFLAGS+= -DHAVE__XEATDATAWORDS
+CPPFLAGS+= -DHAVE__XEATDATAWORDS -DHAVE_REALLOCARRAY
LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
Index: src/external/mit/xorg/lib/libXmu/Makefile
diff -u src/external/mit/xorg/lib/libXmu/Makefile:1.3 src/external/mit/xorg/lib/libXmu/Makefile:1.4
--- src/external/mit/xorg/lib/libXmu/Makefile:1.3 Sun Nov 21 06:01:50 2010
+++ src/external/mit/xorg/lib/libXmu/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/21 06:01:50 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2022/10/29 21:06:15 mrg Exp $
.include <bsd.own.mk>
@@ -24,7 +24,8 @@ INCS= Atoms.h CharSet.h CloseHook.h Conv
INCSDIR=${X11INCDIR}/X11/Xmu
CPPFLAGS+= ${X11FLAGS.THREADLIB}
-CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DHAS_SNPRINTF -DHAVE_REALLOCARRAY -DHAVE_UNAME
+CPPFLAGS+= -D_CONST_X_STRING
CPPFLAGS+= -DXTSTRINGDEFINES #XTODO is this correct?
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xmu
Index: src/external/mit/xorg/lib/libXpresent/Makefile
diff -u src/external/mit/xorg/lib/libXpresent/Makefile:1.1 src/external/mit/xorg/lib/libXpresent/Makefile:1.2
--- src/external/mit/xorg/lib/libXpresent/Makefile:1.1 Thu Jul 23 05:46:39 2015
+++ src/external/mit/xorg/lib/libXpresent/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/07/23 05:46:39 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2022/10/29 21:06:15 mrg Exp $
.include <bsd.own.mk>
@@ -23,7 +23,15 @@ INCSDIR=${X11INCDIR}/X11/extensions
PKGDIST= ${LIB}
-MAN= Xpresent.3
+MAN= Xpresent.3 \
+ XPresentFreeInput.3 \
+ XPresentNotifyMSC.3 \
+ XPresentPixmap.3 \
+ XPresentQueryCapabilities.3 \
+ XPresentQueryExtension.3 \
+ XPresentQueryVersion.3 \
+ XPresentSelectInput.3 \
+ XPresentVersion.3
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libxkbfile/Makefile
diff -u src/external/mit/xorg/lib/libxkbfile/Makefile:1.5 src/external/mit/xorg/lib/libxkbfile/Makefile:1.6
--- src/external/mit/xorg/lib/libxkbfile/Makefile:1.5 Sun Oct 13 07:28:09 2019
+++ src/external/mit/xorg/lib/libxkbfile/Makefile Sat Oct 29 21:06:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/10/29 21:06:15 mrg Exp $
.include <bsd.own.mk>
@@ -11,6 +11,7 @@ SRCS= cout.c maprules.c srvmisc.c xkbato
xkmread.c
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
+CPPFLAGS+= -DHAVE_UNLOCKED_STDIO -DHAVE_STRNDUP -DHAVE_STRCASECMP
INCS= XKBbells.h XKBconfig.h XKBfile.h XKBrules.h XKM.h XKMformat.h
INCSDIR=${X11INCDIR}/X11/extensions