xorg security update for netbsd-9

this combo patch is the xsrc portion for of these CVEs:
   CVE-2022-46285, CVE-2022-44617, CVE-2022-4883


Index: external/mit/xorg/bin/cxpm/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/cxpm/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- external/mit/xorg/bin/cxpm/Makefile	31 May 2013 01:41:08 -0000	1.2
+++ external/mit/xorg/bin/cxpm/Makefile	20 Jan 2023 23:04:44 -0000
@@ -5,7 +5,6 @@
 PROG=	cxpm
 
 CPPFLAGS+=	-I${X11SRCDIR.Xpm}/src
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 
 LDADD+=	-lXpm -lXt -lSM -lICE -lXext -lX11
 DPADD+=	${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +12,7 @@ DPADD+=	${LIBXPM} ${LIBXT} ${LIBSM} ${LI
 .PATH:	${X11SRCDIR.Xpm}/${PROG}
 .PATH:	${X11SRCDIR.Xpm}/man
 
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
Index: external/mit/xorg/bin/sxpm/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/sxpm/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- external/mit/xorg/bin/sxpm/Makefile	31 May 2013 01:41:56 -0000	1.2
+++ external/mit/xorg/bin/sxpm/Makefile	20 Jan 2023 23:04:44 -0000
@@ -13,5 +13,7 @@ DPADD+=	${LIBXPM} ${LIBXT} ${LIBSM} ${LI
 .PATH:	${X11SRCDIR.Xpm}/${PROG}
 .PATH:	${X11SRCDIR.Xpm}/man
 
+.include "${NETBSDSRCDIR}/external/mit/xorg/lib/libXpm/xpm.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
Index: external/mit/xorg/lib/libXpm/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libXpm/Makefile,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile
--- external/mit/xorg/lib/libXpm/Makefile	13 Sep 2008 04:32:30 -0000	1.2
+++ external/mit/xorg/lib/libXpm/Makefile	20 Jan 2023 23:04:44 -0000
@@ -15,14 +15,13 @@ SRCS=	Attrib.c CrBufFrI.c CrBufFrP.c CrD
 INCS=	xpm.h
 INCSDIR=${X11INCDIR}/X11
 
-CPPFLAGS+=-DHAS_SNPRINTF
-CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
-
 LIBDPLIBS=\
 	Xext	${.CURDIR}/../libXext \
 	X11	${.CURDIR}/../libX11/dynamic
 
 PKGDIST=	${LIB}
 
+.include "xpm.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
Index: external/mit/xorg/lib/libXpm/xpm.mk
===================================================================
RCS file: external/mit/xorg/lib/libXpm/xpm.mk
diff -N external/mit/xorg/lib/libXpm/xpm.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ external/mit/xorg/lib/libXpm/xpm.mk	20 Jan 2023 23:04:44 -0000
@@ -0,0 +1,7 @@
+#	$NetBSD: xpm.mk,v 1.2 2023/01/20 10:20:05 mrg Exp $
+
+CPPFLAGS+=	-DHAS_SNPRINTF
+CPPFLAGS+=	-DXPM_PATH_COMPRESS=\"/usr/bin/compress\"
+CPPFLAGS+=	-DXPM_PATH_GZIP=\"/usr/bin/gzip\"
+CPPFLAGS+=	-DXPM_PATH_UNCOMPRESS=\"/usr/bin/uncompress\"
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11