[src/trunk]: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k Xorg 1.2...

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

details:   https://anonhg.NetBSD.org/src/rev/d89d87c6b5cd
branches:  trunk
changeset: 936082:d89d87c6b5cd
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 18 16:07:15 2020 +0000

description:
Xorg 1.20 servers require libXfont2 instead of libXfont.

Per the following upstream commit:
 https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7
 > dix: Switch to the libXfont2 API (v2)

Now Xorg 1.20 based X68k server builds and confirmed working on XM6i.

diffstat:

 external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d7918fe5cf95 -r d89d87c6b5cd external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Sat Jul 18 15:26:30 2020 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile      Sat Jul 18 16:07:15 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
 
 .include <bsd.own.mk>
 
@@ -63,7 +63,7 @@
        ${LDADD.miext/damage} \
        ${LDADD.miext/sync} \
        ${LDADD.Xi} \
-       -lXfont \
+       -lXfont2 \
        -lpixman-1 \
        -lXext \
        -lX11 \
@@ -84,7 +84,7 @@
        ${DPADD.miext/damage} \
        ${DPADD.miext/sync} \
        ${DPADD.Xi} \
-       ${LIBXFONT} \
+       ${LIBXFONT2} \
        ${LIBPIXMAN-1} \
        ${LIBXEXT} \
        ${LIBX11} \