Tue Nov 2 16:34:36 2010 UTC ()

Hook up xz into the build system.


(joerg)

diff -r1.3 -r1.4 src/compat/compatsubdir.mk
diff -r1.22 -r1.23 src/distrib/sets/lists/base/ad.mips64eb
diff -r1.21 -r1.22 src/distrib/sets/lists/base/ad.mips64el
diff -r1.96 -r1.97 src/distrib/sets/lists/base/md.amd64
diff -r1.90 -r1.91 src/distrib/sets/lists/base/md.sparc64
diff -r1.884 -r1.885 src/distrib/sets/lists/base/mi
diff -r1.552 -r1.553 src/distrib/sets/lists/base/shl.mi
diff -r1.10 -r1.11 src/distrib/sets/lists/comp/ad.mips64eb
diff -r1.10 -r1.11 src/distrib/sets/lists/comp/ad.mips64el
diff -r1.76 -r1.77 src/distrib/sets/lists/comp/md.amd64
diff -r1.65 -r1.66 src/distrib/sets/lists/comp/md.sparc64
diff -r1.1518 -r1.1519 src/distrib/sets/lists/comp/mi
diff -r1.135 -r1.136 src/distrib/sets/lists/comp/shl.mi
diff -r1.1244 -r1.1245 src/distrib/sets/lists/man/mi
diff -r1.12 -r1.13 src/external/Makefile
diff -r1.16 -r1.17 src/external/lib/Makefile
diff -r0 -r1.1 src/external/public-domain/Makefile
diff -r0 -r1.1 src/external/public-domain/xz/Makefile
diff -r0 -r1.1 src/external/public-domain/xz/Makefile.inc
diff -r0 -r1.1 src/external/public-domain/xz/prepare-import.sh
diff -r0 -r1.1 src/external/public-domain/xz/bin/Makefile
diff -r0 -r1.1 src/external/public-domain/xz/include/config.h
diff -r0 -r1.1 src/external/public-domain/xz/lib/Makefile
diff -r0 -r1.1 src/external/public-domain/xz/lib/shlib_version

--- src/compat/compatsubdir.mk 2009/12/15 05:23:25	1.3
+++ src/compat/compatsubdir.mk 2010/11/02 16:34:33	1.4

 @@ -1,14 +1,14 @@
