34 different termcap subsets, plus a couple of ports still using

the full termcap distfile. In an attempt to reduce the madness
switch everyone (except the i386 cd install which does its own
thing) to the same (under 8K) termcap subset:

ansi			ansi/pc-term compatible with color
dumb|unknown		80-column dumb tty
hp300h			HP Catseye console
iris-ansi-ap		IRIS ANSI in application-keypad mode
iris-ansi|iris-ansi-net	IRIS emulating 40 line ANSI terminal (almost VT100)
sun|sun1|sun2|sun-il	Sun Microsystems Inc. console with working insert-line
vt100|vt100-am		DEC VT100 (w/advanced video)
vt220-8			DEC VT220 8 bit terminal
vt220|vt200|vt300	DEC VT220 in vt100 emulation mode
wsvt25			NetBSD wscons in 25 line DEC VT220 mode
wsvt25m			NetBSD wscons in 25 line DEC VT220 mode with Meta
x68k|x68k-ite		NetBSD/x68k ITE
xterm|vs100		xterm terminal emulator (X Window System)

Trying to provide similar functionality across all ports? It'll never
catch on...

distrib/acorn26/instkernel/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.13 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: list,v 1.14 2009/09/20 23:19:50 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -69,7 +69,7 @@ COPY	${DISTRIBDIR}/common/protocols	etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src			usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile		.profile

distrib/acorn26/instkernel/termcap.src

@@ -1,63 +0,0 @@
-#	$NetBSD: termcap.src,v 1.1 2002/05/02 23:04:31 bjh21 Exp $
-
-# terminal types that might be useful for an acorn26 install
-# from:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#       Version 9.13.25
-#       termcap syntax
-
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-vt100nam|vt100-nam|vt100 no automargins:\
-	:am@:xn@:tc=vt100-am:
-
-# We use wscons with sun emulation in the INSTALL kernel.
-
-# From: Alexander Lukyanov <lav@video.yars.free.net>, 14 Nov 1995
-# :li: capability later corrected by J.T. Conklin <jtc@cygnus.com>
-sun-il|Sun Microsystems 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:
-sun|sun1|sun2|Sun Microsystems Inc. workstation console:\
-	:tc=sun-il:

distrib/acorn32/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.20 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: list,v 1.21 2009/09/20 23:19:50 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -69,7 +69,7 @@ COPY	${DISTRIBDIR}/common/protocols	etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.vt100			usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 #COPY	${CURDIR}/inst.sh			usr/local/sbin/inst	555
 

distrib/acorn32/ramdisk/termcap.pc3

