From 8a59b0212881b357ade8547f2d5328ce63e3563f Mon Sep 17 00:00:00 2001
From: he <he@NetBSD.org>
Date: Thu, 24 Sep 2009 21:04:45 +0000
Subject: [PATCH] Replace references to local and now no-longer-existing
 termcap files with references to ${DISTRIBB}/common/termcap.  Hi, abs@!

---
 distrib/acorn26/instkernel/Makefile            | 4 ++--
 distrib/acorn32/ramdisk/Makefile               | 4 ++--
 distrib/evbppc/ramdisk/Makefile                | 4 ++--
 distrib/hp300/ramdisk/Makefile                 | 4 ++--
 distrib/hp700/ramdisk/Makefile                 | 4 ++--
 distrib/ibmnws/netboot/ramdisk/Makefile        | 4 ++--
 distrib/macppc/floppies/ramdisk/Makefile       | 4 ++--
 distrib/mipsco/ramdisk/Makefile                | 4 ++--
 distrib/news68k/floppies/ramdisk/Makefile      | 4 ++--
 distrib/newsmips/floppies/ramdisk/Makefile     | 4 ++--
 distrib/ofppc/ramdisks/common/Makefile.ramdisk | 4 ++--
 distrib/prep/floppies/ramdisk/Makefile         | 4 ++--
 distrib/sandpoint/ramdisk/Makefile             | 4 ++--
 distrib/sun3/miniroot/Makefile                 | 5 +++--
 distrib/vax/ramdisk/Makefile                   | 4 ++--
 15 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/distrib/acorn26/instkernel/Makefile b/distrib/acorn26/instkernel/Makefile
