Subject: Re: Build failure when MKDYAMICROOT=no 3.0_STABLE (1/2)
To: Joseph A. Dacuma <jadacuma@ched.gov.ph>
From: Greg A. Woods <woods@weird.com>
List: netbsd-users
Date: 08/03/2006 15:28:58
From: "Greg A. Woods" <woods@weird.com>
To: "Joseph A. Dacuma" <jadacuma@ched.gov.ph>
Cc: "NetBSD Users's Discussion List" <netbsd-users@netbsd.org>
Subject: Re: Build failure when MKDYAMICROOT=no 3.0_STABLE
In-Reply-To: <65318.61.9.41.179.1154406620.squirrel@co-mail.ched.gov.ph>
References: <64043.61.9.41.179.1154162432.squirrel@co-mail.ched.gov.ph>
	<m1G6wyO-001NQuC@most.weird.com>
	<65318.61.9.41.179.1154406620.squirrel@co-mail.ched.gov.ph>
User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3 (alpha--netbsd) MULE/5.0 (SAKAKI)
Reply-To: NetBSD Users's Discussion List <netbsd-users@netbsd.org>
 lz;@-iwMv_u\6uIEKR0KY"=MzoQH#CrqBN`nG_5B@rrM8,f~Gr&h5a\=<t0loVf0$}bP=]i3OMh"n_
 _@m4/,~2`V=(-9LyW.)'`@E_fE^<4y7)BIe`A''/j-Y#gDNZERh%CCij'q-NA4F<|yjznEhd7=l^xH
 2.qD3o0IanGHERTW+z$G
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: multipart/signed;
 boundary="pgp-sign-Multipart_Thu_Aug__3_15:28:31_2006-1"; micalg=pgp-sha1;
 protocol="application/pgp-signature"
Content-Transfer-Encoding: 7bit

--pgp-sign-Multipart_Thu_Aug__3_15:28:31_2006-1
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

At Tue, 1 Aug 2006 12:30:20 +0800 (PHT),
Joseph A. Dacuma wrote:
>=20
> > At Sat, 29 Jul 2006 16:40:32 +0800 (PHT),
> > Joseph A. Dacuma wrote:
> >>
> >> Anyone experiencing problems when mk.conf is set to MKDYNAMICROOT=3Dno
> >> when
> >> building distribution on i386 and AMD64 3.0_STABLE.
> >
> > I've done that on i386 semi-recently.  What sort of problems are you
> > seeing?
> >
> > (it was on the netbsd-3 branch, not 3.0)
> >
> > --
> > 						Greg A. Woods
> >
>=20
> Sorry for the late reply. It says, nbmake: stopped in /usr/src.
>=20
> *** Failed target: distribution
> *** Failed command: _makedirtarget().....etc....
> build NOPOSTINSTALL=3D1
> *** Error code 1
>=20
> ERROR: Failed to make distribution
> *** BUILD ABORTED ***

Ah, of course!  I'd fogotten completely that I had to patch the sets
making scripts and lists a bit.

These changes include extra changes you might not need, but hopefully
they'll still work for you:

(If you have trouble with the quoted-printable MIME encoding just let me
know and I can put the patch on my FTP server)

cvs diff: Diffing distrib/sets
Index: distrib/sets/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/Makefile,v
retrieving revision 1.46.2.1
diff -u -r1.46.2.1 Makefile
--- distrib/sets/Makefile	15 Dec 2005 20:13:55 -0000	1.46.2.1
+++ distrib/sets/Makefile	19 May 2006 16:59:26 -0000
@@ -17,10 +17,10 @@
=20
 .if ${MKX11} !=3D "no"
 MAKEFLIST_FLAGS=3D	-b
-MAKESRCTARS_FLAGS=3D	-x ${X11SRCDIR}
+MAKESRCTARS_FLAGS=3D	-p ${PKGSRCDIR} -x ${X11SRCDIR}
 .else
 MAKEFLIST_FLAGS=3D
-MAKESRCTARS_FLAGS=3D
+MAKESRCTARS_FLAGS=3D	-p ${PKGSRCDIR}
 .endif
=20
 .if !defined(MAKETARSETS)
Index: distrib/sets/makesrctars
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/makesrctars,v
retrieving revision 1.18.2.2
diff -u -r1.18.2.2 makesrctars
--- distrib/sets/makesrctars	21 Oct 2005 17:44:57 -0000	1.18.2.2
+++ distrib/sets/makesrctars	19 May 2006 18:01:31 -0000
@@ -14,26 +14,30 @@
 : ${PAX:=3Dpax}
=20
 xsrcdir=3D
+pkgsrcdir=3D
=20
-GZIP=3D-9
-export GZIP
+: ${GZIP:=3D"-9"}
=20
 usage()
 {
 	cat 1>&2 <<USAGE
-Usage: ${prog} [-N password/group dir] [-x xsrcdir] srcdir setdir
+Usage: ${prog} [-N password/group dir] [-x xsrcdir] [-p pkgsrc] srcdir set=
dir
 	-N dir		location which contains master.passwd and group files
 			(defaults to \${srcdir}/etc)
+	-p pkgsrc	build pkgsrc.tgz from pkgsrc
 	-x xsrcdir	build xsrc.tgz from xsrcdir
-	srcdir		location of sources
+	srcdir		location of the system sources
 	setdir		where to write the .tgz files to
 USAGE
 	exit 1
 }
=20
 # handle args
-while getopts N:x: ch; do
+while getopts N:p:x: ch; do
 	case ${ch} in
+	p)
+		pkgsrcdir=3D${OPTARG}
+		;;
 	x)
 		xsrcdir=3D${OPTARG}
 		;;
@@ -121,6 +125,18 @@
 fi
=20
=20
+# create pkgsrc sets
+#
+if [ -n "${pkgsrcdir}" ]; then
+	if ! cd "${pkgsrcdir}"; then
+		echo "Can't chdir to ${pkgsrcdir}"
+		exit 1
+	fi
+	srcprefix=3Dusr/pkgsrc
+	makeset pkgsrc .
+fi
+
+
 echo "Creating checksum files"
 (cd ${setdir}
 	${CKSUM} -o1 *.tgz > BSDSUM
Index: distrib/sets/sets.subr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/sets.subr,v
retrieving revision 1.39.2.1
diff -u -r1.39.2.1 sets.subr
--- distrib/sets/sets.subr	6 Apr 2005 21:25:18 -0000	1.39.2.1
+++ distrib/sets/sets.subr	7 Jun 2006 16:16:30 -0000
@@ -31,9 +31,11 @@
 	MKCRYPTO_IDEA	\
 	MKCRYPTO_MDC2	\
 	MKCRYPTO_RC5	\
+	MKCSH		\
 	MKCVS		\
 	MKGCCCMDS	\
 	MKDOC		\
+	MKDYNAMICROOT	\
 	MKGDB		\
 	MKHESIOD	\
 	MKINFO		\
@@ -54,6 +56,7 @@
 	MKSENDMAIL	\
 	MKSHARE		\
 	MKSKEY		\
+	MKSSH		\
 	MKUUCP		\
 	MKX11		\
 	MKYP		\
@@ -144,14 +147,17 @@
 #	obsolete		file is obsolete, and only printed if=20
 #				${obsolete} !=3D 0
 #
+#	amd			${MKAMD} !=3D no
 #	bfd			${MKBFD} !=3D no
 #	catpages		${MKCATPAGES} !=3D no
 #	crypto			${MKCRYPTO} !=3D no
 #	crypto_idea		${MKCRYPTO_IDEA} !=3D no
 #	crypto_mdc2		${MKCRYPTO_MDC2} !=3D no
 #	crypto_rc5		${MKCRYPTO_RC5} !=3D no
+#	csh			${MKCSH} !=3D no
 #	cvs			${MKCVS} !=3D no
 #	doc			${MKDOC} !=3D no
+#	dynamicroot		${MKDYNAMICROOT} !=3D no
 #	gcccmds			${MKGCCCMDS} !=3D no
 #	gdb			${MKGDB} !=3D no
 #	hesiod			${MKHESIOD} !=3D no
@@ -171,6 +177,7 @@
 #	sendmail		${MKSENDMAIL} !=3D no
 #	share			${MKSHARE} !=3D no
 #	skey			${MKSKEY} !=3D no
+#	ssh			${MKSSH} !=3D no
 #	uucp			${MKUUCP} !=3D no
 #	yp			${MKYP} !=3D no
 #
cvs diff: Diffing distrib/sets/lists
cvs diff: Diffing distrib/sets/lists/base
Index: distrib/sets/lists/base/md.i386
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/base/md.i386,v
retrieving revision 1.109
diff -u -r1.109 md.i386
--- distrib/sets/lists/base/md.i386	11 Jan 2005 18:59:34 -0000	1.109
+++ distrib/sets/lists/base/md.i386	10 May 2006 03:59:22 -0000
@@ -10,9 +10,9 @@
 ./dev/ttyv6					base-obsolete		obsolete
 ./dev/ttyv7					base-obsolete		obsolete
 ./dev/vga					base-obsolete		obsolete
-./lib/libm387.so				base-sys-shlib
-./lib/libm387.so.0				base-sys-shlib
-./lib/libm387.so.0.0				base-sys-shlib
+./lib/libm387.so				base-sys-shlib		dynamicroot
+./lib/libm387.so.0				base-sys-shlib		dynamicroot
+./lib/libm387.so.0.0				base-sys-shlib		dynamicroot
 ./sbin/fdisk					base-sysutil-root
 ./sbin/ldconfig					base-sysutil-root
 ./usr/bin/fdformat				base-util-bin
Index: distrib/sets/lists/base/mi
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/base/mi,v
retrieving revision 1.532.2.28
diff -u -r1.532.2.28 mi
--- distrib/sets/lists/base/mi	13 Jul 2006 22:02:30 -0000	1.532.2.28
+++ distrib/sets/lists/base/mi	29 Jul 2006 20:41:51 -0000
@@ -8,7 +8,7 @@
 ./bin/chmod					base-util-root
 ./bin/cp					base-util-root
 ./bin/cpio					base-util-root
-./bin/csh					base-util-root
+./bin/csh					base-util-root		csh
 ./bin/date					base-util-root
 ./bin/dd					base-util-root
 ./bin/df					base-util-root
@@ -16,6 +16,7 @@
 ./bin/echo					base-util-root
 ./bin/ed					base-util-root
 ./bin/expr					base-util-root
+./bin/fgrep					base-util-root
 ./bin/hostname					base-util-root
 ./bin/kill					base-util-root
 ./bin/ksh					base-util-root
@@ -542,7 +543,7 @@
 ./usr/bin/paste					base-util-bin
 ./usr/bin/patch					base-util-bin
 ./usr/bin/pathchk				base-util-bin
-./usr/bin/pawd					base-amd-bin
+./usr/bin/pawd					base-amd-bin		amd
 ./usr/bin/pgrep					base-util-bin
 ./usr/bin/pkill					base-util-bin
 ./usr/bin/pmap					base-util-bin
@@ -925,8 +926,8 @@
 ./usr/sbin/accton				base-sysutil-bin
 ./usr/sbin/altqd				base-router-bin
 ./usr/sbin/altqstat				base-router-bin
-./usr/sbin/amd					base-amd-bin
-./usr/sbin/amq					base-amd-bin
+./usr/sbin/amd					base-amd-bin		amd
+./usr/sbin/amq					base-amd-bin		amd
 ./usr/sbin/arp					base-netutil-bin
 ./usr/sbin/authpf				base-netutil-bin	pf
 ./usr/sbin/bootpd				base-bootserver-bin
@@ -962,9 +963,9 @@
 ./usr/sbin/eshconfig				base-sysutil-bin
 ./usr/sbin/etcupdate				base-sysutil-bin
 ./usr/sbin/faithd				base-router-bin		inet6
-./usr/sbin/fixmount				base-nfsclient-bin
+./usr/sbin/fixmount				base-amd-bin		amd
 ./usr/sbin/flush				base-obsolete		obsolete
-./usr/sbin/fsinfo				base-sysutil-bin
+./usr/sbin/fsinfo				base-amd-bin		amd
 ./usr/sbin/fssconfig				base-sysutil-bin
 ./usr/sbin/g711conv				base-obsolete		obsolete
 ./usr/sbin/getencstat				base-sysutil-bin
@@ -976,7 +977,7 @@
 ./usr/sbin/groupdel				base-sysutil-bin
 ./usr/sbin/groupinfo				base-sysutil-bin
 ./usr/sbin/groupmod				base-sysutil-bin
-./usr/sbin/hlfsd				base-amd-bin
+./usr/sbin/hlfsd				base-amd-bin		amd
 ./usr/sbin/host					base-obsolete		obsolete
 ./usr/sbin/hprop				base-krb5-bin		kerberos
 ./usr/sbin/htable				base-obsolete		obsolete
@@ -1025,7 +1026,7 @@
 ./usr/sbin/mbrlabel				base-obsolete		obsolete
 ./usr/sbin/mdconfig				base-sysutil-bin
 ./usr/sbin/mdsetimage				base-sysutil-bin	bfd
-./usr/sbin/mk-amd-map				base-amd-bin
+./usr/sbin/mk-amd-map				base-amd-bin		amd
 ./usr/sbin/mkalias				base-nis-bin		yp
 ./usr/sbin/mknetid				base-nis-bin		yp
 ./usr/sbin/mld6query				base-netutil-bin	inet6
@@ -1180,7 +1181,7 @@
 ./usr/sbin/vipw					base-sysutil-bin
 ./usr/sbin/vnconfig				base-sysutil-bin
 ./usr/sbin/wiconfig				base-sysutil-bin
-./usr/sbin/wire-test				base-netutil-bin
+./usr/sbin/wire-test				base-amd-bin		amd
 ./usr/sbin/wlanctl				base-sysutil-bin
 ./usr/sbin/wsconscfg				base-sysutil-bin
 ./usr/sbin/wsfontload				base-sysutil-bin
@@ -1260,7 +1261,7 @@
 ./usr/share/doc/smm/10.named			base-obsolete		obsolete
 ./usr/share/doc/smm/11.timedop			base-smm-share
 ./usr/share/doc/smm/12.timed			base-smm-share
-./usr/share/doc/smm/13.amd			base-smm-share
+./usr/share/doc/smm/13.amd			base-amd-share		amd
 ./usr/share/doc/smm/14.uucpimpl			base-smm-share
 ./usr/share/doc/smm/15.uucpnet			base-smm-share
 ./usr/share/doc/smm/16.security			base-smm-share
@@ -1304,7 +1305,7 @@
 ./usr/share/doc/usd/30.rogue			base-usd-share
 ./usr/share/doc/usd/31.trek			base-usd-share
 ./usr/share/examples				base-sys-share
-./usr/share/examples/amd			base-amd-examples
+./usr/share/examples/amd			base-amd-examples	amd
 ./usr/share/examples/apm			base-sys-examples
 ./usr/share/examples/dhcp			base-dhcpd-examples
 ./usr/share/examples/disktab			base-sys-examples
Index: distrib/sets/lists/base/shl.elf
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/base/shl.elf,v
retrieving revision 1.99
diff -u -r1.99 shl.elf
--- distrib/sets/lists/base/shl.elf	5 Mar 2005 18:05:14 -0000	1.99
+++ distrib/sets/lists/base/shl.elf	7 Jun 2006 16:18:26 -0000
@@ -1,32 +1,32 @@
 # $NetBSD: shl.elf,v 1.99 2005/03/05 18:05:14 tnozaki Exp $
 # Note: libtermcap and libtermlib are hardlinked and share the same versio=
n.
-./lib/libc.so					base-sys-shlib
-./lib/libc.so.12				base-sys-shlib
-./lib/libcrypt.so				base-sys-shlib
-./lib/libcrypt.so.0				base-sys-shlib
-./lib/libcrypto.so				base-crypto-shlib	crypto
-./lib/libcrypto.so.2				base-crypto-shlib	crypto
-./lib/libedit.so				base-sys-shlib
-./lib/libedit.so.2				base-sys-shlib
-./lib/libevent.so				base-sys-shlib
-./lib/libevent.so.0				base-sys-shlib
-./lib/libipsec.so				base-net-shlib
-./lib/libipsec.so.2				base-net-shlib
-./lib/libkvm.so					base-sys-shlib
-./lib/libkvm.so.5				base-sys-shlib
-./lib/libm.so					base-sys-shlib
-./lib/libm.so.0					base-sys-shlib
-./lib/libradius.so				base-sys-shlib
-./lib/libradius.so.0				base-sys-shlib
-./lib/libtermcap.so				base-sys-shlib
-./lib/libtermcap.so.0				base-sys-shlib
-./lib/libtermlib.so				base-sys-shlib
-./lib/libtermlib.so.0				base-sys-shlib
-./lib/libutil.so				base-sys-shlib
-./lib/libutil.so.7				base-sys-shlib
-./lib/libz.so					base-sys-shlib
-./lib/libz.so.0					base-sys-shlib
-./libexec/ld.elf_so				base-sys-shlib
+./lib/libc.so					base-sys-shlib		dynamicroot
+./lib/libc.so.12				base-sys-shlib		dynamicroot
+./lib/libcrypt.so				base-sys-shlib		dynamicroot
+./lib/libcrypt.so.0				base-sys-shlib		dynamicroot
+./lib/libcrypto.so				base-crypto-shlib	crypto,dynamicroot
+./lib/libcrypto.so.2				base-crypto-shlib	crypto,dynamicroot
+./lib/libedit.so				base-sys-shlib		dynamicroot
+./lib/libedit.so.2				base-sys-shlib		dynamicroot
+./lib/libevent.so				base-sys-shlib		dynamicroot
+./lib/libevent.so.0				base-sys-shlib		dynamicroot
+./lib/libipsec.so				base-net-shlib		dynamicroot
+./lib/libipsec.so.2				base-net-shlib		dynamicroot
+./lib/libkvm.so					base-sys-shlib		dynamicroot
+./lib/libkvm.so.5				base-sys-shlib		dynamicroot
+./lib/libm.so					base-sys-shlib		dynamicroot
+./lib/libm.so.0					base-sys-shlib		dynamicroot
+./lib/libradius.so				base-sys-shlib		dynamicroot
+./lib/libradius.so.0				base-sys-shlib		dynamicroot
+./lib/libtermcap.so				base-sys-shlib		dynamicroot
+./lib/libtermcap.so.0				base-sys-shlib		dynamicroot
+./lib/libtermlib.so				base-sys-shlib		dynamicroot
+./lib/libtermlib.so.0				base-sys-shlib		dynamicroot
+./lib/libutil.so				base-sys-shlib		dynamicroot
+./lib/libutil.so.7				base-sys-shlib		dynamicroot
+./lib/libz.so					base-sys-shlib		dynamicroot
+./lib/libz.so.0					base-sys-shlib		dynamicroot
+./libexec/ld.elf_so				base-sys-shlib		dynamicroot
 ./usr/lib/i18n/libBIG5.so			base-i18n-shlib
 ./usr/lib/i18n/libBIG5.so.4			base-i18n-shlib
 ./usr/lib/i18n/libEUC.so			base-i18n-shlib
@@ -61,7 +61,7 @@
 ./usr/lib/i18n/libmapper_std.so.4		base-i18n-shlib
 ./usr/lib/i18n/libmapper_zone.so		base-i18n-shlib
 ./usr/lib/i18n/libmapper_zone.so.4		base-i18n-shlib
-./usr/lib/libamu.so.2				base-amd-shlib
+./usr/lib/libamu.so.2				base-amd-shlib		amd
 ./usr/lib/libasn1.so				base-krb5-shlib		kerberos
 ./usr/lib/libasn1.so.6				base-krb5-shlib		kerberos
 ./usr/lib/libbsdmalloc.so			base-sys-shlib
Index: distrib/sets/lists/base/shl.mi
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/base/shl.mi,v
retrieving revision 1.304.2.6
diff -u -r1.304.2.6 shl.mi
--- distrib/sets/lists/base/shl.mi	17 Apr 2006 23:11:11 -0000	1.304.2.6
+++ distrib/sets/lists/base/shl.mi	7 Jun 2006 16:18:33 -0000
@@ -1,18 +1,18 @@
 # $NetBSD: shl.mi,v 1.304.2.6 2006/04/17 23:11:11 tron Exp $
 # Note: libtermcap and libtermlib are hardlinked and share the same versio=
n.
-./lib/libc.so.12.128.2				base-sys-shlib
-./lib/libcrypt.so.0.2				base-sys-shlib
-./lib/libcrypto.so.2.1				base-crypto-shlib	crypto
-./lib/libedit.so.2.9				base-sys-shlib
-./lib/libevent.so.0.2				base-sys-shlib
-./lib/libipsec.so.2.1				base-net-shlib
-./lib/libkvm.so.5.2				base-sys-shlib
-./lib/libm.so.0.2				base-sys-shlib
-./lib/libradius.so.0.0				base-sys-shlib
-./lib/libtermcap.so.0.5				base-sys-shlib
-./lib/libtermlib.so.0.5				base-sys-shlib
-./lib/libutil.so.7.6				base-sys-shlib
-./lib/libz.so.0.4				base-sys-shlib
+./lib/libc.so.12.128.2				base-sys-shlib		dynamicroot
+./lib/libcrypt.so.0.2				base-sys-shlib		dynamicroot
+./lib/libcrypto.so.2.1				base-crypto-shlib	crypto,dynamicroot
+./lib/libedit.so.2.9				base-sys-shlib		dynamicroot
+./lib/libevent.so.0.2				base-sys-shlib		dynamicroot
+./lib/libipsec.so.2.1				base-net-shlib		dynamicroot
+./lib/libkvm.so.5.2				base-sys-shlib		dynamicroot
+./lib/libm.so.0.2				base-sys-shlib		dynamicroot
+./lib/libradius.so.0.0				base-sys-shlib		dynamicroot
+./lib/libtermcap.so.0.5				base-sys-shlib		dynamicroot
+./lib/libtermlib.so.0.5				base-sys-shlib		dynamicroot
+./lib/libutil.so.7.6				base-sys-shlib		dynamicroot
+./lib/libz.so.0.4				base-sys-shlib		dynamicroot
 ./usr/lib/i18n/libBIG5.so.4.3			base-i18n-shlib
 ./usr/lib/i18n/libEUC.so.4.3			base-i18n-shlib
 ./usr/lib/i18n/libEUCTW.so.4.3			base-i18n-shlib
@@ -30,7 +30,7 @@
 ./usr/lib/i18n/libmapper_serial.so.4.3		base-i18n-shlib
 ./usr/lib/i18n/libmapper_std.so.4.3		base-i18n-shlib
 ./usr/lib/i18n/libmapper_zone.so.4.3		base-i18n-shlib
-./usr/lib/libamu.so.2.1				base-amd-shlib
+./usr/lib/libamu.so.2.1				base-amd-shlib		amd
 ./usr/lib/libasn1.so.6.1			base-krb5-shlib		kerberos
 ./usr/lib/libbsdmalloc.so.0.0			base-sys-shlib
 ./usr/lib/libbz2.so.1.0				base-sys-shlib
cvs diff: Diffing distrib/sets/lists/comp
cvs diff: Diffing distrib/sets/lists/etc
Index: distrib/sets/lists/etc/mi
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/etc/mi,v
retrieving revision 1.153.2.6
diff -u -r1.153.2.6 mi
--- distrib/sets/lists/etc/mi	15 Sep 2005 21:08:52 -0000	1.153.2.6
+++ distrib/sets/lists/etc/mi	7 Jun 2006 16:19:31 -0000
@@ -14,9 +14,9 @@
 ./dev/MAKEDEV.local				etc-sys-etc
 ./etc/bootptab					etc-bootserver-etc
 ./etc/changelist				etc-sys-etc
-./etc/csh.cshrc					etc-util-etc
-./etc/csh.login					etc-util-etc
-./etc/csh.logout				etc-util-etc
+./etc/csh.cshrc					etc-util-etc		csh
+./etc/csh.login					etc-util-etc		csh
+./etc/csh.logout				etc-util-etc		csh
 ./etc/daily					etc-sys-etc
 ./etc/daily.conf				etc-sys-etc
 ./etc/default					etc-obsolete		obsolete
@@ -68,7 +68,7 @@
 ./etc/mailer.conf				etc-mailwrapper-etc
 ./etc/man.conf					etc-man-etc
 ./etc/master.passwd				etc-sys-etc
-./etc/moduli					etc-secsh-etc		crypto
+./etc/moduli					etc-secsh-etc		crypto,ssh
 ./etc/monthly					etc-sys-etc
 ./etc/monthly.conf				etc-sys-etc
 ./etc/motd					etc-sys-etc
@@ -141,7 +141,7 @@
 ./etc/rc.d/SERVERS				etc-sys-rc
 ./etc/rc.d/accounting				etc-sys-rc
 ./etc/rc.d/altqd				etc-router-rc
-./etc/rc.d/amd					etc-amd-rc
+./etc/rc.d/amd					etc-amd-rc		amd
 ./etc/rc.d/apmd					etc-sys-rc
 ./etc/rc.d/bootconf.sh				etc-sys-rc
 ./etc/rc.d/bootparams				etc-bootserver-rc
@@ -219,7 +219,7 @@
 ./etc/rc.d/securelevel				etc-sys-rc
 ./etc/rc.d/sendmail				etc-sendmail-rc
 ./etc/rc.d/smmsp				etc-sendmail-rc
-./etc/rc.d/sshd					etc-secsh-rc
+./etc/rc.d/sshd					etc-secsh-rc		ssh
 ./etc/rc.d/staticroute				etc-sys-rc
 ./etc/rc.d/swap1				etc-sys-rc
 ./etc/rc.d/swap2				etc-sys-rc
@@ -255,25 +255,25 @@
 ./etc/security.conf				etc-sys-etc
 ./etc/services					etc-net-etc
 ./etc/shells					etc-sys-etc
-./etc/skel/.cshrc				etc-sys-etc
-./etc/skel/.login				etc-sys-etc
-./etc/skel/.logout				etc-sys-etc
+./etc/skel/.cshrc				etc-sys-etc		csh
+./etc/skel/.login				etc-sys-etc		csh
+./etc/skel/.logout				etc-sys-etc		csh
 ./etc/skel/.profile				etc-sys-etc
 ./etc/skeykeys					etc-sys-etc
 ./etc/spamd.conf				etc-obsolete		obsolete
 ./etc/spwd.db					etc-sys-etc
-./etc/ssh/ssh_config				etc-secsh-etc		crypto
-./etc/ssh/ssh_known_hosts			etc-secsh-etc		crypto
-./etc/ssh/sshd_config				etc-secsh-etc		crypto
+./etc/ssh/ssh_config				etc-secsh-etc		crypto,ssh
+./etc/ssh/ssh_known_hosts			etc-secsh-etc		crypto,ssh
+./etc/ssh/sshd_config				etc-secsh-etc		crypto,ssh
 ./etc/sysctl.conf				etc-sys-etc
 ./etc/syslog.conf				etc-sys-etc
 ./etc/ttys					etc-sys-etc
 ./etc/weekly					etc-sys-etc
 ./etc/weekly.conf				etc-sys-etc
 ./etc/wscons.conf				etc-sys-etc
-./root/.cshrc					etc-root-root
+./root/.cshrc					etc-root-root		csh
 ./root/.klogin					etc-root-root
-./root/.login					etc-root-root
+./root/.login					etc-root-root		csh
 ./root/.profile					etc-root-root
 ./root/.shrc					etc-root-root
 ./var/at/at.deny				etc-cron-root
cvs diff: Diffing distrib/sets/lists/games
cvs diff: Diffing distrib/sets/lists/man
Index: distrib/sets/lists/man/mi
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/man/mi,v
retrieving revision 1.768.2.31
diff -u -r1.768.2.31 mi
--- distrib/sets/lists/man/mi	13 Jul 2006 22:02:30 -0000	1.768.2.31
+++ distrib/sets/lists/man/mi	29 Jul 2006 21:59:02 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: mi,v 1.768.2.31 2006/07/13 22:02:30 tron Exp $
 ./etc/mtree/set.man				man-sys-root
-./usr/share/info/am-utils.info			man-amd-info		info
+./usr/share/info/am-utils.info			man-amd-info		amd,info
 ./usr/share/info/as.info			man-computil-info	bfd,info
 ./usr/share/info/awk.info			man-util-info		info
 ./usr/share/info/bfd.info			man-computil-info	bfd,info
@@ -35,7 +35,7 @@
 ./usr/share/info/uucp.info			man-uucp-info		info,uucp
 ./usr/share/man/cat1/Mail.0			man-mail-catman		.cat
 ./usr/share/man/cat1/[.0			man-util-catman		.cat
-./usr/share/man/cat1/alias.0			man-util-catman		.cat
+./usr/share/man/cat1/alias.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/altqstat.0			man-router-catman	.cat
 ./usr/share/man/cat1/amq.0			man-obsolete		obsolete
 ./usr/share/man/cat1/apply.0			man-util-catman		.cat
@@ -54,7 +54,7 @@
 ./usr/share/man/cat1/batch.0			man-cron-catman		.cat
 ./usr/share/man/cat1/bc.0			man-util-catman		.cat
 ./usr/share/man/cat1/bdes.0			man-crypto-catman	crypto,.cat
-./usr/share/man/cat1/bg.0			man-util-catman		.cat
+./usr/share/man/cat1/bg.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/biff.0			man-mail-catman		.cat
 ./usr/share/man/cat1/bpm.0			man-pkgutil-catman	.cat
 ./usr/share/man/cat1/bunzip2.0			man-util-catman		.cat
@@ -90,7 +90,7 @@
 ./usr/share/man/cat1/cpio.0			man-util-catman		.cat
 ./usr/share/man/cat1/cpp.0			man-util-catman		gcccmds,.cat
 ./usr/share/man/cat1/crontab.0			man-cron-catman		.cat
-./usr/share/man/cat1/csh.0			man-util-catman		.cat
+./usr/share/man/cat1/csh.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/ctags.0			man-c-catman		.cat
 ./usr/share/man/cat1/cu.0			man-uucp-catman		uucp,.cat
 ./usr/share/man/cat1/cut.0			man-util-catman		.cat
@@ -104,7 +104,7 @@
 ./usr/share/man/cat1/diff3.0			man-util-catman		.cat
 ./usr/share/man/cat1/dig.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/dirname.0			man-util-catman		.cat
-./usr/share/man/cat1/dirs.0			man-util-catman		.cat
+./usr/share/man/cat1/dirs.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/dnskeygen.0		man-obsolete		obsolete
 ./usr/share/man/cat1/dnsquery.0			man-obsolete		obsolete
 ./usr/share/man/cat1/domainname.0		man-nis-catman		.cat
@@ -121,14 +121,14 @@
 ./usr/share/man/cat1/expr.0			man-util-catman		.cat
 ./usr/share/man/cat1/false.0			man-util-catman		.cat
 ./usr/share/man/cat1/fdformat.0			man-util-catman		.cat
-./usr/share/man/cat1/fg.0			man-util-catman		.cat
+./usr/share/man/cat1/fg.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/fgrep.0			man-util-catman		.cat
 ./usr/share/man/cat1/file.0			man-util-catman		.cat
 ./usr/share/man/cat1/find.0			man-util-catman		.cat
 ./usr/share/man/cat1/finger.0			man-util-catman		.cat
 ./usr/share/man/cat1/fmt.0			man-util-catman		.cat
 ./usr/share/man/cat1/fold.0			man-util-catman		.cat
-./usr/share/man/cat1/foreach.0			man-util-catman		.cat
+./usr/share/man/cat1/foreach.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/from.0			man-util-catman		.cat
 ./usr/share/man/cat1/fsplit.0			man-util-catman		.cat
 ./usr/share/man/cat1/fstat.0			man-util-catman		.cat
@@ -150,7 +150,7 @@
 ./usr/share/man/cat1/head.0			man-util-catman		.cat
 ./usr/share/man/cat1/hesinfo.0			man-hesiod-catman	hesiod,.cat
 ./usr/share/man/cat1/hexdump.0			man-util-catman		.cat
-./usr/share/man/cat1/history.0			man-util-catman		.cat
+./usr/share/man/cat1/history.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/host.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/hostname.0			man-util-catman		.cat
 ./usr/share/man/cat1/i386			man-obsolete		obsolete
@@ -179,7 +179,7 @@
 ./usr/share/man/cat1/ipresend.0			man-ipf-catman		ipfilter,.cat
 ./usr/share/man/cat1/ipsend.0			man-ipf-catman		ipfilter,.cat
 ./usr/share/man/cat1/iptest.0			man-ipf-catman		ipfilter,.cat
-./usr/share/man/cat1/jobs.0			man-util-catman		.cat
+./usr/share/man/cat1/jobs.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/join.0			man-util-catman		.cat
 ./usr/share/man/cat1/jot.0			man-util-catman		.cat
 ./usr/share/man/cat1/kdestroy.0			man-krb5-catman		kerberos,.cat
@@ -203,7 +203,7 @@
 ./usr/share/man/cat1/leave.0			man-util-catman		.cat
 ./usr/share/man/cat1/less.0			man-util-catman		.cat
 ./usr/share/man/cat1/lesskey.0			man-util-catman		.cat
-./usr/share/man/cat1/limit.0			man-util-catman		.cat
+./usr/share/man/cat1/limit.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/linkfarm.0			man-pkgutil-catman	.cat
 ./usr/share/man/cat1/ln.0			man-util-catman		.cat
 ./usr/share/man/cat1/locale.0			man-util-catman		.cat
@@ -299,7 +299,7 @@
 ./usr/share/man/cat1/paste.0			man-util-catman		.cat
 ./usr/share/man/cat1/patch.0			man-util-catman		.cat
 ./usr/share/man/cat1/pathchk.0			man-util-catman		.cat
-./usr/share/man/cat1/pawd.0			man-amd-catman		.cat
+./usr/share/man/cat1/pawd.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat1/pax.0			man-util-catman		.cat
 ./usr/share/man/cat1/pgrep.0			man-util-catman		.cat
 ./usr/share/man/cat1/pim6stat.0			man-obsolete		obsolete
@@ -312,7 +312,7 @@
 ./usr/share/man/cat1/pkill.0			man-util-catman		.cat
 ./usr/share/man/cat1/pmap.0			man-util-catman		.cat
 ./usr/share/man/cat1/pmc.0			man-util-catman		.cat
-./usr/share/man/cat1/popd.0			man-util-catman		.cat
+./usr/share/man/cat1/popd.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/postalias.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/postcat.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat1/postconf.0			man-postfix-catman	postfix,.cat
@@ -330,7 +330,7 @@
 ./usr/share/man/cat1/progress.0			man-util-catman		.cat
 ./usr/share/man/cat1/ps.0			man-util-catman		.cat
 ./usr/share/man/cat1/pstat.0			man-obsolete		obsolete
-./usr/share/man/cat1/pushd.0			man-util-catman		.cat
+./usr/share/man/cat1/pushd.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/pwd.0			man-util-catman		.cat
 ./usr/share/man/cat1/pwhash.0			man-util-catman		.cat
 ./usr/share/man/cat1/qsubst.0			man-util-catman		.cat
@@ -348,8 +348,8 @@
 ./usr/share/man/cat1/rcsmerge.0			man-rcs-catman		.cat
 ./usr/share/man/cat1/rdist.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/readlink.0			man-util-catman		.cat
-./usr/share/man/cat1/rehash.0			man-util-catman		.cat
-./usr/share/man/cat1/repeat.0			man-util-catman		.cat
+./usr/share/man/cat1/rehash.0			man-util-catman		.cat,csh
+./usr/share/man/cat1/repeat.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/reset.0			man-util-catman		.cat
 ./usr/share/man/cat1/rev.0			man-util-catman		.cat
 ./usr/share/man/cat1/rlog.0			man-rcs-catman		.cat
@@ -391,7 +391,7 @@
 ./usr/share/man/cat1/sntp.0			man-ntp-catman		.cat
 ./usr/share/man/cat1/sockstat.0			man-util-catman		.cat
 ./usr/share/man/cat1/sort.0			man-util-catman		.cat
-./usr/share/man/cat1/source.0			man-util-catman		.cat
+./usr/share/man/cat1/source.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/split.0			man-util-catman		.cat
 ./usr/share/man/cat1/ssh-add.0			man-secsh-catman	crypto,.cat
 ./usr/share/man/cat1/ssh-agent.0		man-secsh-catman	crypto,.cat
@@ -399,12 +399,12 @@
 ./usr/share/man/cat1/ssh-keyscan.0		man-secsh-catman	crypto,.cat
 ./usr/share/man/cat1/ssh.0			man-secsh-catman	crypto,.cat
 ./usr/share/man/cat1/stat.0			man-util-catman		.cat
-./usr/share/man/cat1/stop.0			man-util-catman		.cat
+./usr/share/man/cat1/stop.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/stty.0			man-util-catman		.cat
 ./usr/share/man/cat1/su.0			man-util-catman		.cat
 ./usr/share/man/cat1/sum.0			man-util-catman		.cat
 ./usr/share/man/cat1/sup.0			man-sup-catman		.cat
-./usr/share/man/cat1/suspend.0			man-util-catman		.cat
+./usr/share/man/cat1/suspend.0			man-util-catman		.cat,csh
 ./usr/share/man/cat1/sysstat.0			man-util-catman		.cat
 ./usr/share/man/cat1/systat.0			man-util-catman		.cat
 ./usr/share/man/cat1/systrace.0			man-util-catman		.cat
@@ -1412,7 +1412,7 @@
 ./usr/share/man/cat5/acct.0			man-sys-catman		.cat
 ./usr/share/man/cat5/aliases.0			man-sendmail-catman	sendmail,.cat
 ./usr/share/man/cat5/altq.conf.0		man-router-catman	.cat
-./usr/share/man/cat5/amd.conf.0			man-amd-catman		.cat
+./usr/share/man/cat5/amd.conf.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat5/ar.0			man-sys-catman		.cat
 ./usr/share/man/cat5/body_checks.0		man-postfix-catman	postfix,.cat
 ./usr/share/man/cat5/bootparams.0		man-bootserver-catman	.cat
@@ -1611,7 +1611,7 @@
 ./usr/share/man/cat8/alpha/mkbootimage.0	man-sysutil-catman	.cat
 ./usr/share/man/cat8/alpha/setnetbootinfo.0	man-sysutil-catman	.cat
 ./usr/share/man/cat8/altqd.0			man-router-catman	.cat
-./usr/share/man/cat8/amd.0			man-amd-catman		.cat
+./usr/share/man/cat8/amd.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat8/amd64/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/amd64/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/amiga/MAKEDEV.0		man-obsolete		obsolete
@@ -1620,7 +1620,7 @@
 ./usr/share/man/cat8/amiga/grfconfig.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/amiga/installboot.0	man-sysutil-catman	.cat
 ./usr/share/man/cat8/amiga/makedev.0		man-obsolete		obsolete
-./usr/share/man/cat8/amq.0			man-amd-catman		.cat
+./usr/share/man/cat8/amq.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat8/anvil.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/apm.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/apmd.0			man-sysutil-catman	.cat
@@ -1737,7 +1737,7 @@
 ./usr/share/man/cat8/fasthalt.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/fdisk.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/fingerd.0			man-sysutil-catman	.cat
-./usr/share/man/cat8/fixmount.0			man-sysutil-catman	.cat
+./usr/share/man/cat8/fixmount.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat8/flush.0			man-postfix-catman	postfix,.cat
 ./usr/share/man/cat8/fsck.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/fsck_ext2fs.0		man-ext2fs-catman	.cat
@@ -1745,7 +1745,7 @@
 ./usr/share/man/cat8/fsck_lfs.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/fsck_msdos.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/fsdb.0			man-sysutil-catman	.cat
-./usr/share/man/cat8/fsinfo.0			man-sysutil-catman	.cat
+./usr/share/man/cat8/fsinfo.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat8/fsirand.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/fssconfig.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/ftp-proxy.0		man-netutil-catman	pf,.cat
@@ -1764,7 +1764,7 @@
 ./usr/share/man/cat8/groupmod.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/gspa.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/halt.0			man-sysutil-catman	.cat
-./usr/share/man/cat8/hlfsd.0			man-amd-catman		.cat
+./usr/share/man/cat8/hlfsd.0			man-amd-catman		amd,.cat
 ./usr/share/man/cat8/hp300/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/hp300/boot.0		man-sys-catman		.cat
 ./usr/share/man/cat8/hp300/crash.0		man-sys-catman		.cat
@@ -1883,7 +1883,7 @@
 ./usr/share/man/cat8/mfs.0			man-sys-catman		.cat
 ./usr/share/man/cat8/mipsco/MAKEDEV.0		man-obsolete		obsolete
 ./usr/share/man/cat8/mipsco/makedev.0		man-obsolete		obsolete
-./usr/share/man/cat8/mk-amd-map.0		man-amd-catman		.cat
+./usr/share/man/cat8/mk-amd-map.0		man-amd-catman		amd,.cat
 ./usr/share/man/cat8/mkalias.0			man-nis-catman		yp,.cat
 ./usr/share/man/cat8/mknetid.0			man-nis-catman		yp,.cat
 ./usr/share/man/cat8/mknod.0			man-sysutil-catman	.cat
@@ -2232,7 +2232,7 @@
 ./usr/share/man/cat8/walnut/makedev.0		man-obsolete		obsolete
 ./usr/share/man/cat8/wdogctl.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/wiconfig.0			man-netutil-catman	.cat
-./usr/share/man/cat8/wire-test.0		man-netutil-catman	.cat
+./usr/share/man/cat8/wire-test.0		man-amd-catman		amd,.cat
 ./usr/share/man/cat8/wizd.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/wlanctl.0			man-netutil-catman	.cat
 ./usr/share/man/cat8/wsconscfg.0		man-sysutil-catman	.cat
@@ -2269,7 +2269,7 @@
 ./usr/share/man/cat9/boot.0			man-obsolete		obsolete
 ./usr/share/man/man1/Mail.1			man-mail-man		.man
 ./usr/share/man/man1/[.1			man-util-man		.man
-./usr/share/man/man1/alias.1			man-util-man		.man
+./usr/share/man/man1/alias.1			man-util-man		.man,csh
 ./usr/share/man/man1/altqstat.1			man-router-man		.man
 ./usr/share/man/man1/amq.1			man-obsolete		obsolete
 ./usr/share/man/man1/apply.1			man-util-man		.man
@@ -2288,7 +2288,7 @@
 ./usr/share/man/man1/batch.1			man-cron-man		.man
 ./usr/share/man/man1/bc.1			man-util-man		.man
 ./usr/share/man/man1/bdes.1			man-crypto-man		crypto,.man
-./usr/share/man/man1/bg.1			man-util-man		.man
+./usr/share/man/man1/bg.1			man-util-man		.man,csh
 ./usr/share/man/man1/biff.1			man-mail-man		.man
 ./usr/share/man/man1/bpm.1			man-pkgutil-man		.man
 ./usr/share/man/man1/bunzip2.1			man-util-man		.man
@@ -2324,7 +2324,7 @@
 ./usr/share/man/man1/cpio.1			man-util-man		.man
 ./usr/share/man/man1/cpp.1			man-util-man		gcccmds,.man
 ./usr/share/man/man1/crontab.1			man-cron-man		.man
-./usr/share/man/man1/csh.1			man-util-man		.man
+./usr/share/man/man1/csh.1			man-util-man		.man,csh
 ./usr/share/man/man1/ctags.1			man-c-man		.man
 ./usr/share/man/man1/cu.1			man-uucp-man		uucp,.man
 ./usr/share/man/man1/cut.1			man-util-man		.man
@@ -2338,7 +2338,7 @@
 ./usr/share/man/man1/diff3.1			man-util-man		.man
 ./usr/share/man/man1/dig.1			man-netutil-man		.man
 ./usr/share/man/man1/dirname.1			man-util-man		.man
-./usr/share/man/man1/dirs.1			man-util-man		.man
+./usr/share/man/man1/dirs.1			man-util-man		.man,csh
 ./usr/share/man/man1/dnskeygen.1		man-obsolete		obsolete
 ./usr/share/man/man1/dnsquery.1			man-obsolete		obsolete
 ./usr/share/man/man1/domainname.1		man-nis-man		.man
@@ -2355,14 +2355,14 @@
 ./usr/share/man/man1/expr.1			man-util-man		.man
 ./usr/share/man/man1/false.1			man-util-man		.man
 ./usr/share/man/man1/fdformat.1			man-util-man		.man
-./usr/share/man/man1/fg.1			man-util-man		.man
+./usr/share/man/man1/fg.1			man-util-man		.man,csh
 ./usr/share/man/man1/fgrep.1			man-util-man		.man
 ./usr/share/man/man1/file.1			man-util-man		.man
 ./usr/share/man/man1/find.1			man-util-man		.man
 ./usr/share/man/man1/finger.1			man-util-man		.man
 ./usr/share/man/man1/fmt.1			man-util-man		.man
 ./usr/share/man/man1/fold.1			man-util-man		.man
-./usr/share/man/man1/foreach.1			man-util-man		.man
+./usr/share/man/man1/foreach.1			man-util-man		.man,csh
 ./usr/share/man/man1/from.1			man-util-man		.man
 ./usr/share/man/man1/fsplit.1			man-util-man		.man
 ./usr/share/man/man1/fstat.1			man-util-man		.man
@@ -2384,7 +2384,7 @@
 ./usr/share/man/man1/head.1			man-util-man		.man
 ./usr/share/man/man1/hesinfo.1			man-hesiod-man		hesiod,.man
 ./usr/share/man/man1/hexdump.1			man-util-man		.man
-./usr/share/man/man1/history.1			man-util-man		.man
+./usr/share/man/man1/history.1			man-util-man		.man,csh
 ./usr/share/man/man1/host.1			man-netutil-man		.man
 ./usr/share/man/man1/hostname.1			man-util-man		.man
 ./usr/share/man/man1/i386			man-obsolete		obsolete
@@ -2413,7 +2413,7 @@
 ./usr/share/man/man1/ipresend.1			man-ipf-man		ipfilter,.man
 ./usr/share/man/man1/ipsend.1			man-ipf-man		ipfilter,.man
 ./usr/share/man/man1/iptest.1			man-ipf-man		ipfilter,.man
-./usr/share/man/man1/jobs.1			man-util-man		.man
+./usr/share/man/man1/jobs.1			man-util-man		.man,csh
 ./usr/share/man/man1/join.1			man-util-man		.man
 ./usr/share/man/man1/jot.1			man-util-man		.man
 ./usr/share/man/man1/kdestroy.1			man-krb5-man		kerberos,.man
@@ -2437,7 +2437,7 @@
 ./usr/share/man/man1/leave.1			man-util-man		.man
 ./usr/share/man/man1/less.1			man-util-man		.man
 ./usr/share/man/man1/lesskey.1			man-util-man		.man
-./usr/share/man/man1/limit.1			man-util-man		.man
+./usr/share/man/man1/limit.1			man-util-man		.man,csh
 ./usr/share/man/man1/linkfarm.1			man-pkgutil-man		.man
 ./usr/share/man/man1/ln.1			man-util-man		.man
 ./usr/share/man/man1/locale.1			man-util-man		.man
@@ -2533,7 +2533,7 @@
 ./usr/share/man/man1/paste.1			man-util-man		.man
 ./usr/share/man/man1/patch.1			man-util-man		.man
 ./usr/share/man/man1/pathchk.1			man-util-man		.man
-./usr/share/man/man1/pawd.1			man-amd-man		.man
+./usr/share/man/man1/pawd.1			man-amd-man		amd,.man
 ./usr/share/man/man1/pax.1			man-util-man		.man
 ./usr/share/man/man1/pgrep.1			man-util-man		.man
 ./usr/share/man/man1/pim6stat.1			man-obsolete		obsolete
@@ -2546,7 +2546,7 @@
 ./usr/share/man/man1/pkill.1			man-util-man		.man
 ./usr/share/man/man1/pmap.1			man-util-man		.man
 ./usr/share/man/man1/pmc.1			man-util-man		.man
-./usr/share/man/man1/popd.1			man-util-man		.man
+./usr/share/man/man1/popd.1			man-util-man		.man,csh
 ./usr/share/man/man1/postalias.1		man-postfix-man		postfix,.man
 ./usr/share/man/man1/postcat.1			man-postfix-man		postfix,.man
 ./usr/share/man/man1/postconf.1			man-postfix-man		postfix,.man
@@ -2564,7 +2564,7 @@
 ./usr/share/man/man1/progress.1			man-util-man		.man
 ./usr/share/man/man1/ps.1			man-util-man		.man
 ./usr/share/man/man1/pstat.1			man-obsolete		obsolete
-./usr/share/man/man1/pushd.1			man-util-man		.man
+./usr/share/man/man1/pushd.1			man-util-man		.man,csh
 ./usr/share/man/man1/pwd.1			man-util-man		.man
 ./usr/share/man/man1/pwhash.1			man-util-man		.man
 ./usr/share/man/man1/qsubst.1			man-util-man		.man
@@ -2582,8 +2582,8 @@
 ./usr/share/man/man1/rcsmerge.1			man-rcs-man		.man
 ./usr/share/man/man1/rdist.1			man-netutil-man		.man
 ./usr/share/man/man1/readlink.1			man-util-man		.man
-./usr/share/man/man1/rehash.1			man-util-man		.man
-./usr/share/man/man1/repeat.1			man-util-man		.man
+./usr/share/man/man1/rehash.1			man-util-man		.man,csh
+./usr/share/man/man1/repeat.1			man-util-man		.man,csh
 ./usr/share/man/man1/reset.1			man-util-man		.man
 ./usr/share/man/man1/rev.1			man-util-man		.man
 ./usr/share/man/man1/rlog.1			man-rcs-man		.man
@@ -2625,7 +2625,7 @@
 ./usr/share/man/man1/sntp.1			man-ntp-man		.man
 ./usr/share/man/man1/sockstat.1			man-util-man		.man
 ./usr/share/man/man1/sort.1			man-util-man		.man
-./usr/share/man/man1/source.1			man-util-man		.man
+./usr/share/man/man1/source.1			man-util-man		.man,csh
 ./usr/share/man/man1/split.1			man-util-man		.man
 ./usr/share/man/man1/ssh-add.1			man-secsh-man		crypto,.man
 ./usr/share/man/man1/ssh-agent.1		man-secsh-man		crypto,.man
@@ -2633,12 +2633,12 @@
 ./usr/share/man/man1/ssh-keyscan.1		man-secsh-man		crypto,.man
 ./usr/share/man/man1/ssh.1			man-secsh-man		crypto,.man
 ./usr/share/man/man1/stat.1			man-util-man		.man
-./usr/share/man/man1/stop.1			man-util-man		.man
+./usr/share/man/man1/stop.1			man-util-man		.man,csh
 ./usr/share/man/man1/stty.1			man-util-man		.man
 ./usr/share/man/man1/su.1			man-util-man		.man
 ./usr/share/man/man1/sum.1			man-util-man		.man
 ./usr/share/man/man1/sup.1			man-sup-man		.man
-./usr/share/man/man1/suspend.1			man-util-man		.man
+./usr/share/man/man1/suspend.1			man-util-man		.man,csh
 ./usr/share/man/man1/sysstat.1			man-util-man		.man
 ./usr/share/man/man1/systat.1			man-util-man		.man
 ./usr/share/man/man1/systrace.1			man-util-man		.man
@@ -3648,7 +3648,7 @@
 ./usr/share/man/man5/acct.5			man-sys-man		.man
 ./usr/share/man/man5/aliases.5			man-sendmail-man	sendmail,.man
 ./usr/share/man/man5/altq.conf.5		man-router-man		.man
-./usr/share/man/man5/amd.conf.5			man-amd-man		.man
+./usr/share/man/man5/amd.conf.5			man-amd-man		amd,.man
 ./usr/share/man/man5/ar.5			man-sys-man		.man
 ./usr/share/man/man5/body_checks.5		man-postfix-man		postfix,.man
 ./usr/share/man/man5/bootparams.5		man-bootserver-man	.man
@@ -3848,7 +3848,7 @@
 ./usr/share/man/man8/alpha/mkbootimage.8	man-sysutil-man		.man
 ./usr/share/man/man8/alpha/setnetbootinfo.8	man-sysutil-man		.man
 ./usr/share/man/man8/altqd.8			man-router-man		.man
-./usr/share/man/man8/amd.8			man-amd-man		.man
+./usr/share/man/man8/amd.8			man-amd-man		amd,.man
 ./usr/share/man/man8/amd64/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/amd64/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/amiga/MAKEDEV.8		man-obsolete		obsolete
@@ -3857,7 +3857,7 @@
 ./usr/share/man/man8/amiga/grfconfig.8		man-sysutil-man		.man
 ./usr/share/man/man8/amiga/installboot.8	man-sysutil-man		.man
 ./usr/share/man/man8/amiga/makedev.8		man-obsolete		obsolete
-./usr/share/man/man8/amq.8			man-amd-man		.man
+./usr/share/man/man8/amq.8			man-amd-man		amd,.man
 ./usr/share/man/man8/anvil.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/apm.8			man-sysutil-man		.man
 ./usr/share/man/man8/apmd.8			man-sysutil-man		.man
@@ -3974,7 +3974,7 @@
 ./usr/share/man/man8/fasthalt.8			man-sysutil-man		.man
 ./usr/share/man/man8/fdisk.8			man-sysutil-man		.man
 ./usr/share/man/man8/fingerd.8			man-sysutil-man		.man
-./usr/share/man/man8/fixmount.8			man-sysutil-man		.man
+./usr/share/man/man8/fixmount.8			man-amd-man		amd,.man
 ./usr/share/man/man8/flush.8			man-postfix-man		postfix,.man
 ./usr/share/man/man8/fsck.8			man-sysutil-man		.man
 ./usr/share/man/man8/fsck_ext2fs.8		man-ext2fs-man		.man
@@ -3982,7 +3982,7 @@
 ./usr/share/man/man8/fsck_lfs.8			man-sysutil-man		.man
 ./usr/share/man/man8/fsck_msdos.8		man-sysutil-man		.man
 ./usr/share/man/man8/fsdb.8			man-sysutil-man		.man
-./usr/share/man/man8/fsinfo.8			man-sysutil-man		.man
+./usr/share/man/man8/fsinfo.8			man-amd-man		amd,.man
 ./usr/share/man/man8/fsirand.8			man-sysutil-man		.man
 ./usr/share/man/man8/fssconfig.8		man-sysutil-man		.man
 ./usr/share/man/man8/ftp-proxy.8		man-netutil-man		pf,.man
@@ -4001,7 +4001,7 @@
 ./usr/share/man/man8/groupmod.8			man-sysutil-man		.man
 ./usr/share/man/man8/gspa.8			man-sysutil-man		.man
 ./usr/share/man/man8/halt.8			man-sysutil-man		.man
-./usr/share/man/man8/hlfsd.8			man-amd-man		.man
+./usr/share/man/man8/hlfsd.8			man-amd-man		amd,.man
 ./usr/share/man/man8/hp300/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/hp300/boot.8		man-sys-man		.man
 ./usr/share/man/man8/hp300/crash.8		man-sys-man		.man
@@ -4121,7 +4121,7 @@
 ./usr/share/man/man8/mfs.8			man-sys-man		.man
 ./usr/share/man/man8/mipsco/MAKEDEV.8		man-obsolete		obsolete
 ./usr/share/man/man8/mipsco/makedev.8		man-obsolete		obsolete
-./usr/share/man/man8/mk-amd-map.8		man-amd-man		.man
+./usr/share/man/man8/mk-amd-map.8		man-amd-man		amd,.man
 ./usr/share/man/man8/mkalias.8			man-nis-man		yp,.man
 ./usr/share/man/man8/mknetid.8			man-nis-man		yp,.man
 ./usr/share/man/man8/mknod.8			man-sysutil-man		.man
@@ -4470,7 +4470,7 @@
 ./usr/share/man/man8/walnut/makedev.8		man-obsolete		obsolete
 ./usr/share/man/man8/wdogctl.8			man-sysutil-man		.man
 ./usr/share/man/man8/wiconfig.8			man-netutil-man		.man
-./usr/share/man/man8/wire-test.8		man-netutil-man		.man
+./usr/share/man/man8/wire-test.8		man-amd-man		amd,.man
 ./usr/share/man/man8/wizd.8			man-sysutil-man		.man
 ./usr/share/man/man8/wlanctl.8			man-netutil-man		.man
 ./usr/share/man/man8/wsconscfg.8		man-sysutil-man		.man
cvs diff: Diffing distrib/sets/lists/misc
Index: distrib/sets/lists/misc/mi
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D