generate termcap file using a list2sh.awk directrive; distrib becomes a lot smaller again

31 files changed, 107 insertions, 665 deletions

diff --git a/distrib/alpha/inst-common/list b/distrib/alpha/inst-common/list
index 32a08b4e8f9..ee0cc345c34 100644
--- a/distrib/alpha/inst-common/list
+++ b/distrib/alpha/inst-common/list
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: list,v 1.23 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.24 2002/04/29 17:13:38 deraadt Exp $
 #
 
 # copy the crunched binary, link to it, and kill it
@@ -54,7 +54,6 @@ SPECIAL	/bin/rm raminst
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec XXX - no it's not necessary and won't fit.
 #COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
@@ -65,9 +64,7 @@ COPY	${DESTDIR}/etc/group		etc/group
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
-
-# and the common installation tools
-COPY	${TOPDIR}/inst-common/termcap.vt	usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # so DNS can work
 SYMLINK /tmp/resolv.conf.shadow		etc/resolv.conf
diff --git a/distrib/alpha/inst-common/termcap.vt b/distrib/alpha/inst-common/termcap.vt
deleted file mode 100644
index 6ab68007c79..00000000000
--- a/distrib/alpha/inst-common/termcap.vt
+++ /dev/null
@@ -1,23 +0,0 @@
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
diff --git a/distrib/amiga/miniroot/list b/distrib/amiga/miniroot/list
index 67468000ced..1bc3c4128c2 100644
--- a/distrib/amiga/miniroot/list
+++ b/distrib/amiga/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2002/04/22 16:48:48 deraadt Exp $
+#	$OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Amiga extra's
@@ -14,12 +14,9 @@ SYMLINK	/tmp	var/tmp
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
-COPY	${DESTDIR}/dev/MAKEDEV.local	dev/MAKEDEV.local
 SPECIAL	cd dev; sh MAKEDEV all
-#SPECIAL	/bin/rm dev/MAKEDEV
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # copy the kernel
 COPY	bsd	bsd
diff --git a/distrib/amiga/ramdisk/list b/distrib/amiga/ramdisk/list
index 7191bc5b8fd..920a77c1d3c 100644
--- a/distrib/amiga/ramdisk/list
+++ b/distrib/amiga/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2002/04/22 16:48:48 deraadt Exp $
+#	$OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Amiga extra's
@@ -17,8 +17,7 @@ SYMLINK	/tmp	var/tmp
 COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
