From 3fcfdfa86da06f27bc65e4c2aeff5a2bbba67dc0 Mon Sep 17 00:00:00 2001 From: rin Date: Thu, 3 Jun 2021 07:40:48 +0000 Subject: Switch amiga to Xorg server 1.20; wsfb(4) is only graphic driver both for 1.10 and 1.20 (Xamiga was gone a long ago...), and there is no reason to stay with 1.10. At least, 1.20 works fine on wsdisplay(4) at amidisplaycc(4). --- share/mk/bsd.own.mk | 3 +-- share/mk/bsd.x11.mk | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index dca1840d083..9e9677df91c 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1255 2021/05/29 12:25:08 rin Exp $ +# $NetBSD: bsd.own.mk,v 1.1256 2021/06/03 07:40:48 rin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1580,7 +1580,6 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist # During transition from xorg-server 1.10 to 1.20 .if \ ${MACHINE} == "alpha" || \ - ${MACHINE} == "amiga" || \ ${MACHINE} == "netwinder" || \ ${MACHINE} == "sgimips" || \ ${MACHINE} == "vax" diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk index ec87f5594f0..c792990c17f 100644 --- a/share/mk/bsd.x11.mk +++ b/share/mk/bsd.x11.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.138 2021/04/27 04:02:09 mrg Exp $ +# $NetBSD: bsd.x11.mk,v 1.139 2021/06/03 07:40:48 rin Exp $ .include @@ -82,7 +82,6 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ -DDDXOSVERRORF -DDDXTIME -DUSB_HID .if !(${MACHINE} == "acorn32" || \ - ${MACHINE} == "amiga" || \ ${MACHINE} == "pmax" || \ ${MACHINE} == "sun3" || \ ${MACHINE} == "x68k" || \ -- cgit