-#	$NetBSD: compatsubdir.mk,v 1.3 2009/12/15 05:23:25 mrg Exp $
+#	$NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $
 # Build netbsd libraries.
 .include <bsd.own.mk>
 .if ${MKCOMPAT} != "no"
 .if !make(includes)
 # make sure we get an objdir built early enough
 .include <bsd.prog.mk>
 # XXX make this use MAKEOBJDIR
 MAKEDIRTARGETENV=	MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
 @@ -17,26 +17,27 @@ MAKEDIRTARGETENV=	MAKEOBJDIRPREFIX=${.OB
 .if defined(BOOTSTRAP_SUBDIRS)
 SUBDIR=	${BOOTSTRAP_SUBDIRS}
 .else
 SUBDIR= ../../../gnu/lib/crtstuff4 .WAIT \
 	../../../lib/csu .WAIT \
 	../../../gnu/lib/libgcc4 .WAIT \
 	../../../lib/libc .WAIT \
 	../../../lib/libutil .WAIT \
 	../../../lib .WAIT \
 	../../../gnu/lib \
 	../../../external/bsd/bind/lib \
 	../../../external/bsd/libevent/lib \
 	../../../external/bsd/file/lib \
 	../../../external/public-domain/xz/lib \
 	../../../libexec/ld.elf_so
 .if ${MKATF} != "no"
 SUBDIR+= ../../../external/bsd/atf/lib
 .endif
 .if (${MKLDAP} != "no")
 SUBDIR+= ../../../external/bsd/openldap/lib
 .endif
 .if (${MKBINUTILS} != "no")
 SUBDIR+= ../../../external/gpl3/binutils/lib
 .endif

--- src/distrib/sets/lists/base/Attic/ad.mips64eb 2010/09/24 18:01:39	1.22
+++ src/distrib/sets/lists/base/Attic/ad.mips64eb 2010/11/02 16:34:33	1.23

 @@ -1,14 +1,14 @@
-# $NetBSD: ad.mips64eb,v 1.22 2010/09/24 18:01:39 skrll Exp $
+# $NetBSD: ad.mips64eb,v 1.23 2010/11/02 16:34:33 joerg 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
 ./usr/lib/64/i18n				base-compat-lib
 ./usr/lib/64/i18n/libBIG5.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libBIG5.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libDECHanyu.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libDECHanyu.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUC.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUC.so.5.0			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUCTW.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUCTW.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libGBK2K.so.5			base-i18n-shlib		compat,pic
 @@ -113,26 +113,28 @@
 ./usr/lib/64/libkafs.so.11.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkrb5.so.24			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkrb5.so.24.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/64/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/64/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/64/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/64/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0				base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmj.so.0				base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libmj.so.0.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libobjc.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libobjc.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libopcodes.so.4			base-compat-shlib	compat,pic
 @@ -348,26 +350,28 @@
 ./usr/lib/o32/libkafs.so.11.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkrb5.so.24			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkrb5.so.24.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/o32/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0				base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmj.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libmj.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libobjc.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libobjc.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libopcodes.so.4			base-compat-shlib	compat,pic,binutils

--- src/distrib/sets/lists/base/Attic/ad.mips64el 2010/09/24 18:01:39	1.21
+++ src/distrib/sets/lists/base/Attic/ad.mips64el 2010/11/02 16:34:33	1.22

 @@ -1,14 +1,14 @@
-# $NetBSD: ad.mips64el,v 1.21 2010/09/24 18:01:39 skrll Exp $
+# $NetBSD: ad.mips64el,v 1.22 2010/11/02 16:34:33 joerg 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
 ./usr/lib/64/i18n				base-compat-lib
 ./usr/lib/64/i18n/libBIG5.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libBIG5.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libDECHanyu.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libDECHanyu.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUC.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUC.so.5.0			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUCTW.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libEUCTW.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/64/i18n/libGBK2K.so.5			base-i18n-shlib		compat,pic
 @@ -113,26 +113,28 @@
 ./usr/lib/64/libkafs.so.11.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkrb5.so.24			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkrb5.so.24.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/64/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/64/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/libldap_r.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/64/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/64/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/64/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0				base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmj.so.0				base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libmj.so.0.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libnetpgp.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libobjc.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libobjc.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libopcodes.so.4			base-compat-shlib	compat,pic,binutils
 @@ -348,26 +350,28 @@
 ./usr/lib/o32/libkafs.so.11.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkrb5.so.24			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkrb5.so.24.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/o32/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/libldap_r.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/o32/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0				base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmj.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libmj.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libnetpgp.so.3.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libobjc.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libobjc.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libopcodes.so.4			base-compat-shlib	compat,pic,binutils

--- src/distrib/sets/lists/base/md.amd64 2010/10/31 16:31:12	1.96
+++ src/distrib/sets/lists/base/md.amd64 2010/11/02 16:34:33	1.97

 @@ -1,14 +1,14 @@
-# $NetBSD: md.amd64,v 1.96 2010/10/31 16:31:12 mbalmer Exp $
+# $NetBSD: md.amd64,v 1.97 2010/11/02 16:34:33 joerg Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
 ./usr/bin/fdformat				base-util-bin
 ./usr/bin/iasl					base-util-bin
 ./usr/lib/i386					base-compat-lib		compat
 ./usr/lib/i386/i18n				base-compat-lib		compat
 ./usr/lib/i386/i18n/libBIG5.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/i386/i18n/libBIG5.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/i386/i18n/libDECHanyu.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/i386/i18n/libDECHanyu.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/i386/i18n/libEUC.so.5			base-i18n-shlib		compat,pic
 ./usr/lib/i386/i18n/libEUC.so.5.0		base-i18n-shlib		compat,pic
 @@ -121,26 +121,28 @@
 ./usr/lib/i386/libkvm.so.6			base-compat-shlib	compat,pic
 ./usr/lib/i386/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/libldap_r.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/i386/liblua.so			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libm.so.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmenu.so.6			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmenu.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmj.so.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/i386/libmj.so.0.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/i386/libnetpgp.so.3			base-compat-shlib	compat,pic
 ./usr/lib/i386/libnetpgp.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libobjc.so.3			base-compat-shlib	compat,pic
 ./usr/lib/i386/libobjc.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libopcodes.so.4			base-compat-shlib	compat,pic,binutils

--- src/distrib/sets/lists/base/md.sparc64 2010/10/31 16:31:12	1.90
+++ src/distrib/sets/lists/base/md.sparc64 2010/11/02 16:34:33	1.91

 @@ -1,14 +1,14 @@
-# $NetBSD: md.sparc64,v 1.90 2010/10/31 16:31:12 mbalmer Exp $
+# $NetBSD: md.sparc64,v 1.91 2010/11/02 16:34:33 joerg Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel					base-sysutil-root	obsolete
 ./usr/bin/fdformat				base-util-bin
 ./usr/lib/sparc					base-compat-lib		compat
 ./usr/lib/sparc/i18n				base-compat-lib		compat
 ./usr/lib/sparc/i18n/libBIG5.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libBIG5.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libDECHanyu.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libDECHanyu.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libEUC.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libEUC.so.5.0		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libEUCTW.so.5		base-i18n-shlib		compat,pic
 ./usr/lib/sparc/i18n/libEUCTW.so.5.0		base-i18n-shlib		compat,pic
 @@ -118,26 +118,28 @@
 ./usr/lib/sparc/libkvm.so.6.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblber.so.3			base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/liblber.so.3.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/libldap.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/libldap.so.4.1			base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/libldap_r.so.4			base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/libldap_r.so.4.1		base-compat-shlib	compat,pic,ldap
 ./usr/lib/sparc/liblua.so			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblua.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblua.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblzma.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/liblzma.so.1.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libm.so.0			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libmagic.so.3			base-compat-shlib	compat,pic
 ./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/libmj.so.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libmj.so.0.0			base-compat-shlib	compat,pic,crypto
 ./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

--- src/distrib/sets/lists/base/mi 2010/10/31 11:52:51	1.884
+++ src/distrib/sets/lists/base/mi 2010/11/02 16:34:33	1.885

 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.884 2010/10/31 11:52:51 mbalmer Exp $
+# $NetBSD: mi,v 1.885 2010/11/02 16:34:33 joerg Exp $
+#
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
+#
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
 #	may be linked against the old major shared library, and
 #	that is a symlink to the old major.minor shared library.
 #	e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
 #	Exceptions to this rule may include shared libraries that
 #	are dlopen()ed at run-time, such as extra locales, etc.
+#
 .						base-sys-root
 @@ -636,26 +636,27 @@
 ./usr/bin/tput					base-util-bin
 ./usr/bin/tr					base-util-bin
 ./usr/bin/true					base-util-bin
 ./usr/bin/tset					base-util-bin
 ./usr/bin/tty					base-util-bin
 ./usr/bin/ul					base-util-bin
 ./usr/bin/uname					base-util-bin
 ./usr/bin/uncompress				base-util-bin
 ./usr/bin/verify_krb5_conf			base-krb5-bin		kerberos
 ./usr/bin/unexpand				base-util-bin
 ./usr/bin/uniq					base-util-bin
 ./usr/bin/units					base-util-bin
 ./usr/bin/unvis					base-util-bin
 ./usr/bin/unxz					base-util-bin
 ./usr/bin/unzip					base-util-bin
 ./usr/bin/uptime				base-util-bin
 ./usr/bin/usbhidaction				base-util-bin
 ./usr/bin/usbhidctl				base-util-bin
 ./usr/bin/users					base-util-bin
 ./usr/bin/utoppya				base-util-bin
 ./usr/bin/uucp					base-obsolete		obsolete
 ./usr/bin/uudecode				base-util-bin
 ./usr/bin/uuencode				base-util-bin
 ./usr/bin/uuidgen				base-util-bin
 ./usr/bin/uulog					base-obsolete		obsolete
 ./usr/bin/uuname				base-obsolete		obsolete
 ./usr/bin/uupick				base-obsolete		obsolete
 @@ -673,26 +674,28 @@
 ./usr/bin/w					base-util-bin
 ./usr/bin/wall					base-util-bin
 ./usr/bin/wc					base-util-bin
 ./usr/bin/what					base-util-bin
 ./usr/bin/whatis				base-util-bin
 ./usr/bin/whereis				base-util-bin
 ./usr/bin/which					base-util-bin
 ./usr/bin/who					base-util-bin
 ./usr/bin/whoami				base-util-bin
 ./usr/bin/whois					base-netutil-bin
 ./usr/bin/window				base-util-bin
 ./usr/bin/write					base-util-bin
 ./usr/bin/xargs					base-util-bin
 ./usr/bin/xz					base-util-bin
 ./usr/bin/xzcat					base-util-bin
 ./usr/bin/yes					base-util-bin
 ./usr/bin/ypcat					base-nis-bin		yp
 ./usr/bin/ypmatch				base-nis-bin		yp
 ./usr/bin/yppasswd				base-nis-bin		use_yp
 ./usr/bin/ypwhich				base-nis-bin		yp
 ./usr/bin/zcat					base-util-bin
 ./usr/bin/zcmp					base-util-bin
 ./usr/bin/zdiff					base-util-bin
 ./usr/bin/zegrep				base-util-bin
 ./usr/bin/zfgrep				base-util-bin
 ./usr/bin/zforce				base-util-bin
 ./usr/bin/zgrep					base-util-bin
 ./usr/bin/zmore					base-util-bin
 @@ -2430,26 +2433,27 @@
 ./usr/share/locale/ca_ES.ISO8859-1/LC_TIME	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15		base-locale-ca
 ./usr/share/locale/ca_ES.ISO8859-15/LC_CTYPE	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES	base-locale-ca
 ./usr/share/locale/ca_ES.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-ca	nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_MONETARY	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_NUMERIC	base-locale-ca		nls
 ./usr/share/locale/ca_ES.ISO8859-15/LC_TIME	base-locale-ca		nls
 ./usr/share/locale/cs				base-locale-cs
 ./usr/share/locale/cs/LC_MESSAGES		base-locale-cs
 ./usr/share/locale/cs/LC_MESSAGES/grep.mo	base-util_locale-cs	nls
 ./usr/share/locale/cs/LC_MESSAGES/tar.mo	base-obsolete		obsolete
 ./usr/share/locale/cs/LC_MESSAGES/texinfo.mo	base-texinfo_locale-cs	nls
 ./usr/share/locale/cs/LC_MESSAGES/xz.mo	base-util_locale-cs	nls
 ./usr/share/locale/cs_CZ.ISO8859-2		base-locale-cs
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_CTYPE	base-locale-cs		nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES	base-locale-cs
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-cs	nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_MONETARY	base-locale-cs		nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_NUMERIC	base-locale-cs		nls
 ./usr/share/locale/cs_CZ.ISO8859-2/LC_TIME	base-locale-cs		nls
 ./usr/share/locale/da				base-locale-da
 ./usr/share/locale/da/LC_MESSAGES		base-locale-da
 ./usr/share/locale/da/LC_MESSAGES/tar.mo	base-obsolete		obsolete
 ./usr/share/locale/da/LC_MESSAGES/texinfo.mo	base-texinfo_locale-da	nls
 ./usr/share/locale/da_DK.ISO8859-1		base-locale-da
 ./usr/share/locale/da_DK.ISO8859-1/LC_CTYPE	base-locale-da		nls
 @@ -2460,26 +2464,27 @@
 ./usr/share/locale/da_DK.ISO8859-1/LC_TIME	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15		base-locale-da
 ./usr/share/locale/da_DK.ISO8859-15/LC_CTYPE	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES	base-locale-da
 ./usr/share/locale/da_DK.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-da	nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_MONETARY	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_NUMERIC	base-locale-da		nls
 ./usr/share/locale/da_DK.ISO8859-15/LC_TIME	base-locale-da		nls
 ./usr/share/locale/de				base-locale-de
 ./usr/share/locale/de/LC_MESSAGES		base-locale-de
 ./usr/share/locale/de/LC_MESSAGES/grep.mo	base-util_locale-de	nls
 ./usr/share/locale/de/LC_MESSAGES/tar.mo	base-obsolete		obsolete
 ./usr/share/locale/de/LC_MESSAGES/texinfo.mo	base-texinfo_locale-de	nls
 ./usr/share/locale/de/LC_MESSAGES/xz.mo		base-util_locale-de	nls
 ./usr/share/locale/de_AT			base-locale-de
 ./usr/share/locale/de_AT.ISO8859-1		base-locale-de
 ./usr/share/locale/de_AT.ISO8859-1/LC_CTYPE	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES	base-locale-de
 ./usr/share/locale/de_AT.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-de	nls
 ./usr/share/locale/de_AT.ISO8859-1/LC_MONETARY	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-1/LC_NUMERIC	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-1/LC_TIME	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-15		base-locale-de
 ./usr/share/locale/de_AT.ISO8859-15/LC_CTYPE	base-locale-de		nls
 ./usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES	base-locale-de
 ./usr/share/locale/de_AT.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-de	nls
 ./usr/share/locale/de_AT.ISO8859-15/LC_MONETARY	base-locale-de		nls
 @@ -2810,26 +2815,27 @@
 ./usr/share/locale/is_IS.ISO8859-1/LC_NUMERIC	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-1/LC_TIME	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15		base-locale-is
 ./usr/share/locale/is_IS.ISO8859-15/LC_CTYPE	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES	base-locale-is
 ./usr/share/locale/is_IS.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-is	nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_MONETARY	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_NUMERIC	base-locale-is		nls
 ./usr/share/locale/is_IS.ISO8859-15/LC_TIME	base-locale-is		nls
 ./usr/share/locale/it				base-locale-it
 ./usr/share/locale/it/LC_MESSAGES		base-locale-it
 ./usr/share/locale/it/LC_MESSAGES/grep.mo	base-util_locale-it	nls
 ./usr/share/locale/it/LC_MESSAGES/tar.mo	base-obsolete		obsolete
 ./usr/share/locale/it/LC_MESSAGES/xz.mo		base-util_locale-it	nls
 ./usr/share/locale/it_CH.ISO8859-1		base-locale-it
 ./usr/share/locale/it_CH.ISO8859-1/LC_CTYPE	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES	base-locale-it
 ./usr/share/locale/it_CH.ISO8859-1/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-it	nls
 ./usr/share/locale/it_CH.ISO8859-1/LC_MONETARY	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-1/LC_NUMERIC	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-1/LC_TIME	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-15		base-locale-it
 ./usr/share/locale/it_CH.ISO8859-15/LC_CTYPE	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES	base-locale-it
 ./usr/share/locale/it_CH.ISO8859-15/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-it	nls
 ./usr/share/locale/it_CH.ISO8859-15/LC_MONETARY	base-locale-it		nls
 ./usr/share/locale/it_CH.ISO8859-15/LC_NUMERIC	base-locale-it		nls

--- src/distrib/sets/lists/base/shl.mi 2010/10/31 11:52:51	1.552
+++ src/distrib/sets/lists/base/shl.mi 2010/11/02 16:34:33	1.553

 @@ -1,14 +1,14 @@
-# $NetBSD: shl.mi,v 1.552 2010/10/31 11:52:51 mbalmer Exp $
+# $NetBSD: shl.mi,v 1.553 2010/11/02 16:34:33 joerg Exp $
+#
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
+#
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
 #	may be linked against the old major shared library, and
 #	that is a symlink to the old major.minor shared library.
 #	e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
 #	Exceptions to this rule may include shared libraries that
 #	are dlopen()ed at run-time, such as extra locales, etc.
+#
 # Note:	libtermcap and libtermlib are hardlinked and share the same version.
 @@ -33,26 +33,29 @@
 ./lib/libevent.so.3.2				base-sys-shlib		dynamicroot
 ./lib/libgcc_s.so				base-sys-shlib		gcc
 ./lib/libgcc_s.so.1				base-sys-shlib		gcc
 ./lib/libgcc_s.so.1.0				base-sys-shlib		gcc
 ./lib/libipsec.so				base-net-shlib		dynamicroot
 ./lib/libipsec.so.3				base-net-shlib		dynamicroot
 ./lib/libipsec.so.3.0				base-net-shlib		dynamicroot
 ./lib/libkvm.so					base-sys-shlib		dynamicroot
 ./lib/libkvm.so.6				base-sys-shlib		dynamicroot
 ./lib/libkvm.so.6.0				base-sys-shlib		dynamicroot
 ./lib/liblzf.so					base-sys-shlib		dynamicroot
 ./lib/liblzf.so.0				base-sys-shlib		dynamicroot
 ./lib/liblzf.so.0.0				base-sys-shlib		dynamicroot
 ./lib/liblzma.so				base-sys-shlib		dynamicroot
 ./lib/liblzma.so.1				base-sys-shlib		dynamicroot
 ./lib/liblzma.so.1.0				base-sys-shlib		dynamicroot
 ./lib/libm.so					base-sys-shlib		dynamicroot
 ./lib/libm.so.0					base-sys-shlib		dynamicroot
 ./lib/libm.so.0.8				base-sys-shlib		dynamicroot
 ./lib/libprop.so				base-sys-shlib		dynamicroot
 ./lib/libprop.so.1				base-sys-shlib		dynamicroot
 ./lib/libprop.so.1.1				base-sys-shlib		dynamicroot
 ./lib/libradius.so				base-sys-shlib		dynamicroot
 ./lib/libradius.so.4				base-sys-shlib		dynamicroot
 ./lib/libradius.so.4.0				base-sys-shlib		dynamicroot
 ./lib/libtermcap.so				base-sys-shlib		dynamicroot
 ./lib/libtermcap.so.0				base-sys-shlib		dynamicroot
 ./lib/libtermcap.so.0.6				base-sys-shlib		dynamicroot
 ./lib/libterminfo.so				base-sys-shlib		dynamicroot
 @@ -277,26 +280,29 @@
 ./usr/lib/liblber.so.3.1			base-ldap-shlib		ldap
 ./usr/lib/libldap.so				base-ldap-shlib		ldap
 ./usr/lib/libldap.so.4				base-ldap-shlib		ldap
 ./usr/lib/libldap.so.4.1			base-ldap-shlib		ldap
 ./usr/lib/libldap_r.so				base-ldap-shlib		ldap
 ./usr/lib/libldap_r.so.4			base-ldap-shlib		ldap
 ./usr/lib/libldap_r.so.4.1			base-ldap-shlib		ldap
 ./usr/lib/liblua.so				base-sys-shlib
 ./usr/lib/liblua.so.1				base-sys-shlib
 ./usr/lib/liblua.so.1.0				base-sys-shlib
 ./usr/lib/liblwres.so				base-bind-shlib
 ./usr/lib/liblwres.so.5				base-bind-shlib
 ./usr/lib/liblwres.so.5.1			base-bind-shlib
 ./usr/lib/liblzma.so				base-sys-shlib
 ./usr/lib/liblzma.so.1				base-sys-shlib
 ./usr/lib/liblzma.so.1.0			base-sys-shlib
 ./usr/lib/liblzf.so				base-sys-shlib
 ./usr/lib/liblzf.so.0				base-sys-shlib
 ./usr/lib/liblzf.so.0.0				base-sys-shlib
 ./usr/lib/libm.so				base-sys-shlib
 ./usr/lib/libm.so.0				base-sys-shlib
 ./usr/lib/libm.so.0.8				base-sys-shlib
 ./usr/lib/libmagic.so				base-sys-shlib
 ./usr/lib/libmagic.so.3				base-sys-shlib
 ./usr/lib/libmagic.so.3.0			base-sys-shlib
 ./usr/lib/libmenu.so				base-sys-shlib
 ./usr/lib/libmenu.so.6				base-sys-shlib
 ./usr/lib/libmenu.so.6.0			base-sys-shlib
 ./usr/lib/libmj.so				base-crypto-shlib	crypto

--- src/distrib/sets/lists/comp/Attic/ad.mips64eb 2010/08/07 05:53:20	1.10
+++ src/distrib/sets/lists/comp/Attic/ad.mips64eb 2010/11/02 16:34:34	1.11

 @@ -1,14 +1,14 @@
-# $NetBSD: ad.mips64eb,v 1.10 2010/08/07 05:53:20 agc Exp $
+# $NetBSD: ad.mips64eb,v 1.11 2010/11/02 16:34:34 joerg Exp $
 ./usr/bin/elf2aout				comp-obsolete	obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
 ./usr/include/mips/ansi.h			comp-c-include
 ./usr/include/mips/aout_machdep.h		comp-obsolete		obsolete
 ./usr/include/mips/asm.h			comp-c-include
 ./usr/include/mips/bsd-aout.h			comp-obsolete		obsolete
 ./usr/include/mips/bswap.h			comp-c-include
 ./usr/include/mips/cachectl.h			comp-c-include
 ./usr/include/mips/cdefs.h			comp-c-include
 ./usr/include/mips/cpu.h			comp-c-include
 ./usr/include/mips/cpuregs.h			comp-c-include
 ./usr/include/mips/db_machdep.h			comp-obsolete		obsolete
 @@ -330,26 +330,30 @@
 ./usr/lib/64/liblber_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/64/libldap.a				comp-c-lib		compat,ldap
 ./usr/lib/64/libldap.so				base-sys-shlib		compat,pic,ldap
 ./usr/lib/64/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/64/libldap_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/64/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/64/libldap_r.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/64/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/64/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/64/liblwres.a				comp-c-lib		compat
 ./usr/lib/64/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/64/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/64/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/liblzma.a				comp-c-lib		compat
 ./usr/lib/64/liblzma.so				base-sys-shlib		compat,pic
 ./usr/lib/64/liblzma_p.a			comp-c-proflib		compat,profile
 ./usr/lib/64/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libm.a				comp-c-lib		compat
 ./usr/lib/64/libm.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/64/libm_pic.a				comp-c-piclib		compat,pic
 ./usr/lib/64/libmagic.a				comp-c-lib		compat
 ./usr/lib/64/libmagic.so			base-sys-shlib		compat,pic
 ./usr/lib/64/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/64/libmagic_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libmenu.a				comp-c-lib		compat
 ./usr/lib/64/libmenu.so				base-sys-shlib		compat,pic
 ./usr/lib/64/libmenu_p.a			comp-c-proflib		compat,profile
 ./usr/lib/64/libmenu_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/64/libmj.a				comp-c-lib		compat,crypto
 @@ -799,26 +803,30 @@
 ./usr/lib/o32/liblber_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/libldap.a				comp-c-lib		compat,ldap
 ./usr/lib/o32/libldap.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/o32/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/o32/libldap_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/o32/libldap_r.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/o32/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/o32/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/liblwres.a			comp-c-lib		compat
 ./usr/lib/o32/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/liblzma.a				comp-c-lib		compat
 ./usr/lib/o32/liblzma.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/liblzma_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libm.a				comp-c-lib		compat
 ./usr/lib/o32/libm.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/o32/libm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmagic.a			comp-c-lib		compat
 ./usr/lib/o32/libmagic.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libmagic_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmenu.a				comp-c-lib		compat
 ./usr/lib/o32/libmenu.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libmenu_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libmenu_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmj.a				comp-c-lib		compat,crypto

--- src/distrib/sets/lists/comp/Attic/ad.mips64el 2010/08/07 05:53:20	1.10
+++ src/distrib/sets/lists/comp/Attic/ad.mips64el 2010/11/02 16:34:34	1.11

 @@ -1,14 +1,14 @@
-# $NetBSD: ad.mips64el,v 1.10 2010/08/07 05:53:20 agc Exp $
+# $NetBSD: ad.mips64el,v 1.11 2010/11/02 16:34:34 joerg Exp $
 ./usr/bin/elf2aout				comp-obsolete	obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/mips				comp-c-include
 ./usr/include/mips/ansi.h			comp-c-include
 ./usr/include/mips/aout_machdep.h		comp-obsolete		obsolete
 ./usr/include/mips/asm.h			comp-c-include
 ./usr/include/mips/bsd-aout.h			comp-obsolete		obsolete
 ./usr/include/mips/bswap.h			comp-c-include
 ./usr/include/mips/cachectl.h			comp-c-include
 ./usr/include/mips/cdefs.h			comp-c-include
 ./usr/include/mips/cpu.h			comp-c-include
 ./usr/include/mips/cpuregs.h			comp-c-include
 ./usr/include/mips/db_machdep.h			comp-obsolete		obsolete
 @@ -799,26 +799,30 @@
 ./usr/lib/o32/liblber_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/libldap.a				comp-c-lib		compat,ldap
 ./usr/lib/o32/libldap.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/o32/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/o32/libldap_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/o32/libldap_r.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/o32/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/o32/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/o32/liblwres.a			comp-c-lib		compat
 ./usr/lib/o32/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/liblzma.a				comp-c-lib		compat
 ./usr/lib/o32/liblzma.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/liblzma_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libm.a				comp-c-lib		compat
 ./usr/lib/o32/libm.so				base-sys-shlib		compat,pic
 ./usr/lib/o32/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/o32/libm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmagic.a			comp-c-lib		compat
 ./usr/lib/o32/libmagic.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libmagic_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmenu.a				comp-c-lib		compat
 ./usr/lib/o32/libmenu.so			base-sys-shlib		compat,pic
 ./usr/lib/o32/libmenu_p.a			comp-c-proflib		compat,profile
 ./usr/lib/o32/libmenu_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/o32/libmj.a				comp-c-lib		compat,crypto

--- src/distrib/sets/lists/comp/md.amd64 2010/10/31 23:29:16	1.76
+++ src/distrib/sets/lists/comp/md.amd64 2010/11/02 16:34:34	1.77

 @@ -1,14 +1,14 @@
-# $NetBSD: md.amd64,v 1.76 2010/10/31 23:29:16 njoly Exp $
+# $NetBSD: md.amd64,v 1.77 2010/11/02 16:34:34 joerg Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
 ./usr/include/amd64/asm.h			comp-c-include
 ./usr/include/amd64/atomic.h			comp-obsolete		obsolete
 ./usr/include/amd64/autoconf.h			comp-obsolete		obsolete
 ./usr/include/amd64/bootinfo.h			comp-c-include
 ./usr/include/amd64/bswap.h			comp-c-include
 ./usr/include/amd64/bus.h			comp-c-include
 ./usr/include/amd64/byte_swap.h			comp-c-include
 ./usr/include/amd64/cdefs.h			comp-c-include
 ./usr/include/amd64/cpu.h			comp-c-include
 ./usr/include/amd64/cpufunc.h			comp-c-include
 @@ -553,26 +553,27 @@
 ./usr/lib/i386/libkafs_g.a			comp-c-proflib		compat,debuglib,kerberos
 ./usr/lib/i386/libkafs_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/i386/libkafs_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/i386/libkrb5.a			comp-c-lib		compat,kerberos
 ./usr/lib/i386/libkrb5.so			comp-sys-shlib		compat,pic,kerberos
 ./usr/lib/i386/libkrb5_g.a			comp-c-proflib		compat,debuglib,kerberos
 ./usr/lib/i386/libkrb5_p.a			comp-c-proflib		compat,profile,kerberos
 ./usr/lib/i386/libkrb5_pic.a			comp-c-piclib		compat,pic,kerberos
 ./usr/lib/i386/libkvm.a				comp-c-lib		compat
 ./usr/lib/i386/libkvm.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libkvm_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libkvm_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libkvm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libl.a				comp-c-lib		compat
 ./usr/lib/i386/libl_g.a				comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libl_p.a				comp-c-proflib		compat,profile
 ./usr/lib/i386/libl_pic.a			comp-obsolete		obsolete
 ./usr/lib/i386/liblber.a			comp-c-lib		compat,ldap
 ./usr/lib/i386/liblber.so			comp-sys-shlib		compat,pic,ldap
 ./usr/lib/i386/liblber_g.a			comp-c-proflib		compat,debuglib,ldap
 ./usr/lib/i386/liblber_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/i386/liblber_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/i386/libldap.a			comp-c-lib		compat,ldap
 ./usr/lib/i386/libldap.so			comp-sys-shlib		compat,pic,ldap
 ./usr/lib/i386/libldap_g.a			comp-c-proflib		compat,debuglib,ldap
 ./usr/lib/i386/libldap_p.a			comp-c-proflib		compat,profile,ldap
 @@ -580,26 +581,30 @@
 ./usr/lib/i386/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/i386/libldap_r.so			comp-sys-shlib		compat,pic,ldap
 ./usr/lib/i386/libldap_r_g.a			comp-c-proflib		compat,debuglib,ldap
 ./usr/lib/i386/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/i386/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/i386/liblua.a				comp-c-lib		compat
 ./usr/lib/i386/liblua_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/liblua_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/liblwres.a			comp-c-lib		compat
 ./usr/lib/i386/liblwres.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/liblwres_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/liblzma.a			comp-c-lib		compat
 ./usr/lib/i386/liblzma.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/liblzma_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/liblzma_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libm.a				comp-c-lib		compat
 ./usr/lib/i386/libm.so				comp-sys-shlib		compat,pic
 ./usr/lib/i386/libm_g.a				comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libm_p.a				comp-c-proflib		compat,profile
 ./usr/lib/i386/libm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libmagic.a			comp-c-lib		compat
 ./usr/lib/i386/libmagic.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libmagic_g.a			comp-c-proflib		compat,debuglib
 ./usr/lib/i386/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/i386/libmagic_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/i386/libmenu.a			comp-c-lib		compat
 ./usr/lib/i386/libmenu.so			comp-sys-shlib		compat,pic
 ./usr/lib/i386/libmenu_g.a			comp-c-proflib		compat,debuglib
 @@ -881,26 +886,27 @@
 ./usr/libdata/debug/usr/lib/i386/libisccc.so.5.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libisccfg.so.5.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libiscsi.so.2.0.debug	comp-compat-shlib	compat,pic,debug,iscsi
 ./usr/libdata/debug/usr/lib/i386/libkadm5clnt.so.12.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libkadm5srv.so.13.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libkafs.so.11.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libkrb5.so.24.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libkvm.so.6.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/liblber.so.3.1.debug	comp-compat-shlib	compat,pic,ldap,debug
 ./usr/libdata/debug/usr/lib/i386/libldap.so.4.1.debug	comp-compat-shlib	compat,pic,ldap,debug
 ./usr/libdata/debug/usr/lib/i386/libldap_r.so.4.1.debug	comp-compat-shlib	compat,pic,ldap,debug
 ./usr/libdata/debug/usr/lib/i386/liblua.so.1.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/liblwres.so.5.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/liblzma.so.1.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libm.so.0.8.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libmagic.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libmenu.so.6.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libmj.so.0.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libnetpgp.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libobjc.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libopcodes.so.4.0.debug	comp-compat-shlib	compat,pic,binutils,debug
 ./usr/libdata/debug/usr/lib/i386/libossaudio.so.1.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libp2k.so.2.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libpam.so.3.0.debug	comp-compat-shlib	compat,pic,pam,debug
 ./usr/libdata/debug/usr/lib/i386/libpcap.so.3.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libpci.so.2.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libposix.so.0.1.debug	comp-compat-shlib	compat,pic,debug

--- src/distrib/sets/lists/comp/md.sparc64 2010/10/31 23:29:16	1.65
+++ src/distrib/sets/lists/comp/md.sparc64 2010/11/02 16:34:34	1.66

 @@ -1,14 +1,14 @@
-# $NetBSD: md.sparc64,v 1.65 2010/10/31 23:29:16 njoly Exp $
+# $NetBSD: md.sparc64,v 1.66 2010/11/02 16:34:34 joerg Exp $
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
 ./usr/include/sparc/_G_config.h			comp-obsolete		obsolete
 ./usr/include/sparc/ansi.h			comp-c-include
 ./usr/include/sparc/aout_machdep.h		comp-c-include
 ./usr/include/sparc/apmvar.h			comp-c-include
 ./usr/include/sparc/asm.h			comp-c-include
 ./usr/include/sparc/autoconf.h			comp-c-include
 ./usr/include/sparc/bootinfo.h			comp-c-include
 ./usr/include/sparc/bswap.h			comp-c-include
 ./usr/include/sparc/cdefs.h			comp-c-include
 ./usr/include/sparc/cgtworeg.h			comp-c-include
 ./usr/include/sparc/conf.h			comp-obsolete		obsolete
 @@ -406,26 +406,30 @@
 ./usr/lib/sparc/libldap_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/sparc/libldap_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/sparc/libldap_r.a			comp-c-lib		compat,ldap
 ./usr/lib/sparc/libldap_r.so			base-sys-shlib		compat,pic,ldap
 ./usr/lib/sparc/libldap_r_p.a			comp-c-proflib		compat,profile,ldap
 ./usr/lib/sparc/libldap_r_pic.a			comp-c-piclib		compat,pic,ldap
 ./usr/lib/sparc/liblua.a			comp-c-lib		compat
 ./usr/lib/sparc/liblua_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/liblua_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/liblwres.a			comp-c-lib		compat
 ./usr/lib/sparc/liblwres.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/liblwres_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/liblwres_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/liblzma.a			comp-c-lib		compat
 ./usr/lib/sparc/liblzma.so			base-sys-shlib		compat,pic
 ./usr/lib/sparc/liblzma_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/liblzma_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libm.a				comp-c-lib		compat
 ./usr/lib/sparc/libm.so				base-sys-shlib		compat,pic
 ./usr/lib/sparc/libm_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/libm_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libmagic.a			comp-c-lib		compat
 ./usr/lib/sparc/libmagic.so			base-obsolete		obsolete
 ./usr/lib/sparc/libmagic_p.a			comp-c-proflib		compat,profile
 ./usr/lib/sparc/libmagic_pic.a			comp-c-piclib		compat,pic
 ./usr/lib/sparc/libmenu.a			comp-c-lib		compat
 ./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/libmj.a				comp-c-lib		compat,crypto
 @@ -657,26 +661,27 @@
 ./usr/libdata/debug/usr/lib/sparc/libisccc.so.5.1.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libisccfg.so.5.1.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libiscsi.so.2.0.debug			comp-compat-shlib	compat,pic,debug,iscsi
 ./usr/libdata/debug/usr/lib/sparc/libkadm5clnt.so.12.0.debug		comp-compat-shlib	compat,pic,debug,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libkadm5srv.so.13.0.debug		comp-compat-shlib	compat,pic,debug,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libkafs.so.11.0.debug			comp-compat-shlib	compat,pic,debug,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libkrb5.so.24.0.debug			comp-compat-shlib	compat,pic,debug,kerberos
 ./usr/libdata/debug/usr/lib/sparc/libkvm.so.6.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/liblber.so.3.1.debug			comp-compat-shlib	compat,pic,debug,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap.so.4.1.debug			comp-compat-shlib	compat,pic,debug,ldap
 ./usr/libdata/debug/usr/lib/sparc/libldap_r.so.4.1.debug		comp-compat-shlib	compat,pic,debug,ldap
 ./usr/libdata/debug/usr/lib/sparc/liblua.so.1.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/liblwres.so.5.1.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/liblzma.so.1.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libm.so.0.8.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libmagic.so.3.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libmenu.so.6.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libmj.so.0.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libnetpgp.so.3.0.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libobjc.so.3.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libopcodes.so.4.0.debug		comp-compat-shlib	compat,pic,binutils,debug
 ./usr/libdata/debug/usr/lib/sparc/libossaudio.so.1.0.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libp2k.so.2.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpam.so.3.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpcap.so.3.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libpci.so.2.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libposix.so.0.1.debug			comp-compat-shlib	compat,pic,debug

--- src/distrib/sets/lists/comp/mi 2010/10/31 23:29:16	1.1518
+++ src/distrib/sets/lists/comp/mi 2010/11/02 16:34:34	1.1519

 @@ -1,14 +1,14 @@
-#	$NetBSD: mi,v 1.1518 2010/10/31 23:29:16 njoly Exp $
+#	$NetBSD: mi,v 1.1519 2010/11/02 16:34:34 joerg Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./etc/mtree/set.comp				comp-sys-root
 ./usr/bin/addr2line				comp-debug-bin		binutils
 ./usr/bin/ar					comp-util-bin		binutils
 ./usr/bin/as					comp-util-bin		binutils
 ./usr/bin/asa					comp-fortran-bin
 ./usr/bin/atf-compile				comp-obsolete		obsolete
 ./usr/bin/c++					comp-cxx-bin		gcccmds
 ./usr/bin/c++filt				comp-cxx-bin		binutils
 ./usr/bin/c89					comp-c-bin
 ./usr/bin/c99					comp-c-bin
 @@ -2506,26 +2506,29 @@
 ./usr/lib/libldap_g.a				-unknown-		debuglib,ldap
 ./usr/lib/libldap_p.a				comp-ldap-proflib	profile,ldap
 ./usr/lib/libldap_r.a				comp-ldap-lib		ldap
 ./usr/lib/libldap_r_g.a				-unknown-		debuglib,ldap
 ./usr/lib/libldap_r_p.a				comp-ldap-proflib	profile,ldap
 ./usr/lib/liblua.a				comp-c-lib
 ./usr/lib/liblua_p.a				comp-c-proflib		profile
 ./usr/lib/liblwres.a				comp-bind-lib
 ./usr/lib/liblwres_g.a				-unknown-		debuglib
 ./usr/lib/liblwres_p.a				comp-bind-proflib	profile
 ./usr/lib/liblzf.a				comp-c-lib
 ./usr/lib/liblzf_g.a				-unknown-		debuglib
 ./usr/lib/liblzf_p.a				comp-c-proflib		profile
 ./usr/lib/liblzma.a				comp-c-lib
 ./usr/lib/liblzma_g.a				-unknown-		debuglib
 ./usr/lib/liblzma_p.a				comp-c-proflib		profile
 ./usr/lib/libm.a				comp-c-lib
 ./usr/lib/libm_g.a				-unknown-		debuglib
 ./usr/lib/libm_p.a				comp-c-proflib		profile
 ./usr/lib/libmagic.a				comp-c-lib
 ./usr/lib/libmagic_g.a				-unknown-		debuglib
 ./usr/lib/libmagic_p.a				comp-c-proflib		profile
 ./usr/lib/libmenu.a				comp-c-lib
 ./usr/lib/libmenu_g.a				-unknown-		debuglib
 ./usr/lib/libmenu_p.a				comp-c-proflib		profile
 ./usr/lib/libmilter.a				comp-obsolete		obsolete
 ./usr/lib/libmj.a				comp-c-lib		crypto
 ./usr/lib/libmj_g.a				-unknown-		debuglib
 ./usr/lib/libmj_p.a				comp-c-proflib		profile,crypto

--- src/distrib/sets/lists/comp/shl.mi 2010/10/31 23:29:17	1.135
+++ src/distrib/sets/lists/comp/shl.mi 2010/11/02 16:34:34	1.136

 @@ -1,14 +1,14 @@
-# $NetBSD: shl.mi,v 1.135 2010/10/31 23:29:17 njoly Exp $
+# $NetBSD: shl.mi,v 1.136 2010/11/02 16:34:34 joerg Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./usr/lib/crtbeginS.o				comp-c-lib
 ./usr/lib/crtbeginT.o				comp-c-lib
 ./usr/lib/crtendS.o				comp-c-lib
 ./usr/lib/libarchive_pic.a			comp-c-piclib
 ./usr/lib/libasn1_pic.a				comp-c-piclib		kerberos
 ./usr/lib/libatf-c++_pic.a			comp-atf-piclib		atf
 ./usr/lib/libatf-c_pic.a			comp-atf-piclib		atf
 ./usr/lib/libatf_pic.a				comp-obsolete		obsolete
 ./usr/lib/libavl_pic.a				comp-zfs-piclib		zfs
 ./usr/lib/libbind9_pic.a			comp-bind-piclib
 @@ -55,26 +55,27 @@
 ./usr/lib/libkadm5srv_pic.a			comp-c-piclib		kerberos
 ./usr/lib/libkadm_pic.a				comp-obsolete		obsolete
 ./usr/lib/libkafs_pic.a				comp-c-piclib		kerberos
 ./usr/lib/libkdb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libkrb5_pic.a				comp-c-piclib		kerberos
 ./usr/lib/libkrb_pic.a				comp-obsolete		obsolete
 ./usr/lib/libkstream_pic.a			comp-obsolete		obsolete
 ./usr/lib/libkvm_pic.a				comp-c-piclib
 ./usr/lib/liblber_pic.a				comp-ldap-piclib	ldap
 ./usr/lib/libldap_pic.a				comp-ldap-piclib	ldap
 ./usr/lib/libldap_r_pic.a			comp-ldap-piclib	ldap
 ./usr/lib/liblua_pic.a				comp-c-piclib
 ./usr/lib/liblwres_pic.a			comp-bind-piclib
 ./usr/lib/liblzma_pic.a				comp-c-piclib
 ./usr/lib/liblzf_pic.a				comp-c-piclib
 ./usr/lib/libm_pic.a				comp-c-piclib
 ./usr/lib/libmagic_pic.a			comp-c-piclib
 ./usr/lib/libmenu_pic.a				comp-c-piclib
 ./usr/lib/libmj_pic.a				comp-c-piclib
 ./usr/lib/libnetpgp_pic.a			comp-c-piclib		crypto
 ./usr/lib/libnvpair_pic.a			comp-zfs-piclib		zfs
 ./usr/lib/libobjc_pic.a				comp-objc-piclib
 ./usr/lib/libopcodes.so.4			comp-c-shlib		binutils
 ./usr/lib/libopcodes.so.4.0			comp-c-shlib		binutils
 ./usr/lib/libopenpgpsdk_pic.a			comp-obsolete		obsolete
 ./usr/lib/libossaudio_pic.a			comp-c-piclib
 ./usr/lib/libp2k_pic.a				comp-puffs-piclib
 @@ -240,26 +241,27 @@
 ./usr/libdata/debug/usr/lib/libisccc.so.5.1.debug	comp-bind-debug	debug
 ./usr/libdata/debug/usr/lib/libisccfg.so.5.1.debug	comp-bind-debug	debug
 ./usr/libdata/debug/usr/lib/libiscsi.so.2.0.debug	comp-iscsi-debug	iscsi,debug
 ./usr/libdata/debug/usr/lib/libkadm5clnt.so.12.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libkadm5srv.so.13.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libkafs.so.11.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libkrb5.so.24.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libkvm.so.6.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblber.so.3.1.debug	comp-ldap-debug	ldap,debug
 ./usr/libdata/debug/usr/lib/libldap.so.4.1.debug	comp-ldap-debug	ldap,debug
 ./usr/libdata/debug/usr/lib/libldap_r.so.4.1.debug	comp-ldap-debug	ldap,debug
 ./usr/libdata/debug/usr/lib/liblua.so.1.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblwres.so.5.1.debug	comp-bind-debug	debug
 ./usr/libdata/debug/usr/lib/liblzma.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/liblzf.so.0.0.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libm.so.0.8.debug		comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmagic.so.3.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmenu.so.6.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libmj.so.0.0.debug		comp-crypto-debug	debug
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug	comp-zfs-debug	zfs,dynamicroot,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.2.0.debug	comp-sys-debug	gcc=3,debug
 ./usr/libdata/debug/usr/lib/libobjc.so.3.0.debug	comp-sys-debug	gcc=4,debug
 ./usr/libdata/debug/usr/lib/libopcodes.so.4.0.debug	comp-c-debug	binutils,debug
 ./usr/libdata/debug/usr/lib/libossaudio.so.1.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug		comp-puffs-debug	debug
 ./usr/libdata/debug/usr/lib/libpam.so.3.0.debug		comp-sys-debug	pam,debug

--- src/distrib/sets/lists/man/mi 2010/10/31 11:52:52	1.1244
+++ src/distrib/sets/lists/man/mi 2010/11/02 16:34:34	1.1245

 @@ -1,14 +1,14 @@
-# $NetBSD: mi,v 1.1244 2010/10/31 11:52:52 mbalmer Exp $
+# $NetBSD: mi,v 1.1245 2010/11/02 16:34:34 joerg Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
+#
 ./etc/mtree/set.man				man-sys-root
 ./usr/share/info/am-utils.info			man-amd-info		info
 ./usr/share/info/as.info			man-computil-info	binutils,info
 ./usr/share/info/awk.info			man-util-info		info
 ./usr/share/info/bfd.info			man-computil-info	binutils,info
 ./usr/share/info/binutils.info			man-computil-info	binutils,info
 ./usr/share/info/bzip2.info			man-obsolete		obsolete
 ./usr/share/info/cpp.info			man-util-info		gcccmds,info
 ./usr/share/info/cvs.info			man-cvs-info		cvs,info
 ./usr/share/info/cvsclient.info			man-cvs-info		cvs,info
 @@ -551,26 +551,27 @@
 ./usr/share/man/cat1/who.0			man-util-catman		.cat
 ./usr/share/man/cat1/whoami.0			man-util-catman		.cat
 ./usr/share/man/cat1/whois.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/window.0			man-util-catman		.cat
 ./usr/share/man/cat1/write.0			man-util-catman		.cat
 ./usr/share/man/cat1/x68k/aout2hux.0		man-util-catman		.cat
 ./usr/share/man/cat1/x68k/bellctrl.0		man-util-catman		.cat
 ./usr/share/man/cat1/x68k/loadfont.0		man-util-catman		.cat
 ./usr/share/man/cat1/x68k/loadkmap.0		man-util-catman		.cat
 ./usr/share/man/cat1/x68k/palette.0		man-util-catman		.cat
 ./usr/share/man/cat1/x68k/tvctrl.0		man-util-catman		.cat
 ./usr/share/man/cat1/xargs.0			man-util-catman		.cat
 ./usr/share/man/cat1/xgettext.0			man-locale-catman	.cat
 ./usr/share/man/cat1/xz.0			man-util-catman		.cat
 ./usr/share/man/cat1/yes.0			man-util-catman		.cat
 ./usr/share/man/cat1/ypcat.0			man-nis-catman		yp,.cat
 ./usr/share/man/cat1/ypmatch.0			man-nis-catman		yp,.cat
 ./usr/share/man/cat1/yppasswd.0			man-nis-catman		use_yp,.cat
 ./usr/share/man/cat1/ypwhich.0			man-nis-catman		yp,.cat
 ./usr/share/man/cat1/zcat.0			man-util-catman		.cat
 ./usr/share/man/cat1/zcmp.0			man-util-catman		.cat
 ./usr/share/man/cat1/zdiff.0			man-util-catman		.cat
 ./usr/share/man/cat1/zegrep.0			man-util-catman		.cat
 ./usr/share/man/cat1/zfgrep.0			man-util-catman		.cat
 ./usr/share/man/cat1/zforce.0			man-util-catman		.cat
 ./usr/share/man/cat1/zgrep.0			man-util-catman		.cat
 ./usr/share/man/cat1/zmore.0			man-util-catman		.cat
 @@ -3296,26 +3297,27 @@
 ./usr/share/man/html1/who.html			man-util-htmlman	html
 ./usr/share/man/html1/whoami.html		man-util-htmlman	html
 ./usr/share/man/html1/whois.html		man-netutil-htmlman	html
 ./usr/share/man/html1/window.html		man-util-htmlman	html
 ./usr/share/man/html1/write.html		man-util-htmlman	html
 ./usr/share/man/html1/x68k/aout2hux.html	man-util-htmlman	html
 ./usr/share/man/html1/x68k/bellctrl.html	man-util-htmlman	html
 ./usr/share/man/html1/x68k/loadfont.html	man-util-htmlman	html
 ./usr/share/man/html1/x68k/loadkmap.html	man-util-htmlman	html
 ./usr/share/man/html1/x68k/palette.html		man-util-htmlman	html
 ./usr/share/man/html1/x68k/tvctrl.html		man-util-htmlman	html
 ./usr/share/man/html1/xargs.html		man-util-htmlman	html
 ./usr/share/man/html1/xgettext.html		man-locale-htmlman	html
 ./usr/share/man/html1/xz.html			man-util-htmlman	html
 ./usr/share/man/html1/yes.html			man-util-htmlman	html
 ./usr/share/man/html1/ypcat.html		man-nis-htmlman		yp,html
 ./usr/share/man/html1/ypmatch.html		man-nis-htmlman		yp,html
 ./usr/share/man/html1/yppasswd.html		man-nis-htmlman		use_yp,html
 ./usr/share/man/html1/ypwhich.html		man-nis-htmlman		yp,html
 ./usr/share/man/html1/zcat.html			man-util-htmlman	html
 ./usr/share/man/html1/zcmp.html			man-util-htmlman	html
 ./usr/share/man/html1/zdiff.html		man-util-htmlman	html
 ./usr/share/man/html1/zegrep.html		man-util-htmlman	html
 ./usr/share/man/html1/zfgrep.html		man-util-htmlman	html
 ./usr/share/man/html1/zforce.html		man-util-htmlman	html
 ./usr/share/man/html1/zgrep.html		man-util-htmlman	html
 ./usr/share/man/html1/zmore.html		man-util-htmlman	html
 @@ -5709,26 +5711,27 @@
 ./usr/share/man/man1/who.1			man-util-man		.man
 ./usr/share/man/man1/whoami.1			man-util-man		.man
 ./usr/share/man/man1/whois.1			man-netutil-man		.man
 ./usr/share/man/man1/window.1			man-util-man		.man
 ./usr/share/man/man1/write.1			man-util-man		.man
 ./usr/share/man/man1/x68k/aout2hux.1		man-util-man		.man
 ./usr/share/man/man1/x68k/bellctrl.1		man-util-man		.man
 ./usr/share/man/man1/x68k/loadfont.1		man-util-man		.man
 ./usr/share/man/man1/x68k/loadkmap.1		man-util-man		.man
 ./usr/share/man/man1/x68k/palette.1		man-util-man		.man
 ./usr/share/man/man1/x68k/tvctrl.1		man-util-man		.man
 ./usr/share/man/man1/xargs.1			man-util-man		.man
 ./usr/share/man/man1/xgettext.1			man-locale-man		.man
 ./usr/share/man/man1/xz.1			man-util-man		.man
 ./usr/share/man/man1/yes.1			man-util-man		.man
 ./usr/share/man/man1/ypcat.1			man-nis-man		yp,.man
 ./usr/share/man/man1/ypmatch.1			man-nis-man		yp,.man
 ./usr/share/man/man1/yppasswd.1			man-nis-man		use_yp,.man
 ./usr/share/man/man1/ypwhich.1			man-nis-man		yp,.man
 ./usr/share/man/man1/zcat.1			man-util-man		.man
 ./usr/share/man/man1/zcmp.1			man-util-man		.man
 ./usr/share/man/man1/zdiff.1			man-util-man		.man
 ./usr/share/man/man1/zegrep.1			man-util-man		.man
 ./usr/share/man/man1/zfgrep.1			man-util-man		.man
 ./usr/share/man/man1/zforce.1			man-util-man		.man
 ./usr/share/man/man1/zgrep.1			man-util-man		.man
 ./usr/share/man/man1/zmore.1			man-util-man		.man

--- src/external/Makefile 2010/10/31 11:52:53	1.12
+++ src/external/Makefile 2010/11/02 16:34:35	1.13

 @@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.12 2010/10/31 11:52:53 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.13 2010/11/02 16:34:35 joerg Exp $
 SUBDIR+= lib .WAIT
 SUBDIR+= apache2 bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
-SUBDIR+= ibm-public intel-public cddl mit
+SUBDIR+= ibm-public intel-public public-domain cddl mit
 .include <bsd.subdir.mk>

--- src/external/lib/Attic/Makefile 2010/06/09 23:02:44	1.16
+++ src/external/lib/Attic/Makefile 2010/11/02 16:34:35	1.17

 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.16 2010/06/09 23:02:44 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2010/11/02 16:34:35 joerg Exp $
+#
 # This Makefile exists to provide a single point to build
 # all libraries provided by external packages that may
 # be used by other applications in the system.
+#
 .include <bsd.own.mk>
 .if (${MKATF} != "no")
 SUBDIR+= ../bsd/atf/lib
 .endif
 @@ -18,23 +18,25 @@ SUBDIR+= ../apache2/mDNSResponder/lib
 .if (${MKCRYPTO} != "no")
 SUBDIR+= ../../crypto/external/lib .WAIT
 .endif
 .if (${MKLDAP} != "no")
 SUBDIR+= ../bsd/openldap/lib
 .endif
 .if (${MKISCSI} != "no")
 SUBDIR+=	../bsd/iscsi/lib	# depends on libpthread
 .endif
 SUBDIR+= ../public-domain/xz/lib .WAIT
 SUBDIR+= ../bsd/fetch/lib
 SUBDIR+= ../bsd/libarchive/lib
 SUBDIR+= ../bsd/libevent/lib
 SUBDIR+= ../bsd/libelf/lib
 SUBDIR+= ../bsd/libdwarf/lib
 SUBDIR+= ../bsd/am-utils/lib
 SUBDIR+= ../bsd/bind/lib
 SUBDIR+= ../bsd/file/lib
 .include <bsd.subdir.mk>

#	$NetBSD: Makefile,v 1.1 2010/11/02 16:34:35 joerg Exp $

.include <bsd.own.mk>

SUBDIR+= xz

.include <bsd.subdir.mk>

# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $

SUBDIR+=	lib .WAIT bin

.include <bsd.subdir.mk>

# $NetBSD: Makefile.inc,v 1.1 2010/11/02 16:34:36 joerg Exp $

XZHOMEPAGE=	http://tukaani.org/xz/
XZVERSION=	5.0.0

XZSRCDIR:=	${.PARSEDIR}/dist
XZINCDIR:=	${.PARSEDIR}/include

CPPFLAGS+=	-I${XZINCDIR}
CPPFLAGS+=	-I${XZSRCDIR}/src/common
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/api
CPPFLAGS+=	-DHAVE_CONFIG_H

CFLAGS+=	-std=c99
WARNS=		2

#!/bin/sh
# $NetBSD: prepare-import.sh,v 1.1 2010/11/02 16:34:36 joerg Exp $

set -e

rm -rf dist tmp
tar xzf xz-5.0.0.tar.gz
mv xz-5.0.0 dist

cd dist
# Binary files derived from distribution files
rm -rf doc/man
# Files under GPL
rm -rf build-aux extra lib m4/[a-s]* m4/[u-z]* src/scripts/xz* Doxyfile.in
# Files not of relevance
rm -rf ABOUT-NLS aclocal.m4 autogen.sh configure COPYING.*GPL* INSTALL.generic
mkdir po.tmp
mv po/*.po po/*.gmo po.tmp/
rm -rf po
mv po.tmp po
rm -rf debug dos windows
rm -rf Makefile* */Makefile* */*/Makefile* */*/*/Makefile*
# Binary files to be encoded
for f in tests/compress_prepared_bcj_sparc tests/compress_prepared_bcj_x86 \
	 tests/files/*.xz; do
	uuencode -m $f $f > $f.base64
	rm $f
done

# Files under GPL/LGPL kept:
# build-aux/* from autoconf
# lib/*
# m4/*

# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $

PROG=	xz
BINDIR=	/usr/bin
SRCS=	args.c coder.c file_io.c hardware.c list.c main.c \
	message.c options.c signals.c suffix.c util.c \
	tuklib_exit.c tuklib_cpucores.c tuklib_open_stdxxx.c \
	tuklib_mbstr_fw.c tuklib_mbstr_width.c \
	tuklib_physmem.c tuklib_progname.c

USETBL=	yes

.include <bsd.init.mk>

CPPFLAGS+=	-DPACKAGE=\"xz\"
CPPFLAGS+=	-DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"

DPADD+=	${LIBLZMA} ${LIBINTL}
LDADD+=	-llzma -lintl

LINKS+=	${BINDIR}/xz ${BINDIR}/unxz \
	${BINDIR}/xz ${BINDIR}/xzcat \

.PATH:	${XZSRCDIR}/src/common ${XZSRCDIR}/src/xz

.for lang in cs de it
FILES+=					${XZSRCDIR}/po/${lang}.gmo
FILESDIR_${XZSRCDIR}/po/${lang}.gmo=	/usr/share/locale/${lang}/LC_MESSAGES
FILESNAME_${XZSRCDIR}/po/${lang}.gmo=	xz.mo
.endfor

.include <bsd.prog.mk>

/* config.h.  Generated from config.h.in by configure.  */
/* config.h.in.  Generated from configure.ac by autoheader.  */

/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */

/* How many MiB of RAM to assume if the real amount cannot be determined. */
#define ASSUME_RAM 128

/* Define to 1 if bswap_16 is available. */
/* #undef HAVE_BSWAP_16 */

/* Define to 1 if bswap_32 is available. */
/* #undef HAVE_BSWAP_32 */

/* Define to 1 if bswap_64 is available. */
/* #undef HAVE_BSWAP_64 */

/* Define to 1 if you have the <byteswap.h> header file. */
/* #undef HAVE_BYTESWAP_H */

/* Define to 1 if crc32 integrity check is enabled. */
#define HAVE_CHECK_CRC32 1

/* Define to 1 if crc64 integrity check is enabled. */
#define HAVE_CHECK_CRC64 1

/* Define to 1 if sha256 integrity check is enabled. */
#define HAVE_CHECK_SHA256 1

/* Define to 1 if you have the declaration of `program_invocation_name', and
   to 0 if you don't. */
#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0

/* Define to 1 if arm decoder is enabled. */
#define HAVE_DECODER_ARM 1

/* Define to 1 if armthumb decoder is enabled. */
#define HAVE_DECODER_ARMTHUMB 1

/* Define to 1 if delta decoder is enabled. */
#define HAVE_DECODER_DELTA 1

/* Define to 1 if ia64 decoder is enabled. */
#define HAVE_DECODER_IA64 1

/* Define to 1 if lzma1 decoder is enabled. */
#define HAVE_DECODER_LZMA1 1

/* Define to 1 if lzma2 decoder is enabled. */
#define HAVE_DECODER_LZMA2 1

/* Define to 1 if powerpc decoder is enabled. */
#define HAVE_DECODER_POWERPC 1

/* Define to 1 if sparc decoder is enabled. */
#define HAVE_DECODER_SPARC 1

/* Define to 1 if x86 decoder is enabled. */
#define HAVE_DECODER_X86 1

/* Define to 1 if arm encoder is enabled. */
#define HAVE_ENCODER_ARM 1

/* Define to 1 if armthumb encoder is enabled. */
#define HAVE_ENCODER_ARMTHUMB 1

/* Define to 1 if delta encoder is enabled. */
#define HAVE_ENCODER_DELTA 1

/* Define to 1 if ia64 encoder is enabled. */
#define HAVE_ENCODER_IA64 1

/* Define to 1 if lzma1 encoder is enabled. */
#define HAVE_ENCODER_LZMA1 1

/* Define to 1 if lzma2 encoder is enabled. */
#define HAVE_ENCODER_LZMA2 1

/* Define to 1 if powerpc encoder is enabled. */
#define HAVE_ENCODER_POWERPC 1

/* Define to 1 if sparc encoder is enabled. */
#define HAVE_ENCODER_SPARC 1

/* Define to 1 if x86 encoder is enabled. */
#define HAVE_ENCODER_X86 1

/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1

/* Define to 1 if you have the `futimens' function. */
/* #undef HAVE_FUTIMENS */

/* Define to 1 if you have the `futimes' function. */
#define HAVE_FUTIMES 1

/* Define to 1 if you have the `futimesat' function. */
/* #undef HAVE_FUTIMESAT */

/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1

/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1

/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
#define HAVE_MBRTOWC 1

/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1

/* Define to 1 to enable bt2 match finder. */
#define HAVE_MF_BT2 1

/* Define to 1 to enable bt3 match finder. */
#define HAVE_MF_BT3 1

/* Define to 1 to enable bt4 match finder. */
#define HAVE_MF_BT4 1

/* Define to 1 to enable hc3 match finder. */
#define HAVE_MF_HC3 1

/* Define to 1 to enable hc4 match finder. */
#define HAVE_MF_HC4 1

/* Define to 1 if optimizing for size. */
/* #undef HAVE_SMALL */

/* Define to 1 if stdbool.h conforms to C99. */
#define HAVE_STDBOOL_H 1

/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1

/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1

/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1

/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1

/* Define to 1 if `st_atimensec' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1

/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1

/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */
/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */

/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */
/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */

/* Define to 1 if `st_uatime' is a member of `struct stat'. */
/* #undef HAVE_STRUCT_STAT_ST_UATIME */

/* Define to 1 if you have the <sys/byteorder.h> header file. */
/* #undef HAVE_SYS_BYTEORDER_H */

/* Define to 1 if you have the <sys/endian.h> header file. */
#define HAVE_SYS_ENDIAN_H 1

/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1

/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1

/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1

/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1

/* Define to 1 if the system has the type `uintptr_t'. */
#define HAVE_UINTPTR_T 1

/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1

/* Define to 1 if you have the `utime' function. */
/* #undef HAVE_UTIME */

/* Define to 1 if you have the `utimes' function. */
/* #undef HAVE_UTIMES */

/* Define to 1 if you have the `wcwidth' function. */
#define HAVE_WCWIDTH 1

/* Define to 1 if the system has the type `_Bool'. */
#define HAVE__BOOL 1

/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "joerg@NetBSD.org"

/* Define to the full name of this package. */
#define PACKAGE_NAME "XZ Utils"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "XZ Utils 5.0.0"

/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xz"

/* Define to the home page for this package. */
#define PACKAGE_URL "http://tukaani.org/xz/"

/* Define to the version of this package. */
#define PACKAGE_VERSION "5.0.0"

/* The size of `size_t', as computed by sizeof. */
#define SIZEOF_SIZE_T 8

/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1

/* Define to 1 if the number of available CPU cores can be detected with
   pstat_getdynamic(). */
/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */

/* Define to 1 if the number of available CPU cores can be detected with
   sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */
/* #undef TUKLIB_CPUCORES_SYSCONF */

/* Define to 1 if the number of available CPU cores can be detected with
   sysctl(). */
#define TUKLIB_CPUCORES_SYSCTL 1

/* Define to 1 if the system supports fast unaligned access to 16-bit and
   32-bit integers. */
/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */

/* Define to 1 if the amount of physical memory can be detected with
   _system_configuration.physmem. */
/* #undef TUKLIB_PHYSMEM_AIX */

/* Define to 1 if the amount of physical memory can be detected with
   getinvent_r(). */
/* #undef TUKLIB_PHYSMEM_GETINVENT_R */

/* Define to 1 if the amount of physical memory can be detected with
   getsysinfo(). */
/* #undef TUKLIB_PHYSMEM_GETSYSINFO */

/* Define to 1 if the amount of physical memory can be detected with
   pstat_getstatic(). */
/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */

/* Define to 1 if the amount of physical memory can be detected with
   sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */
/* #undef TUKLIB_PHYSMEM_SYSCONF */

/* Define to 1 if the amount of physical memory can be detected with sysctl().
   */
#define TUKLIB_PHYSMEM_SYSCTL 1

/* Define to 1 if the amount of physical memory can be detected with Linux
   sysinfo(). */
/* #undef TUKLIB_PHYSMEM_SYSINFO */

/* Enable extensions on AIX 3, Interix.  */
#ifndef _ALL_SOURCE
# define _ALL_SOURCE 1
#endif
/* Enable GNU extensions on systems that have them.  */
#ifndef _GNU_SOURCE
# define _GNU_SOURCE 1
#endif
/* Enable threading extensions on Solaris.  */
#ifndef _POSIX_PTHREAD_SEMANTICS
# define _POSIX_PTHREAD_SEMANTICS 1
#endif
/* Enable extensions on HP NonStop.  */
#ifndef _TANDEM_SOURCE
# define _TANDEM_SOURCE 1
#endif
/* Enable general extensions on Solaris.  */
#ifndef __EXTENSIONS__
# define __EXTENSIONS__ 1
#endif


/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
   significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
#  define WORDS_BIGENDIAN 1
# endif
#else
# ifndef WORDS_BIGENDIAN
/* #  undef WORDS_BIGENDIAN */
# endif
#endif

/* Number of bits in a file offset, on hosts where this is settable. */
/* #undef _FILE_OFFSET_BITS */

/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */

/* Define to 1 if on MINIX. */
/* #undef _MINIX */

/* Define to 2 if the system does not provide POSIX.1 features except with
   this defined. */
/* #undef _POSIX_1_SOURCE */

/* Define to 1 if you need to in order for `stat' and other things to work. */
/* #undef _POSIX_SOURCE */

/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
   #define below would cause a syntax error. */
/* #undef _UINT32_T */

/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
   #define below would cause a syntax error. */
/* #undef _UINT64_T */

/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
   #define below would cause a syntax error. */
/* #undef _UINT8_T */

/* Define to the type of a signed integer type of width exactly 32 bits if
   such a type exists and the standard includes do not define it. */
/* #undef int32_t */

/* Define to the type of a signed integer type of width exactly 64 bits if
   such a type exists and the standard includes do not define it. */
/* #undef int64_t */

/* Define to the type of an unsigned integer type of width exactly 16 bits if
   such a type exists and the standard includes do not define it. */
/* #undef uint16_t */

/* Define to the type of an unsigned integer type of width exactly 32 bits if
   such a type exists and the standard includes do not define it. */
/* #undef uint32_t */

/* Define to the type of an unsigned integer type of width exactly 64 bits if
   such a type exists and the standard includes do not define it. */
/* #undef uint64_t */

/* Define to the type of an unsigned integer type of width exactly 8 bits if
   such a type exists and the standard includes do not define it. */
/* #undef uint8_t */

/* Define to the type of an unsigned integer type wide enough to hold a
   pointer, if such a type exists, and if the system does not define it. */
/* #undef uintptr_t */

# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $

LIB=		lzma
USE_SHLIBDIR=	yes
NOLINT=		yes

.include <bsd.init.mk>

LDFLAGS+=	-Wl,-z,defs

CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/check
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/common
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/delta
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/lz
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/lzma
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/rangecoder
CPPFLAGS+=	-I${XZSRCDIR}/src/liblzma/simple
CPPFLAGS+=	-DTUKLIB_SYMBOL_PREFIX=lzma_
CPPFLAGS+=	-DNETBSD_NATIVE_SHA256

.PATH:	${XZSRCDIR}/src/common
SRCS+=	tuklib_physmem.c

.PATH:	${XZSRCDIR}/src/liblzma/check
SRCS+=	check.c crc32_table.c crc64_table.c
SRCS+=	crc32_fast.c crc64_fast.c

.PATH:	${XZSRCDIR}/src/liblzma/common
SRCS+=	common.c block_util.c easy_preset.c filter_common.c \
	hardware_physmem.c index.c \
	stream_flags_common.c vli_size.c \
	alone_encoder.c block_buffer_encoder.c block_encoder.c \
	block_header_encoder.c easy_buffer_encoder.c \
	easy_encoder_memusage.c filter_buffer_encoder.c \
	filter_encoder.c filter_flags_encoder.c index_encoder.c \
	stream_buffer_encoder.c stream_encoder.c stream_flags_encoder.c \
	vli_encoder.c \
	alone_decoder.c auto_decoder.c block_buffer_decoder.c \
	block_decoder.c block_header_decoder.c easy_decoder_memusage.c \
	filter_buffer_decoder.c filter_decoder.c filter_flags_decoder.c \
	index_decoder.c index_hash.c stream_buffer_decoder.c \
	stream_decoder.c stream_flags_decoder.c vli_decoder.c

.PATH:	${XZSRCDIR}/src/liblzma/delta
SRCS+=	delta_common.c delta_encoder.c delta_decoder.c

.PATH:	${XZSRCDIR}/src/liblzma/lz
SRCS+=	lz_decoder.c lz_encoder.c lz_encoder_mf.c

.PATH:	${XZSRCDIR}/src/liblzma/lzma
SRCS+=	lzma_encoder.c lzma_encoder_presets.c \
	lzma_encoder_optimum_fast.c lzma_encoder_optimum_normal.c \
	lzma_decoder.c lzma2_encoder.c lzma2_decoder.c \
	fastpos_table.c

.PATH:	${XZSRCDIR}/src/liblzma/rangecoder
SRCS+=	price_table.c

.PATH:	${XZSRCDIR}/src/liblzma/simple
SRCS+=	simple_coder.c simple_encoder.c simple_decoder.c \
	arm.c armthumb.c ia64.c powerpc.c sparc.c x86.c

liblzma.pc:	${XZSRCDIR}/src/liblzma/liblzma.pc.in
	${_MKTARGET_CREATE}
	rm -f ${.TARGET}
	${TOOL_SED} \
	    -e 's,@prefix@,/usr,' \
	    -e 's,@exec_prefix@,/usr,' \
	    -e 's,@libdir@,/usr/lib,' \
	    -e 's,@includedir@,/usr/include,' \
	    -e 's,@PACKAGE_HOMEPAGE@,${XZHOMEPAGE:Q},' \
	    -e 's,@PACKAGE_VERSION@,${XZVERSION:Q},' \
	    -e 's,@PTHREAD_CFLAGS@ @PTHREAD_LIBS@,,' \
	    < ${XZSRCDIR}/src/liblzma/liblzma.pc.in \
	    > ${.TARGET}.tmp && \
	mv -f ${.TARGET}.tmp ${.TARGET}

CLEANFILES+=	liblzma.pc

.include <bsd.lib.mk>

#	$NetBSD: shlib_version,v 1.1 2010/11/02 16:34:36 joerg Exp $
#
major=1
minor=0