diff --git a/distrib/hp300/common/termcap.hp-vt b/distrib/hp300/common/termcap.hp-vt
deleted file mode 100644
index df406fcfd15..00000000000
--- a/distrib/hp300/common/termcap.hp-vt
+++ /dev/null
@@ -1,134 +0,0 @@
-#
-#	$OpenBSD: termcap.hp-vt,v 1.1 1997/02/16 18:19:59 downsj Exp $
-#	$NetBSD: termcap.vt,v 1.1 1995/07/18 04:13:31 briggs Exp $
-#
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-hpansi|hp700|hewlett packard 700/44 in HP-PCterm mode:\
-	:am:eo:xn:xo:\
-	:co#80:li#25:\
-	:@7=\E[4~:RA=\E[?7l:S4=\E[>11h\EPO**x0/65;1/67\E\\:\
-	:S5=\E[>11l\EP1**x0/11;1/13\E[m\E\\:SA=\E[?7h:XF=g:XN=e:\
-	:ac=k\277l\332m\300j\331n\305w\302q\304u\264t\303v\301x\263:\
-	:al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[2J\E[H:\
-	:cm=\E[%i%d;%dH:cr=^M:dc=\E[P:dl=\E[M:do=\E[B:ei=:ho=\E[H:\
-	:ic=\E[@:im=:\
-	:is=\E[44"p\E[?7h\E[>10h\E[>12h\EP1;1|3/7F\E\\:\
-	:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:k5=\E[21~:\
-	:k6=\E[23~:k7=\E[24~:k8=\E[25~:k9=\E[26~:k;=\E[28~:\
-	:kB=\E[Z:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:kh=\E[1~:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=\E[D:me=\E[m:nd=\E[C:se=\E[m:sf=^J:\
-	:so=\E[7m:ta=^I:ue=\E[m:up=\E[A:us=\E[4m:ve=\E[?25h:\
-	:vi=\E[?25l:
-hp2392|2392|2393|239x series:\
-	:co#80:\
-	:bt=\Ei:cm=\E&a%dy%dC:cv=\E&a%dY:im=\EQ:k1=\Ep\r:k2=\Eq\r:\
-	:k3=\Er\r:k4=\Es\r:k5=\Et\r:k6=\Eu\r:k7=\Ev\r:k8=\Ew\r:\
-	:kF=\EU:kN=\Eu:kP=\Ev:kR=\EV:kh=\Eh:ue=\E&d@:us=\E&dD:\
-	:tc=hpsub:
-hpsub|hp terminals -- capability subset:\
-	:am:da:db:mi:xo:xs:\
-	:li#24:\
-	:al=\EL:bl=^G:cd=\EJ:ce=\EK:ch=\E&a%dC:cl=\EH\EJ:cr=^M:\
-	:dc=\EP:dl=\EM:do=\EB:ei=\ER:if=/usr/share/tabset/stdcrt:\
-	:is=\E&s1A\E<\E&k0\\: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:up=\EA:
-hpex|hp extended capabilites:\
-	:cm=\E&a%dy%dC:cr=^M:cv=\E&a%dY:do=^J:im=\EQ:kb=^H:kd=^J:\
-	:kl=^H:nw=^M^J:sf=^J:ta=^I:ue=\E&d@:us=\E&dD:\
-	:tc=hpsub:
-hp300h|HP Catseye console:\
-	:am: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:
-hp700-wy|HP700/41 emulating wyse30:\
-	:am:bw:mi:ms:\
-	:co#80:it#8:li#24:sg#1:ug#1:\
-	:al=0.7*\EE:bt=\EI:cd=\EY:ce=10\ET:cl=^Z:cm=\E=%+ %+ :\
-	:cr=^M:ct=\E0:cv=\E[%+ :dc=\EW:dl=\ER:do=^V:ei=\Er:ho=^^:\
-	:i1=\E~"\EC\Er\E(\EG0\003\E`9\E`1:\
-	:if=/usr/share/tabset/stdcrt:im=\Eq:kB=\EI:kC=^Z:kE=\ET:\
-	:kI=\Eq:kM=\Er:kS=\EY:kT=\EI:kb=\177:kd=^V:kh=^^:kl=^H:kr=^L:\
-	:ku=^K:le=^H:ll=^^^K:me=10\EG0:nd=^L:se=10\EG0:so=10\EG4:\
-	:sr=\Ej:st=\E1:ta=^I:ue=10\EG0:up=^K:us=10\EG8:
-hp70092|70092a|70092A|hp70092a|hp70092A|HP 700/92:\
-	:am:da:db:xs:\
-	:Nl#8:co#80:lh#2:li#24:lm#0:lw#8:\
-	:LF=\E&j@:LO=\E&jB:ac=:ae=^O:al=\EL:as=^N:bl=^G:bt=\Ei:\
-	: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:im=\EQ:\
-	:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
-	:kA=\EL:kC=\EJ:kD=\EP:kE=\EK:kF=\ES:kH=\EF:kI=\EQ:kL=\EM:\
-	:kM=\ER:kN=\EU:kP=\EV:kR=\ET:kS=\EJ:kT=\E1:ka=\E3:kb=^H:\
-	:kd=\EB:ke=\E&s0A:kh=\Eh:kl=\ED:kr=\EC:ks=\E&s1A:kt=\E2:\
-	:ku=\EA:le=^H:mb=\E&dA:md=\E&dB:me=\E&d@:mh=\E&dH:mr=\E&dB:\
-	:nd=\EC:se=\E&d@:so=\E&dJ:sr=\ET:st=\E1:ta=^I:ue=\E&d@:\
-	:up=\EA:us=\E&dD:
-#
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-vt300|vt320|vt300-80|VT 300 with 80 columns, on VMS:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SR=1*\E[%dM:UP=\E[%dA:al=\E[L:\
-	:am:bl=^G:bs:cd=2*\E[J:ce=2*\E[K:cl=45\E[H\E[2J:\
-	:cm=%i\E[%d;%dH:co#80:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:dm=:do=\ED:ec=\E[%dX:ed=:ei=\E[4l:\
-	:ho=\E[H:ic:im=\E[4h:it#8:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kn#4:kr=\E[C:ks=\E[?1h\E=:\
-	:ku=\E[A:le=^H:li#24:mb=\E[5m:md=\E[1m:me=\E[0m:mi:\
-	:mr=\E[7m:ms:nd=\E[C:nl=\ED:nw=\EE:pf=\E[?4i:po=\E[?5i:\
-	:ps=\E[i:rc=\E8:sc=\E7:se=\E[27m:sf=1*\ED:so=\E[7m:\
-	:sr=1*\EM:st=\EH:ue=\E[24m:up=\EM:us=\E[4m:xn:
diff --git a/distrib/hp300/ramdisk/list b/distrib/hp300/ramdisk/list
index 9c8dceb119e..f29ed4da949 100644
--- a/distrib/hp300/ramdisk/list
+++ b/distrib/hp300/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.28 2002/04/22 02:40:30 deraadt Exp $
+#	$OpenBSD: list,v 1.29 2002/04/29 17:13:38 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst				bin/cat
@@ -67,8 +67,7 @@ COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SPECIAL	sed -e '/^#[ 	].*$/d' < ${DESTDIR}/etc/disktab > etc/disktab
-
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/termcap.hp-vt > usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb,hp2392,hpansi,hpsub,hpex,hp300h,hp700-wy,hp70092	usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index 2d47272541c..618ec17d66c 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.2 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.3 2002/04/29 17:13:38 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -67,6 +67,7 @@ COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
 COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
 COPY	${CURDIR}/../../miniroot/protocols etc/protocols
 COPY	${CURDIR}/../../miniroot/services  etc/services
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
@@ -76,9 +77,6 @@ SYMLINK	/tmp/hosts			etc/hosts
 # dhcp things
 COPY	${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
 
-# and the common installation tools
-COPY	${CURDIR}/../common/termcap.vt		usr/share/misc/termcap
-
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile	 > .profile
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md	 > install.md
diff --git a/distrib/i386/common/termcap.vt b/distrib/i386/common/termcap.vt
deleted file mode 100644
index 6ab68007c79..00000000000
--- a/distrib/i386/common/termcap.vt
+++ /dev/null
@@ -1,23 +0,0 @@
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
diff --git a/distrib/mac68k/common/termcap.vt b/distrib/mac68k/common/termcap.vt
deleted file mode 100644
index 7fe17226606..00000000000
--- a/distrib/mac68k/common/termcap.vt
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#	$OpenBSD: termcap.vt,v 1.1 1999/06/13 10:33:31 downsj Exp $
-#	$NetBSD: termcap.vt,v 1.1 1995/07/18 04:13:31 briggs Exp $
-#
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-vt300|vt320|vt300-80|VT 300 with 80 columns, on VMS:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SR=1*\E[%dM:UP=\E[%dA:al=\E[L:\
-	:am:bl=^G:bs:cd=2*\E[J:ce=2*\E[K:cl=45\E[H\E[2J:\
-	:cm=%i\E[%d;%dH:co#80:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:dm=:do=\ED:ec=\E[%dX:ed=:ei=\E[4l:\
-	:ho=\E[H:ic:im=\E[4h:it#8:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kn#4:kr=\E[C:ks=\E[?1h\E=:\
-	:ku=\E[A:le=^H:li#24:mb=\E[5m:md=\E[1m:me=\E[0m:mi:\
-	:mr=\E[7m:ms:nd=\E[C:nl=\ED:nw=\EE:pf=\E[?4i:po=\E[?5i:\
-	:ps=\E[i:rc=\E8:sc=\E7:se=\E[27m:sf=1*\ED:so=\E[7m:\
-	:sr=1*\EM:st=\EH:ue=\E[24m:up=\EM:us=\E[4m:xn:
diff --git a/distrib/mac68k/ramdisk/list b/distrib/mac68k/ramdisk/list
index f5778de9e7a..68f7b5260c5 100644
--- a/distrib/mac68k/ramdisk/list
+++ b/distrib/mac68k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
 COPY	${OBJDIR}/instbin	instbin
@@ -48,7 +48,6 @@ SPECIAL	rm instbin
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL	/bin/rm dev/MAKEDEV
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/group		etc/group
@@ -59,9 +58,7 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
-
-# and the common installation tools
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/macppc/common/termcap.vt b/distrib/macppc/common/termcap.vt
deleted file mode 100644
index 6ab68007c79..00000000000
--- a/distrib/macppc/common/termcap.vt
+++ /dev/null
@@ -1,23 +0,0 @@
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index d2f561ca991..9aa6b5ae032 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.12 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.13 2002/04/29 17:13:38 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -58,28 +58,25 @@ SPECIAL /bin/rm instbin
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL	/bin/rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec
-COPY	${DESTDIR}/usr/mdec/ofwboot	usr/mdec/ofwboot
-COPY	${DESTDIR}/usr/mdec/mbr		usr/mdec/mbr
-COPY	${DESTDIR}/usr/mdec/msdos1mb.gz	usr/mdec/msdos1mb.gz
+COPY	${DESTDIR}/usr/mdec/ofwboot		usr/mdec/ofwboot
+COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
+COPY	${DESTDIR}/usr/mdec/msdos1mb.gz		usr/mdec/msdos1mb.gz
 
 # various files that we need in /etc for the install
-COPY	${DESTDIR}/etc/group		etc/group
-COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
+COPY	${DESTDIR}/etc/group			etc/group
+COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
-SYMLINK	/tmp/disktab.shadow		etc/disktab
-SYMLINK	/tmp/fstab.shadow		etc/fstab
-SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
-SYMLINK	/tmp/hosts			etc/hosts
+SYMLINK	/tmp/disktab.shadow			etc/disktab
+SYMLINK	/tmp/fstab.shadow			etc/fstab
+SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
+SYMLINK	/tmp/hosts				etc/hosts
+TERMCAP	vt100,vt200,dumb			usr/share/misc/termcap
 
 # dhcp things
-COPY    ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
-
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
+COPY    ${DESTDIR}/sbin/dhclient-script		sbin/dhclient-script
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile	 > .profile
diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk
index bfc2ba8a699..510215b6efb 100644
--- a/distrib/miniroot/list2sh.awk
+++ b/distrib/miniroot/list2sh.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: list2sh.awk,v 1.6 2002/04/25 21:57:43 deraadt Exp $
+#	$OpenBSD: list2sh.awk,v 1.7 2002/04/29 17:13:38 deraadt Exp $
 #	$NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $
 
 BEGIN {
@@ -63,6 +63,12 @@ $1 == "SPECIAL" {
 	printf("(cd ${TARGDIR}; %s)\n", work);
 	next;
 }
+$1 == "TERMCAP" {
+	printf("echo '%s'\n", $0);
+	printf("(cd ${TARGDIR}; tic -C -x -r -e %s ${UTILS}/../../share/termtypes/termtypes.master | sed -e '/^#.*/d' -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' > %s)\n",
+	    $2, $3);
+	next;
+}
 {
 	printf("echo '%s'\n", $0);
 	printf("echo 'Unknown keyword \"%s\" at line %d of input.'\n", $1, NR);
diff --git a/distrib/mvme68k/common/termcap.vt b/distrib/mvme68k/common/termcap.vt
deleted file mode 100644
index afbbc1e9ddf..00000000000
--- a/distrib/mvme68k/common/termcap.vt
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#	$OpenBSD: termcap.vt,v 1.2 2000/03/01 22:10:04 todd Exp $
-#	$NetBSD: termcap.vt,v 1.1 1995/07/18 04:13:31 briggs Exp $
-#
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)termcap.src	5.109 (Berkeley) 3/8/93
-#
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-vt300|vt320|vt300-80|VT 300 with 80 columns, on VMS:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SR=1*\E[%dM:UP=\E[%dA:al=\E[L:\
-	:am:bl=^G:bs:cd=2*\E[J:ce=2*\E[K:cl=45\E[H\E[2J:\
-	:cm=%i\E[%d;%dH:co#80:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:dm=:do=\ED:ec=\E[%dX:ed=:ei=\E[4l:\
-	:ho=\E[H:ic:im=\E[4h:it#8:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kn#4:kr=\E[C:ks=\E[?1h\E=:\
-	:ku=\E[A:le=^H:li#24:mb=\E[5m:md=\E[1m:me=\E[0m:mi:\
-	:mr=\E[7m:ms:nd=\E[C:nl=\ED:nw=\EE:pf=\E[?4i:po=\E[?5i:\
-	:ps=\E[i:rc=\E8:sc=\E7:se=\E[27m:sf=1*\ED:so=\E[7m:\
-	:sr=1*\EM:st=\EH:ue=\E[24m:up=\EM:us=\E[4m:xn:
diff --git a/distrib/mvme68k/ramdisk/list b/distrib/mvme68k/ramdisk/list
index 13d1e3f2346..0c869eddfb5 100644
--- a/distrib/mvme68k/ramdisk/list
+++ b/distrib/mvme68k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.18 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.19 2002/04/29 17:13:38 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -51,7 +51,6 @@ SPECIAL rm instbin
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL	/bin/rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec
 COPY	${DESTDIR}/usr/mdec/netboot	usr/mdec/netboot
@@ -68,9 +67,7 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
-
-# and the common installation tools
-SPECIAL	sed -e '/^#[ 	].*$/d' < ${TOPDIR}/common/termcap.vt > usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/mvme88k/common/termcap.vt b/distrib/mvme88k/common/termcap.vt
deleted file mode 100644
index ea544db11c5..00000000000
--- a/distrib/mvme88k/common/termcap.vt
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#	$OpenBSD: termcap.vt,v 1.1 1998/12/17 02:16:30 smurph Exp $
-#
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)termcap.src	5.109 (Berkeley) 3/8/93
-#
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-vt300|vt320|vt300-80|VT 300 with 80 columns, on VMS:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SR=1*\E[%dM:UP=\E[%dA:al=\E[L:\
-	:am:bl=^G:bs:cd=2*\E[J:ce=2*\E[K:cl=45\E[H\E[2J:\
-	:cm=%i\E[%d;%dH:co#80:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:dm=:do=\ED:ec=\E[%dX:ed=:ei=\E[4l:\
-	:ho=\E[H:ic:im=\E[4h:it#8:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kn#4:kr=\E[C:ks=\E[?1h\E=:\
-	:ku=\E[A:le=^H:li#24:mb=\E[5m:md=\E[1m:me=\E[0m:mi:\
-	:mr=\E[7m:ms:nd=\E[C:nl=\ED:nw=\EE:pf=\E[?4i:po=\E[?5i:\
-	:ps=\E[i:rc=\E8:sc=\E7:se=\E[27m:sf=1*\ED:so=\E[7m:\
-	:sr=1*\EM:st=\EH:ue=\E[24m:up=\EM:us=\E[4m:xn:
diff --git a/distrib/mvme88k/miniroot/list b/distrib/mvme88k/miniroot/list
index 3478ac1332a..f2fbb56727a 100644
--- a/distrib/mvme88k/miniroot/list
+++ b/distrib/mvme88k/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.8 2002/04/22 02:43:16 deraadt Exp $
+#	$OpenBSD: list,v 1.9 2002/04/29 17:13:38 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Amiga extra's
@@ -14,12 +14,7 @@ SYMLINK	/tmp	var/tmp
 
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV		dev/MAKEDEV
-COPY	${DESTDIR}/dev/MAKEDEV.local	dev/MAKEDEV.local
 SPECIAL	cd dev; sh MAKEDEV all
-#SPECIAL	/bin/rm dev/MAKEDEV
-
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
 
 # copy the kernel
 COPY	bsd	bsd
@@ -30,6 +25,7 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${ARCHDIR}/../install.md > install.md
diff --git a/distrib/mvme88k/ramdisk/list b/distrib/mvme88k/ramdisk/list
index 465319b9129..ae51f90f9ef 100644
--- a/distrib/mvme88k/ramdisk/list
+++ b/distrib/mvme88k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.13 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.14 2002/04/29 17:13:38 deraadt Exp $
 
 COPY	${OBJDIR}/raminst		raminst
 LINK	raminst			bin/cat
@@ -63,13 +63,11 @@ COPY    ${DESTDIR}/usr/mdec/bootxx 	usr/mdec
 COPY    ${DESTDIR}/usr/mdec/bootsd 	usr/mdec
 
 # various files that we need in /etc for the install
-COPY	${DESTDIR}/etc/group		etc
+COPY	${DESTDIR}/etc/group		etc/group
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
-COPY	${DESTDIR}/etc/spwd.db		etc
-
-# and the common installation tools
-COPY	${TOPDIR}/common/termcap.vt	usr/share/misc/termcap
+COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # the disktab explanation file
 COPY	disktab.preinstall		etc
diff --git a/distrib/mvmeppc/common/termcap.vt b/distrib/mvmeppc/common/termcap.vt
deleted file mode 100644
index 6ab68007c79..00000000000
--- a/distrib/mvmeppc/common/termcap.vt
+++ /dev/null
@@ -1,23 +0,0 @@
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
diff --git a/distrib/mvmeppc/ramdisk/list b/distrib/mvmeppc/ramdisk/list
index 3a884f44da7..896c3ab6e77 100644
--- a/distrib/mvmeppc/ramdisk/list
+++ b/distrib/mvmeppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.8 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.9 2002/04/29 17:13:39 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -57,7 +57,6 @@ LINK	instbin			usr/bin/sed
 # copy the MAKEDEV script and make some devices
 COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
-#SPECIAL	/bin/rm dev/MAKEDEV
 
 # we need the contents of /usr/mdec
 COPY	${DESTDIR}/usr/mdec/ofwboot	usr/mdec/ofwboot
@@ -73,13 +72,11 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # dhcp things
 COPY    ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script
 
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
-
 # and the installation tools
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile	 > .profile
diff --git a/distrib/sparc/miniroot/list b/distrib/sparc/miniroot/list
index 116794ac3d8..3429a3b4eab 100644
--- a/distrib/sparc/miniroot/list
+++ b/distrib/sparc/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.17 2002/04/22 02:43:16 deraadt Exp $
+#	$OpenBSD: list,v 1.18 2002/04/29 17:13:39 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
@@ -27,9 +27,6 @@ SPECIAL	cd dev; sh MAKEDEV all
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
 SPECIAL	rm -f usr/mdec/binstall usr/mdec/installboot
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^sun.*|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' -e '/^pc3|/,/:[ 	]*$/p' -e '/^pcvt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
-
 # copy the kernel
 COPY	bsd	bsd
 
@@ -39,6 +36,7 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb,sun		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md	 > install.md
diff --git a/distrib/sparc/ramdisk/list b/distrib/sparc/ramdisk/list
index b7acb40d3f5..2e5c1a58bcd 100644
--- a/distrib/sparc/ramdisk/list
+++ b/distrib/sparc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.14 2002/04/22 02:43:16 deraadt Exp $
+#	$OpenBSD: list,v 1.15 2002/04/29 17:13:39 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # Sparc extra's
@@ -22,15 +22,13 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPYDIR	${DESTDIR}/usr/mdec	usr/mdec
 SPECIAL	rm -f usr/mdec/binstall usr/mdec/installboot
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^sun.*|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' -e '/^pc3|/,/:[ 	]*$/p' -e '/^pcvt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
-
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
 SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt220,dumb,sun		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md	 > install.md
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index ea11613f5e2..6f915abe100 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.8 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.9 2002/04/29 17:13:39 deraadt Exp $
 #	$NetBSD: list,v 1.4.4.1 1996/06/20 20:30:26 pk Exp $
 
 SRCDIRS distrib/special
@@ -63,9 +63,7 @@ SYMLINK	/tmp/disktab.shadow			etc/disktab
 SYMLINK	/tmp/fstab.shadow			etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
 SYMLINK	/tmp/hosts				etc/hosts
-
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb,sun			usr/share/misc/termcap
 
 # and the installation scripts
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/sparc64/common/termcap.vt b/distrib/sparc64/common/termcap.vt
deleted file mode 100644
index 6ab68007c79..00000000000
--- a/distrib/sparc64/common/termcap.vt
+++ /dev/null
@@ -1,23 +0,0 @@
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index e713aff68ad..1c85b080349 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.13 2002/04/28 19:25:09 deraadt Exp $
+#	$OpenBSD: list,v 1.14 2002/04/29 17:13:39 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -65,9 +65,7 @@ SYMLINK	/tmp/disktab.shadow			etc/disktab
 SYMLINK	/tmp/fstab.shadow			etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
 SYMLINK	/tmp/hosts				etc/hosts
-
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb,sun			usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index 8dfa5301539..474bff04244 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.9 2002/04/28 19:25:10 deraadt Exp $
+#	$OpenBSD: list,v 1.10 2002/04/29 17:13:39 deraadt Exp $
 
 SRCDIRS distrib/special
 SRCDIRS gnu/usr.bin usr.bin bin sbin usr.sbin
@@ -65,9 +65,7 @@ SYMLINK	/tmp/disktab.shadow			etc/disktab
 SYMLINK	/tmp/fstab.shadow			etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow			etc/resolv.conf
 SYMLINK	/tmp/hosts				etc/hosts
-
-# and the common installation tools
-COPY    ${TOPDIR}/common/termcap.vt        usr/share/misc/termcap
+TERMCAP	vt100,vt200,dumb,sun			usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL	sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${CURDIR}/../../miniroot/dot.profile > .profile
diff --git a/distrib/sun3/miniroot/list b/distrib/sun3/miniroot/list
index e6596372872..49bc05f3179 100644
--- a/distrib/sun3/miniroot/list
+++ b/distrib/sun3/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.7 2002/04/22 16:48:48 deraadt Exp $
+#	$OpenBSD: list,v 1.8 2002/04/29 17:13:39 deraadt Exp $
 
 # Sun3 extras
 LINK	instbin			sbin/disklabel
@@ -28,9 +28,6 @@ COPY	${DESTDIR}/usr/mdec/ufsboot	boot
 COPY	${DESTDIR}/usr/mdec/bootxx	/usr/mdec/bootxx
 COPY	${DESTDIR}/usr/mdec/ufsboot	/usr/mdec/ufsboot
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^sun.*|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' -e '/^pc3|/,/:[ 	]*$/p' -e '/^pcvt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
-
 # copy the kernel
 COPY	bsd	bsd
 
@@ -40,6 +37,7 @@ SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb,sun		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`" < ${CURDIR}/../common/install.md	 > install.md
diff --git a/distrib/sun3/ramdisk/list b/distrib/sun3/ramdisk/list
index a905a12b4ca..6c04698a92e 100644
--- a/distrib/sun3/ramdisk/list
+++ b/distrib/sun3/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.9 2002/04/22 16:48:48 deraadt Exp $
+#	$OpenBSD: list,v 1.10 2002/04/29 17:13:39 deraadt Exp $
 
 # Sun3 extra's
 LINK	instbin			sbin/disklabel
@@ -21,15 +21,13 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${DESTDIR}/usr/mdec/bootxx	usr/mdec/bootxx
 COPY	${DESTDIR}/usr/mdec/ufsboot	usr/mdec/ufsboot
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^sun.*|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' -e '/^pc3|/,/:[ 	]*$/p' -e '/^pcvt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
-
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/disktab		etc/disktab.shadow
 SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb,sun		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${CURDIR}/../common/install.md	 > install.md
diff --git a/distrib/vax/common/list b/distrib/vax/common/list
index f9182b43174..530f3df1bc5 100644
--- a/distrib/vax/common/list
+++ b/distrib/vax/common/list
@@ -1,49 +1,49 @@
-#	$OpenBSD: list,v 1.2 2002/04/28 19:25:10 deraadt Exp $
+#	$OpenBSD: list,v 1.3 2002/04/29 17:13:39 deraadt Exp $
 
 # copy the crunched binary, link to it, and kill it
-COPY	${OBJDIR}/instbin	instbin
-LINK	instbin			bin/cat
-LINK	instbin			bin/chmod bin/chgrp sbin/chown
-LINK	instbin			bin/cp
-LINK	instbin			bin/dd
-LINK	instbin			bin/df
-LINK	instbin			bin/ed
-LINK	instbin			bin/expr
-LINK	instbin			bin/ln
-LINK	instbin			bin/ls
-LINK	instbin			bin/mkdir
-LINK	instbin			bin/mv
-LINK	instbin			bin/mt
-LINK	instbin			bin/rm
-LINK	instbin			bin/sh
-LINK	instbin			bin/-sh
-LINK	instbin			bin/stty
-LINK	instbin			bin/sync
-LINK	instbin			bin/test
-LINK	instbin			bin/[
-LINK	instbin			sbin/disklabel
-LINK	instbin			sbin/dmesg
-LINK	instbin			sbin/fsck
-LINK	instbin			sbin/halt
-LINK	instbin			sbin/ifconfig
-LINK	instbin			sbin/init
-LINK	instbin			sbin/mknod
-LINK	instbin			sbin/mount
-LINK	instbin			sbin/mount_ffs
-LINK	instbin			sbin/mount_nfs
-LINK	instbin			sbin/newfs
-LINK	instbin			sbin/reboot
-LINK	instbin			sbin/route
-LINK	instbin			sbin/shutdown
-LINK	instbin			sbin/slattach
-LINK	instbin			sbin/umount
-LINK	instbin			usr/bin/awk
-LINK	instbin			usr/bin/ftp
-LINK	instbin			usr/bin/more
-LINK	instbin			usr/bin/sed
-LINK	instbin			usr/bin/tar
-LINK	instbin			usr/sbin/chown
-# LINK	instbin			usr/sbin/bad144
+COPY	${OBJDIR}/instbin			instbin
+LINK	instbin					bin/cat
+LINK	instbin					bin/chmod bin/chgrp sbin/chown
+LINK	instbin					bin/cp
+LINK	instbin					bin/dd
+LINK	instbin					bin/df
+LINK	instbin					bin/ed
+LINK	instbin					bin/expr
+LINK	instbin					bin/ln
+LINK	instbin					bin/ls
+LINK	instbin					bin/mkdir
+LINK	instbin					bin/mv
+LINK	instbin					bin/mt
+LINK	instbin					bin/rm
+LINK	instbin					bin/sh
+LINK	instbin					bin/-sh
+LINK	instbin					bin/stty
+LINK	instbin					bin/sync
+LINK	instbin					bin/test
+LINK	instbin					bin/[
+LINK	instbin					sbin/disklabel
+LINK	instbin					sbin/dmesg
+LINK	instbin					sbin/fsck
+LINK	instbin					sbin/halt
+LINK	instbin					sbin/ifconfig
+LINK	instbin					sbin/init
+LINK	instbin					sbin/mknod
+LINK	instbin					sbin/mount
+LINK	instbin					sbin/mount_ffs
+LINK	instbin					sbin/mount_nfs
+LINK	instbin					sbin/newfs
+LINK	instbin					sbin/reboot
+LINK	instbin					sbin/route
+LINK	instbin					sbin/shutdown
+LINK	instbin					sbin/slattach
+LINK	instbin					sbin/umount
+LINK	instbin					usr/bin/awk
+LINK	instbin					usr/bin/ftp
+LINK	instbin					usr/bin/more
+LINK	instbin					usr/bin/sed
+LINK	instbin					usr/bin/tar
+LINK	instbin					usr/sbin/chown
+# LINK	instbin					usr/sbin/bad144
 SPECIAL	/bin/rm instbin
 
 # copy the MAKEDEV script and make some devices
@@ -51,17 +51,14 @@ COPY	${DESTDIR}/dev/MAKEDEV	dev/MAKEDEV
 SPECIAL	cd dev; sh MAKEDEV ramdisk
 
 # we need the contents of /usr/mdec (XXX)
-# COPY	${DESTDIR}/usr/mdec/*	usr/mdec
+# COPY	${DESTDIR}/usr/mdec/*			usr/mdec
 
 # various files that we need in /etc for the install
-COPY	${DESTDIR}/etc/group		etc
+COPY	${DESTDIR}/etc/group			etc/group
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
-COPY	${DESTDIR}/etc/spwd.db		etc
-
-# and the common installation tools
-COPY	${TOPDIR}/common/termcap.vt	usr/share/misc/termcap
-
-COPY	${DESTDIR}/bsd			.
-COPY	${DESTDIR}/boot			.
+COPY	${DESTDIR}/etc/spwd.db			etc/spwd.db
+TERMCAP	vt100,vt200,dumb			usr/share/misc/termcap
 
+COPY	${DESTDIR}/bsd				.
+COPY	${DESTDIR}/boot				.
diff --git a/distrib/vax/common/termcap.vt b/distrib/vax/common/termcap.vt
deleted file mode 100644
index 4954731814c..00000000000
--- a/distrib/vax/common/termcap.vt
+++ /dev/null
@@ -1,66 +0,0 @@
-#	$OpenBSD: termcap.vt,v 1.1 2002/04/25 22:10:28 deraadt Exp $
-
-# Copyright (c) 1980, 1985, 1989 The Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
-#    may be used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-#	@(#)termcap.src	5.109 (Berkeley) 3/8/93
-#
-vt200|vt220|dec-vt220|vt200-js|vt220-js|dec vt200 series with jump scroll:\
-	: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:ct=\E[3g:dc=\E[P:dl=\E[M:\
-	:ei=\E[4l:im=\E[4h:k1=\E[17~:k2=\E[18~:k3=\E[19~:k4=\E[20~:\
-	:k5=\E[21~:k6=\E[23~:k7=\E[24~:k8=\E[25~:kD=\E[3~:kH=\E[4~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=\177:kh=\E[1~:km:mi:ms:\
-	:if=/usr/share/tabset/vt100:se=\E[27m:st=\EH:ue=\E[24m:\
-	:tc=vt100:
-vt100|dec-vt100|vt100-am|vt100am|dec vt100:\
-	:bl=^G:cr=^M:it#8:\
-	:do=^J:co#80:li#24:cl=50\E[;H\E[2J:sf=2*\ED:\
-	:le=^H:bs:am:cm=5\E[%i%d;%dH:nd=2\E[C:up=2\E[A:cb=3\E[1K:\
-	:ce=3\E[K:cd=50\E[J:so=2\E[7m:se=2\E[m:us=2\E[4m:ue=2\E[m:\
-	:md=2\E[1m:mr=2\E[7m:mb=2\E[5m:me=2\E[m:is=\E[1;24r\E[24;1H:\
-	:if=/usr/share/tabset/vt100:\
-	:rs=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h:ks=\E[?1h\E=:ke=\E[?1l\E>:\
-	:ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:kb=^H:\
-	:ho=\E[H:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:pt:sr=2*\EM:vt#3:xn:\
-	:sc=\E7:rc=\E8:cs=\E[%i%d;%dr:
-vt300|vt320|vt300-80|VT 300 with 80 columns, on VMS:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\
-	:LE=\E[%dD:RI=\E[%dC:SR=1*\E[%dM:UP=\E[%dA:al=\E[L:\
-	:am:bl=^G:bs:cd=2*\E[J:ce=2*\E[K:cl=45\E[H\E[2J:\
-	:cm=%i\E[%d;%dH:co#80:cr=\r:cs=\E[%i%d;%dr:ct=\E[3g:\
-	:dc=\E[P:dl=\E[M:dm=:do=\ED:ec=\E[%dX:ed=:ei=\E[4l:\
-	:ho=\E[H:ic:im=\E[4h:it#8:k1=\EOP:k2=\EOQ:k3=\EOR:\
-	:k4=\EOS:kd=\E[B:ke=\E[?1l\E>:kl=\E[D:kn#4:kr=\E[C:ks=\E[?1h\E=:\
-	:ku=\E[A:le=^H:li#24:mb=\E[5m:md=\E[1m:me=\E[0m:mi:\
-	:mr=\E[7m:ms:nd=\E[C:nl=\ED:nw=\EE:pf=\E[?4i:po=\E[?5i:\
-	:ps=\E[i:rc=\E8:sc=\E7:se=\E[27m:sf=1*\ED:so=\E[7m:\
-	:sr=1*\EM:st=\EH:ue=\E[24m:up=\EM:us=\E[4m:xn:
diff --git a/distrib/vax/ramdisk/list b/distrib/vax/ramdisk/list
index 2759d3d8a10..a53236b9ff9 100644
--- a/distrib/vax/ramdisk/list
+++ b/distrib/vax/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.13 2002/04/22 16:48:48 deraadt Exp $
+#	$OpenBSD: list,v 1.14 2002/04/29 17:13:39 deraadt Exp $
 #	$NetBSD: list,v 1.2.4.2 1996/06/26 19:25:00 pk Exp $
 
 # extras
@@ -22,15 +22,13 @@ LINK	usr/mdec/xxboot			usr/mdec/raboot
 LINK	usr/mdec/xxboot			usr/mdec/rdboot
 LINK	usr/mdec/xxboot			usr/mdec/sdboot
 
-# and a few useful bits of the termcap file (512K and still growing 8-)
-SPECIAL tic -C ${CURDIR}/../../share/termtypes/termtypes.master | sed -n -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' -e 's,/usr/lib/tabset,/usr/share/tabset,g' -e '/^dumb|/,/:[ 	]*$/p' -e '/^unknown|/,/:[ 	]*$/p' -e '/^vt.*|/,/:[ 	]*$/p' > usr/share/misc/termcap
-
 # various files that we need in /etc for the install
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' < ${DESTDIR}/etc/disktab	> etc/disktab.shadow
 SYMLINK	/tmp/disktab.shadow		etc/disktab
 SYMLINK	/tmp/fstab.shadow		etc/fstab
 SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
+TERMCAP	vt100,vt200,dumb		usr/share/misc/termcap
 
 # and the installation tools
 SPECIAL sed -e '/^[ 	]*#[ 	].*$/d' -e '/^[ 	]*#$/d' -e "s/^ARCH=ARCH$/ARCH=`arch -ks`/" < ${ARCHDIR}/../install.md	 > install.md