Module Name: src
Committed By: mrg
Date: Sun Jul 11 06:16:57 UTC 2010
Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/man: mi
src/distrib/sets/lists/tests: mi
src/external/bsd: Makefile
src/share/mk: bsd.own.mk
src/tests/crypto/libcrypto: Makefile
src/usr.sbin/puffs: Makefile
Log Message:
ldap is configured to depend upon MKCRYPTO no, so force MKLAP=no if
MKCRYPTO=no.
don't build pkg_install, libcrypto tests or rump_smbfs if MKCRYPTO=no.
mark librumpcrypto, rump_smb, pkg_*
fix set lists as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/base/ad.mips64eb \
src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.876 -r1.877 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.545 -r1.546 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1481 -r1.1482 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1226 -r1.1227 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/Makefile
cvs rdiff -u -r1.633 -r1.634 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/puffs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.16 src/distrib/sets/lists/base/ad.mips64eb:1.17
--- src/distrib/sets/lists/base/ad.mips64eb:1.16 Tue Jun 29 05:48:13 2010
+++ src/distrib/sets/lists/base/ad.mips64eb Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.16 2010/06/29 05:48:13 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.17 2010/07/11 06:16:55 mrg Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib compat
@@ -173,8 +173,8 @@
./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic
@@ -405,8 +405,8 @@
./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/o32/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.16 src/distrib/sets/lists/base/ad.mips64el:1.17
--- src/distrib/sets/lists/base/ad.mips64el:1.16 Tue Jun 29 05:48:13 2010
+++ src/distrib/sets/lists/base/ad.mips64el Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.16 2010/06/29 05:48:13 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.17 2010/07/11 06:16:55 mrg Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib compat
@@ -173,8 +173,8 @@
./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic
@@ -405,8 +405,8 @@
./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/o32/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.91 src/distrib/sets/lists/base/md.amd64:1.92
--- src/distrib/sets/lists/base/md.amd64:1.91 Tue Jun 29 04:16:25 2010
+++ src/distrib/sets/lists/base/md.amd64 Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.91 2010/06/29 04:16:25 mrg Exp $
+# $NetBSD: md.amd64,v 1.92 2010/07/11 06:16:55 mrg Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -174,8 +174,8 @@
./usr/lib/i386/librt.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/librump.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librump.so.0.0 base-compat-shlib compat,pic
-./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/i386/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpnet.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.85 src/distrib/sets/lists/base/md.sparc64:1.86
--- src/distrib/sets/lists/base/md.sparc64:1.85 Tue Jun 29 04:43:45 2010
+++ src/distrib/sets/lists/base/md.sparc64 Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.85 2010/06/29 04:43:45 mrg Exp $
+# $NetBSD: md.sparc64,v 1.86 2010/07/11 06:16:55 mrg Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -68,12 +68,12 @@
./usr/lib/sparc/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic
./usr/lib/sparc/libcrypt.so.1.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libcrypto.so.6 base-compat-shlib compat,pic
-./usr/lib/sparc/libcrypto.so.6.1 base-compat-shlib compat,pic
+./usr/lib/sparc/libcrypto.so.6 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libcrypto.so.6.1 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libcurses.so.7 base-compat-shlib compat,pic
./usr/lib/sparc/libcurses.so.7.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libdes.so.8 base-compat-shlib compat,pic
-./usr/lib/sparc/libdes.so.8.1 base-compat-shlib compat,pic
+./usr/lib/sparc/libdes.so.8 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libdes.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libdns.so.5 base-compat-shlib compat,pic
./usr/lib/sparc/libdns.so.5.1 base-compat-shlib compat,pic
./usr/lib/sparc/libedit.so.3 base-compat-shlib compat,pic
@@ -130,8 +130,8 @@
./usr/lib/sparc/libmagic.so.3.0 base-compat-shlib compat,pic
./usr/lib/sparc/libmenu.so.6 base-compat-shlib compat,pic
./usr/lib/sparc/libmenu.so.6.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libnetpgp.so.3 base-compat-shlib compat,pic
-./usr/lib/sparc/libnetpgp.so.3.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libnetpgp.so.3 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libnetpgp.so.3.0 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libobjc.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/libobjc.so.3.0 base-compat-shlib compat,pic
./usr/lib/sparc/libopcodes.so.4 base-compat-shlib compat,pic,binutils
@@ -170,8 +170,8 @@
./usr/lib/sparc/librt.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/librump.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librump.so.0.0 base-compat-shlib compat,pic
-./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic
-./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic
+./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpnet.so.0 base-compat-shlib compat,pic
@@ -186,10 +186,10 @@
./usr/lib/sparc/libsl.so.4.0 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libss.so.6 base-compat-shlib compat,pic,kerberos
./usr/lib/sparc/libss.so.6.0 base-compat-shlib compat,pic,kerberos
-./usr/lib/sparc/libssh.so.15 base-compat-shlib compat,pic
-./usr/lib/sparc/libssh.so.15.0 base-compat-shlib compat,pic
-./usr/lib/sparc/libssl.so.8 base-compat-shlib compat,pic
-./usr/lib/sparc/libssl.so.8.1 base-compat-shlib compat,pic
+./usr/lib/sparc/libssh.so.15 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libssh.so.15.0 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libssl.so.8 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libssl.so.8.1 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libstdc++.so.7 base-compat-shlib compat,pic
./usr/lib/sparc/libstdc++.so.7.0 base-compat-shlib compat,pic
./usr/lib/sparc/libsupc++.so.1 base-obsolete obsolete
@@ -231,7 +231,7 @@
./usr/lib/sparc/security/pam_securetty.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/security/pam_self.so.3 base-compat-shlib compat,pic
./usr/lib/sparc/security/pam_skey.so.3 base-compat-shlib compat,pic
-./usr/lib/sparc/security/pam_ssh.so.3 base-compat-shlib compat,pic
+./usr/lib/sparc/security/pam_ssh.so.3 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/security/pam_unix.so.3 base-compat-shlib compat,pic
./usr/lkm/compat_netbsd32.o base-obsolete obsolete
./usr/lkm/compat_sunos32.o base-obsolete obsolete
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.876 src/distrib/sets/lists/base/mi:1.877
--- src/distrib/sets/lists/base/mi:1.876 Thu Jul 8 22:01:34 2010
+++ src/distrib/sets/lists/base/mi Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.876 2010/07/08 22:01:34 tron Exp $
+# $NetBSD: mi,v 1.877 2010/07/11 06:16:55 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1069,13 +1069,13 @@
./usr/sbin/amd base-amd-bin
./usr/sbin/amq base-amd-bin
./usr/sbin/arp base-netutil-bin
-./usr/sbin/audit-packages base-pkgutil-bin
+./usr/sbin/audit-packages base-pkgutil-bin crypto
./usr/sbin/authpf base-pf-bin pf
./usr/sbin/bootpd base-bootserver-bin
./usr/sbin/bootpef base-bootserver-bin
./usr/sbin/bootpgw base-bootserver-bin
./usr/sbin/bootptest base-bootserver-bin
-./usr/sbin/bpm base-pkgutil-bin
+./usr/sbin/bpm base-pkgutil-bin crypto
./usr/sbin/btattach base-sysutil-bin
./usr/sbin/btconfig base-sysutil-bin
./usr/sbin/btcontrol base-obsolete obsolete
@@ -1108,7 +1108,7 @@
./usr/sbin/dnssec-signkey base-obsolete obsolete
./usr/sbin/dnssec-settime base-bind-bin
./usr/sbin/dnssec-signzone base-bind-bin
-./usr/sbin/download-vulnerability-list base-pkgutil-bin
+./usr/sbin/download-vulnerability-list base-pkgutil-bin crypto
./usr/sbin/dtmfdecode base-isdn-bin
./usr/sbin/dtrace base-debug-bin dtrace
./usr/sbin/dumpfs base-sysutil-bin
@@ -1258,11 +1258,11 @@
./usr/sbin/pim6dd base-obsolete obsolete
./usr/sbin/pim6sd base-obsolete obsolete
./usr/sbin/pim6stat base-obsolete obsolete
-./usr/sbin/pkg_add base-pkgutil-bin
-./usr/sbin/pkg_admin base-pkgutil-bin
-./usr/sbin/pkg_create base-pkgutil-bin
-./usr/sbin/pkg_delete base-pkgutil-bin
-./usr/sbin/pkg_info base-pkgutil-bin
+./usr/sbin/pkg_add base-pkgutil-bin crypto
+./usr/sbin/pkg_admin base-pkgutil-bin crypto
+./usr/sbin/pkg_create base-pkgutil-bin crypto
+./usr/sbin/pkg_delete base-pkgutil-bin crypto
+./usr/sbin/pkg_info base-pkgutil-bin crypto
./usr/sbin/pkg_view base-obsolete obsolete
./usr/sbin/portmap base-obsolete obsolete
./usr/sbin/postalias base-postfix-bin postfix
@@ -1324,7 +1324,7 @@
./usr/sbin/rump_msdos base-puffs-bin
./usr/sbin/rump_nfs base-puffs-bin
./usr/sbin/rump_ntfs base-puffs-bin
-./usr/sbin/rump_smbfs base-puffs-bin
+./usr/sbin/rump_smbfs base-puffs-bin crypto
./usr/sbin/rump_syspuffs base-puffs-bin
./usr/sbin/rump_sysvbfs base-puffs-bin
./usr/sbin/rump_tmpfs base-puffs-bin
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.545 src/distrib/sets/lists/base/shl.mi:1.546
--- src/distrib/sets/lists/base/shl.mi:1.545 Fri Jul 2 08:09:58 2010
+++ src/distrib/sets/lists/base/shl.mi Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.545 2010/07/02 08:09:58 mrg Exp $
+# $NetBSD: shl.mi,v 1.546 2010/07/11 06:16:55 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -360,9 +360,9 @@
./usr/lib/librump.so base-rump-shlib
./usr/lib/librump.so.0 base-rump-shlib
./usr/lib/librump.so.0.0 base-rump-shlib
-./usr/lib/librumpcrypto.so base-rump-shlib
-./usr/lib/librumpcrypto.so.0 base-rump-shlib
-./usr/lib/librumpcrypto.so.0.0 base-rump-shlib
+./usr/lib/librumpcrypto.so base-rump-shlib crypto
+./usr/lib/librumpcrypto.so.0 base-rump-shlib crypto
+./usr/lib/librumpcrypto.so.0.0 base-rump-shlib crypto
./usr/lib/librumpdev.so base-rump-shlib
./usr/lib/librumpdev.so.0 base-rump-shlib
./usr/lib/librumpdev.so.0.0 base-rump-shlib
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.6 src/distrib/sets/lists/comp/ad.mips64eb:1.7
--- src/distrib/sets/lists/comp/ad.mips64eb:1.6 Tue Jun 29 05:48:13 2010
+++ src/distrib/sets/lists/comp/ad.mips64eb Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.6 2010/06/29 05:48:13 mrg Exp $
+# $NetBSD: ad.mips64eb,v 1.7 2010/07/11 06:16:55 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -435,10 +435,10 @@
./usr/lib/64/librump.so base-sys-shlib compat,pic
./usr/lib/64/librump_p.a comp-c-proflib compat,profile
./usr/lib/64/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/64/librumpcrypto.a comp-c-lib compat
-./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic
-./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/64/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/64/librumpdev.a comp-c-lib compat
./usr/lib/64/librumpdev.so base-sys-shlib compat,pic
./usr/lib/64/librumpdev_p.a comp-c-proflib compat,profile
@@ -896,10 +896,10 @@
./usr/lib/o32/librump.so base-sys-shlib compat,pic
./usr/lib/o32/librump_p.a comp-c-proflib compat,profile
./usr/lib/o32/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/o32/librumpcrypto.a comp-c-lib compat
-./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic
-./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/o32/librumpdev.a comp-c-lib compat
./usr/lib/o32/librumpdev.so base-sys-shlib compat,pic
./usr/lib/o32/librumpdev_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.6 src/distrib/sets/lists/comp/ad.mips64el:1.7
--- src/distrib/sets/lists/comp/ad.mips64el:1.6 Tue Jun 29 05:48:13 2010
+++ src/distrib/sets/lists/comp/ad.mips64el Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.6 2010/06/29 05:48:13 mrg Exp $
+# $NetBSD: ad.mips64el,v 1.7 2010/07/11 06:16:55 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -435,10 +435,10 @@
./usr/lib/64/librump.so base-sys-shlib compat,pic
./usr/lib/64/librump_p.a comp-c-proflib compat,profile
./usr/lib/64/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/64/librumpcrypto.a comp-c-lib compat
-./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic
-./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/64/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/64/librumpdev.a comp-c-lib compat
./usr/lib/64/librumpdev.so base-sys-shlib compat,pic
./usr/lib/64/librumpdev_p.a comp-c-proflib compat,profile
@@ -896,10 +896,10 @@
./usr/lib/o32/librump.so base-sys-shlib compat,pic
./usr/lib/o32/librump_p.a comp-c-proflib compat,profile
./usr/lib/o32/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/o32/librumpcrypto.a comp-c-lib compat
-./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic
-./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/o32/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/o32/librumpdev.a comp-c-lib compat
./usr/lib/o32/librumpdev.so base-sys-shlib compat,pic
./usr/lib/o32/librumpdev_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.70 src/distrib/sets/lists/comp/md.amd64:1.71
--- src/distrib/sets/lists/comp/md.amd64:1.70 Wed Jul 7 00:10:14 2010
+++ src/distrib/sets/lists/comp/md.amd64 Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.70 2010/07/07 00:10:14 njoly Exp $
+# $NetBSD: md.amd64,v 1.71 2010/07/11 06:16:55 mrg Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -704,11 +704,11 @@
./usr/lib/i386/librump_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/librump_p.a comp-c-proflib compat,profile
./usr/lib/i386/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/i386/librumpcrypto.a comp-c-lib compat
-./usr/lib/i386/librumpcrypto.so comp-sys-shlib compat,pic
-./usr/lib/i386/librumpcrypto_g.a comp-c-proflib compat,debuglib
-./usr/lib/i386/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/i386/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/i386/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/i386/librumpcrypto.so comp-sys-shlib compat,pic,crypto
+./usr/lib/i386/librumpcrypto_g.a comp-c-proflib compat,debuglib,crypto
+./usr/lib/i386/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/i386/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/i386/librumpdev.a comp-c-lib compat
./usr/lib/i386/librumpdev.so comp-sys-shlib compat,pic
./usr/lib/i386/librumpdev_g.a comp-c-proflib compat,debuglib
@@ -903,7 +903,7 @@
./usr/libdata/debug/usr/lib/i386/librpcsvc.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librt.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librump.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug,crypto
./usr/libdata/debug/usr/lib/i386/librumpdev.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librumpnet.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librumpuser.so.0.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.59 src/distrib/sets/lists/comp/md.sparc64:1.60
--- src/distrib/sets/lists/comp/md.sparc64:1.59 Tue Jun 29 04:43:45 2010
+++ src/distrib/sets/lists/comp/md.sparc64 Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.59 2010/06/29 04:43:45 mrg Exp $
+# $NetBSD: md.sparc64,v 1.60 2010/07/11 06:16:55 mrg Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -278,24 +278,24 @@
./usr/lib/sparc/libcrypt.so base-sys-shlib compat,pic
./usr/lib/sparc/libcrypt_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libcrypt_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/libcrypto.a comp-c-lib compat
-./usr/lib/sparc/libcrypto.so base-sys-shlib compat,pic
+./usr/lib/sparc/libcrypto.a comp-c-lib compat,crypto
+./usr/lib/sparc/libcrypto.so base-sys-shlib compat,pic,crypto
./usr/lib/sparc/libcrypto_idea.a comp-c-lib crypto_idea,compat
./usr/lib/sparc/libcrypto_idea_p.a comp-c-proflib crypto_idea,compat,profile
./usr/lib/sparc/libcrypto_mdc2.a comp-c-lib crypto_mdc2,compat
./usr/lib/sparc/libcrypto_mdc2_p.a comp-c-proflib crypto_mdc2,compat,profile
-./usr/lib/sparc/libcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libcrypto_rc5.a comp-c-lib crypto_rc5,compat
./usr/lib/sparc/libcrypto_rc5_p.a comp-c-proflib crypto_rc5,compat,profile
./usr/lib/sparc/libcurses.a comp-c-lib compat
./usr/lib/sparc/libcurses.so base-sys-shlib compat,pic
./usr/lib/sparc/libcurses_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libcurses_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/libdes.a comp-c-lib compat
-./usr/lib/sparc/libdes.so base-sys-shlib compat,pic
-./usr/lib/sparc/libdes_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libdes_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libdes.a comp-c-lib compat,crypto
+./usr/lib/sparc/libdes.so base-sys-shlib compat,pic,crypto
+./usr/lib/sparc/libdes_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libdes_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libdns.a comp-c-lib compat
./usr/lib/sparc/libdns.so base-sys-shlib compat,pic
./usr/lib/sparc/libdns_p.a comp-c-proflib compat,profile
@@ -425,10 +425,10 @@
./usr/lib/sparc/libmenu.so base-sys-shlib compat,pic
./usr/lib/sparc/libmenu_p.a comp-c-proflib compat,profile
./usr/lib/sparc/libmenu_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/libnetpgp.a comp-c-lib compat
-./usr/lib/sparc/libnetpgp.so comp-sys-shlib compat,pic
-./usr/lib/sparc/libnetpgp_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libnetpgp_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libnetpgp.a comp-c-lib compat,crypto
+./usr/lib/sparc/libnetpgp.so comp-sys-shlib compat,pic,crypto
+./usr/lib/sparc/libnetpgp_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libnetpgp_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libobjc.a comp-c-lib compat
./usr/lib/sparc/libobjc.so base-sys-shlib compat,pic
./usr/lib/sparc/libobjc_p.a comp-c-proflib compat,profile
@@ -508,10 +508,10 @@
./usr/lib/sparc/librump.so base-sys-shlib compat,pic
./usr/lib/sparc/librump_p.a comp-c-proflib compat,profile
./usr/lib/sparc/librump_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/librumpcrypto.a comp-c-lib compat
-./usr/lib/sparc/librumpcrypto.so base-sys-shlib compat,pic
-./usr/lib/sparc/librumpcrypto_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/librumpcrypto_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/librumpcrypto.a comp-c-lib compat,crypto
+./usr/lib/sparc/librumpcrypto.so base-sys-shlib compat,pic,crypto
+./usr/lib/sparc/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/librumpdev.a comp-c-lib compat
./usr/lib/sparc/librumpdev.so base-sys-shlib compat,pic
./usr/lib/sparc/librumpdev_p.a comp-c-proflib compat,profile
@@ -544,14 +544,14 @@
./usr/lib/sparc/libss.so base-sys-shlib compat,pic,kerberos
./usr/lib/sparc/libss_p.a comp-c-proflib compat,profile,kerberos
./usr/lib/sparc/libss_pic.a comp-c-piclib compat,pic,kerberos
-./usr/lib/sparc/libssh.a comp-c-lib compat
-./usr/lib/sparc/libssh.so base-sys-shlib compat,pic
-./usr/lib/sparc/libssh_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libssh_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/libssl.a comp-c-lib compat
-./usr/lib/sparc/libssl.so base-sys-shlib compat,pic
-./usr/lib/sparc/libssl_p.a comp-c-proflib compat,profile
-./usr/lib/sparc/libssl_pic.a comp-c-piclib compat,pic
+./usr/lib/sparc/libssh.a comp-c-lib compat,crypto
+./usr/lib/sparc/libssh.so base-sys-shlib compat,pic,crypto
+./usr/lib/sparc/libssh_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libssh_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/sparc/libssl.a comp-c-lib compat,crypto
+./usr/lib/sparc/libssl.so base-sys-shlib compat,pic,crypto
+./usr/lib/sparc/libssl_p.a comp-c-proflib compat,profile,crypto
+./usr/lib/sparc/libssl_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libstdc++.a comp-c-lib compat,cxx
./usr/lib/sparc/libstdc++.so base-sys-shlib compat,pic,cxx
./usr/lib/sparc/libstdc++_p.a comp-c-proflib compat,profile,cxx
@@ -622,7 +622,7 @@
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_serial.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_std.so.5.0.debug comp-i18n-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/i18n/libmapper_zone.so.5.0.debug comp-i18n-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libasn1.so.8.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libasn1.so.8.0.debug comp-compat-shlib compat,pic,debug,kerberos
./usr/libdata/debug/usr/lib/sparc/libbfd.so.11.0.debug comp-compat-shlib compat,pic,binutils,debug
./usr/libdata/debug/usr/lib/sparc/libbind9.so.5.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libbluetooth.so.4.2.debug comp-compat-shlib compat,pic,debug
@@ -631,9 +631,9 @@
./usr/libdata/debug/usr/lib/sparc/libc.so.12.173.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libcom_err.so.6.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libcrypto.so.6.1.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libcrypto.so.6.1.debug comp-compat-shlib compat,pic,debug,crypto
./usr/libdata/debug/usr/lib/sparc/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libdes.so.8.1.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libdes.so.8.1.debug comp-compat-shlib compat,pic,debug,crypto
./usr/libdata/debug/usr/lib/sparc/libdns.so.5.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libedit.so.3.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libevent.so.3.2.debug comp-compat-shlib compat,pic,debug
@@ -682,7 +682,7 @@
./usr/libdata/debug/usr/lib/sparc/librpcsvc.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librt.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librump.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug,crypto
./usr/libdata/debug/usr/lib/sparc/librumpdev.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librumpnet.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librumpuser.so.0.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1481 src/distrib/sets/lists/comp/mi:1.1482
--- src/distrib/sets/lists/comp/mi:1.1481 Thu Jul 8 19:20:27 2010
+++ src/distrib/sets/lists/comp/mi Sun Jul 11 06:16:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1481 2010/07/08 19:20:27 rmind Exp $
+# $NetBSD: mi,v 1.1482 2010/07/11 06:16:55 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2582,9 +2582,9 @@
./usr/lib/librump.a comp-c-lib
./usr/lib/librump_g.a -unknown- debuglib
./usr/lib/librump_p.a comp-c-proflib profile
-./usr/lib/librumpcrypto.a comp-c-lib
-./usr/lib/librumpcrypto_g.a -unknown- debuglib
-./usr/lib/librumpcrypto_p.a comp-c-proflib profile
+./usr/lib/librumpcrypto.a comp-c-lib crypto
+./usr/lib/librumpcrypto_g.a -unknown- debuglib,crypto
+./usr/lib/librumpcrypto_p.a comp-c-proflib profile,crypto
./usr/lib/librumpdev.a comp-c-lib
./usr/lib/librumpdev_g.a -unknown- debuglib
./usr/lib/librumpdev_p.a comp-c-proflib profile
@@ -3633,11 +3633,11 @@
./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug
-./usr/libdata/debug/usr/sbin/pkg_admin.debug comp-pkgutil-debug debug
-./usr/libdata/debug/usr/sbin/pkg_create.debug comp-pkgutil-debug debug
-./usr/libdata/debug/usr/sbin/pkg_delete.debug comp-pkgutil-debug debug
-./usr/libdata/debug/usr/sbin/pkg_info.debug comp-pkgutil-debug debug
+./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug,crypto
+./usr/libdata/debug/usr/sbin/pkg_admin.debug comp-pkgutil-debug debug,crypto
+./usr/libdata/debug/usr/sbin/pkg_create.debug comp-pkgutil-debug debug,crypto
+./usr/libdata/debug/usr/sbin/pkg_delete.debug comp-pkgutil-debug debug,crypto
+./usr/libdata/debug/usr/sbin/pkg_info.debug comp-pkgutil-debug debug,crypto
./usr/libdata/debug/usr/sbin/postalias.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postcat.debug comp-postfix-debug postfix,debug
./usr/libdata/debug/usr/sbin/postconf.debug comp-postfix-debug postfix,debug
@@ -3692,7 +3692,7 @@
./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/rump_nfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-puffs-debug debug
-./usr/libdata/debug/usr/sbin/rump_smbfs.debug comp-puffs-debug debug
+./usr/libdata/debug/usr/sbin/rump_smbfs.debug comp-puffs-debug crypto,debug
./usr/libdata/debug/usr/sbin/rump_syspuffs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/rump_sysvbfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/rump_tmpfs.debug comp-puffs-debug debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.126 src/distrib/sets/lists/comp/shl.mi:1.127
--- src/distrib/sets/lists/comp/shl.mi:1.126 Fri Jul 2 07:43:36 2010
+++ src/distrib/sets/lists/comp/shl.mi Sun Jul 11 06:16:56 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.126 2010/07/02 07:43:36 mrg Exp $
+# $NetBSD: shl.mi,v 1.127 2010/07/11 06:16:56 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -92,7 +92,7 @@
./usr/lib/librpcsvc_pic.a comp-c-piclib
./usr/lib/librt_pic.a comp-c-piclib
./usr/lib/librump_pic.a comp-c-piclib
-./usr/lib/librumpcrypto_pic.a comp-c-piclib
+./usr/lib/librumpcrypto_pic.a comp-c-piclib crypto
./usr/lib/librumpdev_audio_pic.a comp-c-piclib
./usr/lib/librumpdev_bpf_pic.a comp-c-piclib
./usr/lib/librumpdev_cgd_pic.a comp-c-piclib
@@ -270,7 +270,7 @@
./usr/libdata/debug/usr/lib/librpcsvc.so.1.0.debug comp-net-debug debug
./usr/libdata/debug/usr/lib/librt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/librump.so.0.0.debug comp-rump-debug debug
-./usr/libdata/debug/usr/lib/librumpcrypto.so.0.0.debug comp-rump-debug debug
+./usr/libdata/debug/usr/lib/librumpcrypto.so.0.0.debug comp-rump-debug debug,crypto
./usr/libdata/debug/usr/lib/librumpdev.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpdev_audio.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpdev_bpf.so.0.0.debug comp-rump-debug debug
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1226 src/distrib/sets/lists/man/mi:1.1227
--- src/distrib/sets/lists/man/mi:1.1226 Thu Jul 8 21:43:58 2010
+++ src/distrib/sets/lists/man/mi Sun Jul 11 06:16:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1226 2010/07/08 21:43:58 tron Exp $
+# $NetBSD: mi,v 1.1227 2010/07/11 06:16:57 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -75,7 +75,7 @@
./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/biff.0 man-mail-catman .cat
-./usr/share/man/cat1/bpm.0 man-pkgutil-catman .cat
+./usr/share/man/cat1/bpm.0 man-pkgutil-catman crypto,.cat
./usr/share/man/cat1/bthset.0 man-util-catman .cat
./usr/share/man/cat1/btkey.0 man-util-catman .cat
./usr/share/man/cat1/btpin.0 man-util-catman .cat
@@ -378,11 +378,11 @@
./usr/share/man/cat1/pgrep.0 man-util-catman .cat
./usr/share/man/cat1/pigz.0 man-util-catman .cat
./usr/share/man/cat1/pim6stat.0 man-obsolete obsolete
-./usr/share/man/cat1/pkg_add.0 man-pkgutil-catman .cat
-./usr/share/man/cat1/pkg_admin.0 man-pkgutil-catman .cat
-./usr/share/man/cat1/pkg_create.0 man-pkgutil-catman .cat
-./usr/share/man/cat1/pkg_delete.0 man-pkgutil-catman .cat
-./usr/share/man/cat1/pkg_info.0 man-pkgutil-catman .cat
+./usr/share/man/cat1/pkg_add.0 man-pkgutil-catman crypto,.cat
+./usr/share/man/cat1/pkg_admin.0 man-pkgutil-catman crypto,.cat
+./usr/share/man/cat1/pkg_create.0 man-pkgutil-catman crypto,.cat
+./usr/share/man/cat1/pkg_delete.0 man-pkgutil-catman crypto,.cat
+./usr/share/man/cat1/pkg_info.0 man-pkgutil-catman crypto,.cat
./usr/share/man/cat1/pkg_view.0 man-obsolete obsolete
./usr/share/man/cat1/pkill.0 man-util-catman .cat
./usr/share/man/cat1/pmap.0 man-util-catman .cat
@@ -1871,8 +1871,8 @@
./usr/share/man/cat5/phones.0 man-sys-man .cat
./usr/share/man/cat5/pim6dd.conf.0 man-obsolete obsolete
./usr/share/man/cat5/pim6sd.conf.0 man-obsolete obsolete
-./usr/share/man/cat5/pkg_install.conf.0 man-pkgutil-catman .cat
-./usr/share/man/cat5/pkg_summary.0 man-pkgutil-catman .cat
+./usr/share/man/cat5/pkg_install.conf.0 man-pkgutil-catman crypto,.cat
+./usr/share/man/cat5/pkg_summary.0 man-pkgutil-catman crypto,.cat
./usr/share/man/cat5/postconf.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/postfix-wrapper.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/primes.0 man-obsolete obsolete
@@ -2582,7 +2582,7 @@
./usr/share/man/cat8/rump_msdos.0 man-puffs-catman .cat
./usr/share/man/cat8/rump_nfs.0 man-puffs-catman .cat
./usr/share/man/cat8/rump_ntfs.0 man-puffs-catman .cat
-./usr/share/man/cat8/rump_smbfs.0 man-puffs-catman .cat
+./usr/share/man/cat8/rump_smbfs.0 man-puffs-catman crypto,.cat
./usr/share/man/cat8/rump_syspuffs.0 man-puffs-catman .cat
./usr/share/man/cat8/rump_sysvbfs.0 man-puffs-catman .cat
./usr/share/man/cat8/rump_tmpfs.0 man-puffs-catman .cat
@@ -2829,7 +2829,7 @@
./usr/share/man/html1/bdes.html man-crypto-htmlman crypto,html
./usr/share/man/html1/bg.html man-util-htmlman html
./usr/share/man/html1/biff.html man-mail-htmlman html
-./usr/share/man/html1/bpm.html man-pkgutil-htmlman html
+./usr/share/man/html1/bpm.html man-pkgutil-htmlman crypto,html
./usr/share/man/html1/bthset.html man-util-htmlman html
./usr/share/man/html1/btkey.html man-util-htmlman html
./usr/share/man/html1/btpin.html man-util-htmlman html
@@ -3114,11 +3114,11 @@
./usr/share/man/html1/pcpp.html man-util-htmlman pcccmds,html
./usr/share/man/html1/pgrep.html man-util-htmlman html
./usr/share/man/html1/pigz.html man-util-htmlman html
-./usr/share/man/html1/pkg_add.html man-pkgutil-htmlman html
-./usr/share/man/html1/pkg_admin.html man-pkgutil-htmlman html
-./usr/share/man/html1/pkg_create.html man-pkgutil-htmlman html
-./usr/share/man/html1/pkg_delete.html man-pkgutil-htmlman html
-./usr/share/man/html1/pkg_info.html man-pkgutil-htmlman html
+./usr/share/man/html1/pkg_add.html man-pkgutil-htmlman crypto,html
+./usr/share/man/html1/pkg_admin.html man-pkgutil-htmlman crypto,html
+./usr/share/man/html1/pkg_create.html man-pkgutil-htmlman crypto,html
+./usr/share/man/html1/pkg_delete.html man-pkgutil-htmlman crypto,html
+./usr/share/man/html1/pkg_info.html man-pkgutil-htmlman crypto,html
./usr/share/man/html1/pkg_view.html man-obsolete obsolete
./usr/share/man/html1/pkill.html man-util-htmlman html
./usr/share/man/html1/pmap.html man-util-htmlman html
@@ -4452,8 +4452,8 @@
./usr/share/man/html5/pf.conf.html man-pf-htmlman pf,html
./usr/share/man/html5/pf.os.html man-pf-htmlman pf,html
./usr/share/man/html5/phones.html man-sys-man html
-./usr/share/man/html5/pkg_install.conf.html man-pkgutil-htmlman html
-./usr/share/man/html5/pkg_summary.html man-pkgutil-htmlman html
+./usr/share/man/html5/pkg_install.conf.html man-pkgutil-htmlman crypto,html
+./usr/share/man/html5/pkg_summary.html man-pkgutil-htmlman crypto,html
./usr/share/man/html5/postconf.html man-postfix-htmlman postfix,html
./usr/share/man/html5/postfix-wrapper.html man-postfix-htmlman postfix,html
./usr/share/man/html5/printcap.html man-lpr-htmlman html
@@ -5005,7 +5005,7 @@
./usr/share/man/html8/rump_msdos.html man-puffs-htmlman html
./usr/share/man/html8/rump_nfs.html man-puffs-htmlman html
./usr/share/man/html8/rump_ntfs.html man-puffs-htmlman html
-./usr/share/man/html8/rump_smbfs.html man-puffs-htmlman html
+./usr/share/man/html8/rump_smbfs.html man-puffs-htmlman crypto,html
./usr/share/man/html8/rump_syspuffs.html man-puffs-htmlman html
./usr/share/man/html8/rump_sysvbfs.html man-puffs-htmlman html
./usr/share/man/html8/rump_tmpfs.html man-puffs-htmlman html
@@ -5199,7 +5199,7 @@
./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/biff.1 man-mail-man .man
-./usr/share/man/man1/bpm.1 man-pkgutil-man .man
+./usr/share/man/man1/bpm.1 man-pkgutil-man crypto,.man
./usr/share/man/man1/bthset.1 man-util-man .man
./usr/share/man/man1/btkey.1 man-util-man .man
./usr/share/man/man1/btpin.1 man-util-man .man
@@ -5502,11 +5502,11 @@
./usr/share/man/man1/pgrep.1 man-util-man .man
./usr/share/man/man1/pigz.1 man-util-man .man
./usr/share/man/man1/pim6stat.1 man-obsolete obsolete
-./usr/share/man/man1/pkg_add.1 man-pkgutil-man .man
-./usr/share/man/man1/pkg_admin.1 man-pkgutil-man .man
-./usr/share/man/man1/pkg_create.1 man-pkgutil-man .man
-./usr/share/man/man1/pkg_delete.1 man-pkgutil-man .man
-./usr/share/man/man1/pkg_info.1 man-pkgutil-man .man
+./usr/share/man/man1/pkg_add.1 man-pkgutil-man crypto,.man
+./usr/share/man/man1/pkg_admin.1 man-pkgutil-man crypto,.man
+./usr/share/man/man1/pkg_create.1 man-pkgutil-man crypto,.man
+./usr/share/man/man1/pkg_delete.1 man-pkgutil-man crypto,.man
+./usr/share/man/man1/pkg_info.1 man-pkgutil-man crypto,.man
./usr/share/man/man1/pkg_view.1 man-obsolete obsolete
./usr/share/man/man1/pkill.1 man-util-man .man
./usr/share/man/man1/pmap.1 man-util-man .man
@@ -6995,8 +6995,8 @@
./usr/share/man/man5/phones.5 man-sys-man .man
./usr/share/man/man5/pim6dd.conf.5 man-obsolete obsolete
./usr/share/man/man5/pim6sd.conf.5 man-obsolete obsolete
-./usr/share/man/man5/pkg_install.conf.5 man-pkgutil-man .man
-./usr/share/man/man5/pkg_summary.5 man-pkgutil-man .man
+./usr/share/man/man5/pkg_install.conf.5 man-pkgutil-man crypto,.man
+./usr/share/man/man5/pkg_summary.5 man-pkgutil-man .crypto,man
./usr/share/man/man5/postconf.5 man-postfix-man postfix,.man
./usr/share/man/man5/postfix-wrapper.5 man-postfix-man postfix,.man
./usr/share/man/man5/primes.5 man-obsolete obsolete
@@ -7706,7 +7706,7 @@
./usr/share/man/man8/rump_msdos.8 man-puffs-man .man
./usr/share/man/man8/rump_nfs.8 man-puffs-man .man
./usr/share/man/man8/rump_ntfs.8 man-puffs-man .man
-./usr/share/man/man8/rump_smbfs.8 man-puffs-man .man
+./usr/share/man/man8/rump_smbfs.8 man-puffs-man crypto,.man
./usr/share/man/man8/rump_syspuffs.8 man-puffs-man .man
./usr/share/man/man8/rump_sysvbfs.8 man-puffs-man .man
./usr/share/man/man8/rump_tmpfs.8 man-puffs-man .man
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.103 src/distrib/sets/lists/tests/mi:1.104
--- src/distrib/sets/lists/tests/mi:1.103 Sat Jul 10 17:29:12 2010
+++ src/distrib/sets/lists/tests/mi Sun Jul 11 06:16:57 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.103 2010/07/10 17:29:12 jmmv Exp $
+# $NetBSD: mi,v 1.104 2010/07/11 06:16:57 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -154,36 +154,36 @@
./usr/libdata/debug/usr/tests/atf/units/t_utils.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/crypto tests-crypto-debug
./usr/libdata/debug/usr/tests/crypto/libcrypto tests-crypto-debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_bftest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_bntest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_casttest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_conftest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_destest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_dhtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_divtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_dsatest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdhtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdsatest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ectest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_exptest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto_idea
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md5test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto_mdc2
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_randtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc2test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc4test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc5test.debug tests-crypto-debug debug,crypto_rc5
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ripemdtest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rsatest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_sha1test.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_shatest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_threadstest.debug tests-crypto-debug debug
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_x509v3test.debug tests-crypto-debug debug
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_bftest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_bntest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_casttest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_conftest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_destest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_dhtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_divtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_dsatest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdhtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdsatest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ectest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_exptest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto_idea,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md5test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto_mdc2,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_randtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc2test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc4test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc5test.debug tests-crypto-debug debug,crypto_rc5,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ripemdtest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rsatest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_sha1test.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_shatest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_threadstest.debug tests-crypto-debug debug,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_x509v3test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/fs tests-fs-debug
./usr/libdata/debug/usr/tests/fs/ffs tests-fs-debug
./usr/libdata/debug/usr/tests/fs/ffs/t_fifos.debug tests-fs-debug debug,atf
@@ -820,46 +820,46 @@
./usr/tests/crypto tests-crypto-tests
./usr/tests/crypto/Atffile tests-crypto-tests
./usr/tests/crypto/libcrypto tests-crypto-tests
-./usr/tests/crypto/libcrypto/Atffile tests-crypto-tests
-./usr/tests/crypto/libcrypto/d_conf.out tests-crypto-tests
-./usr/tests/crypto/libcrypto/d_conf_ssleay.cnf tests-crypto-tests
-./usr/tests/crypto/libcrypto/d_client.pem tests-crypto-tests
-./usr/tests/crypto/libcrypto/d_server.pem tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_bftest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_bntest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_casttest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_conftest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_destest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_dhtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_divtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_dsatest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_ecdhtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_ecdsatest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_ectest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_enginetest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_exptest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_hmactest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto_idea
-./usr/tests/crypto/libcrypto/h_lhashtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_md2test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_md4test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_md5test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto_mdc2
-./usr/tests/crypto/libcrypto/h_randtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_rc2test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_rc4test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_rc5test tests-crypto-tests crypto_rc5
-./usr/tests/crypto/libcrypto/h_ripemdtest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_rsatest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_sha1test tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_shatest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_threadstest tests-crypto-tests
-./usr/tests/crypto/libcrypto/h_x509v3test tests-crypto-tests
-./usr/tests/crypto/libcrypto/t_certs tests-crypto-tests
-./usr/tests/crypto/libcrypto/t_ciphers tests-crypto-tests
-./usr/tests/crypto/libcrypto/t_hashes tests-crypto-tests
-./usr/tests/crypto/libcrypto/t_libcrypto tests-crypto-tests
-./usr/tests/crypto/libcrypto/t_pubkey tests-crypto-tests
+./usr/tests/crypto/libcrypto/Atffile tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/d_conf.out tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/d_conf_ssleay.cnf tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/d_client.pem tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/d_server.pem tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_bftest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_bntest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_casttest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_conftest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_destest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_dhtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_divtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_dsatest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_ecdhtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_ecdsatest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_ectest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_enginetest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_exptest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_hmactest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto_idea,crypto
+./usr/tests/crypto/libcrypto/h_lhashtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_md2test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_md4test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_md5test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto_mdc2,crypto
+./usr/tests/crypto/libcrypto/h_randtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_rc2test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_rc4test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_rc5test tests-crypto-tests crypto_rc5,crypto
+./usr/tests/crypto/libcrypto/h_ripemdtest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_rsatest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_sha1test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_shatest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_threadstest tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/h_x509v3test tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/t_certs tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/t_ciphers tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/t_hashes tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/t_libcrypto tests-crypto-tests crypto
+./usr/tests/crypto/libcrypto/t_pubkey tests-crypto-tests crypto
./usr/tests/fs tests-fs-tests
./usr/tests/fs/Atffile tests-fs-tests atf
./usr/tests/fs/h_funcs.subr tests-fs-tests atf
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.22 src/external/bsd/Makefile:1.23
--- src/external/bsd/Makefile:1.22 Fri May 7 17:35:32 2010
+++ src/external/bsd/Makefile Sun Jul 11 06:16:54 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2010/05/07 17:35:32 christos Exp $
+# $NetBSD: Makefile,v 1.23 2010/07/11 06:16:54 mrg Exp $
.include <bsd.own.mk>
SUBDIR+= am-utils bind cron dhcpcd fetch file flex libarchive libevent liblzf \
- mdocml openresolv pkg_install top byacc
+ mdocml openresolv top byacc
.if (${MKATF} != "no")
SUBDIR+= atf
@@ -15,7 +15,7 @@
SUBDIR+= openldap
.endif
.if (${MKCRYPTO} != "no")
-SUBDIR+= ../../crypto/external/bsd
+SUBDIR+= pkg_install ../../crypto/external/bsd
.endif
.if (${MKPCC} != "no")
SUBDIR+= pcc
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.633 src/share/mk/bsd.own.mk:1.634
--- src/share/mk/bsd.own.mk:1.633 Tue Jul 6 05:59:56 2010
+++ src/share/mk/bsd.own.mk Sun Jul 11 06:16:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.633 2010/07/06 05:59:56 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.634 2010/07/11 06:16:54 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -760,6 +760,7 @@
.if ${MKCRYPTO} == "no"
MKKERBEROS:= no
+MKLDAP:= no
.endif
.if ${MKMAN} == "no"
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.4 src/tests/crypto/libcrypto/Makefile:1.5
--- src/tests/crypto/libcrypto/Makefile:1.4 Sat Jul 10 16:43:25 2010
+++ src/tests/crypto/libcrypto/Makefile Sun Jul 11 06:16:54 2010
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2010/07/10 16:43:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/11 06:16:54 mrg Exp $
.include <bsd.own.mk>
+.if ${MKCRYPTO} != "no"
+
SUBDIR+=bf bn cast conf des dh dsa ec ecdh ecdsa engine hmac lhash \
md2 md4 md5 rand rc2 rc4 ripemd rsa sha sha1 threads x509v3
@@ -23,5 +25,8 @@
TESTS_SH+= t_libcrypto
TESTS_SH+= t_pubkey
-.include <bsd.subdir.mk>
.include <bsd.test.mk>
+
+.endif
+
+.include <bsd.subdir.mk>
Index: src/usr.sbin/puffs/Makefile
diff -u src/usr.sbin/puffs/Makefile:1.14 src/usr.sbin/puffs/Makefile:1.15
--- src/usr.sbin/puffs/Makefile:1.14 Thu Apr 29 22:42:48 2010
+++ src/usr.sbin/puffs/Makefile Sun Jul 11 06:16:54 2010
@@ -1,11 +1,17 @@
-# $NetBSD: Makefile,v 1.14 2010/04/29 22:42:48 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/11 06:16:54 mrg Exp $
+
+.include <bsd.own.mk>
SUBDIR= mount_9p mount_psshfs mount_sysctlfs
SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs
-SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_smbfs rump_syspuffs rump_sysvbfs
+SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs
SUBDIR+=rump_tmpfs rump_udf
+.if ${MKCRYPTO} != "no"
+SUBDIR+=rump_smbfs
+.endif
+
#
# The following are not built by default
#