@@ -1,44 +0,0 @@
-#	$NetBSD: termcap.pc3,v 1.1 2002/01/25 15:28:49 reinoud 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
-#
-pc3|ibmpc3|IBM PC 386BSD Console:\
-	:DO=\E[%dB:K1=\E[H:K2=\E[E:K3=\E[I:K4=\E[F:K5=\E[G:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:am:bl=^G:bs:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:co#80:cr=^M:do=^J:ho=\E[H:is=\E[m:k0=\E[V:k1=\E[M:\
-	:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
-	:kD=\177:kH=\E[F:kN=\E[G:kP=\E[I:kb=\177:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:li#25:ms:nd=\E[C:rs=\E[m\E[x\E[14r:se=\E[m:\
-	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:te=\E[m:ti=\E[m:up=\E[A:km:pt:\
-	:AL=\E[%dL:DL=\E[%dM:SF=\E[%dS:SR=\E[%dT:al=\E[L:dl=\E[M:

distrib/acorn32/ramdisk/termcap.vt100

@@ -1,52 +0,0 @@
-#	$NetBSD: termcap.vt100,v 1.1 2002/01/30 23:02:21 reinoud 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
-#
-
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:

distrib/acorn32/ramdisk/termcap.xterm

@@ -1,23 +0,0 @@
-#	$NetBSD: termcap.xterm,v 1.1 2002/01/25 15:28:49 reinoud Exp $
-#
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:

distrib/alpha/instkernel/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: Makefile,v 1.28 2009/09/20 23:19:51 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${DESTDIR}/usr/share/misc/termcap \
+		${DISTRIBDIR}/common/termcap \
 		${DISTRIBDIR}/utils/script-installer/dot.commonutils \
 		${DISTRIBDIR}/utils/script-installer/dot.instutils \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \

distrib/alpha/instkernel/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.34 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: list,v 1.35 2009/09/20 23:19:51 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin
 
@@ -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	${DESTDIR}/usr/share/misc/termcap	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 COPY	${DISTRIBDIR}/utils/script-installer/dot.commonutils .commonutils
 COPY	${DISTRIBDIR}/utils/script-installer/dot.instutils   .instutils
 

distrib/amd64/ramdisks/common/Makefile.ramdisk

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.6 2009/09/20 19:49:07 abs Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.7 2009/09/20 23:19:51 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 PARSELISTENV+=	BOOTMODEL=${BOOTMODEL:Q}
 
 .if defined(USE_SYSINST)

distrib/amd64/ramdisks/common/list.ramdisk

@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.9 2009/09/20 19:49:07 abs Exp $
+#	$NetBSD: list.ramdisk,v 1.10 2009/09/20 23:19:51 abs 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	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/../common/dot.profile		.profile

distrib/amiga/floppies/inst-common/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.16 2009/09/20 19:49:07 abs Exp $
+#	$NetBSD: list,v 1.17 2009/09/20 23:19:51 abs 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	${TOPDIR}/inst-common/termcap.vt	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap

distrib/amiga/floppies/inst-common/termcap.vt

@@ -1,66 +0,0 @@
-#	$NetBSD: termcap.vt,v 1.2 1996/08/30 17:32:29 thorpej 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:

distrib/amiga/miniroot/Makefile.inc

@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.15 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.16 2009/09/20 23:19:51 abs Exp $
 
 IMAGESIZE=	6m
 MAKEFS_FLAGS=   -o density=4k
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS+=	${ARCHDIR}/dot.profile \
-		${ARCHDIR}/install.md ${ARCHDIR}/termcap.vt \
+		${ARCHDIR}/install.md ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/boot.amiga \
 		${KERNOBJDIR}/INSTALL/netbsd
 

distrib/amiga/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.20 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.21 2009/09/20 23:19:51 abs Exp $
 
 # Amiga extra's
 PROG	sbin/disklabel
@@ -25,7 +25,7 @@ SYMLINK	/tmp/resolv.conf.shadow		etc/resolv.conf
 SYMLINK	/tmp/hosts			etc/hosts
 
 # and the termcap file
-COPY	${ARCHDIR}/termcap.vt		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # and the installation scripts
 COPY	${ARCHDIR}/install.md		install.md

distrib/amiga/miniroot/termcap.vt

@@ -1,67 +0,0 @@
-#
-#	$NetBSD: termcap.vt,v 1.1 1997/09/09 23:07:07 is 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:

distrib/arc/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2009/09/20 19:49:07 abs Exp $
+#	$NetBSD: Makefile,v 1.19 2009/09/20 23:19:51 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 SMALLPROG_INET6=1
 
 # Use stubs to eliminate some large stuff from libc

distrib/arc/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.16 2009/09/20 19:49:07 abs Exp $
+#	$NetBSD: list,v 1.17 2009/09/20 23:19:51 abs Exp $
 
 SRCDIRS	usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin
@@ -77,11 +77,11 @@ COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/atari/floppies/common/list.images

@@ -1,4 +1,4 @@
-#	$NetBSD: list.images,v 1.5 2009/02/02 18:38:37 abs Exp $
+#	$NetBSD: list.images,v 1.6 2009/09/20 23:19:51 abs 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
@@ -11,7 +11,7 @@ COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 
 # the termcap file
-COPY	${CURDIR}/../common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 COPY	${CURDIR}/../common/dot.profile 	.profile
 COPY	${CURDIR}/../common/mount_gemdos	sbin/mount_gemdos	555

distrib/atari/floppies/common/termcap.mini

@@ -1,67 +0,0 @@
-#
-#	$NetBSD: termcap.mini,v 1.1.1.1 2002/04/12 21:11:47 leo 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:

distrib/bebox/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.15 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.16 2009/09/20 23:19:51 abs 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	${CURDIR}/termcap.pc3		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile		.profile

distrib/bebox/floppies/ramdisk/termcap.pc3

@@ -1,44 +0,0 @@
-#	$NetBSD: termcap.pc3,v 1.1 1998/11/19 08:58:06 sakamoto 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
-#
-pc3|ibmpc3|IBM PC 386BSD Console:\
-	:DO=\E[%dB:K1=\E[H:K2=\E[E:K3=\E[I:K4=\E[F:K5=\E[G:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:am:bl=^G:bs:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:co#80:cr=^M:do=^J:ho=\E[H:is=\E[m:k0=\E[V:k1=\E[M:\
-	:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
-	:kD=\177:kH=\E[F:kN=\E[G:kP=\E[I:kb=\177:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:li#25:ms:nd=\E[C:rs=\E[m\E[x\E[14r:se=\E[m:\
-	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:te=\E[m:ti=\E[m:up=\E[A:km:pt:\
-	:AL=\E[%dL:DL=\E[%dM:SF=\E[%dS:SR=\E[%dT:al=\E[L:dl=\E[M:

distrib/cats/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2009/09/20 22:50:50 abs Exp $
+#	$NetBSD: Makefile,v 1.18 2009/09/20 23:19:52 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 
 .if ${USE_INET6} != "no"
 LISTS+=		${DISTRIBDIR}/common/list.inet6

distrib/cats/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.17 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.18 2009/09/20 23:19:52 abs 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
@@ -68,11 +68,11 @@ LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile		.profile

distrib/cobalt/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.5 2009/09/20 23:19:52 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
 SMALLPROG_INET6=1
 

distrib/cobalt/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.6 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list,v 1.7 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin
@@ -79,12 +79,12 @@ COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 COPY	${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/common/termcap

@@ -1,27 +1,12 @@
-#	$NetBSD: termcap.mini,v 1.5 2008/12/22 18:46:41 tsutsui Exp $
+#	$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:
-
-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:
-
-vt100|vt100-am|dec vt100 (w/advanced video):am:bs:ms:xn:xo:co#80:\
+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:\
@@ -33,8 +18,7 @@ vt100|vt100-am|dec vt100 (w/advanced video):am:bs:ms:xn:xo:co#80:\
 	: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|DEC VT220 in vt100 emulation mode:am:bs:mi:pt:xn:xo:\
+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:\
@@ -47,7 +31,18 @@ vt220|vt200|DEC VT220 in vt100 emulation mode:am:bs:mi:pt:xn:xo:\
 	: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~:\
@@ -64,10 +59,53 @@ xterm|vs100|xterm terminal emulator (X Window System):am:bs:km:mi:\
 	: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:

distrib/dreamcast/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.10 2009/09/20 23:19:52 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/netconfig \
 		${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script
 #SMALLPROG_INET6=1
 

distrib/dreamcast/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.10 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list,v 1.11 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -71,12 +71,12 @@ LIBS	libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 COPY	${NETBSDSRCDIR}/usr.sbin/dhcp/clientscript/dhclient-script sbin/dhclient-script 555
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/evbarm/instkernel/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile,v 1.10 2009/09/20 23:19:52 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${DESTDIR}/usr/share/misc/termcap \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services

distrib/evbarm/instkernel/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.14 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.15 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -70,11 +70,11 @@ ARGVLN	sh -sh
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile		.profile

distrib/evbmips/instkernel/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile,v 1.7 2009/09/20 23:19:52 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -21,7 +21,7 @@ IMAGEENDIAN=	be
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${DESTDIR}/usr/share/misc/termcap \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services

distrib/evbmips/instkernel/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.9 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.10 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -62,11 +62,11 @@ ARGVLN	sh -sh
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${DESTDIR}/usr/share/misc/termcap	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile			.profile

distrib/evbppc/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.11 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.12 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -69,11 +69,11 @@ LIBS	libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/evbppc/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/evbsh3/rom/ramdiskcommon/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.8 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list,v 1.9 2009/09/20 23:19:52 abs Exp $
 
 # various files that we need in /etc for the install
 COPY	${CURDIR}/../../../../etc/master.passwd		etc/master.passwd
@@ -12,7 +12,6 @@ COPY	${DISTRIBDIR}/common/services		etc/services
 COPY	${CURDIR}/../ramdiskcommon/shells		etc/shells
 COPY	${CURDIR}/../../../../etc/etc.evbsh3/ttys	etc/ttys
 #COPY	${CURDIR}/dot.profile				etc/.profile
-#COPY	${CURDIR}/termcap.mini				usr/share/misc/termcap
 #COPY	${CURDIR}/kvm.db				var/db/kvm.db
 
 #SPECIAL pwd_mkdb -p -d ./ etc/master.passwd

distrib/ews4800mips/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.6 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list,v 1.7 2009/09/20 23:19:52 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -77,11 +77,11 @@ COPY	${DESTDIR}/usr/mdec/boot		usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/ews4800mips/floppies/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/hp300/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.9 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.10 2009/09/20 23:19:52 abs 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 \
-		${NETBSDSRCDIR}/share/termcap/termcap.src
+		${DISTRIBDIR}/common/termcap

distrib/hp300/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.15 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.16 2009/09/20 23:19:52 abs Exp $
 
 # hp300 extra's
 PROG	sbin/disklabel
@@ -32,7 +32,7 @@ MTREE	./usr/mdec/installboot	mode=0555
 COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # and the termcap file
-COPY	${NETBSDSRCDIR}/share/termcap/termcap.src usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # copy the kernel
 COPY	${KERNOBJDIR}/INSTALL/netbsd	netbsd

distrib/hp300/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.20 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list,v 1.21 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -61,11 +61,11 @@ COPY	${DESTDIR}/usr/mdec/installboot	usr/mdec/installboot	555
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.mini		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/hp300/ramdisk/termcap.mini

@@ -1,74 +0,0 @@
-#	$NetBSD: termcap.mini,v 1.2 2008/12/22 18:37:09 tsutsui 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
-#
-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:
-
-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:
-
-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:

distrib/hp700/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.11 2009/09/20 22:46:11 abs Exp $
+#	$NetBSD: list,v 1.12 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -72,11 +72,11 @@ COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/hp700/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/hpcarm/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.3 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2009/09/20 23:19:53 abs Exp $
 
 DBG=		-Os
 
@@ -8,7 +8,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile
 SMALLPROG_INET6=1
 

distrib/hpcarm/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.4 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.5 2009/09/20 23:19:53 abs Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -27,7 +27,7 @@ SPECIAL	vi		srcdir usr.bin/nvi/build
 SYMLINK	/tmp	var/tmp
 
 # termcap file
-COPY	${ARCHDIR}/termcap.vt100	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # and the installation tools
 COPY	${ARCHDIR}/dot.profile		.profile

distrib/hpcarm/miniroot/termcap.vt100

@@ -1,29 +0,0 @@
-#	$NetBSD: termcap.vt100,v 1.1 2005/12/30 11:47:19 rjs Exp $
-#
-#	termcap for vt100 console(wscons)
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:

distrib/hpcmips/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.16 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.17 2009/09/20 23:19:53 abs Exp $
 
 DBG=		-Os
 
@@ -8,7 +8,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile
 SMALLPROG_INET6=1
 

distrib/hpcmips/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.12 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.13 2009/09/20 23:19:53 abs Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -27,7 +27,7 @@ SPECIAL	vi		srcdir usr.bin/nvi/build
 SYMLINK	/tmp	var/tmp
 
 # termcap file
-COPY	${ARCHDIR}/termcap.vt100	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # and the installation tools
 COPY	${ARCHDIR}/dot.profile		.profile

distrib/hpcmips/miniroot/termcap.vt100

@@ -1,29 +0,0 @@
-#	$NetBSD: termcap.vt100,v 1.1 2000/01/21 11:25:59 shin Exp $
-#
-#	termcap for vt100 console(wscons)
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:

distrib/hpcsh/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2009/09/20 23:19:53 abs Exp $
 
 DBG=		-O
 
@@ -8,5 +8,5 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	all
 #LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile ${DESTDIR}/etc/spwd.db

distrib/hpcsh/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.3 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.4 2009/09/20 23:19:53 abs Exp $
 
 # extras in bin
 #PROG	bin/csh
@@ -27,7 +27,7 @@ PROG	usr/bin/rsh
 SYMLINK	/tmp	var/tmp
 
 # termcap file
-COPY	${ARCHDIR}/termcap.vt100	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # various files that we need in /etc for the install
 COPY	${DESTDIR}/etc/spwd.db		etc/spwd.db

distrib/hpcsh/miniroot/termcap.vt100

@@ -1,29 +0,0 @@
-#	$NetBSD: termcap.vt100,v 1.1 2002/07/02 04:14:38 itojun Exp $
-#
-#	termcap for vt100 console(wscons)
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:

distrib/i386/ramdisks/common/Makefile.ramdisk

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.6 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.7 2009/09/20 23:19:53 abs Exp $
 
 .include <bsd.own.mk>
 .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 \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 PARSELISTENV+=	BOOTMODEL=${BOOTMODEL:Q}
 
 # This propogates through to the link of ramdiskbin

distrib/i386/ramdisks/common/list.ramdisk

@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.12 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: list.ramdisk,v 1.13 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS	usr.bin/less
 SRCDIRS	bin sbin usr.bin usr.sbin
@@ -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	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 CMD	sed -e "s/@BOOTMODEL@/${BOOTMODEL}/" < ${CURDIR}/../common/dot.profile > .profile

distrib/ibmnws/netboot/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.9 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.10 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -64,11 +64,11 @@ LIBS	libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/ibmnws/netboot/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/landisk/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile,v 1.8 2009/09/20 23:19:53 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/netconfig \
 		${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 
 IMAGETAR_RELEASEDIR=	installation/netboot
 

distrib/landisk/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.11 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.12 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -58,14 +58,14 @@ LIBS	libhack.o -lbz2 -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz -lprop
 ARGVLN	sh -sh
 
 # various files that we need in /etc for the install
-COPY	${NETBSDSRCDIR}/etc/group			etc/group
-COPY	${NETBSDSRCDIR}/etc/master.passwd		etc/master.passwd
-COPY	${NETBSDSRCDIR}/etc/netconfig			etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${NETBSDSRCDIR}/etc/group		etc/group
+COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
+COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the shell startup files
 COPY	${CURDIR}/dot.profile			.profile

distrib/mac68k/instkernel/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile,v 1.34 2009/09/20 23:19:53 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ IMAGEENDIAN=	be
 MAKEDEVTARGETS=	raminst
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${DISTRIBDIR}/mac68k/miniroot/termcap \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services

distrib/mac68k/instkernel/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.25 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.26 2009/09/20 23:19:53 abs Exp $
 
 SRCDIRS bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin gnu/usr.bin/binutils
 
@@ -71,11 +71,11 @@ LIBS    libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${DISTRIBDIR}/mac68k/miniroot/termcap	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile			.profile

distrib/mac68k/miniroot/Makefile.inc

@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.5 2003/05/02 22:40:19 he Exp $
+#	$NetBSD: Makefile.inc,v 1.6 2009/09/20 23:19:54 abs Exp $
 
 IMAGESIZE=	4m
 IMAGEENDIAN=	be
 MAKEFS_FLAGS=	-o density=12k
 MAKEDEVTARGETS=	raminst
 IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/install.md \
-		${ARCHDIR}/termcap
+		${DISTRIBDIR}/common/termcap

distrib/mac68k/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.8 2008/10/30 12:39:16 tsutsui Exp $
+#	$NetBSD: list,v 1.9 2009/09/20 23:19:54 abs Exp $
 
 # mac68k extra's
 PROG	sbin/dmesg
@@ -25,7 +25,7 @@ SYMLINK	/tmp	var/tmp
 #COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # and the termcap file
-COPY	${ARCHDIR}/termcap		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # copy the kernel
 #COPY	${KRNOBJDIR}/GENERIC/netbsd	netbsd

distrib/mac68k/miniroot/termcap

@@ -1,111 +0,0 @@
-#
-#	$NetBSD: termcap,v 1.1 1997/09/23 06:12:23 scottr Exp $
-#
-
-#
-# Customized for installation on Sun machines.
-#
-
-dumb:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown:\
-	:gn:\
-	:tc=dumb:
-other|none of the above, but not exactly unknown:\
-	:am:gn:\
-	:co#80:\
-	:cl=^M^J:do=^J:ho=^M:
-
-arpanet|bussiplexer|dialup|ethernet|network|net|patch|plugboard|switch|network switch or dialup:\
-	:tc=unknown:
-lpr|printer|print|printing|line printer:\
-	:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-
-#### ANSI terminals and terminal emulators
-#
-# See near the end of this file for details on ANSI conformance.
-# Don't mess with these entries!  Lots of other entries depend on them!
-#
-
-# (ansi: changed ":pt:" to ":it#8:" -- esr)
-ansi|any ansi terminal with pessimistic assumptions:\
-	:am:bs:\
-	:co#80:it#8:li#24:\
-	:ce=\E[K:cl=\E[;H\E[2J:cm=\E[%i%d;%dH:do=\E[B:\
-	:ho=\E[H:le=\E[D:nd=\E[C:up=\E[A:
-#
-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:
-#
-vt220|vt200|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:\
-	:..sa=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;:\
-	: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:
-#
-sun|Sun Microsystems Workstation console:\
-	:am:bs:km:mi:ms:pt:\
-	:co#80:it#8:li#34:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@: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=\E[B:ei=:ic=\E[@:im=:is=\E[1r:\
-	:k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:\
-	:kl=\E[D:kr=\E[C:ku=\E[A:le=^H:nd=\E[C:rs=\E[1r:\
-	:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
-#
-xterm|vs100|xterm terminal emulator (X11R6 Window System):\
-	:am:bs:km:mi:ms:pt:xn:xo:\
-	:co#80:it#8:li#65:\
-	:@7=\E[[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[23~:\
-	:F2=\E[24~:IC=\E[%d@:LE=\E[%dD:UP=\E[%dA:\
-	:ac=++\054\054..00II--``aaffgghhjjkkllmmnnooqqssttuuvvwwxx~~:\
-	: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:\
-	:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:ic=\E[@:im=\E[4h:\
-	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
-	:ke=\E[?1l\E>:kh=\E[@:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u6=\E[%d;%dR:\
-	:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm24|vs100-24|xterm terminal emulator (24 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterm25|vs100-25|xterm terminal emulator (25 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterms|vs100s|xterm terminal emulator (small) (X11R6 window system):\
-	:tc=xterm24:

distrib/macppc/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.33 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.34 2009/09/20 23:19:54 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -79,11 +79,11 @@ COPY	${DESTDIR}/usr/mdec/ofwboot	usr/mdec/ofwboot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/macppc/floppies/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/mipsco/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.13 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.14 2009/09/20 23:19:54 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin gnu/usr.bin
 
@@ -69,11 +69,11 @@ COPY	${DESTDIR}/usr/mdec/bootxx_ffs	usr/mdec/bootxx_ffs
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 COPY	${DISTRIBDIR}/utils/script-installer/dot.commonutils	.commonutils
 COPY	${DISTRIBDIR}/utils/script-installer/dot.instutils	.instutils
 

distrib/mipsco/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/mvme68k/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.9 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.10 2009/09/20 23:19:54 abs 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 \
-		${NETBSDSRCDIR}/share/termcap/termcap.src
+		${DISTRIBDIR}/common/termcap
 LISTS+=		${DISTRIBDIR}/common/list.sysinst

distrib/mvme68k/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.16 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.17 2009/09/20 23:19:54 abs Exp $
 
 # mvme68k's extras
 PROG	sbin/disklabel
@@ -31,7 +31,7 @@ MTREE	./usr/mdec/installboot	mode=0555
 COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # and the termcap file
-COPY	${NETBSDSRCDIR}/share/termcap/termcap.src usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # copy the kernel
 COPY	${KERNOBJDIR}/GENERIC/netbsd	netbsd

distrib/news68k/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.24 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: list,v 1.25 2009/09/20 23:19:54 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -75,11 +75,11 @@ COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/news68k/floppies/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/newsmips/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.22 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: list,v 1.23 2009/09/20 23:19:54 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -74,11 +74,11 @@ COPY	${DESTDIR}/usr/mdec/boot	usr/mdec/boot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/newsmips/floppies/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/ofppc/ramdisks/common/list.ramdisk

@@ -1,4 +1,4 @@
-#	$NetBSD: list.ramdisk,v 1.5 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: list.ramdisk,v 1.6 2009/09/20 23:19:54 abs 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	${CURDIR}/../common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/../common/dot.profile		.profile

distrib/ofppc/ramdisks/common/termcap.mini

@@ -1,95 +0,0 @@
-#	$NetBSD: termcap.mini,v 1.1 2008/01/02 11:39:03 mrg 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
-#
-pc3|ibmpc3|IBM PC 386BSD Console:\
-	:DO=\E[%dB:K1=\E[H:K2=\E[E:K3=\E[I:K4=\E[F:K5=\E[G:LE=\E[%dD:\
-	:RI=\E[%dC:UP=\E[%dA:am:bl=^G:bs:cb=\E[1K:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\
-	:cm=\E[%i%d;%dH:co#80:cr=^M:do=^J:ho=\E[H:is=\E[m:k0=\E[V:k1=\E[M:\
-	:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:\
-	:kD=\177:kH=\E[F:kN=\E[G:kP=\E[I:kb=\177:kd=\E[B:kh=\E[H:kl=\E[D:\
-	:kr=\E[C:ku=\E[A:le=^H:li#25:ms:nd=\E[C:rs=\E[m\E[x\E[14r:se=\E[m:\
-	:sf=\E[S:so=\E[7m:sr=\E[T:ta=^I:te=\E[m:ti=\E[m:up=\E[A:km:pt:\
-	:AL=\E[%dL:DL=\E[%dM:SF=\E[%dS:SR=\E[%dT:al=\E[L:dl=\E[M:
-
-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:
-vt100nam|vt100-nam|vt100 no automargins:\
-	:am@:xn@:tc=vt100-am:
-
-vt220|vt200|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-w|vt200-w|DEC vt220 in wide mode:\
-	:co#132:\
-	:r3=\E[?3h:tc=vt220:
-
-wsvt25|NetBSD wscons in 25 line DEC VT220 mode:\
-	:Co#16:NC#32:pa#256:ms:ut:\
-	:@7=\E[8~:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:k6=\E[17~:\
-	:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kh=\E[7~:F1=\E[23~:F2=\E[24~:\
-	:AB=\E[4%dm:AF=\E[3%dm:op=\E[m:\
-	:co#80:li#25:tc=vt220:
-
-wsvt25m|NetBSD wscons in 25 line DEC VT220 mode with Meta:\
-	:km:tc=wsvt25:

distrib/playstation2/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.11 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.12 2009/09/20 23:19:54 abs Exp $
 
 DBG=		-Os
 
@@ -8,6 +8,6 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile
 SMALLPROG_INET6=1

distrib/playstation2/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.7 2009/09/20 22:46:12 abs Exp $
+#	$NetBSD: list,v 1.8 2009/09/20 23:19:54 abs Exp $
 
 # extras in bin
 #PROG	bin/csh
@@ -27,7 +27,7 @@ PROG	usr/bin/rsh
 SYMLINK	/tmp	var/tmp
 
 # termcap file
-COPY	${ARCHDIR}/termcap.vt100	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # and the installation tools
 COPY	${ARCHDIR}/dot.profile		.profile

distrib/playstation2/miniroot/termcap.vt100

@@ -1,29 +0,0 @@
-#	$NetBSD: termcap.vt100,v 1.1 2001/10/15 16:22:50 uch Exp $
-#
-#	termcap for vt100 console(wscons)
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:

distrib/pmax/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.19 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.20 2009/09/20 23:19:55 abs Exp $
 
 DBG=		-Os
 
@@ -8,7 +8,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.vt100 \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile ${DESTDIR}/boot.pmax \
 		${KERNOBJDIR}/GENERIC/netbsd \
 		${KERNOBJDIR}/GENERIC/netbsd.ecoff \

distrib/pmax/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.18 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.19 2009/09/20 23:19:55 abs Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -36,7 +36,7 @@ COPY	${DESTDIR}/boot.pmax	boot.pmax
 #COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # a subset termcap file
-COPY	${ARCHDIR}/termcap.vt100 usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # copy the kernel(s)
 COPY	${KERNOBJDIR}/GENERIC/netbsd		netbsd

distrib/pmax/miniroot/termcap.vt100

@@ -1,61 +0,0 @@
-#
-#       $NetBSD: termcap.vt100,v 1.1 2006/07/29 19:10:56 ad Exp $
-#
-#	termcap customized for pmax installation
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-vt100:\
-	: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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-#
-xterm|vs100|xterm terminal emulator (X11R6 Window System):\
-	:am:bs:km:mi:ms:pt:xn:xo:\
-	:co#80:it#8:li#65:\
-	:@7=\E[[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[23~:\
-	:F2=\E[24~:IC=\E[%d@:LE=\E[%dD:UP=\E[%dA:\
-	:ac=++\054\054..00II--``aaffgghhjjkkllmmnnooqqssttuuvvwwxx~~:\
-	: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:\
-	:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:ic=\E[@:im=\E[4h:\
-	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
-	:ke=\E[?1l\E>:kh=\E[@:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u6=\E[%d;%dR:\
-	:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm24|vs100-24|xterm terminal emulator (24 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterm25|vs100-25|xterm terminal emulator (25 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterms|vs100s|xterm terminal emulator (small) (X11R6 window system):\
-	:tc=xterm24:

distrib/pmax/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.42 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile,v 1.43 2009/09/20 23:19:55 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	minimal pty0
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${.CURDIR}/../miniroot/termcap.vt100 \
+		${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/boot.pmax ${DESTDIR}/usr/mdec/bootxx_ffs \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig \

distrib/pmax/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.24 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.25 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/pmax/stand
 
@@ -68,11 +68,11 @@ COPY	${DESTDIR}/usr/mdec/boot.pmax		usr/mdec/boot.pmax
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/../miniroot/termcap.vt100	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the shell startup files
 COPY	${CURDIR}/dot.profile			.profile

distrib/prep/floppies/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.15 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.16 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin gnu/usr.bin
 
@@ -65,13 +65,13 @@ SPECIAL	umount		srcdir	distrib/utils/x_umount
 LIBS	libhack.o -ledit -lutil -lcurses -ltermcap -lcrypt -ll -lm -lz -lprop
 
 # and the termcap file
-COPY	${CURDIR}/termcap.src 			usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # various files that we need in /etc for the install
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the installation scripts

distrib/prep/floppies/ramdisk/termcap.src

@@ -1,45 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/rs6000/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2009/09/20 22:50:51 abs Exp $
+#	$NetBSD: Makefile,v 1.4 2009/09/20 23:19:55 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -23,7 +23,7 @@ IMAGEDEPENDS=	${CRUNCHBIN} \
 		${NETBSDSRCDIR}/etc/netconfig \
 		${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services \
-		${NETBSDSRCDIR}/distrib/common/termcap.mini
+		${DISTRIBDIR}/common/termcap
 SMALLPROG_INET6=1
 
 .if ${USE_INET6} != "no"

distrib/rs6000/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.3 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.4 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -71,11 +71,11 @@ COPY	${DESTDIR}/usr/mdec/mkbootimage		usr/mdec/mkbootimage
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${NETBSDSRCDIR}/distrib/common/termcap.mini	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/sandpoint/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.6 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.7 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin
 
@@ -69,11 +69,11 @@ LIBS	libhack.o -ledit -lutil -lcurses -ltermcap -lrmt -ll -lm -lz -lprop
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the boot script
 COPY	${CURDIR}/dot.profile		.profile

distrib/sandpoint/ramdisk/termcap.src

@@ -1,61 +0,0 @@
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:

distrib/sgimips/miniroot/Makefile.inc.xxx

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc.xxx,v 1.5 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile.inc.xxx,v 1.6 2009/09/20 23:19:55 abs Exp $
 
 DBG=		-Os -Wa,-xgot # XXX -xgot workaround for objcopy-crunchide
 
@@ -8,7 +8,7 @@ IMAGEENDIAN?=	be
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 MTREECONF+=	${.CURDIR}/mtree.usr.install
-IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${ARCHDIR}/termcap.iris-ansi \
+IMAGEDEPENDS+=	${ARCHDIR}/dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/.profile \
 		${KERNOBJDIR}/GENERIC32_IP2x/netbsd.ecoff \
 		${KERNOBJDIR}/GENERIC32_IP2x/netbsd \

distrib/sgimips/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.6 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.7 2009/09/20 23:19:55 abs Exp $
 
 # extras in bin
 PROG	bin/csh
@@ -37,7 +37,7 @@ COPY	${DESTDIR}/usr/mdec/ip3xboot	usr/mdec/ip3xboot
 #COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # a subset termcap file
-COPY	${ARCHDIR}/termcap.iris-ansi	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # copy the kernel(s)
 COPY	${KERNOBJDIR}/GENERIC/netbsd	netbsd

distrib/sgimips/miniroot/termcap.iris-ansi

@@ -1,83 +0,0 @@
-#
-#	termcap customized for sgimips installation
-#	From:
-######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
-#
-#
-#	Version 9.13.25
-#	termcap syntax
-#
-#	Eric S. Raymond		(current maintainer)
-#	John Kunze, Berkeley
-#	Craig Leres, Berkeley
-#
-# (iris-ansi: added rmam/smam based on init string -- esr)
-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:
-########
-vt100:\
-	: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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-#
-xterm|vs100|xterm terminal emulator (X11R6 Window System):\
-	:am:bs:km:mi:ms:pt:xn:xo:\
-	:co#80:it#8:li#65:\
-	:@7=\E[[:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:F1=\E[23~:\
-	:F2=\E[24~:IC=\E[%d@:LE=\E[%dD:UP=\E[%dA:\
-	:ac=++\054\054..00II--``aaffgghhjjkkllmmnnooqqssttuuvvwwxx~~:\
-	: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:\
-	:ct=\E[3k:dc=\E[P:dl=\E[M:do=^J:ei=\E[4l:ho=\E[H:\
-	:ic=\E[@:im=\E[4h:\
-	:is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\
-	:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:k5=\E[15~:\
-	:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:\
-	:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\EOB:\
-	:ke=\E[?1l\E>:kh=\E[@:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\
-	:ku=\EOA:le=^H:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:\
-	:r2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E<:\
-	:rc=\E8:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:u6=\E[%d;%dR:\
-	:u7=\E[6n:u8=\E[?1;2c:u9=\E[c:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm24|vs100-24|xterm terminal emulator (24 lines) (X11R6 window system):\
-	:co#80:li#24:\
-	:tc=xterm:
-xterm25|vs100-25|xterm terminal emulator (25 lines) (X11R6 window system):\
-	:co#80:li#25:\
-	:tc=xterm:
-xterms|vs100s|xterm terminal emulator (small) (X11R6 window system):\
-	:tc=xterm24:

distrib/sgimips/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile,v 1.16 2009/09/20 23:19:55 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -18,7 +18,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${.CURDIR}/../miniroot/termcap.iris-ansi \
+		${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/aoutboot ${DESTDIR}/usr/mdec/ip2xboot \
 		${DESTDIR}/usr/mdec/ip3xboot \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \

distrib/sgimips/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.14 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.15 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin usr.sbin gnu/usr.bin sys/arch/sgimips/stand
 
@@ -67,11 +67,11 @@ COPY	${DESTDIR}/usr/mdec/ip3xboot		usr/mdec/ip3xboot
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${CURDIR}/../miniroot/termcap.iris-ansi	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the shell startup files
 COPY	${CURDIR}/dot.profile			.profile

distrib/shark/instkernel/ramdisk/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile,v 1.19 2009/09/20 23:19:55 abs Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		dot.profile \
-		${DESTDIR}/usr/share/misc/termcap \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services

distrib/shark/instkernel/ramdisk/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.17 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.18 2009/09/20 23:19:55 abs Exp $
 
 SRCDIRS	bin sbin usr.bin/less usr.bin usr.sbin gnu/usr.bin
 
@@ -66,11 +66,11 @@ LIBS	libhack.o -lbz2 -ledit -lutil -lcurses -ltermcap -lrmt -lcrypt -ll -lm -lz
 COPY	${NETBSDSRCDIR}/etc/group		etc/group
 COPY	${NETBSDSRCDIR}/etc/master.passwd	etc/master.passwd
 COPY	${NETBSDSRCDIR}/etc/netconfig		etc/netconfig
-COPY	${DISTRIBDIR}/common/protocols	etc/protocols
+COPY	${DISTRIBDIR}/common/protocols		etc/protocols
 COPY	${DISTRIBDIR}/common/services		etc/services
 
 # and the common installation tools
-COPY	${DESTDIR}/usr/share/misc/termcap	usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap		usr/share/misc/termcap
 
 # and the installation tools
 COPY	${CURDIR}/dot.profile		.profile

distrib/sparc/miniroot/Makefile.inc

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.14 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile.inc,v 1.15 2009/09/20 23:19:55 abs Exp $
 
 IMAGESIZE=	8192k
 MAKEFS_FLAGS=   -o density=4k
@@ -6,7 +6,7 @@ IMAGEENDIAN=	be
 MAKEDEVTARGETS=	all
 LISTS+=		${DISTRIBDIR}/common/list.sysinst
 IMAGEDEPENDS+=	${ARCHDIR}/../install.md ${ARCHDIR}/dot.profile \
-		${ARCHDIR}/termcap.src \
+		${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/boot \
 		${KERNOBJDIR}/GENERIC/netbsd
 

distrib/sparc/miniroot/list

@@ -1,4 +1,4 @@
-#	$NetBSD: list,v 1.31 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: list,v 1.32 2009/09/20 23:19:55 abs Exp $
 
 # Sparc extra's
 PROG	bin/rcmd
@@ -32,7 +32,7 @@ MTREE	./usr/mdec/binstall	mode=0555
 COPYDIR	${DESTDIR}/usr/share/zoneinfo	usr/share/zoneinfo
 
 # and the termcap file
-COPY	${ARCHDIR}/termcap.src		usr/share/misc/termcap
+COPY	${DISTRIBDIR}/common/termcap	usr/share/misc/termcap
 
 # copy the kernel
 COPY	${KERNOBJDIR}/GENERIC/netbsd	netbsd

distrib/sparc/miniroot/termcap.src

@@ -1,150 +0,0 @@
-#	$NetBSD: termcap.src,v 1.3 2002/10/08 20:29:58 martin Exp $
-#
-adm+sgr|adm style highlight capabilities:\
-	:me=\EG0:mk=\EG1:mr=\EG4:se=\EG0:so=\EG4:ue=\EG0:us=\EG8:
-dumb|80-column dumb tty:\
-	:am:\
-	:co#80:\
-	:bl=^G:cr=^M:do=^J:sf=^J:
-unknown|unknown terminal type:\
-	:gn:tc=dumb:
-lpr|printer|line printer:\
-	:bs:hc:os:\
-	:co#132:li#66:\
-	:bl=^G:cr=^M:do=^J:ff=^L:le=^H:sf=^J:
-glasstty|classic glass tty interpreting ASCII control characters:\
-	:am:\
-	:co#80:\
-	:bl=^G:cl=^L:cr=^M:do=^J:kb=^H:kd=^J:kl=^H:le=^H:nw=^M^J:\
-	:ta=^I:
-vt52|dec vt52:\
-	:bs:\
-	:co#80:it#8:li#24:\
-	:ac=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~:\
-	:ae=\EG:as=\EF:bl=^G:cd=\EJ:ce=\EK:cl=\EH\EJ:cm=\EY%+ %+ :\
-	:cr=^M:do=\EB:ho=\EH:kb=^H:kd=\EB:kl=\ED:kr=\EC:ku=\EA:\
-	:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
-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:\
-	:..sa=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;:\
-	: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:
-wy50|wyse50|Wyse 50:\
-	:5i:am:bs:bw:hs:mi:ms:xo:\
-	:Nl#8:co#80:lh#1:li#24:lw#8:ma#1:ws#45:\
-	:#2=\E{:%9=\EP:&3=\Er:@8=\E7:F1=^AJ\r:F2=^AK\r:F3=^AL\r:\
-	:F4=^AM\r:F5=^AN\r:F6=^AO\r:LF=\EA11:LO=\EA10:\
-	:ac=0wa_h[jukslrmqnxqzttuyv]wpxv:ae=\EH^C:al=\EE:\
-	:as=\EH^B:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:cm=\E=%+ %+ :\
-	:cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:ei=\Er:fs=^M:\
-	:ho=^^:i1=\E`\072\E`9:im=\Eq:ip=:is=\016\024\E'\E(:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:k;=^AI\r:kA=\EE:kB=\EI:kD=\EW:\
-	:kE=\ET:kI=\EQ:kL=\ER:kN=\EK:kP=\EJ:kS=\EY:kb=^H:kd=^J:kh=^^:\
-	:kl=^H:kr=^L:ku=^K:le=^H:ll=^^^K:me=\E(\EH\003:mh=\E`7\E):\
-	:mp=\E`7\E):mr=\E`6\E):nd=^L:nw=^M^J:pf=^T:pn=\Ez%+/%s\r:\
-	:po=^X:ps=\EP:px=\Ez%+?%s\177:\
-	:..sa=%?%p1%p3%|%t\E`6\E)\n%e%p5%p8%|%t\E`7\E)%e\E(%;\n%?%p9%t\EH\002%e\EH\003%;:\
-	:se=\E(:sf=\n:so=\E`6\E):sr=\Ej:st=\E1:ta=^I:ts=\EF:up=^K:\
-	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:
-wy60|wyse60|Wyse 60:\
-	:am:bs:bw:hs:km:mi:ms:\
-	:co#80:li#24:ws#45:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
-	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\EwJ\Ew1:im=\Eq:ip=:\
-	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
-	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
-	:so=\EGt:sr=\Ej:st=\E1:ta=\011:te=\Ew1:ti=\Ew0:ts=\EF:up=^K:\
-	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
-	:tc=adm+sgr:
-wy160|wyse160|Wyse 160:\
-	:am:bw:hs:km:mi:ms:\
-	:co#80:li#24:ws#38:\
-	:ae=\EcD:al=\EE:as=\EcE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=\E+:\
-	:cm=\E=%+ %+ :cr=^M:ct=\E0:dc=\EW:dl=\ER:do=^J:ds=\EF\r:\
-	:ei=\Er:fs=^M:ho=\E{:i1=\EcB0\EcC1:i2=\Ew0:im=\Eq:ip=:\
-	:is=\Ed$\EcD\E'\Er\EH\003\Ed/\EO\Ee1\Ed*\E`@\E`9\E`1\016\024\El:\
-	:k1=^A@\r:k2=^AA\r:k3=^AB\r:k4=^AC\r:k5=^AD\r:k6=^AE\r:\
-	:k7=^AF\r:k8=^AG\r:k9=^AH\r:kD=\EW:kI=\EQ:kN=\EK:kP=\EJ:\
-	:kb=^H:kd=^J:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:ll=\E{^K:mb=\EG2:\
-	:me=\E(\EH\003\EG0\EcD:mh=\EGp:nd=^L:nw=\r\n:sf=\n:\
-	:so=\EGt:sr=\Ej:st=\E1:ta=^I:te=\Ew0:ti=\Ew1:ts=\EF:up=^K:\
-	:vb=\E`8\E`9:ve=\E`1:vi=\E`0:\
-	:tc=adm+sgr:
-oldsun|Sun Microsystems Workstation console:\
-	:am:bs:km:mi:ms:\
-	:co#80:it#8:li#34:\
-	:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:IC=\E[%d@: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=\E[B:ei=:i1=\E[1r:ic=\E[@:im=:k1=\EOP:k2=\EOQ:\
-	:k3=\EOR:k4=\EOS:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
-	:le=^H:me=\E[m:nd=\E[C:se=\E[m:sf=^J:so=\E[7m:ta=^I:up=\E[A:
-sun-il|Sun Microsystems 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:
-sun|sun1|sun2|Sun Microsystems Inc. workstation console:\
-	:tc=sun-il:
-sun-ss5|Sun SparcStation 5 console:\
-	:AL@:al@:tc=sun-il:
-sun-type4|Sun Workstation console with type 4 keyboard:\
-	:kd=\E[221z:kl=\E[217z:kr=\E[219z:ku=\E[215z:tc=sun-il:
-xterm-r6|xterm-old|xterm X11R6 version:\
-	:am:bs:km:mi:ms:xn:\
-	:co#80:it#8:li#24:\
-	:*6=\E[4~:@0=\E[1~:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
-	:DO=\E[%dB:F1=\E[23~:F2=\E[24~:F3=\E[25~:F4=\E[26~:\
-	:F5=\E[28~:F6=\E[29~:F7=\E[31~:F8=\E[32~:F9=\E[33~:\
-	:FA=\E[34~:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:\
-	: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:ct=\E[3g:dc=\E[P:\
-	:dl=\E[M:do=^J:eA=\E(B:ei=\E[4l:ho=\E[H:im=\E[4h:\
-	:is=\E7\E[r\E[m\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~:k;=\E[21~:kD=\E[3~:kI=\E[2~:kN=\E[6~:\
-	:kP=\E[5~:kb=^H:kd=\EOB:ke=\E[?1l\E>:kl=\EOD:kr=\EOC:\
-	:ks=\E[?1h\E=:ku=\EOA:le=^H:md=\E[1m:me=\E[m:ml=\El:\
-	:mr=\E[7m:mu=\Em:nd=\E[C:\
-	:r2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>:rc=\E8:\
-	:sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:ta=^I:\
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:up=\E[A:\
-	:us=\E[4m:
-xterm|vs100|xterms|xterm terminal emulator (X Window System):\
-	:tc=xterm-r6:
-tvi925|televideo 925:\
-	:am:bs:bw:hs:ul:\
-	:co#80:li#24:sg#1:\
-	:al=\EE:bl=^G:bt=\EI:cd=\EY:ce=\ET:cl=^Z:cm=\E=%+ %+ :cr=^M:\
-	:ct=\E3:dc=\EW:dl=\ER:do=^V:ds=\Eh:ei=:fs=^M\Eg:ho=^^:ic=\EQ:\
-	:im=:is=\El\E":k0=^AI\r:k1=^A@\r:k2=^AA\r:k3=^AB\r:\
-	:k4=^AC\r:k5=^AD\r:k6=^AE\r:k7=^AF\r:k8=^AG\r:k9=^AH\r:\
-	:kA=\EE:kC=^Z:kD=\EW:kE=\ET:kI=\EQ:kL=\ER:kS=\EY:kb=^H:kd=^V:\
-	:kh=^^:kl=^H:kr=^L:ku=^K:le=^H:mk@:nd=^L:sf=^J:sr=\Ej:st=\E1:\
-	:ta=^I:ts=\Eh\Ef:up=^K:vb=\Eb\Ed:ve=\E.4:vs=\E.2:\
-	:tc=adm+sgr:

distrib/sparc64/instfs/Makefile.instfs

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.instfs,v 1.9 2009/09/20 22:46:13 abs Exp $
+#	$NetBSD: Makefile.instfs,v 1.10 2009/09/20 23:19:56 abs Exp $
 
 INSTFSDIR=	${.CURDIR}/../instfs
 
@@ -15,7 +15,7 @@ MAKEDEVTARGETS=	ramdisk bpf
 PARSELISTENV=	INSTFSDIR=${INSTFSDIR:Q}
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		${INSTFSDIR}/dot.profile \
-		${INSTFSDIR}/termcap.mini \
+		${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services