diff --git a/distrib/acorn26/instkernel/Makefile b/distrib/acorn26/instkernel/Makefile index 80a7b4115461..fdcedf928e9b 100644 --- a/distrib/acorn26/instkernel/Makefile +++ b/distrib/acorn26/instkernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/09/24 21:04:45 he Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/05 10:01:16 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,7 +16,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= le MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/acorn26/instkernel/list b/distrib/acorn26/instkernel/list index 84d91c951fe0..2884c0393108 100644 --- a/distrib/acorn26/instkernel/list +++ b/distrib/acorn26/instkernel/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2009/09/20 23:19:50 abs Exp $ +# $NetBSD: list,v 1.15 2010/02/05 10:01:16 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -53,7 +53,7 @@ PROG usr/sbin/chroot SPECIAL ping srcdir distrib/utils/x_ping -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # init invokes the shell as -sh ARGVLN sh -sh @@ -69,7 +69,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/acorn32/ramdisk/Makefile b/distrib/acorn32/ramdisk/Makefile index c3986143a08b..3ac281a9749e 100644 --- a/distrib/acorn32/ramdisk/Makefile +++ b/distrib/acorn32/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2010/01/13 14:24:58 he Exp $ +# $NetBSD: Makefile,v 1.23 2010/02/05 10:01:16 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,7 +16,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= le MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/acorn32/ramdisk/list b/distrib/acorn32/ramdisk/list index 439c36c8ba90..1a0996477298 100644 --- a/distrib/acorn32/ramdisk/list +++ b/distrib/acorn32/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2009/09/20 23:19:50 abs Exp $ +# $NetBSD: list,v 1.22 2010/02/05 10:01:16 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -56,7 +56,7 @@ ARGVLN sh -sh SPECIAL ping srcdir distrib/utils/x_ping -LIBS -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot blocks /usr/mdec #COPYDIR ${DESTDIR}/usr/mdec usr/mdec @@ -69,7 +69,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db #COPY ${CURDIR}/inst.sh usr/local/sbin/inst 555 diff --git a/distrib/alpha/instkernel/ramdisk/Makefile b/distrib/alpha/instkernel/ramdisk/Makefile index 24aca45bf16b..cdfa862d5aab 100644 --- a/distrib/alpha/instkernel/ramdisk/Makefile +++ b/distrib/alpha/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: Makefile,v 1.29 2010/02/05 10:01:17 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ MAKEDEVTARGETS= minimal IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile install.sh upgrade.sh \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx_ffs \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DISTRIBDIR}/utils/script-installer/dot.commonutils \ ${DISTRIBDIR}/utils/script-installer/dot.instutils \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ diff --git a/distrib/alpha/instkernel/ramdisk/list b/distrib/alpha/instkernel/ramdisk/list index 17c4e3dd1a67..2571825b95ec 100644 --- a/distrib/alpha/instkernel/ramdisk/list +++ b/distrib/alpha/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.35 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list,v 1.36 2010/02/05 10:01:17 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin @@ -59,7 +59,7 @@ ARGVLN sh -sh SPECIAL ping srcdir distrib/utils/x_ping -LIBS -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS -ledit -lbz2 -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot blocks /usr/mdec COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -78,7 +78,7 @@ MTREE ./etc/pwd.db type=file uname=root gname=wheel mode=0644 MTREE ./etc/spwd.db type=file uname=root gname=wheel mode=0600 # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db COPY ${DISTRIBDIR}/utils/script-installer/dot.commonutils .commonutils COPY ${DISTRIBDIR}/utils/script-installer/dot.instutils .instutils diff --git a/distrib/amd64/ramdisks/common/Makefile.ramdisk b/distrib/amd64/ramdisks/common/Makefile.ramdisk index 9220e2d57527..cdacb9fd4f88 100644 --- a/distrib/amd64/ramdisks/common/Makefile.ramdisk +++ b/distrib/amd64/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.7 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: Makefile.ramdisk,v 1.8 2010/02/05 10:01:17 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -25,7 +25,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db PARSELISTENV+= BOOTMODEL=${BOOTMODEL:Q} .if defined(USE_SYSINST) diff --git a/distrib/amd64/ramdisks/common/list.ramdisk b/distrib/amd64/ramdisks/common/list.ramdisk index b7ccf7fcdae9..df1b5f2af4ec 100644 --- a/distrib/amd64/ramdisks/common/list.ramdisk +++ b/distrib/amd64/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.10 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list.ramdisk,v 1.11 2010/02/05 10:01:17 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin libexec @@ -25,7 +25,7 @@ COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/../common/dot.profile .profile diff --git a/distrib/amd64/ramdisks/ramdisk/list b/distrib/amd64/ramdisks/ramdisk/list index 4d6330d5f1f2..d2522e519ca5 100644 --- a/distrib/amd64/ramdisks/ramdisk/list +++ b/distrib/amd64/ramdisks/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/09/20 22:46:11 abs Exp $ +# $NetBSD: list,v 1.11 2010/02/05 10:01:17 roy Exp $ # SRCDIRS usr.bin/less @@ -70,4 +70,4 @@ SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop diff --git a/distrib/amiga/floppies/inst-common/instbin.conf b/distrib/amiga/floppies/inst-common/instbin.conf index f7ea61c33ac1..aff1a10ece40 100644 --- a/distrib/amiga/floppies/inst-common/instbin.conf +++ b/distrib/amiga/floppies/inst-common/instbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: instbin.conf,v 1.10 1999/11/23 22:14:23 simonb Exp $ +# $NetBSD: instbin.conf,v 1.11 2010/02/05 10:01:17 roy Exp $ # # kcbin.conf - unified binary for the kc floppy # @@ -24,4 +24,4 @@ ln reboot halt ln sh -sh # init invokes the shell this way ln test [ -libs -ledit -lutil -ltermcap -lpcap -lcrypt -ll -lm +libs -ledit -lutil -lterminfo -lpcap -lcrypt -ll -lm diff --git a/distrib/amiga/floppies/inst-common/list b/distrib/amiga/floppies/inst-common/list index 2189c33f5a41..dd624584526d 100644 --- a/distrib/amiga/floppies/inst-common/list +++ b/distrib/amiga/floppies/inst-common/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list,v 1.18 2010/02/05 10:01:17 roy Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -76,4 +76,4 @@ COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools COPY ${TOPDIR}/inst-common/dot.commonutils .commonutils -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db diff --git a/distrib/amiga/miniroot/Makefile.inc b/distrib/amiga/miniroot/Makefile.inc index 492af2ec5288..3975c5d55726 100644 --- a/distrib/amiga/miniroot/Makefile.inc +++ b/distrib/amiga/miniroot/Makefile.inc @@ -1,11 +1,12 @@ -# $NetBSD: Makefile.inc,v 1.16 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: Makefile.inc,v 1.17 2010/02/05 10:01:17 roy Exp $ IMAGESIZE= 6m MAKEFS_FLAGS= -o density=4k IMAGEENDIAN= be MAKEDEVTARGETS= floppy IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ - ${ARCHDIR}/install.md ${DISTRIBDIR}/common/termcap \ + ${ARCHDIR}/install.md \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/boot.amiga \ ${KERNOBJDIR}/INSTALL/netbsd diff --git a/distrib/amiga/miniroot/list b/distrib/amiga/miniroot/list index 40c5cb1525e6..77235e64ada5 100644 --- a/distrib/amiga/miniroot/list +++ b/distrib/amiga/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.22 2010/01/02 06:39:00 tsutsui Exp $ +# $NetBSD: list,v 1.23 2010/02/05 10:01:17 roy Exp $ # Amiga extra's PROG sbin/disklabel @@ -21,8 +21,8 @@ SYMLINK /tmp/fstab.shadow etc/fstab SYMLINK /tmp/resolv.conf.shadow etc/resolv.conf SYMLINK /tmp/hosts etc/hosts -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation scripts COPY ${ARCHDIR}/install.md install.md diff --git a/distrib/arc/ramdisk/Makefile b/distrib/arc/ramdisk/Makefile index 57a6c02332a9..ea1dd3cdfd47 100644 --- a/distrib/arc/ramdisk/Makefile +++ b/distrib/arc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: Makefile,v 1.20 2010/02/05 10:01:17 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,7 +21,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db SMALLPROG_INET6=1 # Use stubs to eliminate some large stuff from libc diff --git a/distrib/arc/ramdisk/list b/distrib/arc/ramdisk/list index d3679e900aa9..5336eb9bab28 100644 --- a/distrib/arc/ramdisk/list +++ b/distrib/arc/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list,v 1.18 2010/02/05 10:01:17 roy Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin @@ -69,7 +69,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -81,7 +81,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/atari/floppies/common/list.images b/distrib/atari/floppies/common/list.images index 0c56c6dbf42d..f6304386baf9 100644 --- a/distrib/atari/floppies/common/list.images +++ b/distrib/atari/floppies/common/list.images @@ -1,7 +1,7 @@ -# $NetBSD: list.images,v 1.6 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list.images,v 1.7 2010/02/05 10:01:17 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/atari/stand -LIBS libhack.o -lprop -lrmt -ledit -lz -lbz2 -lutil -lcurses -ltermcap -lcrypt -lkvm -ll -lm +LIBS libhack.o -lprop -lrmt -ledit -lz -lbz2 -lutil -lcurses -lterminfo -lcrypt -lkvm -ll -lm # init invokes the shell as -sh ARGVLN sh -sh @@ -10,8 +10,8 @@ ARGVLN sh -sh COPY ${NETBSDSRCDIR}/etc/group etc/group COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd -# the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db COPY ${CURDIR}/../common/dot.profile .profile COPY ${CURDIR}/../common/mount_gemdos sbin/mount_gemdos 555 diff --git a/distrib/bebox/floppies/ramdisk/list b/distrib/bebox/floppies/ramdisk/list index cb65347acf50..1020e1e6c3e1 100644 --- a/distrib/bebox/floppies/ramdisk/list +++ b/distrib/bebox/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.16 2009/09/20 23:19:51 abs Exp $ +# $NetBSD: list,v 1.17 2010/02/05 10:01:17 roy Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -68,7 +68,7 @@ SPECIAL pwd_mkdb -p -d ./ etc/master.passwd # and the common installation tools # COPY ${CURDIR}/../../../utils/script-installer/dot.commonutils .commonutils #COPY ${CURDIR}/../../../utils/script-installer/dot.instutils .instutils -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/bebox/floppies/ramdisk/ramdiskbin.conf b/distrib/bebox/floppies/ramdisk/ramdiskbin.conf index 7ec4b3461633..700a75305d18 100644 --- a/distrib/bebox/floppies/ramdisk/ramdiskbin.conf +++ b/distrib/bebox/floppies/ramdisk/ramdiskbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.6 2000/02/03 19:25:17 itojun Exp $ +# $NetBSD: ramdiskbin.conf,v 1.7 2010/02/05 10:01:17 roy Exp $ # # ramdiskbin.conf - unified binary for the install ramdisk # @@ -33,4 +33,4 @@ ln mount_nfs nfs ln mount_kernfs kernfs ln reboot halt -libs -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm +libs -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm diff --git a/distrib/cats/ramdisk/Makefile b/distrib/cats/ramdisk/Makefile index b94967d6de1a..9ecc031e95bc 100644 --- a/distrib/cats/ramdisk/Makefile +++ b/distrib/cats/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/05 10:01:17 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db .if ${USE_INET6} != "no" LISTS+= ${DISTRIBDIR}/common/list.inet6 diff --git a/distrib/cats/ramdisk/list b/distrib/cats/ramdisk/list index d3dd285383ce..75e2ca0e0159 100644 --- a/distrib/cats/ramdisk/list +++ b/distrib/cats/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.18 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.19 2010/02/05 10:01:17 roy Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -62,7 +62,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -72,7 +72,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/cobalt/ramdisk/Makefile b/distrib/cobalt/ramdisk/Makefile index eef87e24e2b2..0caa895b4764 100644 --- a/distrib/cobalt/ramdisk/Makefile +++ b/distrib/cobalt/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: Makefile,v 1.6 2010/02/05 10:01:17 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,7 +21,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script SMALLPROG_INET6=1 diff --git a/distrib/cobalt/ramdisk/list b/distrib/cobalt/ramdisk/list index 4473c56261d9..ae466243e32f 100644 --- a/distrib/cobalt/ramdisk/list +++ b/distrib/cobalt/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.8 2010/02/05 10:01:17 roy Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin @@ -71,7 +71,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -84,7 +84,7 @@ COPY ${DISTRIBDIR}/common/services etc/services COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/common/mktermcap b/distrib/common/mktermcap deleted file mode 100755 index f1e692c4a0b3..000000000000 --- a/distrib/common/mktermcap +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# $NetBSD: mktermcap,v 1.5 2009/10/21 11:35:19 abs Exp $ -# -# Note - output has been further adjusted by hand to save space - -TARGET=termcap - -# x68k pulls in vt220 -echo "# \$NetBSD\$" > ${TARGET} -for t in wsvt25m vt100 xterm ansi dumb hp300h iris-ansi iris-ansi-ap sun x68k -do - getent termcap -rp $t -done | sed 's/^ //' | grep . >> ${TARGET} diff --git a/distrib/common/termcap b/distrib/common/termcap deleted file mode 100644 index f41442795662..000000000000 --- a/distrib/common/termcap +++ /dev/null @@ -1,111 +0,0 @@ -# $NetBSD: termcap,v 1.1 2009/09/20 23:19:52 abs Exp $ -wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta:km:\ - :tc=wsvt25: -wsvt25|NetBSD wscons in 25 line DEC VT220 mode:Co#8:pa#64:it#8:ut:\ - :co#80:li#25:vb@:if@:NC#2:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\ - :k5=\E[15~:k;=\E[21~:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:is=\E[!p:\ - :ti=\E)0:te=\E)B:ac=``aaffggjjkkllmmnnqqttuuvvwwxxyyzz{{}}~~:\ - :@7=\E[8~:kh=\E[7~:kH=\E[8~:rs=\Ec:tc=vt220-8: -vt100|vt100-am|DEC VT100 (w/advanced video):am:bs:ms:xn:xo:co#80:\ - :it#8:li#24:vt#3:@8=\EOM:DO=\E[%dB:K1=\EOq:K2=\EOr:K3=\EOs:K4=\EOp:\ - :K5=\EOn:LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\ - :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:ae=\E(B:\ - :as=\E(0:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:cm=\E[%i%d;%dH:\ - :cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:do=^J:eA=\E(B:ho=\E[H:k0=\EOy:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\EOt:k6=\EOu:k7=\EOv:k8=\EOl:\ - :k9=\EOw:k;=\EOx:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\ - :ks=\E[?1h\E=:ku=\EOA:le=^H:mb=\E[5m:md=\E[1m:me=\E[m\017:mr=\E[7m:\ - :nd=\E[C:r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:sc=\E7:\ - :se=\E[m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:ue=\E[m:up=\E[A:\ - :us=\E[4m: -vt220|vt200|vt300|DEC VT220 in vt100 emulation mode:am:bs:mi:pt:xn:xo:\ - :co#80:li#24:vt#3:@7=\E[4~:RA=\E[?7l:SA=\E[?7h:\ - :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:ae=\E(B:\ - :al=\E[L:as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:\ - :cr=^M:cs=\E[%i%d;%dr:dc=\E[P:dl=\E[M:do=\E[B:ei=\E[4l:ho=\E[H:\ - :if=/usr/share/tabset/vt100:im=\E[4h:is=\E[1;24r\E[24;1H:k1=\EOP:\ - :k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[17~:k6=\E[18~:k7=\E[19~:k8=\E[20~:\ - :k9=\E[21~:k;=\E[29~:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:\ - :kd=\E[B:kh=\E[1~:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:\ - :me=\E[m:mr=\E[7m:nd=\E[C:nl=^J:\ - :r2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:rc=\E8:\ - :rf=/usr/share/tabset/vt100:sc=\E7:se=\E[27m:sf=20\ED:so=\E[7m:\ - :sr=14\EM:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l: -vt220-8|DEC VT220 8 bit terminal:am:bs:mi:ms:xn:xo:co#80:it#8:\ - :li#24:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:\ - :RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:ce=\E[K:\ - :cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:\ - :dl=\E[M:do=^J:ec=\E[%dX:ei=\E[4l:ho=\E[H:\ - :if=/usr/share/tabset/vt100:im=\E[4h:is=\E[?7h\E[>\E[?1h\E F\E[?4l:\ - :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k6=\E[17~:k7=\E[18~:k8=\E[19~:\ - :k9=\E[20~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[H:\ - :kl=\E[D:kr=\E[C:ku=\E[A:le=^H:mb=\E[5m:md=\E[1m:me=\E[m:mr=\E[7m:\ - :nd=\E[C:nw=\EE:rc=\E8:sc=\E7:se=\E[27m:sf=\ED:so=\E[7m:sr=\EM:\ - :st=\EH:ta=^I:ue=\E[24m:up=\E[A:us=\E[4m:vb=\E[?5h\E[?5l:\ - :ve=\E[?25h:vi=\E[?25l: -xterm|vs100|xterm terminal emulator (X Window System):am:bs:km:mi:\ - :ms:ut:xn:co#80:it#8:li#24:Co#8:pa#64:AB=\E[4%dm:AF=\E[3%dm:\ - :op=\E[m:@1=\EOE:@7=\EOF:@8=\EOM:k;=\E[21~:F1=\E[23~:F2=\E[24~:\ - :ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:AL=\E[%dL:\ - :DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:K1=\EOw:K2=\EOy:K3=\EOu:\ - :K4=\EOq:K5=\EOs:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=^O:al=\E[L:as=^N:\ - :bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\ - :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:eA=\E(B\E)0:\ - :ec=\E[%dX:ei=\E[4l:ho=\E[H:im=\E[4h:\ - :is=\E[m\E7\E[r\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:k1=\EOP:k2=\EOQ:\ - :k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\ - :kB=\E[Z:kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\ - :ke=\E[?1l\E>:kh=\EOH:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:ku=\EOA:le=^H:\ - :md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:sc=\E7:se=\E[m:sf=^J:\ - :so=\E[7m:sr=\EM:st=\EH:ta=^I:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:\ - :ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h: -ansi|ansi/pc-term compatible with color:5i:am:bs:mi:ms:Co#8:NC#3:\ - :co#80:it#8:li#24:pa#64:AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:\ - :DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:LE=\E[%dD:RI=\E[%dC:S2=\E[11m:\ - :S3=\E[10m:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ - :ac=`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~q\304r\362s_t\303u\264v\301w\302x\263y\371z\372{\373|\374}\375~\376.\031-\030,\021+^P0\333p\304r\304y\363z\362{\343|\330}\234:ae=\E[10m:al=\E[L:as=\E[11m:bl=^G:bt=\E[Z:cb=\E[1K:cd=\E[J:ce=\E[K:ch=\E[%i%dG:cl=\E[H\E[J:cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:cv=\E[%i%dd:dc=\E[P:dl=\E[M:do=\E[B:ec=\E[%dX:ei=:ho=\E[H:im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:mb=\E[5m:md=\E[1m:me=\E[0;10m:mk=\E[8m:mr=\E[7m:nd=\E[C:nw=\r\E[S:op=\E[39;49m:pf=\E[4i:po=\E[5i:s0=\E(B:s1=\E)B:s2=\E*B:s3=\E+B:se=\E[m:sf=^J:so=\E[7m:st=\EH:ta=\E[I:u6=\E[%i%d;%dR:u7=\E[6n:u9=\E[c:ue=\E[m:up=\E[A:us=\E[4m: -dumb|unknown|80-column dumb tty:am:co#80:bl=^G:cr=^M:do=^J:sf=^J: -hp300h|HP Catseye console:\ - :am:bs:da:db:mi:xs:co#128:li#51:lm#0:sg#0:\ - :al=\EL:bl=^G:bt=\Ei:cd=\EJ:ce=\EK:ch=\E&a%dC:\ - :cl=\E&a0y0C\EJ:cm=\E&a%dy%dC:cr=^M:ct=\E3:cv=\E&a%dY:\ - :dc=\EP:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\ - :im=\EQ:kb=^H:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:\ - :ks=\E&s1A:ku=\EA:le=^H:me=\E&d@:nd=\EC:se=\E&d@:sf=^J:\ - :so=\E&dB:ta=^I:ue=\E&d@:up=\EA:us=\E&dD: -iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100):\ - :am:co#80:it#8:li#40:\ - :!2=\E[218q:#2=\E[143q:#4=\E[158q:%9=\E[209q:%f=\E[210q:\ - :%i=\E[167q:&7=\E[217q:*4=\E[P:*7=\E[147q:@7=\E[146q:\ - :@8=^M:AL=\E[%dL:DL=\E[%dM:DO=\E[%dB:F1=\EOR:F2=\EOS:\ - :LE=\E[%dD:RA=\E[?7l:RI=\E[%dC:SA=\E[?7h:UP=\E[%dA:\ - :al=\E[L:bl=^G:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\ - :cm=\E[%i%d;%dH:cr=^M:ct=\E[3g:dl=\E[M:do=^J:ho=\E[H:\ - :is=\E[?1l\E>\E[?7h\E[100g\E[0m\E7\E[r\E8:k1=\E[001q:\ - :k2=\E[002q:k3=\E[003q:k4=\E[004q:k5=\E[005q:k6=\E[006q:\ - :k7=\E[007q:k8=\E[008q:k9=\EOP:k;=\EOQ:kB=\E[Z:kD=\177:\ - :kI=\E[139q:kM=\E[146q:kN=\E[154q:kP=\E[150q:kb=^H:\ - :kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:le=\E[D:md=\E[1m:\ - :me=\E[m:mr=\E[7m:nd=\E[C:nw=\EE:pk=\EP101;%d.y%s\E\\:\ - :rc=\E8:sc=\E7:se=\E[m:sf=\ED:so=\E[1;7m:sr=\EM:st=\EH:\ - :ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[9/y\E[12/y\E[=6l:\ - :vs=\E[10/y\E[=1h\E[=2l\E[=6h: -iris-ansi-ap|IRIS ANSI in application-keypad mode:\ - :@8=\EOM:F1=\E[011q:F2=\E[012q:is=\E[?1l\E=\E[?7h:\ - :k9=\E[009q:k;=\E[010q:ke=\E>:ks=\E=:\ - :tc=iris-ansi: -sun|sun1|sun2|sun-il|Sun Microsystems Inc. console with working insert-line:\ - :am:km:ms:co#80:li#34:\ - :%7=\E[194z:&5=\E[193z:&8=\E[195z:@7=\E[220z:AL=\E[%dL:\ - :DC=\E[%dP:DL=\E[%dM:F1=\E[234z:F2=\E[235z:IC=\E[%d@:\ - :K2=\E[218z:al=\E[L:bl=^G:cd=\E[J:ce=\E[K:cl=^L:\ - :cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=^J:ei=:ic=\E[@:im=:\ - :k1=\E[224z:k2=\E[225z:k3=\E[226z:k4=\E[227z:k5=\E[228z:\ - :k6=\E[229z:k7=\E[230z:k8=\E[231z:k9=\E[232z:k;=\E[233z:\ - :kD=\177:kN=\E[222z:kP=\E[216z:kb=^H:kd=\E[B:kh=\E[214z:\ - :kl=\E[D:kr=\E[C:ku=\E[A:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:\ - :nd=\E[C:r2=\E[s:\ - :..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m:\ - :se=\E[m:sf=^J:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m: -x68k|x68k-ite|NetBSD/x68k ITE:\ - :co#96:li#32:%1=\E[28~:kC=\E[9~:tc=vt220: diff --git a/distrib/dreamcast/ramdisk/Makefile b/distrib/dreamcast/ramdisk/Makefile index 84ff56fef3c4..8de0c5b16156 100644 --- a/distrib/dreamcast/ramdisk/Makefile +++ b/distrib/dreamcast/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/netconfig \ ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script #SMALLPROG_INET6=1 diff --git a/distrib/dreamcast/ramdisk/list b/distrib/dreamcast/ramdisk/list index adbceb1521cc..03d446ea36ce 100644 --- a/distrib/dreamcast/ramdisk/list +++ b/distrib/dreamcast/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.11 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.12 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -65,7 +65,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -76,7 +76,7 @@ COPY ${DISTRIBDIR}/common/services etc/services COPY ${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555 # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/evbarm/instkernel/ramdisk/Makefile b/distrib/evbarm/instkernel/ramdisk/Makefile index 30e6a8b7702c..1357c43ca30e 100644 --- a/distrib/evbarm/instkernel/ramdisk/Makefile +++ b/distrib/evbarm/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ IMAGEENDIAN= le MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/evbarm/instkernel/ramdisk/list b/distrib/evbarm/instkernel/ramdisk/list index 5426efa067d3..184d2478e54a 100644 --- a/distrib/evbarm/instkernel/ramdisk/list +++ b/distrib/evbarm/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.16 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -58,7 +58,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # init invokes the shell as -sh ARGVLN sh -sh @@ -74,7 +74,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/evbmips/instkernel/ramdisk/Makefile b/distrib/evbmips/instkernel/ramdisk/Makefile index 374fef9a056f..1359dc815657 100644 --- a/distrib/evbmips/instkernel/ramdisk/Makefile +++ b/distrib/evbmips/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/12/14 01:12:05 matt Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -21,7 +21,7 @@ IMAGEENDIAN= be MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/evbmips/instkernel/ramdisk/list b/distrib/evbmips/instkernel/ramdisk/list index 7caba40e02ae..30f99e1c88ff 100644 --- a/distrib/evbmips/instkernel/ramdisk/list +++ b/distrib/evbmips/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.11 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -53,7 +53,7 @@ PROG usr/sbin/chroot SPECIAL ping srcdir distrib/utils/x_ping -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # init invokes the shell as -sh ARGVLN sh -sh @@ -66,7 +66,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/evbppc/ramdisk/Makefile b/distrib/evbppc/ramdisk/Makefile index 4d6b58d41197..fa359d30df4a 100644 --- a/distrib/evbppc/ramdisk/Makefile +++ b/distrib/evbppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/09/24 21:04:45 he Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,7 +16,8 @@ LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/evbppc/ramdisk/list b/distrib/evbppc/ramdisk/list index 42fbb7d795cc..b679e5a3c4d8 100644 --- a/distrib/evbppc/ramdisk/list +++ b/distrib/evbppc/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.12 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.13 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -63,7 +63,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -73,7 +73,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf b/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf index a60af1aa360a..6b90cddaca0e 100644 --- a/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf +++ b/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf @@ -1,4 +1,4 @@ -# $NetBSD: ramdiskbin.conf,v 1.5 2009/12/05 20:11:01 pooka Exp $ +# $NetBSD: ramdiskbin.conf,v 1.6 2010/02/05 10:01:18 roy Exp $ srcdirs bin sbin libexec usr.bin usr.sbin gnu/usr.bin @@ -79,7 +79,7 @@ ln newfs mount_mfs ln reboot halt ln swapctl swapon -libs -lbz2 -ledit -lutil -lcurses -ltermcap -lpcap -ll -lcrypt -lutil -lkvm -lm -lskey -lipsec -lrpcsvc -lz +libs -lbz2 -ledit -lutil -lcurses -lterminfo -lpcap -ll -lcrypt -lutil -lkvm -lm -lskey -lipsec -lrpcsvc -lz # -l telnet # -ldes -lkrb5 # -lkrb5 -lasn1 -lkrb -lcrypto -lroken -lcom_err diff --git a/distrib/ews4800mips/floppies/ramdisk/Makefile b/distrib/ews4800mips/floppies/ramdisk/Makefile index 3bd8cfec940a..060a7f9a1605 100644 --- a/distrib/ews4800mips/floppies/ramdisk/Makefile +++ b/distrib/ews4800mips/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/10/09 15:56:25 tsutsui Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db # Use stubs to eliminate some large stuff from libc HACKSRC= ${DISTRIBDIR}/utils/libhack diff --git a/distrib/ews4800mips/floppies/ramdisk/list b/distrib/ews4800mips/floppies/ramdisk/list index a74d0009df25..8be08b64e74b 100644 --- a/distrib/ews4800mips/floppies/ramdisk/list +++ b/distrib/ews4800mips/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: list,v 1.8 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -67,7 +67,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/bootxx_ustarfs usr/mdec/bootxx_ustarfs COPY ${DESTDIR}/usr/mdec/bootxx_bfs usr/mdec/bootxx_bfs @@ -81,7 +81,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/hp300/miniroot/Makefile.inc b/distrib/hp300/miniroot/Makefile.inc index 6e240cfcf9e5..9f758c982576 100644 --- a/distrib/hp300/miniroot/Makefile.inc +++ b/distrib/hp300/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2009/09/20 23:19:52 abs Exp $ +# $NetBSD: Makefile.inc,v 1.11 2010/02/05 10:01:18 roy Exp $ IMAGESIZE= 7m IMAGEENDIAN= be @@ -6,4 +6,4 @@ MAKEDEVTARGETS= all MAKEFS_FLAGS= -o density=4k IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/install.md \ ${KERNOBJDIR}/INSTALL/netbsd \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db diff --git a/distrib/hp300/miniroot/list b/distrib/hp300/miniroot/list index a6287b0b2356..3ba1913e17da 100644 --- a/distrib/hp300/miniroot/list +++ b/distrib/hp300/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.18 2010/02/05 10:01:18 roy Exp $ # hp300 extra's PROG sbin/disklabel @@ -28,8 +28,8 @@ COPYDIR ${DESTDIR}/usr/mdec usr/mdec # ensure installboot is executable MTREE ./usr/mdec/installboot mode=0555 -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel COPY ${KERNOBJDIR}/INSTALL/netbsd netbsd diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index 5b2adc081505..93f4193601cf 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2009/09/24 21:04:45 he Exp $ +# $NetBSD: Makefile,v 1.29 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,7 +16,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= all IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list index 930f9977b9a9..06e48b044c76 100644 --- a/distrib/hp300/ramdisk/list +++ b/distrib/hp300/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.21 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.22 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -52,7 +52,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -lutil -lcurses -lterminfo -lcrypt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/uboot.lif usr/mdec/uboot.lif COPY ${DESTDIR}/usr/mdec/installboot usr/mdec/installboot 555 @@ -65,7 +65,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/hp700/ramdisk/Makefile b/distrib/hp700/ramdisk/Makefile index b34ed5c36700..2d20dbe084c0 100644 --- a/distrib/hp700/ramdisk/Makefile +++ b/distrib/hp700/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/01/13 10:12:32 skrll Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/05 10:01:18 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= all IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/hp700/ramdisk/list b/distrib/hp700/ramdisk/list index fc14241f1d15..5ced9c6f4809 100644 --- a/distrib/hp700/ramdisk/list +++ b/distrib/hp700/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.12 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.13 2010/02/05 10:01:18 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -63,7 +63,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/xxboot usr/mdec/xxboot COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -76,7 +76,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/hpcarm/miniroot/Makefile.inc b/distrib/hpcarm/miniroot/Makefile.inc index 8deea1da0cb9..358283017132 100644 --- a/distrib/hpcarm/miniroot/Makefile.inc +++ b/distrib/hpcarm/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile.inc,v 1.5 2010/02/05 10:01:18 roy Exp $ DBG= -Os @@ -8,7 +8,8 @@ IMAGEENDIAN= le MAKEDEVTARGETS= all LISTS+= ${DISTRIBDIR}/common/list.sysinst MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/.profile SMALLPROG_INET6=1 diff --git a/distrib/hpcarm/miniroot/list b/distrib/hpcarm/miniroot/list index e1f1ff0bc822..c0daeb77e39d 100644 --- a/distrib/hpcarm/miniroot/list +++ b/distrib/hpcarm/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.5 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.6 2010/02/05 10:01:18 roy Exp $ # extras in bin PROG bin/csh @@ -26,8 +26,8 @@ SPECIAL vi srcdir usr.bin/nvi/build # Minimize use of MFS SYMLINK /tmp var/tmp -# termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${ARCHDIR}/dot.profile .profile diff --git a/distrib/hpcmips/miniroot/Makefile.inc b/distrib/hpcmips/miniroot/Makefile.inc index c6b15d131a9c..3e7a8d4a02cc 100644 --- a/distrib/hpcmips/miniroot/Makefile.inc +++ b/distrib/hpcmips/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.17 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile.inc,v 1.18 2010/02/05 10:01:18 roy Exp $ DBG= -Os @@ -8,7 +8,8 @@ IMAGEENDIAN= le MAKEDEVTARGETS= all LISTS+= ${DISTRIBDIR}/common/list.sysinst MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/.profile SMALLPROG_INET6=1 diff --git a/distrib/hpcmips/miniroot/list b/distrib/hpcmips/miniroot/list index 7bf443b2330c..c0b3d0d00497 100644 --- a/distrib/hpcmips/miniroot/list +++ b/distrib/hpcmips/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.13 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.14 2010/02/05 10:01:18 roy Exp $ # extras in bin PROG bin/csh @@ -26,8 +26,8 @@ SPECIAL vi srcdir usr.bin/nvi/build # Minimize use of MFS SYMLINK /tmp var/tmp -# termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${ARCHDIR}/dot.profile .profile diff --git a/distrib/hpcsh/miniroot/Makefile.inc b/distrib/hpcsh/miniroot/Makefile.inc index a15802d9f262..0f66be42db15 100644 --- a/distrib/hpcsh/miniroot/Makefile.inc +++ b/distrib/hpcsh/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile.inc,v 1.4 2010/02/05 10:01:18 roy Exp $ DBG= -O @@ -8,5 +8,6 @@ IMAGEENDIAN= le MAKEDEVTARGETS= all #LISTS+= ${DISTRIBDIR}/common/list.sysinst MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/.profile ${DESTDIR}/etc/spwd.db diff --git a/distrib/hpcsh/miniroot/list b/distrib/hpcsh/miniroot/list index 772e882428b3..b367d8ca213b 100644 --- a/distrib/hpcsh/miniroot/list +++ b/distrib/hpcsh/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.5 2010/02/05 10:01:18 roy Exp $ # extras in bin #PROG bin/csh @@ -26,8 +26,8 @@ PROG usr/bin/rsh # Minimize use of MFS SYMLINK /tmp var/tmp -# termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # various files that we need in /etc for the install COPY ${DESTDIR}/etc/spwd.db etc/spwd.db diff --git a/distrib/i386/cdroms/Makefile.cdrom b/distrib/i386/cdroms/Makefile.cdrom index b587029d855f..9873b9f746ab 100644 --- a/distrib/i386/cdroms/Makefile.cdrom +++ b/distrib/i386/cdroms/Makefile.cdrom @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.cdrom,v 1.14 2009/09/30 00:32:08 ahoka Exp $ +# $NetBSD: Makefile.cdrom,v 1.15 2010/02/05 10:01:19 roy Exp $ .include @@ -34,7 +34,7 @@ CDRUNTIME+= ./usr/lib/libc.so* CDRUNTIME+= ./usr/lib/libcurses.so* CDRUNTIME+= ./usr/lib/libedit.so* CDRUNTIME+= ./usr/lib/libkvm.so* -CDRUNTIME+= ./usr/lib/libtermcap.so* +CDRUNTIME+= ./usr/lib/libterminfo.so* CDRUNTIME+= ./usr/lib/libutil.so* CDRUNTIME+= ./usr/lib/libz.so* CDRUNTIME+= ./usr/libexec/ld.elf_so @@ -43,7 +43,7 @@ CDRUNTIME+= ./usr/sbin/chown CDRUNTIME+= ./usr/sbin/chroot CDRUNTIME+= ./usr/sbin/installboot CDRUNTIME+= ./usr/sbin/wiconfig -CDRUNTIME+= ./usr/share/misc/termcap +CDRUNTIME+= ./usr/share/misc/terminfo.db image_md_pre: ${MKDIR} cdrom/etc diff --git a/distrib/i386/ramdisks/common/Makefile.ramdisk b/distrib/i386/ramdisks/common/Makefile.ramdisk index 28b5a20b3bed..98ae7bd9dfba 100644 --- a/distrib/i386/ramdisks/common/Makefile.ramdisk +++ b/distrib/i386/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.7 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile.ramdisk,v 1.8 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -25,7 +25,7 @@ IMAGEDEPENDS+= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db PARSELISTENV+= BOOTMODEL=${BOOTMODEL:Q} # This propogates through to the link of ramdiskbin diff --git a/distrib/i386/ramdisks/common/list.ramdisk b/distrib/i386/ramdisks/common/list.ramdisk index 2d2ae38cf167..3d82483cc5bf 100644 --- a/distrib/i386/ramdisks/common/list.ramdisk +++ b/distrib/i386/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.13 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list.ramdisk,v 1.14 2010/02/05 10:01:19 roy Exp $ SRCDIRS usr.bin/less SRCDIRS bin sbin usr.bin usr.sbin @@ -62,7 +62,7 @@ SPECIAL route srcdir distrib/utils/x_route ARGVLN sh -sh # libhack.o is built by Makefile & included Makefile.inc -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -80,7 +80,7 @@ COPY ${DESTDIR}/usr/mdec/mbr_ext usr/mdec/mbr_ext COPY ${DESTDIR}/usr/mdec/mbr_bootsel usr/mdec/mbr_bootsel # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script CMD sed -e "s/@BOOTMODEL@/${BOOTMODEL}/" < ${CURDIR}/../common/dot.profile > .profile diff --git a/distrib/ibmnws/netboot/ramdisk/Makefile b/distrib/ibmnws/netboot/ramdisk/Makefile index 95f2832cb491..ffaac1d92430 100644 --- a/distrib/ibmnws/netboot/ramdisk/Makefile +++ b/distrib/ibmnws/netboot/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/09/24 21:04:45 he Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= std md0 pty0 ttyv0 IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/ibmnws/netboot/ramdisk/list b/distrib/ibmnws/netboot/ramdisk/list index 023058ca86d8..93de22e3e7eb 100644 --- a/distrib/ibmnws/netboot/ramdisk/list +++ b/distrib/ibmnws/netboot/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: list,v 1.11 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -58,7 +58,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -68,7 +68,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile index 374801fef231..6ef8183f44c8 100644 --- a/distrib/landisk/ramdisk/Makefile +++ b/distrib/landisk/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/netconfig \ ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db IMAGETAR_RELEASEDIR= installation/netboot diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list index ec709b670ab1..845b7a8d7065 100644 --- a/distrib/landisk/ramdisk/list +++ b/distrib/landisk/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2009/12/22 11:15:25 nonaka Exp $ +# $NetBSD: list,v 1.15 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -57,7 +57,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # init invokes the shell as -sh ARGVLN sh -sh @@ -70,7 +70,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the shell startup files COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/mac68k/instkernel/ramdisk/Makefile b/distrib/mac68k/instkernel/ramdisk/Makefile index f6f16072e510..ebb9eaa9ff9b 100644 --- a/distrib/mac68k/instkernel/ramdisk/Makefile +++ b/distrib/mac68k/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2009/09/20 23:19:53 abs Exp $ +# $NetBSD: Makefile,v 1.35 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ IMAGEENDIAN= be MAKEDEVTARGETS= raminst IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/mac68k/instkernel/ramdisk/list b/distrib/mac68k/instkernel/ramdisk/list index 84e74ae1ad29..6353fc188a4a 100644 --- a/distrib/mac68k/instkernel/ramdisk/list +++ b/distrib/mac68k/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.27 2009/11/13 08:20:29 he Exp $ +# $NetBSD: list,v 1.28 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -64,7 +64,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -74,7 +74,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/mac68k/miniroot/Makefile.inc b/distrib/mac68k/miniroot/Makefile.inc index b369865483a9..cad625aa3e1e 100644 --- a/distrib/mac68k/miniroot/Makefile.inc +++ b/distrib/mac68k/miniroot/Makefile.inc @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.6 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: Makefile.inc,v 1.7 2010/02/05 10:01:19 roy Exp $ IMAGESIZE= 4m IMAGEENDIAN= be MAKEFS_FLAGS= -o density=12k MAKEDEVTARGETS= raminst IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/install.md \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db \ No newline at end of file diff --git a/distrib/mac68k/miniroot/list b/distrib/mac68k/miniroot/list index 3e7a3f517823..6cfd362a747a 100644 --- a/distrib/mac68k/miniroot/list +++ b/distrib/mac68k/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.10 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.11 2010/02/05 10:01:19 roy Exp $ # mac68k extra's PROG sbin/dmesg @@ -21,8 +21,8 @@ SPECIAL less srcdir usr.bin/less/less # Minimize use of MFS SYMLINK /tmp var/tmp -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel #COPY ${KRNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile index 1093db121abf..386bf6842ee6 100644 --- a/distrib/macppc/floppies/ramdisk/Makefile +++ b/distrib/macppc/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.37 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= floppy IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/usr/mdec/bootxx \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/macppc/floppies/ramdisk/list b/distrib/macppc/floppies/ramdisk/list index 3b2ff65f848a..5db397cb8b54 100644 --- a/distrib/macppc/floppies/ramdisk/list +++ b/distrib/macppc/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.35 2009/11/27 10:23:16 tsutsui Exp $ +# $NetBSD: list,v 1.36 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -69,7 +69,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot @@ -82,7 +82,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/miniroot/list b/distrib/miniroot/list index e755d1b3a08a..ad62a4c1ee71 100644 --- a/distrib/miniroot/list +++ b/distrib/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.30 2010/01/02 06:37:28 tsutsui Exp $ +# $NetBSD: list,v 1.31 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -58,7 +58,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route LIBS libhack.o -LIBS -lrmt -lutil -lcurses -ltermcap -lbz2 -lcrypt -lintl -ll -lm -lkvm -lz -lprop +LIBS -lrmt -lutil -lcurses -lterminfo -lbz2 -lcrypt -lintl -ll -lm -lkvm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group diff --git a/distrib/mipsco/ramdisk/Makefile b/distrib/mipsco/ramdisk/Makefile index 79dfc4da657b..204a195cfb3d 100644 --- a/distrib/mipsco/ramdisk/Makefile +++ b/distrib/mipsco/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -18,7 +18,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= minimal IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/installboot \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx_ffs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ diff --git a/distrib/mipsco/ramdisk/list b/distrib/mipsco/ramdisk/list index 81ff09362180..1eee3197b42c 100644 --- a/distrib/mipsco/ramdisk/list +++ b/distrib/mipsco/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.14 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: list,v 1.15 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -59,7 +59,7 @@ SPECIAL ping srcdir distrib/utils/x_ping # we have not switched to MI usr.sbin/installboot yet. SPECIAL installboot srcdir sys/arch/${MACHINE}/stand/installboot -LIBS libhack.o -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lbz2 -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot blocks /usr/mdec COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -73,7 +73,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db COPY ${DISTRIBDIR}/utils/script-installer/dot.commonutils .commonutils COPY ${DISTRIBDIR}/utils/script-installer/dot.instutils .instutils diff --git a/distrib/mvme68k/miniroot/Makefile.inc b/distrib/mvme68k/miniroot/Makefile.inc index 4c48e25040f6..efbdaca4ed86 100644 --- a/distrib/mvme68k/miniroot/Makefile.inc +++ b/distrib/mvme68k/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: Makefile.inc,v 1.11 2010/02/05 10:01:19 roy Exp $ IMAGESIZE= 7m MAKEFS_FLAGS= -o density=4096 @@ -6,5 +6,5 @@ IMAGEENDIAN= be MAKEDEVTARGETS= all IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${ARCHDIR}/install.md \ ${KERNOBJDIR}/GENERIC/netbsd \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db LISTS+= ${DISTRIBDIR}/common/list.sysinst diff --git a/distrib/mvme68k/miniroot/list b/distrib/mvme68k/miniroot/list index 767adba155d8..93fffd4eefe5 100644 --- a/distrib/mvme68k/miniroot/list +++ b/distrib/mvme68k/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.18 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.19 2010/02/05 10:01:19 roy Exp $ # mvme68k's extras PROG sbin/disklabel @@ -27,8 +27,8 @@ COPYDIR ${DESTDIR}/usr/mdec usr/mdec # ensure installboot is executable MTREE ./usr/mdec/installboot mode=0555 -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel COPY ${KERNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/news68k/floppies/ramdisk/list b/distrib/news68k/floppies/ramdisk/list index da055718d208..ef0dc0090d9d 100644 --- a/distrib/news68k/floppies/ramdisk/list +++ b/distrib/news68k/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: list,v 1.26 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -66,7 +66,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -79,7 +79,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/newsmips/floppies/ramdisk/Makefile b/distrib/newsmips/floppies/ramdisk/Makefile index 5414b00a52a5..7c99ae5b4ae0 100644 --- a/distrib/newsmips/floppies/ramdisk/Makefile +++ b/distrib/newsmips/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.30 2010/02/05 10:01:19 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= floppy IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/newsmips/floppies/ramdisk/list b/distrib/newsmips/floppies/ramdisk/list index ed68e97cffd6..76f765adf2e6 100644 --- a/distrib/newsmips/floppies/ramdisk/list +++ b/distrib/newsmips/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.23 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: list,v 1.24 2010/02/05 10:01:19 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -65,7 +65,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/bootxx usr/mdec/bootxx COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot @@ -78,7 +78,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/ofppc/ramdisks/common/Makefile.ramdisk b/distrib/ofppc/ramdisks/common/Makefile.ramdisk index e00b3cdb7c21..7d1a34c23137 100644 --- a/distrib/ofppc/ramdisks/common/Makefile.ramdisk +++ b/distrib/ofppc/ramdisks/common/Makefile.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.ramdisk,v 1.5 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile.ramdisk,v 1.6 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -16,7 +16,8 @@ LISTS= ${.CURDIR}/list ${OFPPCCOMMON}/list.ramdisk MTREECONF= ${DISTRIBDIR}/common/mtree.common ${.CURDIR}/../common/mtree.ramdisk IMAGEENDIAN= le IMAGEDEPENDS+= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/ofwboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/ofppc/ramdisks/common/list.ramdisk b/distrib/ofppc/ramdisks/common/list.ramdisk index ca15860c2cec..852c8456e431 100644 --- a/distrib/ofppc/ramdisks/common/list.ramdisk +++ b/distrib/ofppc/ramdisks/common/list.ramdisk @@ -1,4 +1,4 @@ -# $NetBSD: list.ramdisk,v 1.6 2009/09/20 23:19:54 abs Exp $ +# $NetBSD: list.ramdisk,v 1.7 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin libexec @@ -21,7 +21,7 @@ COPY ${DESTDIR}/usr/mdec/netbsd.chrp usr/mdec/netbsd.chrp COPY ${DESTDIR}/usr/mdec/mkbootinfo usr/mdec/mkbootinfo 755 # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/../common/dot.profile .profile diff --git a/distrib/ofppc/ramdisks/ramdisk/list b/distrib/ofppc/ramdisks/ramdisk/list index f2bd528e128f..dcaa74d47dc3 100644 --- a/distrib/ofppc/ramdisks/ramdisk/list +++ b/distrib/ofppc/ramdisks/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2009/04/07 11:49:18 joerg Exp $ +# $NetBSD: list,v 1.5 2010/02/05 10:01:20 roy Exp $ # SRCDIRS usr.bin/less @@ -70,4 +70,4 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL vi srcdir usr.bin/nvi/build -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop diff --git a/distrib/pmax/miniroot/Makefile.inc b/distrib/pmax/miniroot/Makefile.inc index d9fa4242eb7c..1b3510c96446 100644 --- a/distrib/pmax/miniroot/Makefile.inc +++ b/distrib/pmax/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.21 2009/12/14 01:12:06 matt Exp $ +# $NetBSD: Makefile.inc,v 1.22 2010/02/05 10:01:20 roy Exp $ .if ${MACHINE_ARCH} == "mips64el" SFX= 64 @@ -13,7 +13,8 @@ MAKEDEVTARGETS= all LISTS= ${.CURDIR}/list ${ARCHDIR}/list${SFX} LISTS+= ${DISTRIBDIR}/common/list.sysinst MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/.profile ${DESTDIR}/boot.pmax \ ${DESTDIR}/etc/disktab \ ${KERNOBJDIR}/GENERIC${SFX}/netbsd diff --git a/distrib/pmax/miniroot/list b/distrib/pmax/miniroot/list index b7b7f3f1c259..c369fa2cc15e 100644 --- a/distrib/pmax/miniroot/list +++ b/distrib/pmax/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.20 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.21 2010/02/05 10:01:20 roy Exp $ # extras in bin PROG bin/csh @@ -32,8 +32,8 @@ COPYDIR ${DESTDIR}/usr/mdec usr/mdec # and /boot.pmax COPY ${DESTDIR}/boot.pmax boot.pmax -# a subset termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# a subset terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel(s) COPY ${KERNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/pmax/miniroot/list64 b/distrib/pmax/miniroot/list64 index 23f4a7fb6e22..3a936c70f5dc 100644 --- a/distrib/pmax/miniroot/list64 +++ b/distrib/pmax/miniroot/list64 @@ -1,4 +1,4 @@ -# $NetBSD: list64,v 1.2 2009/12/14 01:12:06 matt Exp $ +# $NetBSD: list64,v 1.3 2010/02/05 10:01:20 roy Exp $ # extras in bin PROG bin/csh @@ -35,8 +35,8 @@ COPY ${DESTDIR}/boot.pmax boot.pmax # the zoneinfo (dont use) #COPYDIR ${DESTDIR}/usr/share/zoneinfo usr/share/zoneinfo -# a subset termcap file -COPY ${ARCHDIR}/termcap.vt100 usr/share/misc/termcap +# a subset terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel(s) COPY ${KERNOBJDIR}/GENERIC64/netbsd netbsd diff --git a/distrib/pmax/ramdisk/Makefile b/distrib/pmax/ramdisk/Makefile index f2ff2b83caf3..6b9fb519ad0b 100644 --- a/distrib/pmax/ramdisk/Makefile +++ b/distrib/pmax/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: Makefile,v 1.44 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEENDIAN= le MAKEDEVTARGETS= minimal pty0 IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/boot.pmax ${DESTDIR}/usr/mdec/bootxx_ffs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig \ diff --git a/distrib/pmax/ramdisk/list b/distrib/pmax/ramdisk/list index 2359013463d2..ecdbd755fe6a 100644 --- a/distrib/pmax/ramdisk/list +++ b/distrib/pmax/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.25 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.26 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/pmax/stand @@ -57,7 +57,7 @@ ARGVLN sh -sh SPECIAL ping srcdir distrib/utils/x_ping -LIBS -ledit -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS -ledit -lbz2 -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot blocks /usr/mdec COPY ${DESTDIR}/usr/mdec/bootxx_ffs usr/mdec/bootxx_ffs @@ -72,7 +72,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the shell startup files COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/prep/floppies/ramdisk/Makefile b/distrib/prep/floppies/ramdisk/Makefile index 6fb9228524dd..dc08496c03e4 100644 --- a/distrib/prep/floppies/ramdisk/Makefile +++ b/distrib/prep/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig \ ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/prep/floppies/ramdisk/list b/distrib/prep/floppies/ramdisk/list index 2d9eaca3c5c3..0e1a5c15173d 100644 --- a/distrib/prep/floppies/ramdisk/list +++ b/distrib/prep/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.16 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.17 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin @@ -62,10 +62,10 @@ SPECIAL route srcdir distrib/utils/x_route SPECIAL ed srcdir distrib/utils/x_ed SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lcrypt -ll -lm -lz -lprop -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group diff --git a/distrib/rs6000/ramdisk/Makefile b/distrib/rs6000/ramdisk/Makefile index 3446a04335c8..7f9ebcf73207 100644 --- a/distrib/rs6000/ramdisk/Makefile +++ b/distrib/rs6000/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: Makefile,v 1.5 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -23,7 +23,8 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/netconfig \ ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db + SMALLPROG_INET6=1 .if ${USE_INET6} != "no" diff --git a/distrib/rs6000/ramdisk/list b/distrib/rs6000/ramdisk/list index 3e520bdfa874..ac8999868164 100644 --- a/distrib/rs6000/ramdisk/list +++ b/distrib/rs6000/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.5 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -62,7 +62,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${DESTDIR}/usr/mdec/mkbootimage usr/mdec/mkbootimage @@ -75,7 +75,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/sandpoint/ramdisk/Makefile b/distrib/sandpoint/ramdisk/Makefile index 936e4543ad1d..35070dd0225b 100644 --- a/distrib/sandpoint/ramdisk/Makefile +++ b/distrib/sandpoint/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.6 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,8 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be MAKEDEVTARGETS= std md0 wd0 pty0 IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/sandpoint/ramdisk/list b/distrib/sandpoint/ramdisk/list index a52cb50f0b6c..04ef88d0456b 100644 --- a/distrib/sandpoint/ramdisk/list +++ b/distrib/sandpoint/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.7 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.8 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -63,7 +63,7 @@ SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -73,7 +73,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the boot script COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/sgimips/miniroot/Makefile.inc.xxx b/distrib/sgimips/miniroot/Makefile.inc.xxx index 3c5be34e7916..bfea10f11565 100644 --- a/distrib/sgimips/miniroot/Makefile.inc.xxx +++ b/distrib/sgimips/miniroot/Makefile.inc.xxx @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc.xxx,v 1.6 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: Makefile.inc.xxx,v 1.7 2010/02/05 10:01:20 roy Exp $ DBG= -Os -Wa,-xgot # XXX -xgot workaround for objcopy-crunchide @@ -8,7 +8,8 @@ IMAGEENDIAN?= be MAKEDEVTARGETS= all LISTS+= ${DISTRIBDIR}/common/list.sysinst MTREECONF+= ${.CURDIR}/mtree.usr.install -IMAGEDEPENDS+= ${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \ +IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/.profile \ ${KERNOBJDIR}/GENERIC32_IP2x/netbsd.ecoff \ ${KERNOBJDIR}/GENERIC32_IP2x/netbsd \ diff --git a/distrib/sgimips/miniroot/list b/distrib/sgimips/miniroot/list index f20e867b7436..3860c73de0b0 100644 --- a/distrib/sgimips/miniroot/list +++ b/distrib/sgimips/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.8 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.9 2010/02/05 10:01:20 roy Exp $ # extras in bin PROG bin/csh @@ -33,8 +33,8 @@ COPY ${DESTDIR}/usr/mdec/aoutboot usr/mdec/aoutboot COPY ${DESTDIR}/usr/mdec/ip2xboot usr/mdec/ip2xboot COPY ${DESTDIR}/usr/mdec/ip3xboot usr/mdec/ip3xboot -# a subset termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# a subset terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel(s) COPY ${KERNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/sgimips/ramdisk/Makefile b/distrib/sgimips/ramdisk/Makefile index 9a7b97f324a2..8f931740002e 100644 --- a/distrib/sgimips/ramdisk/Makefile +++ b/distrib/sgimips/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: Makefile,v 1.17 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -18,7 +18,7 @@ MTREECONF= ${DISTRIBDIR}/common/mtree.common IMAGEENDIAN= be IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/aoutboot ${DESTDIR}/usr/mdec/ip2xboot \ ${DESTDIR}/usr/mdec/ip3xboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ diff --git a/distrib/sgimips/ramdisk/list b/distrib/sgimips/ramdisk/list index c5f3c4e10ebd..a94a033bd665 100644 --- a/distrib/sgimips/ramdisk/list +++ b/distrib/sgimips/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.16 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand @@ -53,7 +53,7 @@ SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount SPECIAL sgivol srcdir sys/arch/sgimips/stand/sgivol -LIBS libhack.o -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # init invokes the shell as -sh ARGVLN sh -sh @@ -71,7 +71,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the shell startup files COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/shark/instkernel/ramdisk/Makefile b/distrib/shark/instkernel/ramdisk/Makefile index 861e86da5089..29c340180539 100644 --- a/distrib/shark/instkernel/ramdisk/Makefile +++ b/distrib/shark/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: Makefile,v 1.20 2010/02/05 10:01:20 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ IMAGEENDIAN= le MAKEDEVTARGETS= ramdisk IMAGEDEPENDS= ${CRUNCHBIN} \ dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/shark/instkernel/ramdisk/list b/distrib/shark/instkernel/ramdisk/list index d381c58d59cc..ee015568f0ba 100644 --- a/distrib/shark/instkernel/ramdisk/list +++ b/distrib/shark/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.18 2009/09/20 23:19:55 abs Exp $ +# $NetBSD: list,v 1.19 2010/02/05 10:01:20 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -57,7 +57,7 @@ ARGVLN sh -sh SPECIAL ping srcdir distrib/utils/x_ping -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # we need the boot blocks /usr/mdec #COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot @@ -70,7 +70,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/sparc/miniroot/Makefile.inc b/distrib/sparc/miniroot/Makefile.inc index 7502b28b4161..11706b389c68 100644 --- a/distrib/sparc/miniroot/Makefile.inc +++ b/distrib/sparc/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.16 2009/10/17 12:45:20 tsutsui Exp $ +# $NetBSD: Makefile.inc,v 1.17 2010/02/05 10:01:20 roy Exp $ IMAGESIZE= 8192k DBG= -Os @@ -7,7 +7,7 @@ IMAGEENDIAN= be MAKEDEVTARGETS= all LISTS+= ${DISTRIBDIR}/common/list.sysinst IMAGEDEPENDS+= ${ARCHDIR}/../install.md ${ARCHDIR}/dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/boot \ ${KERNOBJDIR}/GENERIC/netbsd diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list index 6a6210b29fda..0a38953e5880 100644 --- a/distrib/sparc/miniroot/list +++ b/distrib/sparc/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.33 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.34 2010/02/05 10:01:20 roy Exp $ # Sparc extra's PROG bin/rcmd @@ -28,8 +28,8 @@ COPYDIR ${DESTDIR}/usr/mdec usr/mdec # ensure binstall is executable MTREE ./usr/mdec/binstall mode=0555 -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel COPY ${KERNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/sparc64/instfs/Makefile.instfs b/distrib/sparc64/instfs/Makefile.instfs index 885a761fda21..6fe45cca4965 100644 --- a/distrib/sparc64/instfs/Makefile.instfs +++ b/distrib/sparc64/instfs/Makefile.instfs @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.instfs,v 1.10 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: Makefile.instfs,v 1.11 2010/02/05 10:01:21 roy Exp $ INSTFSDIR= ${.CURDIR}/../instfs @@ -15,7 +15,7 @@ MAKEDEVTARGETS= ramdisk bpf PARSELISTENV= INSTFSDIR=${INSTFSDIR:Q} IMAGEDEPENDS= ${CRUNCHBIN} \ ${INSTFSDIR}/dot.profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services diff --git a/distrib/sparc64/instfs/list b/distrib/sparc64/instfs/list index c8cc5e75adb5..52c9a6a3bf46 100644 --- a/distrib/sparc64/instfs/list +++ b/distrib/sparc64/instfs/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.15 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.16 2010/02/05 10:01:21 roy Exp $ SRCDIRS bin sbin libexec usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -75,7 +75,7 @@ SPECIAL pppd srcdir usr.sbin/pppd/pppd SPECIAL route srcdir distrib/utils/x_route LIBS libhack.o -LIBS -ledit -lutil -lcurses -ltermcap -lrmt -lbz2 -lcrypt -ll -lm -lpcap -lz -lprop +LIBS -ledit -lutil -lcurses -lterminfo -lrmt -lbz2 -lcrypt -ll -lm -lpcap -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -91,7 +91,7 @@ COPY ${DESTDIR}/usr/mdec/ofwboot ofwboot COPY ${DESTDIR}/usr/mdec/ofwboot usr/mdec/ofwboot # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${INSTFSDIR}/dot.profile .profile diff --git a/distrib/sun2/miniroot/Makefile b/distrib/sun2/miniroot/Makefile index 365b638aee3b..00294873b05b 100644 --- a/distrib/sun2/miniroot/Makefile +++ b/distrib/sun2/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2009/10/09 15:56:25 tsutsui Exp $ +# $NetBSD: Makefile,v 1.32 2010/02/05 10:01:21 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -32,7 +32,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${DISTRIBDIR}/common/protocols \ ${DESTDIR}/etc/pwd.db \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/etc/spwd.db \ ${DESTDIR}/usr/mdec/bootxx ${DESTDIR}/usr/mdec/bootyy \ ${DESTDIR}/usr/mdec/netboot ${DESTDIR}/usr/mdec/tapeboot \ diff --git a/distrib/sun2/miniroot/list b/distrib/sun2/miniroot/list index 3cb9d0ece464..ae947e017941 100644 --- a/distrib/sun2/miniroot/list +++ b/distrib/sun2/miniroot/list @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.13 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.14 2010/02/05 10:01:21 roy Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -41,7 +41,7 @@ COPY ${DESTDIR}/dev/MAKEDEV.local dev/MAKEDEV.local 555 # copy the miniroot installation tools COPY ${CURDIR}/profile .profile -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db COPY ${CURDIR}/install.md install.md COPY ${OBJDIR}/install.sub install.sub @@ -149,4 +149,4 @@ SPECIAL route srcdir distrib/utils/x_route ARGVLN sh -sh LIBS libhack.o -LIBS -lrmt -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lkvm -lbz2 -lz -lprop +LIBS -lrmt -ledit -lutil -lcurses -lterminfo -lcrypt -ll -lm -lkvm -lbz2 -lz -lprop diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile index ec0908ac1a31..f265966786c7 100644 --- a/distrib/sun3/miniroot/Makefile +++ b/distrib/sun3/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.43 2010/02/05 10:01:21 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -26,7 +26,7 @@ MAKEDEVTARGETS= std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0 fd0 IMAGEDEPENDS= ${CRUNCHBIN} \ ${KERNEL3} ${KERNEL3X} \ fstab install.md profile \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/dev/MAKEDEV ${DESTDIR}/dev/MAKEDEV.local \ ${DESTDIR}/etc/group \ ${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \ diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list index 4790cd230a4a..9b19266b6df3 100644 --- a/distrib/sun3/miniroot/list +++ b/distrib/sun3/miniroot/list @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.22 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.23 2010/02/05 10:01:21 roy Exp $ # COPY ${KERNEL3} netbsd.sun3 @@ -40,7 +40,7 @@ COPY ${DESTDIR}/dev/MAKEDEV.local dev/MAKEDEV.local 555 # copy the miniroot installation tools COPY ${CURDIR}/profile .profile -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db COPY ${CURDIR}/install.md install.md COPY ${OBJDIR}/install.sub install.sub @@ -148,4 +148,4 @@ SPECIAL route srcdir distrib/utils/x_route ARGVLN sh -sh LIBS libhack.o -LIBS -lrmt -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lkvm -lbz2 -lz -lprop +LIBS -lrmt -ledit -lutil -lcurses -lterminfo -lcrypt -ll -lm -lkvm -lbz2 -lz -lprop diff --git a/distrib/vax/inst-common/instbin.conf b/distrib/vax/inst-common/instbin.conf index f04777c272da..41da68bfc86f 100644 --- a/distrib/vax/inst-common/instbin.conf +++ b/distrib/vax/inst-common/instbin.conf @@ -1,6 +1,6 @@ # # kcbin.conf - unified binary for the kc floppy -# $NetBSD: instbin.conf,v 1.3 1999/11/23 22:14:25 simonb Exp $ +# $NetBSD: instbin.conf,v 1.4 2010/02/05 10:01:21 roy Exp $ # srcdirs /usr/src/bin /usr/src/sbin /usr/src/usr.bin /usr/src/usr.sbin @@ -20,4 +20,4 @@ ln sh -sh # init invokes the shell this way ln test [ ln reboot halt -libs -ledit -lutil -ltermcap -lcrypt -ll -lm +libs -ledit -lutil -lterminfo -lcrypt -ll -lm diff --git a/distrib/vax/inst-common/list b/distrib/vax/inst-common/list index e64f059b24d8..6d1aed2dd689 100644 --- a/distrib/vax/inst-common/list +++ b/distrib/vax/inst-common/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.12 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.13 2010/02/05 10:01:21 roy Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -63,7 +63,7 @@ COPY ${DISTRIBDIR}/common/services etc COPY ${DESTDIR}/etc/spwd.db etc # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db SPECIAL strip /sys/arch/vax/compile/MINIROOT/netbsd COPY /sys/arch/vax/compile/MINIROOT/netbsd . diff --git a/distrib/vax/miniroot/Makefile.inc b/distrib/vax/miniroot/Makefile.inc index 466177921c7e..6080b6d32dbd 100644 --- a/distrib/vax/miniroot/Makefile.inc +++ b/distrib/vax/miniroot/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.18 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: Makefile.inc,v 1.19 2010/02/05 10:01:21 roy Exp $ IMAGESIZE= 7m MAKEFS_FLAGS= -o density=4k @@ -9,7 +9,7 @@ IMAGEDEPENDS+= ${ARCHDIR}/../install.md \ ${ARCHDIR}/dot.profile \ ${DESTDIR}/usr/mdec/boot \ ${KERNOBJDIR}/GENERIC/netbsd \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db IMAGEPOSTBUILD= ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${IMAGE} \ ${DESTDIR}/usr/mdec/xxboot diff --git a/distrib/vax/miniroot/list b/distrib/vax/miniroot/list index 93fac0f0033c..ebd875405cb2 100644 --- a/distrib/vax/miniroot/list +++ b/distrib/vax/miniroot/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.11 2010/01/02 06:46:09 tsutsui Exp $ +# $NetBSD: list,v 1.12 2010/02/05 10:01:21 roy Exp $ # Vax extras PROG sbin/disklabel @@ -26,8 +26,8 @@ SYMLINK /tmp var/tmp # we need the contents of /usr/mdec COPYDIR ${DESTDIR}/usr/mdec usr/mdec -# and the termcap file -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +# and the terminfo database +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # copy the kernel COPY ${KERNOBJDIR}/GENERIC/netbsd netbsd diff --git a/distrib/vax/ramdisk/Makefile b/distrib/vax/ramdisk/Makefile index 43f2eb3642a8..cbf60c526100 100644 --- a/distrib/vax/ramdisk/Makefile +++ b/distrib/vax/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2009/09/24 21:04:46 he Exp $ +# $NetBSD: Makefile,v 1.25 2010/02/05 10:01:21 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -17,7 +17,7 @@ IMAGEENDIAN= le MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \ sd0 sd1 sd2 md0 pty0 cd0 cd1 IMAGEDEPENDS= ${CRUNCHBIN} \ - dot.profile ${DISTRIBDIR}/common/termcap \ + dot.profile ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list index b741734d8eb2..4c764acddfa9 100644 --- a/distrib/vax/ramdisk/list +++ b/distrib/vax/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.22 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.23 2010/02/05 10:01:21 roy Exp $ SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin @@ -58,7 +58,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route -LIBS libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -lbz2 -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lbz2 -lcrypt -ll -lm -lz -lprop # we need the boot in /, and boot blocks in /usr/mdec COPY ${DESTDIR}/boot boot @@ -76,7 +76,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/x68k/floppies/ramdisk/Makefile b/distrib/x68k/floppies/ramdisk/Makefile index 774f72bc0003..67124b23718a 100644 --- a/distrib/x68k/floppies/ramdisk/Makefile +++ b/distrib/x68k/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2009/10/09 15:59:27 tsutsui Exp $ +# $NetBSD: Makefile,v 1.39 2010/02/05 10:01:21 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -20,7 +20,7 @@ MAKEDEVTARGETS= ramdisk IMAGEDEPENDS+= ${CRUNCHBIN} \ dot.profile \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap \ + ${DESTDIR}/rescue/terminfo.db \ ${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/mboot \ ${DESTDIR}/usr/mdec/sdboot_ufs \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ diff --git a/distrib/x68k/floppies/ramdisk/list b/distrib/x68k/floppies/ramdisk/list index 7ee7b6cc40dd..47c8a5836f6d 100644 --- a/distrib/x68k/floppies/ramdisk/list +++ b/distrib/x68k/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.26 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.27 2010/02/05 10:01:21 roy Exp $ SRCDIRS bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/x68k/stand @@ -64,7 +64,7 @@ SPECIAL route srcdir distrib/utils/x_route SPECIAL installboot srcdir sys/arch/x68k/stand/installboot # libhack.o is built by Makefile & included Makefile.inc -LIBS libhack.o -lz -lutil -lcurses -ltermcap -lcrypt -ll -lm -lprop +LIBS libhack.o -lz -lutil -lcurses -lterminfo -lcrypt -ll -lm -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/master.passwd etc/master.passwd @@ -81,7 +81,7 @@ COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot COPY ${DESTDIR}/usr/mdec/mboot usr/mdec/mboot # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile diff --git a/distrib/zaurus/ramdisk/Makefile b/distrib/zaurus/ramdisk/Makefile index edcf3fd61ccd..c03a728254d2 100644 --- a/distrib/zaurus/ramdisk/Makefile +++ b/distrib/zaurus/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/05 10:01:21 roy Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -19,7 +19,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \ ${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \ ${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \ ${DISTRIBDIR}/common/services \ - ${DISTRIBDIR}/common/termcap + ${DESTDIR}/rescue/terminfo.db .if ${USE_INET6} != "no" LISTS+= ${DISTRIBDIR}/common/list.inet6 diff --git a/distrib/zaurus/ramdisk/list b/distrib/zaurus/ramdisk/list index cc7583f8f1d0..83822d10b34d 100644 --- a/distrib/zaurus/ramdisk/list +++ b/distrib/zaurus/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.11 2009/09/20 23:19:56 abs Exp $ +# $NetBSD: list,v 1.12 2010/02/05 10:01:21 roy Exp $ # usr.bin/less has to be first, otherwise the ramdisk.mk generation fails SRCDIRS usr.bin/less bin sbin usr.bin usr.sbin gnu/usr.bin @@ -63,7 +63,7 @@ SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route -LIBS libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop +LIBS libhack.o -lbz2 -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop # various files that we need in /etc for the install COPY ${NETBSDSRCDIR}/etc/group etc/group @@ -73,7 +73,7 @@ COPY ${DISTRIBDIR}/common/protocols etc/protocols COPY ${DISTRIBDIR}/common/services etc/services # and the common installation tools -COPY ${DISTRIBDIR}/common/termcap usr/share/misc/termcap +COPY ${DESTDIR}/rescue/terminfo.db usr/share/misc/terminfo.db # and the installation tools COPY ${CURDIR}/dot.profile .profile