Created
June 18, 2022 00:22
-
-
Save tsutsui/549920b4c9b7bfbb3c0071596ea567dd to your computer and use it in GitHub Desktop.
WIP diff to fix mangled sysinst menu borders on NetBSD/x68k 9.99.97
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: distrib/utils/libhack/Makefile.inc | |
=================================================================== | |
RCS file: /cvsroot/src/distrib/utils/libhack/Makefile.inc,v | |
retrieving revision 1.39 | |
diff -u -p -d -r1.39 Makefile.inc | |
--- distrib/utils/libhack/Makefile.inc 25 May 2021 10:58:41 -0000 1.39 | |
+++ distrib/utils/libhack/Makefile.inc 18 Jun 2022 00:17:31 -0000 | |
@@ -48,9 +48,22 @@ TERMINFO_SRC!= cd ${HACKSRC}/../../../li | |
TERMINFO_PATH!= cd ${HACKSRC}/../../../lib/libterminfo && \ | |
${MAKE} -v .OBJDIR | |
+# override compiled terms per HACK_MD_TERM for non-wscons ports | |
+.if defined(HACK_MD_TERM) | |
+TERMINFO= ${NETBSDSRCDIR}/share/terminfo/terminfo | |
+DEFTERMS?= vt100 vt220 wsvt25 xterm | |
+ | |
+term.o: compiled_terms.c | |
+ | |
+compiled_terms.c: ${TERMINFO} | |
+ ${TOOL_TIC} -Sx ${TERMINFO} ${DEFTERMS} ${HACK_MD_TERM} > ${.TARGET} | |
+ | |
+CLEANFILES+= compiled_terms.c | |
+.endif | |
+ | |
.for s in ${TERMINFO_SRC} | |
CPPFLAGS.${s}+= -DDISABLE_WCHAR -DSMALL \ | |
- -I${HACKSRC}/../../../lib/libterminfo \ | |
+ -I${.OBJDIR} -I${HACKSRC}/../../../lib/libterminfo \ | |
-I${TERMINFO_PATH} | |
HACKOBJS+= ${s:S/.c/.o/} | |
.if ${s:Mhash*} != "" | |
Index: distrib/x68k/floppies/ramdisk/Makefile | |
=================================================================== | |
RCS file: /cvsroot/src/distrib/x68k/floppies/ramdisk/Makefile,v | |
retrieving revision 1.49 | |
diff -u -p -d -r1.49 Makefile | |
--- distrib/x68k/floppies/ramdisk/Makefile 4 Feb 2022 17:19:52 -0000 1.49 | |
+++ distrib/x68k/floppies/ramdisk/Makefile 18 Jun 2022 00:17:31 -0000 | |
@@ -32,6 +32,8 @@ LISTS+= ${DISTRIBDIR}/common/list.inet6 | |
# Use stubs to eliminate some large stuff from libc | |
HACKSRC= ${DISTRIBDIR}/utils/libhack | |
+HACK_CURSES= yes | |
+HACK_MD_TERM= x68k | |
.include "${HACKSRC}/Makefile.inc" | |
${CRUNCHBIN}: libhack.o | |
Index: distrib/x68k/floppies/ramdisk/dot.profile | |
=================================================================== | |
RCS file: /cvsroot/src/distrib/x68k/floppies/ramdisk/dot.profile,v | |
retrieving revision 1.16 | |
diff -u -p -d -r1.16 dot.profile | |
--- distrib/x68k/floppies/ramdisk/dot.profile 9 Jan 2020 19:17:46 -0000 1.16 | |
+++ distrib/x68k/floppies/ramdisk/dot.profile 18 Jun 2022 00:17:31 -0000 | |
@@ -35,7 +35,7 @@ | |
PATH=/sbin:/bin:/usr/bin:/usr/sbin:/ | |
export PATH | |
-TERM=vt220 | |
+TERM=x68k | |
export TERM | |
HOME=/ | |
export HOME | |
Index: share/terminfo/terminfo | |
=================================================================== | |
RCS file: /cvsroot/src/share/terminfo/terminfo,v | |
retrieving revision 1.15 | |
diff -u -p -d -r1.15 terminfo | |
--- share/terminfo/terminfo 5 Dec 2021 04:54:20 -0000 1.15 | |
+++ share/terminfo/terminfo 18 Jun 2022 00:17:35 -0000 | |
@@ -1798,7 +1798,8 @@ arm100-w|arm100-wam|Arm(RiscPC) ncurses | |
# From Minoura Makoto <minoura@netlaputa.or.jp>, 12 May 1996 | |
x68k|x68k-ite|NetBSD/x68k ITE, | |
cols#96, lines#32, | |
- kbs=\177,kclr=\E[9~, khlp=\E[28~, use=vt220, | |
+ kbs=\177, kclr=\E[9~, khlp=\E[28~, | |
+ acsc=, rmacs@, smacs@, use=vt220, | |
# <tv@pobox.com>: | |
# Entry for the DNARD OpenFirmware console, close to ANSI but not quite. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment