[src/trunk]: src/external/mit/xorg/lib fix libXfont2 build, and (for now) rem...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9d3b6555a4a1
branches:  trunk
changeset: 1007606:9d3b6555a4a1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 23 09:24:12 2020 +0000

description:
fix libXfont2 build, and (for now) remove new XvMCW pkg-config file.

diffstat:

 external/mit/xorg/lib/libXfont2/Makefile |  6 ++++--
 external/mit/xorg/lib/libXvMCW/Makefile  |  6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 9df60d7ee0a9 -r 9d3b6555a4a1 external/mit/xorg/lib/libXfont2/Makefile
--- a/external/mit/xorg/lib/libXfont2/Makefile  Sun Feb 23 09:14:05 2020 +0000
+++ b/external/mit/xorg/lib/libXfont2/Makefile  Sun Feb 23 09:24:12 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $
+#      $NetBSD: Makefile,v 1.6 2020/02/23 09:24:12 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -25,7 +25,8 @@
        miscutil.c \
        patcache.c \
        private.c \
-       utilbitmap.c
+       utilbitmap.c \
+       reallocarray.c
 .PATH: ${XFONT2DIR}/src/util
 
 SRCS.fontfile= \
@@ -104,6 +105,7 @@
 CPPFLAGS+=      -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
 CPPFLAGS+=     -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\" 
 CPPFLAGS+=     -I${XFONT2DIR}/src/stubs
+CPPFLAGS+=     -I${XFONT2DIR}
 CPPFLAGS+=     -I${XFONT2DIR}/include
 CPPFLAGS+=     -I${XFONT2DIR}/../include
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}
diff -r 9df60d7ee0a9 -r 9d3b6555a4a1 external/mit/xorg/lib/libXvMCW/Makefile
--- a/external/mit/xorg/lib/libXvMCW/Makefile   Sun Feb 23 09:14:05 2020 +0000
+++ b/external/mit/xorg/lib/libXvMCW/Makefile   Sun Feb 23 09:24:12 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2020/02/23 09:10:51 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2020/02/23 09:24:12 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,9 @@
 
 COPTS.XvMCWrapper.c=   ${GCC_NO_STRINGOP_OVERFLOW}
 
-PKGDIST=       xvmc-wrapper
+# XXX
+#PKGDIST=      xvmc-wrapper
+#.PATH:        ${X11SRCDIR.XvMC}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>