Module Name: src
Committed By: rin
Date: Thu Jun 3 07:40:48 UTC 2021
Modified Files:
src/share/mk: bsd.own.mk bsd.x11.mk
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.1255 -r1.1256 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.138 -r1.139 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1255 src/share/mk/bsd.own.mk:1.1256
--- src/share/mk/bsd.own.mk:1.1255 Sat May 29 12:25:08 2021
+++ src/share/mk/bsd.own.mk Thu Jun 3 07:40:48 2021
@@ -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?= ${X11SRCDIRM
# During transition from xorg-server 1.10 to 1.20
.if \
${MACHINE} == "alpha" || \
- ${MACHINE} == "amiga" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "vax"
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.138 src/share/mk/bsd.x11.mk:1.139
--- src/share/mk/bsd.x11.mk:1.138 Tue Apr 27 04:02:09 2021
+++ src/share/mk/bsd.x11.mk Thu Jun 3 07:40:48 2021
@@ -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 <bsd.init.mk>
@@ -82,7 +82,6 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
.if !(${MACHINE} == "acorn32" || \
- ${MACHINE} == "amiga" || \
${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
${MACHINE} == "x68k" || \
