[src/trunk]: src/external/mit/xorg fix libXfont2 sources list. update for xf...

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

details:   https://anonhg.NetBSD.org/src/rev/df5d1b34193d
branches:  trunk
changeset: 321321:df5d1b34193d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 11 10:17:10 2018 +0000

description:
fix libXfont2 sources list.  update for xfs 1.2.0.

diffstat:

 external/mit/xorg/bin/xfs/Makefile       |   6 ++----
 external/mit/xorg/lib/libXfont2/Makefile |  21 +++++++++++++++------
 2 files changed, 17 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r e706b35bc1ee -r df5d1b34193d external/mit/xorg/bin/xfs/Makefile
--- a/external/mit/xorg/bin/xfs/Makefile        Sun Mar 11 10:14:04 2018 +0000
+++ b/external/mit/xorg/bin/xfs/Makefile        Sun Mar 11 10:17:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2018/03/11 10:17:10 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,8 +19,6 @@
 
 CPPFLAGS+=             -I${XFSDIR}/include \
                        -I${DESTDIR}${X11INCDIR}/X11/FS \
-                       -I${X11SRCDIR.libXfont}/include \
-                       -I${X11SRCDIR.libXfont}/bitmap \
                        -I${XFSDIR}/../include \
                        -DHAVE_DAEMON
 
@@ -59,7 +57,7 @@
 FILESDIR=      ${XFSCONFIGDIR}
 
 
-LDADD+=        -lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
+LDADD+=        -lXfont2 -lfontenc -lXext -lX11 -lfreetype -lm -lz
 DPADD+=        ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
        ${LIBFREETYPE} ${LIBM} ${LIBZ}
 
diff -r e706b35bc1ee -r df5d1b34193d external/mit/xorg/lib/libXfont2/Makefile
--- a/external/mit/xorg/lib/libXfont2/Makefile  Sun Mar 11 10:14:04 2018 +0000
+++ b/external/mit/xorg/lib/libXfont2/Makefile  Sun Mar 11 10:17:10 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -55,15 +55,24 @@
 .PATH: ${XFONT2DIR}/src/FreeType
 
 SRCS.bitmap=   \
-       ftenc.c \
-       ftfuncs.c \
-       fttools.c \
-       xttcap.c \
+       bitmap.c \
+       bitmapfunc.c \
+       bitmaputil.c \
+       bitscale.c \
+       fontink.c \
+       bitmap.c \
+       bitmapfunc.c \
+       bitmaputil.c \
+       bitscale.c \
+       fontink.c \
        bdfread.c \
        bdfutils.c \
-       pcfread.c \
+       pcfread.c
+.if 0
+SRCS.bitmap+=  \
        pcfwrite.c \
        snfread.c
+.endif
 .PATH: ${XFONT2DIR}/src/bitmap
 
 SRCS.builtins= \