index b83a1e4d04ab..80a7b4115461 100644
--- a/distrib/acorn26/instkernel/Makefile
+++ b/distrib/acorn26/instkernel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: Makefile,v 1.13 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	le
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/acorn32/ramdisk/Makefile b/distrib/acorn32/ramdisk/Makefile
index 22a02b99a747..504c83592afd 100644
--- a/distrib/acorn32/ramdisk/Makefile
+++ b/distrib/acorn32/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2009/09/20 22:46:10 abs Exp $
+#	$NetBSD: Makefile,v 1.21 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	le
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.vt100 \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/evbppc/ramdisk/Makefile b/distrib/evbppc/ramdisk/Makefile
index 777aa8f923f1..4d6b58d41197 100644
--- a/distrib/evbppc/ramdisk/Makefile
+++ b/distrib/evbppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.6 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ LISTS=		${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
 MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile
index d3090484c9f2..5b2adc081505 100644
--- a/distrib/hp300/ramdisk/Makefile
+++ b/distrib/hp300/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2009/09/20 19:49:08 abs Exp $
+#	$NetBSD: Makefile,v 1.28 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	all
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.mini \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/installboot ${DESTDIR}/usr/mdec/uboot.lif \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
diff --git a/distrib/hp700/ramdisk/Makefile b/distrib/hp700/ramdisk/Makefile
index 561b68de6abe..9b7f91c3be0e 100644
--- a/distrib/hp700/ramdisk/Makefile
+++ b/distrib/hp700/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2009/09/20 22:50:50 abs Exp $
+#	$NetBSD: Makefile,v 1.8 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	all
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/ibmnws/netboot/ramdisk/Makefile b/distrib/ibmnws/netboot/ramdisk/Makefile
index 6ea43789a6c4..95f2832cb491 100644
--- a/distrib/ibmnws/netboot/ramdisk/Makefile
+++ b/distrib/ibmnws/netboot/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2009/09/20 22:50:50 abs Exp $
+#	$NetBSD: Makefile,v 1.7 2009/09/24 21:04:45 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	std md0 pty0 ttyv0
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/macppc/floppies/ramdisk/Makefile b/distrib/macppc/floppies/ramdisk/Makefile
index 221bea2ef898..1093db121abf 100644
--- a/distrib/macppc/floppies/ramdisk/Makefile
+++ b/distrib/macppc/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.35 2009/09/20 22:50:50 abs Exp $
+#	$NetBSD: Makefile,v 1.36 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/usr/mdec/bootxx \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
diff --git a/distrib/mipsco/ramdisk/Makefile b/distrib/mipsco/ramdisk/Makefile
index 8dd3bcda398c..79dfc4da657b 100644
--- a/distrib/mipsco/ramdisk/Makefile
+++ b/distrib/mipsco/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.18 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -18,7 +18,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	minimal
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/installboot \
 		${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx_ffs \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
diff --git a/distrib/news68k/floppies/ramdisk/Makefile b/distrib/news68k/floppies/ramdisk/Makefile
index e3ba8270c065..4575e7a06539 100644
--- a/distrib/news68k/floppies/ramdisk/Makefile
+++ b/distrib/news68k/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.33 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile \
 		${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig \
diff --git a/distrib/newsmips/floppies/ramdisk/Makefile b/distrib/newsmips/floppies/ramdisk/Makefile
index 6c960dfcb844..5414b00a52a5 100644
--- a/distrib/newsmips/floppies/ramdisk/Makefile
+++ b/distrib/newsmips/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.29 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	floppy
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/bootxx \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
diff --git a/distrib/ofppc/ramdisks/common/Makefile.ramdisk b/distrib/ofppc/ramdisks/common/Makefile.ramdisk
index c9f39a90bb38..e00b3cdb7c21 100644
--- a/distrib/ofppc/ramdisks/common/Makefile.ramdisk
+++ b/distrib/ofppc/ramdisks/common/Makefile.ramdisk
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.ramdisk,v 1.4 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile.ramdisk,v 1.5 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -16,7 +16,7 @@ LISTS=		${.CURDIR}/list ${OFPPCCOMMON}/list.ramdisk
 MTREECONF=	${DISTRIBDIR}/common/mtree.common ${.CURDIR}/../common/mtree.ramdisk
 IMAGEENDIAN=	le
 IMAGEDEPENDS+= 	${CRUNCHBIN} \
-		dot.profile termcap.mini \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/usr/mdec/ofwboot \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
diff --git a/distrib/prep/floppies/ramdisk/Makefile b/distrib/prep/floppies/ramdisk/Makefile
index 5b2a43f16da6..6fb9228524dd 100644
--- a/distrib/prep/floppies/ramdisk/Makefile
+++ b/distrib/prep/floppies/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2009/09/20 19:49:09 abs Exp $
+#	$NetBSD: Makefile,v 1.18 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	ramdisk
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig \
 		${DISTRIBDIR}/common/protocols \
diff --git a/distrib/sandpoint/ramdisk/Makefile b/distrib/sandpoint/ramdisk/Makefile
index 31694aa0b20b..936e4543ad1d 100644
--- a/distrib/sandpoint/ramdisk/Makefile
+++ b/distrib/sandpoint/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2009/09/20 19:49:10 abs Exp $
+#	$NetBSD: Makefile,v 1.5 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ MTREECONF=	${DISTRIBDIR}/common/mtree.common
 IMAGEENDIAN=	be
 MAKEDEVTARGETS=	std md0 wd0 pty0
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.src \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
 		${DISTRIBDIR}/common/services
diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile
index 0e91b4309b13..ec0908ac1a31 100644
--- a/distrib/sun3/miniroot/Makefile
+++ b/distrib/sun3/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.41 2009/09/20 22:46:14 abs Exp $
+#	$NetBSD: Makefile,v 1.42 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -25,7 +25,8 @@ PARSELISTENV=	KERNEL3=${KERNEL3} KERNEL3X=${KERNEL3X}
 MAKEDEVTARGETS=	std md0 cd0 st0 st1 sd0 sd1 sd2 xd0 xy0 fd0
 IMAGEDEPENDS=	${CRUNCHBIN} \
 		${KERNEL3} ${KERNEL3X} \
-		fstab install.md profile termcap \
+		fstab install.md profile \
+		${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/dev/MAKEDEV ${DESTDIR}/dev/MAKEDEV.local \
 		${DESTDIR}/etc/group \
 		${DESTDIR}/etc/master.passwd ${DESTDIR}/etc/netconfig \
diff --git a/distrib/vax/ramdisk/Makefile b/distrib/vax/ramdisk/Makefile
index 428f35fef2ef..43f2eb3642a8 100644
--- a/distrib/vax/ramdisk/Makefile
+++ b/distrib/vax/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2009/09/20 22:46:14 abs Exp $
+#	$NetBSD: Makefile,v 1.24 2009/09/24 21:04:46 he Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,7 +17,7 @@ IMAGEENDIAN=	le
 MAKEDEVTARGETS=	std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
 		sd0 sd1 sd2 md0 pty0 cd0 cd1
 IMAGEDEPENDS=	${CRUNCHBIN} \
-		dot.profile termcap.vt100 \
+		dot.profile ${DISTRIBDIR}/common/termcap \
 		${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
 		${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
 		${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \