Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: remove external/lib/Makefile and crypto/external/lib/Makefile



On Sat, 20 Nov 2010, Bernd Ernesti wrote:

> On Mon, Nov 15, 2010 at 04:02:40PM +0000, Iain Hibbert wrote:
> > On Sun, 14 Nov 2010, Bernd Ernesti wrote:
> > > If you want to move the entries from gnu/lib/Makefile into lib/Makefile 
> > > then
> > > this should be in a different order like the one used in 
> > > compat/compatsubdir.mk
> > > because all other libraries depends on some of the libraries from 
> > > gnu/lib/Makefile:
> > >  crtstuff4
> > >  libgcc4
> > > But these two libraries should not be added to src/lib/Makefile since 
> > > they are
> > > already handled in src/Makefile. I see no point in running the build 
> > > target
> > > multiple times, yes they will not really be build but it not necessary.
> >
> > They are of course already run multiple times and in fact are not the only
> > libraries that reappear this way during a complete build (eg libc itself
> > does). My proposed change does not really affect that, I think its a
> > different issue..
>
> Yeah.

The main reason that they appear multiple times in the build is that they
need to appear in the regular SUBDIR path because for example make(obj)
proceeds in that order, even though a top-level make(build) will
explicitly compile and install them in advance.. this means that the
ordering in lib/Makefile and compatsubdir.mk for those items (csu,
crtstuff4, libgcc4 and libc) is not as crucial as it would seem, since a
make(build) from top-level does the right thing.

(and incidentally, "cd lib && make" does work fine too)

> > > Right now this it not optimal, crtstuff4 and libgcc4 should maybe removed
> > > from src/gnu/lib/Makefile then add src/gnu/lib/Makefile in 
> > > src/lib/Makefile
> > > and remove the do-gnu-lib part from src/Makefile but I haven't thought 
> > > about
> > > that much.
> >
> > I believe some work is underway to update gcc to a later version, and
> > perhaps that will include updating some of these and moving them to
> > external/gpl3 ..  I was hoping that if this is the case, gnu/lib/Makefile
> > would become mostly redundant at that time, and is why I thought it best
> > to not modify it at this time..
>
> Hmm, what about leaving the include of it out of src/lib/Makefile for
> the moment?

Well I was busy last week but did some builds this weekend with
gnu/lib/Makefile also entirely removed, and all lib items referred
directly from lib/Makefile.   my patch is attached and I can detect no
problems with it here

> > In the patch I gave, it
> > is already after the atf libraries and does build fine that way..  in any
> > case, the atf-c++ library only results in .a files which don't have
> > dependencies as such (I believe the dependency occurs at link stage)
>
> I haven't checked that part and only had in my mind that this c++.

Yeah it seems so, but its easy to shuffle around afterwards if somebody
wants to make it an actual dependency so I'm not too worried about that
one at the moment

iain
Index: Makefile
===================================================================
RCS file: /cvsroot/src/Makefile,v
retrieving revision 1.279
diff -u -r1.279 Makefile
--- Makefile    22 Nov 2010 08:35:44 -0000      1.279
+++ Makefile    22 Nov 2010 18:46:04 -0000
@@ -90,8 +90,6 @@
 #                    external/bsd/pcc/crtstuff and external/bsd/pcc/libpcc.
 #   do-lib-libc:     builds and installs prerequisites from lib/libc.
 #   do-lib:          builds and installs prerequisites from lib.
-#   do-gnu-lib:      builds and installs prerequisites from gnu/lib.
-#   do-external-lib: builds and installs prerequisites from external/lib.
 #   do-sys-rump-dev-lib: builds and installs prerequisites from 
sys/rump/dev/lib
 #   do-sys-rump-fs-lib:  builds and installs prerequisites from sys/rump/fs/lib
 #   do-sys-rump-kern-lib:  builds and installs prereq. from sys/rump/kern/lib
@@ -239,7 +237,7 @@
 BUILDTARGET+=  do-libpcc
 .endif
 BUILDTARGETS+= do-lib-libc
-BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
+BUILDTARGETS+= do-lib
 .if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
 BUILDTARGETS+= do-sys-modules
 .endif
@@ -416,7 +414,7 @@
 BUILD_CC_LIB+= external/bsd/pcc/libpcc
 .endif
 
-.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib gnu/lib 
external/lib crypto/external/lib sys/rump/dev/lib sys/rump/fs/lib 
sys/rump/kern/lib sys/rump/net/lib sys/modules
+.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib 
sys/rump/dev/lib sys/rump/fs/lib sys/rump/kern/lib sys/rump/net/lib sys/modules
 do-${dir:S/\//-/g}: .PHONY .MAKE
 .for targ in dependall install
        ${MAKEDIRTARGET} ${dir} ${targ}
@@ -427,7 +425,7 @@
 COMPAT_SUBDIR_LIST=lib/csu ${BUILD_CC_LIB} lib/libc
 .for dir in ${COMPAT_SUBDIR_LIST}
 do-compat-${dir:S/\//-/g}: .PHONY .MAKE
-.for targ in obj dependall install
+.for targ in dependall install
        ${MAKEDIRTARGET} compat ${targ} BOOTSTRAP_SUBDIRS="../../../${dir}"
 .endfor
 .endfor
Index: external/Makefile
===================================================================
RCS file: /cvsroot/src/external/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- external/Makefile   3 Nov 2010 18:52:44 -0000       1.14
+++ external/Makefile   22 Nov 2010 18:46:04 -0000
@@ -1,7 +1,5 @@
 #      $NetBSD: Makefile,v 1.14 2010/11/03 18:52:44 christos Exp $
 
-SUBDIR+= lib .WAIT
-
 SUBDIR+= apache2 atheros bsd intel-fw-eula intel-fw-public gpl2 gpl3 historical
 SUBDIR+= ibm-public intel-public public-domain cddl mit
 
Index: external/lib/Makefile
===================================================================
RCS file: external/lib/Makefile
diff -N external/lib/Makefile
--- external/lib/Makefile       2 Nov 2010 16:34:35 -0000       1.17
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,42 +0,0 @@
-#      $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
-
-.if (${MKMDNS} != "no")
-SUBDIR+= ../apache2/mDNSResponder/lib
-.endif
-
-.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>
Index: crypto/external/lib/Makefile
===================================================================
RCS file: crypto/external/lib/Makefile
diff -N crypto/external/lib/Makefile
--- crypto/external/lib/Makefile        20 Mar 2010 02:07:33 -0000      1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-#      $NetBSD: Makefile,v 1.6 2010/03/20 02:07:33 uwe Exp $
-
-#
-# This Makefile exists to provide a single point to build
-# all crypto libraries provided by external packages that may
-# be used by other applications in the system.
-#
-
-.include <bsd.own.mk>
-
-.if (${MKCRYPTO} != "no")
-SUBDIR+= ../bsd/openssl/lib
-SUBDIR+= .WAIT
-SUBDIR+= ../bsd/netpgp/lib
-SUBDIR+= ../bsd/openssh/lib
-.endif
-
-.include <bsd.subdir.mk>
Index: gnu/Makefile
===================================================================
RCS file: /cvsroot/src/gnu/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- gnu/Makefile        8 Nov 2009 17:01:58 -0000       1.16
+++ gnu/Makefile        22 Nov 2010 18:46:04 -0000
@@ -1,6 +1,6 @@
 #      $NetBSD: Makefile,v 1.16 2009/11/08 17:01:58 pgoyette Exp $
 
-SUBDIR+= lib .WAIT usr.bin
+SUBDIR+= usr.bin
 
 # Speedup stubs for some subtrees that don't need to run these rules
 includes-libexec:
Index: gnu/lib/Makefile
===================================================================
RCS file: gnu/lib/Makefile
diff -N gnu/lib/Makefile
--- gnu/lib/Makefile    14 Dec 2009 12:43:48 -0000      1.46
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-#      $NetBSD: Makefile,v 1.46 2009/12/14 12:43:48 uebayasi Exp $
-
-.include <bsd.own.mk>
-
-.if ${MKGCC} != "no"
-SUBDIR+= crtstuff4 libgcc4 libobjc4
-.if ${MKCXX} != "no"
-SUBDIR+= libsupc++4 libstdc++-v3_4
-.endif
-.endif
-
-SUBDIR+= libmalloc
-
-.include <bsd.subdir.mk>
Index: lib/Makefile
===================================================================
RCS file: /cvsroot/src/lib/Makefile,v
retrieving revision 1.153
diff -u -r1.153 Makefile
--- lib/Makefile        4 Nov 2010 21:01:28 -0000       1.153
+++ lib/Makefile        22 Nov 2010 18:46:14 -0000
@@ -11,8 +11,39 @@
        libpthread_dbg libpuffs libresolv librmt librpcsvc librt \
        librumpclient libterminfo libusbhid libutil libwrap liby libz
 
-SUBDIR+=../external/bsd/flex/lib
-SUBDIR+=../external/mit/lua/lib
+.if (${MKMDNS} != "no")
+SUBDIR+=       ../external/apache2/mDNSResponder/lib
+.endif
+
+.if (${MKATF} != "no")
+SUBDIR+=       ../external/bsd/atf/lib
+.endif
+
+SUBDIR+=       ../external/bsd/file/lib
+SUBDIR+=       ../external/bsd/flex/lib
+SUBDIR+=       ../external/bsd/libdwarf/lib
+SUBDIR+=       ../external/bsd/libelf/lib
+SUBDIR+=       ../external/bsd/libevent/lib
+
+.if (${MKBINUTILS} != "no")
+SUBDIR+=       ../external/gpl3/binutils/lib
+.endif
+
+SUBDIR+=       ../external/mit/lua/lib
+
+SUBDIR+=       ../external/public-domain/xz/lib
+
+.if (${MKGCC} != "no")
+SUBDIR+=       ../gnu/lib/crtstuff4
+SUBDIR+=       ../gnu/lib/libgcc4
+SUBDIR+=       ../gnu/lib/libobjc4
+.if (${MKCXX} != "no")
+SUBDIR+=       ../gnu/lib/libstdc++-v3_4
+SUBDIR+=       ../gnu/lib/libsupc++4
+.endif
+.endif
+
+SUBDIR+=       ../gnu/lib/libmalloc
 
 # libcurses needs libtermlib
 SUBDIR+=       .WAIT libcurses
@@ -57,6 +88,19 @@
 
 SUBDIR+=       libradius       # depends on libcrypto - only if ${MKCRYPTO}
 
+SUBDIR+=       ../external/bsd/am-utils/lib    # depends on libssl
+SUBDIR+=       ../external/bsd/bind/lib        # depends on libcrypto
+SUBDIR+=       ../external/bsd/fetch/lib       # depends on libssl
+
+.if (${MKISCSI} != "no")
+SUBDIR+=       ../external/bsd/iscsi/lib       # depends on libpthread
+.endif
+
+SUBDIR+=       ../external/bsd/libarchive/lib  # depends on libxz
+
+.if (${MKLDAP} != "no")
+SUBDIR+=       ../external/bsd/openldap/lib    # depends on libcrypto
+.endif
 
 .if (${MKKERBEROS} != "no")
 SUBDIR+=       libkrb5         # depends on libcrypto and more
Index: compat/compatsubdir.mk
===================================================================
RCS file: /cvsroot/src/compat/compatsubdir.mk,v
retrieving revision 1.4
diff -u -r1.4 compatsubdir.mk
--- compat/compatsubdir.mk      2 Nov 2010 16:34:33 -0000       1.4
+++ compat/compatsubdir.mk      22 Nov 2010 18:46:14 -0000
@@ -13,39 +13,11 @@
 # XXX make this use MAKEOBJDIR
 MAKEDIRTARGETENV=      MAKEOBJDIRPREFIX=${.OBJDIR} MKOBJDIRS=yes MKSHARE=no 
BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE}
 
-# XXX fix the "library" list to include all 'external' libs?
 .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 \
+SUBDIR= ../../../lib .WAIT \
        ../../../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
-
-.if (${MKISCSI} != "no")
-SUBDIR+= ../../../external/bsd/iscsi/lib
-.endif
-
 .endif
 
 .include <bsd.subdir.mk>
Index: distrib/sets/lists/base/ad.mips64eb
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/ad.mips64eb,v
retrieving revision 1.26
diff -u -r1.26 ad.mips64eb
--- distrib/sets/lists/base/ad.mips64eb 6 Nov 2010 09:40:31 -0000       1.26
+++ distrib/sets/lists/base/ad.mips64eb 22 Nov 2010 18:46:15 -0000
@@ -49,6 +49,10 @@
 ./usr/lib/64/i18n/libmapper_std.so.5.0         base-i18n-shlib         
compat,pic
 ./usr/lib/64/i18n/libmapper_zone.so.5          base-i18n-shlib         
compat,pic
 ./usr/lib/64/i18n/libmapper_zone.so.5.0                base-i18n-shlib         
compat,pic
+./usr/lib/64/libamu.so.4                       base-compat-shlib       
compat,pic
+./usr/lib/64/libamu.so.4.0                     base-compat-shlib       
compat,pic
+./usr/lib/64/libarchive.so.3                   base-compat-shlib       
compat,pic
+./usr/lib/64/libarchive.so.3.1                 base-compat-shlib       
compat,pic
 ./usr/lib/64/libasn1.so.8                      base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/64/libasn1.so.8.0                    base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/64/libbfd.so.11                      base-compat-shlib       
compat,pic,binutils
@@ -75,10 +79,18 @@
 ./usr/lib/64/libdes.so.8.1                     base-compat-shlib       
compat,pic,crypto
 ./usr/lib/64/libdns.so.5                       base-compat-shlib       
compat,pic
 ./usr/lib/64/libdns.so.5.1                     base-compat-shlib       
compat,pic
+./usr/lib/64/libdns_sd.so.0                    base-compat-shlib       
compat,pic,mdns
+./usr/lib/64/libdns_sd.so.0.0                  base-compat-shlib       
compat,pic,mdns
+./usr/lib/64/libdwarf.so.0                     base-compat-shlib       
compat,pic
+./usr/lib/64/libdwarf.so.0.0                   base-compat-shlib       
compat,pic
 ./usr/lib/64/libedit.so.3                      base-compat-shlib       
compat,pic
 ./usr/lib/64/libedit.so.3.0                    base-compat-shlib       
compat,pic
+./usr/lib/64/libelf.so.0                       base-compat-shlib       
compat,pic
+./usr/lib/64/libelf.so.0.0                     base-compat-shlib       
compat,pic
 ./usr/lib/64/libevent.so.3                     base-compat-shlib       
compat,pic
 ./usr/lib/64/libevent.so.3.2                   base-compat-shlib       
compat,pic
+./usr/lib/64/libfetch.so.3                     base-compat-shlib       
compat,pic
+./usr/lib/64/libfetch.so.3.0                   base-compat-shlib       
compat,pic
 ./usr/lib/64/libform.so.6                      base-compat-shlib       
compat,pic
 ./usr/lib/64/libform.so.6.0                    base-compat-shlib       
compat,pic
 ./usr/lib/64/libgcc_s.so.1                     base-compat-shlib       
compat,pic
@@ -290,6 +302,10 @@
 ./usr/lib/o32/i18n/libmapper_std.so.5.0                base-i18n-shlib         
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone.so.5         base-i18n-shlib         
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone.so.5.0       base-i18n-shlib         
compat,pic
+./usr/lib/o32/libamu.so.4                      base-compat-shlib       
compat,pic
+./usr/lib/o32/libamu.so.4.0                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libarchive.so.3                  base-compat-shlib       
compat,pic
+./usr/lib/o32/libarchive.so.3.1                        base-compat-shlib       
compat,pic
 ./usr/lib/o32/libasn1.so.8                     base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/o32/libasn1.so.8.0                   base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/o32/libbfd.so.11                     base-compat-shlib       
compat,pic,binutils
@@ -316,10 +332,18 @@
 ./usr/lib/o32/libdes.so.8.1                    base-compat-shlib       
compat,pic,crypto
 ./usr/lib/o32/libdns.so.5                      base-compat-shlib       
compat,pic
 ./usr/lib/o32/libdns.so.5.1                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libdns_sd.so.0                   base-compat-shlib       
compat,pic,mdns
+./usr/lib/o32/libdns_sd.so.0.0                 base-compat-shlib       
compat,pic,mdns
+./usr/lib/o32/libdwarf.so.0                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libdwarf.so.0.0                  base-compat-shlib       
compat,pic
 ./usr/lib/o32/libedit.so.3                     base-compat-shlib       
compat,pic
 ./usr/lib/o32/libedit.so.3.0                   base-compat-shlib       
compat,pic
+./usr/lib/o32/libelf.so.0                      base-compat-shlib       
compat,pic
+./usr/lib/o32/libelf.so.0.0                    base-compat-shlib       
compat,pic
 ./usr/lib/o32/libevent.so.3                    base-compat-shlib       
compat,pic
 ./usr/lib/o32/libevent.so.3.2                  base-compat-shlib       
compat,pic
+./usr/lib/o32/libfetch.so.3                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libfetch.so.3.0                  base-compat-shlib       
compat,pic
 ./usr/lib/o32/libform.so.6                     base-compat-shlib       
compat,pic
 ./usr/lib/o32/libform.so.6.0                   base-compat-shlib       
compat,pic
 ./usr/lib/o32/libgcc_s.so.1                    base-compat-shlib       
compat,pic
Index: distrib/sets/lists/base/ad.mips64el
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/ad.mips64el,v
retrieving revision 1.24
diff -u -r1.24 ad.mips64el
--- distrib/sets/lists/base/ad.mips64el 6 Nov 2010 09:40:31 -0000       1.24
+++ distrib/sets/lists/base/ad.mips64el 22 Nov 2010 18:46:16 -0000
@@ -49,6 +49,10 @@
 ./usr/lib/64/i18n/libmapper_std.so.5.0         base-i18n-shlib         
compat,pic
 ./usr/lib/64/i18n/libmapper_zone.so.5          base-i18n-shlib         
compat,pic
 ./usr/lib/64/i18n/libmapper_zone.so.5.0                base-i18n-shlib         
compat,pic
+./usr/lib/64/libamu.so.4                       base-compat-shlib       
compat,pic
+./usr/lib/64/libamu.so.4.0                     base-compat-shlib       
compat,pic
+./usr/lib/64/libarchive.so.3                   base-compat-shlib       
compat,pic
+./usr/lib/64/libarchive.so.3.1                 base-compat-shlib       
compat,pic
 ./usr/lib/64/libasn1.so.8                      base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/64/libasn1.so.8.0                    base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/64/libbfd.so.11                      base-compat-shlib       
compat,pic,binutils
@@ -75,10 +79,18 @@
 ./usr/lib/64/libdes.so.8.1                     base-compat-shlib       
compat,pic,crypto
 ./usr/lib/64/libdns.so.5                       base-compat-shlib       
compat,pic
 ./usr/lib/64/libdns.so.5.1                     base-compat-shlib       
compat,pic
+./usr/lib/64/libdns_sd.so.0                    base-compat-shlib       
compat,pic,mdns
+./usr/lib/64/libdns_sd.so.0.0                  base-compat-shlib       
compat,pic,mdns
+./usr/lib/64/libdwarf.so.0                     base-compat-shlib       
compat,pic
+./usr/lib/64/libdwarf.so.0.0                   base-compat-shlib       
compat,pic
 ./usr/lib/64/libedit.so.3                      base-compat-shlib       
compat,pic
 ./usr/lib/64/libedit.so.3.0                    base-compat-shlib       
compat,pic
+./usr/lib/64/libelf.so.0                       base-compat-shlib       
compat,pic
+./usr/lib/64/libelf.so.0.0                     base-compat-shlib       
compat,pic
 ./usr/lib/64/libevent.so.3                     base-compat-shlib       
compat,pic
 ./usr/lib/64/libevent.so.3.2                   base-compat-shlib       
compat,pic
+./usr/lib/64/libfetch.so.3                     base-compat-shlib       
compat,pic
+./usr/lib/64/libfetch.so.3.0                   base-compat-shlib       
compat,pic
 ./usr/lib/64/libform.so.6                      base-compat-shlib       
compat,pic
 ./usr/lib/64/libform.so.6.0                    base-compat-shlib       
compat,pic
 ./usr/lib/64/libgcc_s.so.1                     base-compat-shlib       
compat,pic
@@ -290,6 +302,10 @@
 ./usr/lib/o32/i18n/libmapper_std.so.5.0                base-i18n-shlib         
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone.so.5         base-i18n-shlib         
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone.so.5.0       base-i18n-shlib         
compat,pic
+./usr/lib/o32/libamu.so.4                      base-compat-shlib       
compat,pic
+./usr/lib/o32/libamu.so.4.0                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libarchive.so.3                  base-compat-shlib       
compat,pic
+./usr/lib/o32/libarchive.so.3.1                        base-compat-shlib       
compat,pic
 ./usr/lib/o32/libasn1.so.8                     base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/o32/libasn1.so.8.0                   base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/o32/libbfd.so.11                     base-compat-shlib       
compat,pic,binutils
@@ -316,10 +332,18 @@
 ./usr/lib/o32/libdes.so.8.1                    base-compat-shlib       
compat,pic,crypto
 ./usr/lib/o32/libdns.so.5                      base-compat-shlib       
compat,pic
 ./usr/lib/o32/libdns.so.5.1                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libdns_sd.so.0                   base-compat-shlib       
compat,pic,mdns
+./usr/lib/o32/libdns_sd.so.0.0                 base-compat-shlib       
compat,pic,mdns
+./usr/lib/o32/libdwarf.so.0                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libdwarf.so.0.0                  base-compat-shlib       
compat,pic
 ./usr/lib/o32/libedit.so.3                     base-compat-shlib       
compat,pic
 ./usr/lib/o32/libedit.so.3.0                   base-compat-shlib       
compat,pic
+./usr/lib/o32/libelf.so.0                      base-compat-shlib       
compat,pic
+./usr/lib/o32/libelf.so.0.0                    base-compat-shlib       
compat,pic
 ./usr/lib/o32/libevent.so.3                    base-compat-shlib       
compat,pic
 ./usr/lib/o32/libevent.so.3.2                  base-compat-shlib       
compat,pic
+./usr/lib/o32/libfetch.so.3                    base-compat-shlib       
compat,pic
+./usr/lib/o32/libfetch.so.3.0                  base-compat-shlib       
compat,pic
 ./usr/lib/o32/libform.so.6                     base-compat-shlib       
compat,pic
 ./usr/lib/o32/libform.so.6.0                   base-compat-shlib       
compat,pic
 ./usr/lib/o32/libgcc_s.so.1                    base-compat-shlib       
compat,pic
Index: distrib/sets/lists/base/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/md.amd64,v
retrieving revision 1.98
diff -u -r1.98 md.amd64
--- distrib/sets/lists/base/md.amd64    4 Nov 2010 21:15:54 -0000       1.98
+++ distrib/sets/lists/base/md.amd64    22 Nov 2010 18:46:17 -0000
@@ -52,6 +52,10 @@
 ./usr/lib/i386/i18n/libmapper_std.so.5.0       base-i18n-shlib         
compat,pic
 ./usr/lib/i386/i18n/libmapper_zone.so.5                base-i18n-shlib         
compat,pic
 ./usr/lib/i386/i18n/libmapper_zone.so.5.0      base-i18n-shlib         
compat,pic
+./usr/lib/i386/libamu.so.4                     base-compat-shlib       
compat,pic
+./usr/lib/i386/libamu.so.4.0                   base-compat-shlib       
compat,pic
+./usr/lib/i386/libarchive.so.3                 base-compat-shlib       
compat,pic
+./usr/lib/i386/libarchive.so.3.1               base-compat-shlib       
compat,pic
 ./usr/lib/i386/libasn1.so.8                    base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/i386/libasn1.so.8.0                  base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/i386/libbfd.so.11                    base-compat-shlib       
compat,pic,binutils
@@ -78,10 +82,18 @@
 ./usr/lib/i386/libdes.so.8.1                   base-compat-shlib       
compat,pic
 ./usr/lib/i386/libdns.so.5                     base-compat-shlib       
compat,pic
 ./usr/lib/i386/libdns.so.5.1                   base-compat-shlib       
compat,pic
+./usr/lib/i386/libdns_sd.so.0                  base-compat-shlib       
compat,pic,mdns
+./usr/lib/i386/libdns_sd.so.0.0                        base-compat-shlib       
compat,pic,mdns
+./usr/lib/i386/libdwarf.so.0                   base-compat-shlib       
compat,pic
+./usr/lib/i386/libdwarf.so.0.0                 base-compat-shlib       
compat,pic
 ./usr/lib/i386/libedit.so.3                    base-compat-shlib       
compat,pic
 ./usr/lib/i386/libedit.so.3.0                  base-compat-shlib       
compat,pic
+./usr/lib/i386/libelf.so.0                     base-compat-shlib       
compat,pic
+./usr/lib/i386/libelf.so.0.0                   base-compat-shlib       
compat,pic
 ./usr/lib/i386/libevent.so.3                   base-compat-shlib       
compat,pic
 ./usr/lib/i386/libevent.so.3.2                 base-compat-shlib       
compat,pic
+./usr/lib/i386/libfetch.so.3                   base-compat-shlib       
compat,pic
+./usr/lib/i386/libfetch.so.3.0                 base-compat-shlib       
compat,pic
 ./usr/lib/i386/libform.so.6                    base-compat-shlib       
compat,pic
 ./usr/lib/i386/libform.so.6.0                  base-compat-shlib       
compat,pic
 ./usr/lib/i386/libgcc_s.so.1                   base-compat-shlib       
compat,pic
Index: distrib/sets/lists/base/md.sparc64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/base/md.sparc64,v
retrieving revision 1.92
diff -u -r1.92 md.sparc64
--- distrib/sets/lists/base/md.sparc64  4 Nov 2010 21:15:54 -0000       1.92
+++ distrib/sets/lists/base/md.sparc64  22 Nov 2010 18:46:17 -0000
@@ -50,6 +50,10 @@
 ./usr/lib/sparc/i18n/libmapper_std.so.5.0      base-i18n-shlib         
compat,pic
 ./usr/lib/sparc/i18n/libmapper_zone.so.5       base-i18n-shlib         
compat,pic
 ./usr/lib/sparc/i18n/libmapper_zone.so.5.0     base-i18n-shlib         
compat,pic
+./usr/lib/sparc/libamu.so.4                    base-compat-shlib       
compat,pic
+./usr/lib/sparc/libamu.so.4.0                  base-compat-shlib       
compat,pic
+./usr/lib/sparc/libarchive.so.3                        base-compat-shlib       
compat,pic
+./usr/lib/sparc/libarchive.so.3.1              base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libasn1.so.8                   base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/sparc/libasn1.so.8.0                 base-compat-shlib       
compat,pic,kerberos
 ./usr/lib/sparc/libbfd.so.11                   base-compat-shlib       
compat,pic,binutils
@@ -76,10 +80,18 @@
 ./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/libdns_sd.so.0                 base-compat-shlib       
compat,pic,mdns
+./usr/lib/sparc/libdns_sd.so.0.0               base-compat-shlib       
compat,pic,mdns
+./usr/lib/sparc/libdwarf.so.0                  base-compat-shlib       
compat,pic
+./usr/lib/sparc/libdwarf.so.0.0                        base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libedit.so.3                   base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libedit.so.3.0                 base-compat-shlib       
compat,pic
+./usr/lib/sparc/libelf.so.0                    base-compat-shlib       
compat,pic
+./usr/lib/sparc/libelf.so.0.0                  base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libevent.so.3                  base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libevent.so.3.2                        base-compat-shlib       
compat,pic
+./usr/lib/sparc/libfetch.so.3                  base-compat-shlib       
compat,pic
+./usr/lib/sparc/libfetch.so.3.0                        base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libform.so.6                   base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libform.so.6.0                 base-compat-shlib       
compat,pic
 ./usr/lib/sparc/libgcc_s.so.1                  base-compat-shlib       
compat,pic
Index: distrib/sets/lists/comp/ad.mips64eb
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/ad.mips64eb,v
retrieving revision 1.13
diff -u -r1.13 ad.mips64eb
--- distrib/sets/lists/comp/ad.mips64eb 6 Nov 2010 09:40:31 -0000       1.13
+++ distrib/sets/lists/comp/ad.mips64eb 22 Nov 2010 18:46:18 -0000
@@ -160,6 +160,10 @@
 ./usr/lib/64/i18n/libmapper_zone.so            base-sys-shlib          
compat,pic
 ./usr/lib/64/i18n/libmapper_zone_p.a           comp-obsolete           obsolete
 ./usr/lib/64/i18n/libmapper_zone_pic.a         comp-obsolete           obsolete
+./usr/lib/64/libarchive.a                      comp-c-lib              compat
+./usr/lib/64/libarchive.so                     base-sys-shlib          
compat,pic
+./usr/lib/64/libarchive_p.a                    comp-c-proflib          
compat,profile
+./usr/lib/64/libarchive_pic.a                  comp-c-piclib           
compat,pic
 ./usr/lib/64/libasn1.a                         comp-c-lib              
compat,kerberos
 ./usr/lib/64/libasn1.so                                base-sys-shlib          
compat,pic,kerberos
 ./usr/lib/64/libasn1_p.a                       comp-c-proflib          
compat,profile,kerberos
@@ -227,14 +231,30 @@
 ./usr/lib/64/libdns.so                         base-sys-shlib          
compat,pic
 ./usr/lib/64/libdns_p.a                                comp-c-proflib          
compat,profile
 ./usr/lib/64/libdns_pic.a                      comp-c-piclib           
compat,pic
+./usr/lib/64/libdns_sd.a                       comp-c-lib              
compat,mdns
+./usr/lib/64/libdns_sd.so                      base-mdns-shlib         
compat,pic,mdns
+./usr/lib/64/libdns_sd_p.a                     comp-c-proflib          
compat,profile,mdns
+./usr/lib/64/libdns_sd_pic.a                   comp-c-piclib           
compat,pic,mdns
+./usr/lib/64/libdwarf.a                                comp-c-lib              
compat
+./usr/lib/64/libdwarf.so                       base-sys-shlib          
compat,pic
+./usr/lib/64/libdwarf_p.a                      comp-c-proflib          
compat,profile
+./usr/lib/64/libdwarf_pic.a                    comp-c-piclib           
compat,pic
 ./usr/lib/64/libedit.a                         comp-c-lib              compat
 ./usr/lib/64/libedit.so                                base-sys-shlib          
compat,pic
 ./usr/lib/64/libedit_p.a                       comp-c-proflib          
compat,profile
 ./usr/lib/64/libedit_pic.a                     comp-c-piclib           
compat,pic
+./usr/lib/64/libelf.a                          comp-c-lib              compat
+./usr/lib/64/libelf.so                         base-sys-shlib          
compat,pic
+./usr/lib/64/libelf_p.a                                comp-c-proflib          
compat,profile
+./usr/lib/64/libelf_pic.a                      comp-c-piclib           
compat,pic
 ./usr/lib/64/libevent.a                                comp-c-lib              
compat
 ./usr/lib/64/libevent.so                       base-sys-shlib          
compat,pic
 ./usr/lib/64/libevent_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/64/libevent_pic.a                    comp-c-piclib           
compat,pic
+./usr/lib/64/libfetch.a                                comp-c-lib              
compat
+./usr/lib/64/libfetch.so                       base-sys-shlib          
compat,pic
+./usr/lib/64/libfetch_p.a                      comp-c-proflib          
compat,profile
+./usr/lib/64/libfetch_pic.a                    comp-c-piclib           
compat,pic
 ./usr/lib/64/libfl.a                           comp-c-lib              compat
 ./usr/lib/64/libfl_p.a                         comp-c-proflib          
compat,profile
 ./usr/lib/64/libform.a                         comp-c-lib              compat
@@ -641,6 +661,10 @@
 ./usr/lib/o32/i18n/libmapper_zone.so           base-sys-shlib          
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone_p.a          comp-obsolete           obsolete
 ./usr/lib/o32/i18n/libmapper_zone_pic.a                comp-obsolete           
obsolete
+./usr/lib/o32/libarchive.a                     comp-c-lib              compat
+./usr/lib/o32/libarchive.so                    base-sys-shlib          
compat,pic
+./usr/lib/o32/libarchive_p.a                   comp-c-proflib          
compat,profile
+./usr/lib/o32/libarchive_pic.a                 comp-c-piclib           
compat,pic
 ./usr/lib/o32/libasn1.a                                comp-c-lib              
compat,kerberos
 ./usr/lib/o32/libasn1.so                       base-sys-shlib          
compat,pic,kerberos
 ./usr/lib/o32/libasn1_p.a                      comp-c-proflib          
compat,profile,kerberos
@@ -708,14 +732,30 @@
 ./usr/lib/o32/libdns.so                                base-sys-shlib          
compat,pic
 ./usr/lib/o32/libdns_p.a                       comp-c-proflib          
compat,profile
 ./usr/lib/o32/libdns_pic.a                     comp-c-piclib           
compat,pic
+./usr/lib/o32/libdns_sd.a                      comp-c-lib              
compat,mdns
+./usr/lib/o32/libdns_sd.so                     base-mdns-shlib         
compat,pic,mdns
+./usr/lib/o32/libdns_sd_p.a                    comp-c-proflib          
compat,profile,mdns
+./usr/lib/o32/libdns_sd_pic.a                  comp-c-piclib           
compat,pic,mdns
+./usr/lib/o32/libdwarf.a                       comp-c-lib              compat
+./usr/lib/o32/libdwarf.so                      base-sys-shlib          
compat,pic
+./usr/lib/o32/libdwarf_p.a                     comp-c-proflib          
compat,profile
+./usr/lib/o32/libdwarf_pic.a                   comp-c-piclib           
compat,pic
 ./usr/lib/o32/libedit.a                                comp-c-lib              
compat
 ./usr/lib/o32/libedit.so                       base-sys-shlib          
compat,pic
 ./usr/lib/o32/libedit_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/o32/libedit_pic.a                    comp-c-piclib           
compat,pic
+./usr/lib/o32/libelf.a                         comp-c-lib              compat
+./usr/lib/o32/libelf.so                                base-sys-shlib          
compat,pic
+./usr/lib/o32/libelf_p.a                       comp-c-proflib          
compat,profile
+./usr/lib/o32/libelf_pic.a                     comp-c-piclib           
compat,pic
 ./usr/lib/o32/libevent.a                       comp-c-lib              compat
 ./usr/lib/o32/libevent.so                      base-sys-shlib          
compat,pic
 ./usr/lib/o32/libevent_p.a                     comp-c-proflib          
compat,profile
 ./usr/lib/o32/libevent_pic.a                   comp-c-piclib           
compat,pic
+./usr/lib/o32/libfetch.a                       comp-c-lib              compat
+./usr/lib/o32/libfetch.so                      base-sys-shlib          
compat,pic
+./usr/lib/o32/libfetch_p.a                     comp-c-proflib          
compat,profile
+./usr/lib/o32/libfetch_pic.a                   comp-c-piclib           
compat,pic
 ./usr/lib/o32/libfl.a                          comp-c-lib              compat
 ./usr/lib/o32/libfl_p.a                                comp-c-proflib          
compat,profile
 ./usr/lib/o32/libform.a                                comp-c-lib              
compat
Index: distrib/sets/lists/comp/ad.mips64el
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/ad.mips64el,v
retrieving revision 1.13
diff -u -r1.13 ad.mips64el
--- distrib/sets/lists/comp/ad.mips64el 6 Nov 2010 09:40:31 -0000       1.13
+++ distrib/sets/lists/comp/ad.mips64el 22 Nov 2010 18:46:20 -0000
@@ -160,6 +160,10 @@
 ./usr/lib/64/i18n/libmapper_zone.so            base-sys-shlib          
compat,pic
 ./usr/lib/64/i18n/libmapper_zone_p.a           comp-obsolete           obsolete
 ./usr/lib/64/i18n/libmapper_zone_pic.a         comp-obsolete           obsolete
+./usr/lib/64/libarchive.a                      comp-c-lib              compat
+./usr/lib/64/libarchive.so                     base-sys-shlib          
compat,pic
+./usr/lib/64/libarchive_p.a                    comp-c-proflib          
compat,profile
+./usr/lib/64/libarchive_pic.a                  comp-c-piclib           
compat,pic
 ./usr/lib/64/libasn1.a                         comp-c-lib              
compat,kerberos
 ./usr/lib/64/libasn1.so                                base-sys-shlib          
compat,pic,kerberos
 ./usr/lib/64/libasn1_p.a                       comp-c-proflib          
compat,profile,kerberos
@@ -227,14 +231,30 @@
 ./usr/lib/64/libdns.so                         base-sys-shlib          
compat,pic
 ./usr/lib/64/libdns_p.a                                comp-c-proflib          
compat,profile
 ./usr/lib/64/libdns_pic.a                      comp-c-piclib           
compat,pic
+./usr/lib/64/libdns_sd.a                       comp-c-lib              
compat,mdns
+./usr/lib/64/libdns_sd.so                      base-mdns-shlib         
compat,pic,mdns
+./usr/lib/64/libdns_sd_p.a                     comp-c-proflib          
compat,profile,mdns
+./usr/lib/64/libdns_sd_pic.a                   comp-c-piclib           
compat,pic,mdns
+./usr/lib/64/libdwarf.a                                comp-c-lib              
compat
+./usr/lib/64/libdwarf.so                       base-sys-shlib          
compat,pic
+./usr/lib/64/libdwarf_p.a                      comp-c-proflib          
compat,profile
+./usr/lib/64/libdwarf_pic.a                    comp-c-piclib           
compat,pic
 ./usr/lib/64/libedit.a                         comp-c-lib              compat
 ./usr/lib/64/libedit.so                                base-sys-shlib          
compat,pic
 ./usr/lib/64/libedit_p.a                       comp-c-proflib          
compat,profile
 ./usr/lib/64/libedit_pic.a                     comp-c-piclib           
compat,pic
+./usr/lib/64/libelf.a                          comp-c-lib              compat
+./usr/lib/64/libelf.so                         base-sys-shlib          
compat,pic
+./usr/lib/64/libelf_p.a                                comp-c-proflib          
compat,profile
+./usr/lib/64/libelf_pic.a                      comp-c-piclib           
compat,pic
 ./usr/lib/64/libevent.a                                comp-c-lib              
compat
 ./usr/lib/64/libevent.so                       base-sys-shlib          
compat,pic
 ./usr/lib/64/libevent_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/64/libevent_pic.a                    comp-c-piclib           
compat,pic
+./usr/lib/64/libfetch.a                                comp-c-lib              
compat
+./usr/lib/64/libfetch.so                       base-sys-shlib          
compat,pic
+./usr/lib/64/libfetch_p.a                      comp-c-proflib          
compat,profile
+./usr/lib/64/libfetch_pic.a                    comp-c-piclib           
compat,pic
 ./usr/lib/64/libfl.a                           comp-c-lib              compat
 ./usr/lib/64/libfl_p.a                         comp-c-proflib          
compat,profile
 ./usr/lib/64/libform.a                         comp-c-lib              compat
@@ -641,6 +661,10 @@
 ./usr/lib/o32/i18n/libmapper_zone.so           base-sys-shlib          
compat,pic
 ./usr/lib/o32/i18n/libmapper_zone_p.a          comp-obsolete           obsolete
 ./usr/lib/o32/i18n/libmapper_zone_pic.a                comp-obsolete           
obsolete
+./usr/lib/o32/libarchive.a                     comp-c-lib              compat
+./usr/lib/o32/libarchive.so                    base-sys-shlib          
compat,pic
+./usr/lib/o32/libarchive_p.a                   comp-c-proflib          
compat,profile
+./usr/lib/o32/libarchive_pic.a                 comp-c-piclib           
compat,pic
 ./usr/lib/o32/libasn1.a                                comp-c-lib              
compat,kerberos
 ./usr/lib/o32/libasn1.so                       base-sys-shlib          
compat,pic,kerberos
 ./usr/lib/o32/libasn1_p.a                      comp-c-proflib          
compat,profile,kerberos
@@ -708,14 +732,30 @@
 ./usr/lib/o32/libdns.so                                base-sys-shlib          
compat,pic
 ./usr/lib/o32/libdns_p.a                       comp-c-proflib          
compat,profile
 ./usr/lib/o32/libdns_pic.a                     comp-c-piclib           
compat,pic
+./usr/lib/o32/libdns_sd.a                      comp-c-lib              
compat,mdns
+./usr/lib/o32/libdns_sd.so                     base-mdns-shlib         
compat,pic,mdns
+./usr/lib/o32/libdns_sd_p.a                    comp-c-proflib          
compat,profile,mdns
+./usr/lib/o32/libdns_sd_pic.a                  comp-c-piclib           
compat,pic,mdns
+./usr/lib/o32/libdwarf.a                       comp-c-lib              compat
+./usr/lib/o32/libdwarf.so                      base-sys-shlib          
compat,pic
+./usr/lib/o32/libdwarf_p.a                     comp-c-proflib          
compat,profile
+./usr/lib/o32/libdwarf_pic.a                   comp-c-piclib           
compat,pic
 ./usr/lib/o32/libedit.a                                comp-c-lib              
compat
 ./usr/lib/o32/libedit.so                       base-sys-shlib          
compat,pic
 ./usr/lib/o32/libedit_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/o32/libedit_pic.a                    comp-c-piclib           
compat,pic
+./usr/lib/o32/libelf.a                         comp-c-lib              compat
+./usr/lib/o32/libelf.so                                base-sys-shlib          
compat,pic
+./usr/lib/o32/libelf_p.a                       comp-c-proflib          
compat,profile
+./usr/lib/o32/libelf_pic.a                     comp-c-piclib           
compat,pic
 ./usr/lib/o32/libevent.a                       comp-c-lib              compat
 ./usr/lib/o32/libevent.so                      base-sys-shlib          
compat,pic
 ./usr/lib/o32/libevent_p.a                     comp-c-proflib          
compat,profile
 ./usr/lib/o32/libevent_pic.a                   comp-c-piclib           
compat,pic
+./usr/lib/o32/libfetch.a                       comp-c-lib              compat
+./usr/lib/o32/libfetch.so                      base-sys-shlib          
compat,pic
+./usr/lib/o32/libfetch_p.a                     comp-c-proflib          
compat,profile
+./usr/lib/o32/libfetch_pic.a                   comp-c-piclib           
compat,pic
 ./usr/lib/o32/libfl.a                          comp-c-lib              compat
 ./usr/lib/o32/libfl_p.a                                comp-c-proflib          
compat,profile
 ./usr/lib/o32/libform.a                                comp-c-lib              
compat
Index: distrib/sets/lists/comp/md.amd64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/md.amd64,v
retrieving revision 1.78
diff -u -r1.78 md.amd64
--- distrib/sets/lists/comp/md.amd64    4 Nov 2010 21:15:55 -0000       1.78
+++ distrib/sets/lists/comp/md.amd64    22 Nov 2010 18:46:21 -0000
@@ -356,6 +356,11 @@
 ./usr/lib/i386/i18n/libmapper_zone_g.a         comp-c-proflib          
compat,debuglib
 ./usr/lib/i386/i18n/libmapper_zone_p.a         comp-obsolete           obsolete
 ./usr/lib/i386/i18n/libmapper_zone_pic.a       comp-obsolete           obsolete
+./usr/lib/i386/libarchive.a                    comp-c-lib              compat
+./usr/lib/i386/libarchive.so                   comp-sys-shlib          
compat,pic
+./usr/lib/i386/libarchive_g.a                  comp-c-proflib          
compat,debuglib
+./usr/lib/i386/libarchive_p.a                  comp-c-proflib          
compat,profile
+./usr/lib/i386/libarchive_pic.a                        comp-c-piclib           
compat,pic
 ./usr/lib/i386/libasn1.a                       comp-c-lib              
compat,kerberos
 ./usr/lib/i386/libasn1.so                      comp-sys-shlib          
compat,pic,kerberos
 ./usr/lib/i386/libasn1_g.a                     comp-c-proflib          
compat,debuglib,kerberos
@@ -439,16 +444,36 @@
 ./usr/lib/i386/libdns_g.a                      comp-c-proflib          
compat,debuglib
 ./usr/lib/i386/libdns_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/i386/libdns_pic.a                    comp-c-piclib           
compat,pic
+./usr/lib/i386/libdns_sd.a                     comp-c-lib              
compat,mdns
+./usr/lib/i386/libdns_sd.so                    comp-mdns-shlib         
compat,pic,mdns
+./usr/lib/i386/libdns_sd_g.a                   comp-c-proflib          
compat,debuglib,mdns
+./usr/lib/i386/libdns_sd_p.a                   comp-c-proflib          
compat,profile,mdns
+./usr/lib/i386/libdns_sd_pic.a                 comp-c-piclib           
compat,pic,mdns
+./usr/lib/i386/libdwarf.a                      comp-c-lib              compat
+./usr/lib/i386/libdwarf.so                     comp-sys-shlib          
compat,pic
+./usr/lib/i386/libdwarf_g.a                    comp-c-proflib          
compat,debuglib
+./usr/lib/i386/libdwarf_p.a                    comp-c-proflib          
compat,profile
+./usr/lib/i386/libdwarf_pic.a                  comp-c-piclib           
compat,pic
 ./usr/lib/i386/libedit.a                       comp-c-lib              compat
 ./usr/lib/i386/libedit.so                      comp-sys-shlib          
compat,pic
 ./usr/lib/i386/libedit_g.a                     comp-c-proflib          
compat,debuglib
 ./usr/lib/i386/libedit_p.a                     comp-c-proflib          
compat,profile
 ./usr/lib/i386/libedit_pic.a                   comp-c-piclib           
compat,pic
+./usr/lib/i386/libelf.a                                comp-c-lib              
compat
+./usr/lib/i386/libelf.so                       comp-sys-shlib          
compat,pic
+./usr/lib/i386/libelf_g.a                      comp-c-proflib          
compat,debuglib
+./usr/lib/i386/libelf_p.a                      comp-c-proflib          
compat,profile
+./usr/lib/i386/libelf_pic.a                    comp-c-piclib           
compat,pic
 ./usr/lib/i386/libevent.a                      comp-c-lib              compat
 ./usr/lib/i386/libevent.so                     comp-sys-shlib          
compat,pic
 ./usr/lib/i386/libevent_g.a                    comp-c-proflib          
compat,debuglib
 ./usr/lib/i386/libevent_p.a                    comp-c-proflib          
compat,profile
 ./usr/lib/i386/libevent_pic.a                  comp-c-piclib           
compat,pic
+./usr/lib/i386/libfetch.a                      comp-c-lib              compat
+./usr/lib/i386/libfetch.so                     comp-sys-shlib          
compat,pic
+./usr/lib/i386/libfetch_g.a                    comp-c-proflib          
compat,debuglib
+./usr/lib/i386/libfetch_p.a                    comp-c-proflib          
compat,profile
+./usr/lib/i386/libfetch_pic.a                  comp-c-piclib           
compat,pic
 ./usr/lib/i386/libfl.a                         comp-c-lib              compat
 ./usr/lib/i386/libfl_g.a                       comp-c-proflib          
compat,debuglib
 ./usr/lib/i386/libfl_p.a                       comp-c-proflib          
compat,profile
@@ -862,6 +887,8 @@
 ./usr/libdata/debug/usr/lib/i386/i18n/libmapper_serial.so.5.0.debug    
comp-i18n-shlib         compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/i18n/libmapper_std.so.5.0.debug       
comp-i18n-shlib         compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/i18n/libmapper_zone.so.5.0.debug      
comp-i18n-shlib         compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libamu.so.4.0.debug   comp-compat-shlib       
compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libarchive.so.3.1.debug       
comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libasn1.so.8.0.debug  comp-compat-shlib       
compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libbfd.so.11.0.debug  comp-compat-shlib       
compat,pic,binutils,debug
 ./usr/libdata/debug/usr/lib/i386/libbind9.so.5.1.debug comp-compat-shlib       
compat,pic,debug
@@ -875,8 +902,12 @@
 ./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug        
comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug   comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libdns.so.5.1.debug   comp-compat-shlib       
compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdns_sd.so.0.0.debug        
comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libdwarf.so.0.0.debug comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libedit.so.3.0.debug  comp-compat-shlib       
compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libelf.so.0.0.debug   comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libevent.so.3.2.debug comp-compat-shlib       
compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libfetch.so.3.0.debug comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libform.so.6.0.debug  comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libgcc_s.so.1.0.debug comp-compat-shlib       
compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libgnumalloc.so.1.0.debug     
comp-compat-shlib       compat,pic,debug
Index: distrib/sets/lists/comp/md.sparc64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/md.sparc64,v
retrieving revision 1.68
diff -u -r1.68 md.sparc64
--- distrib/sets/lists/comp/md.sparc64  4 Nov 2010 21:15:55 -0000       1.68
+++ distrib/sets/lists/comp/md.sparc64  22 Nov 2010 18:46:22 -0000
@@ -233,6 +233,10 @@
 ./usr/lib/sparc/i18n/libmapper_zone.so         base-sys-shlib          
compat,pic
 ./usr/lib/sparc/i18n/libmapper_zone_p.a                comp-obsolete           
obsolete
 ./usr/lib/sparc/i18n/libmapper_zone_pic.a      comp-obsolete           obsolete
+./usr/lib/sparc/libarchive.a                   comp-c-lib              compat
+./usr/lib/sparc/libarchive.so                  base-sys-shlib          
compat,pic
+./usr/lib/sparc/libarchive_p.a                 comp-c-proflib          
compat,profile
+./usr/lib/sparc/libarchive_pic.a               comp-c-piclib           
compat,pic
 ./usr/lib/sparc/libasn1.a                      comp-c-lib              
compat,kerberos
 ./usr/lib/sparc/libasn1.so                     base-sys-shlib          
compat,pic,kerberos
 ./usr/lib/sparc/libasn1_p.a                    comp-c-proflib          
compat,profile,kerberos
@@ -300,14 +304,30 @@
 ./usr/lib/sparc/libdns.so                      base-sys-shlib          
compat,pic
 ./usr/lib/sparc/libdns_p.a                     comp-c-proflib          
compat,profile
 ./usr/lib/sparc/libdns_pic.a                   comp-c-piclib           
compat,pic
+./usr/lib/sparc/libdns_sd.a                    comp-c-lib              
compat,mdns
+./usr/lib/sparc/libdns_sd.so                   base-mdns-shlib         
compat,pic,mdns
+./usr/lib/sparc/libdns_sd_p.a                  comp-c-proflib          
compat,profile,mdns
+./usr/lib/sparc/libdns_sd_pic.a                        comp-c-piclib           
compat,pic,mdns
+./usr/lib/sparc/libdwarf.a                     comp-c-lib              compat
+./usr/lib/sparc/libdwarf.so                    base-sys-shlib          
compat,pic
+./usr/lib/sparc/libdwarf_p.a                   comp-c-proflib          
compat,profile
+./usr/lib/sparc/libdwarf_pic.a                 comp-c-piclib           
compat,pic
 ./usr/lib/sparc/libedit.a                      comp-c-lib              compat
 ./usr/lib/sparc/libedit.so                     base-sys-shlib          
compat,pic
 ./usr/lib/sparc/libedit_p.a                    comp-c-proflib          
compat,profile
 ./usr/lib/sparc/libedit_pic.a                  comp-c-piclib           
compat,pic
+./usr/lib/sparc/libelf.a                       comp-c-lib              compat
+./usr/lib/sparc/libelf.so                      base-sys-shlib          
compat,pic
+./usr/lib/sparc/libelf_p.a                     comp-c-proflib          
compat,profile
+./usr/lib/sparc/libelf_pic.a                   comp-c-piclib           
compat,pic
 ./usr/lib/sparc/libevent.a                     comp-c-lib              compat
 ./usr/lib/sparc/libevent.so                    base-sys-shlib          
compat,pic
 ./usr/lib/sparc/libevent_p.a                   comp-c-proflib          
compat,profile
 ./usr/lib/sparc/libevent_pic.a                 comp-c-piclib           
compat,pic
+./usr/lib/sparc/libfetch.a                     comp-c-lib              compat
+./usr/lib/sparc/libfetch.so                    base-sys-shlib          
compat,pic
+./usr/lib/sparc/libfetch_p.a                   comp-c-proflib          
compat,profile
+./usr/lib/sparc/libfetch_pic.a                 comp-c-piclib           
compat,pic
 ./usr/lib/sparc/libfl.a                                comp-c-lib              
compat
 ./usr/lib/sparc/libfl_p.a                      comp-c-proflib          
compat,profile
 ./usr/lib/sparc/libform.a                      comp-c-lib              compat
@@ -637,6 +657,8 @@
 ./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/libamu.so.4.0.debug                  
comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libarchive.so.3.1.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
@@ -650,8 +672,12 @@
 ./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,crypto
 ./usr/libdata/debug/usr/lib/sparc/libdns.so.5.1.debug                  
comp-compat-shlib       compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libdns_sd.so.0.0.debug               
comp-compat-shlib       compat,pic,debug,mdns
+./usr/libdata/debug/usr/lib/sparc/libdwarf.so.0.0.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/libelf.so.0.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
+./usr/libdata/debug/usr/lib/sparc/libfetch.so.3.0.debug                        
comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libform.so.6.0.debug                 
comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libgcc_s.so.1.0.debug                        
comp-compat-shlib       compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libgnumalloc.so.1.0.debug            
comp-compat-shlib       compat,pic,debug
Index: external/bsd/libdwarf/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libdwarf/prepare-import.sh,v
retrieving revision 1.1
diff -u -r1.1 prepare-import.sh
--- external/bsd/libdwarf/prepare-import.sh     23 Dec 2009 00:06:53 -0000      
1.1
+++ external/bsd/libdwarf/prepare-import.sh     22 Nov 2010 18:46:22 -0000
@@ -4,7 +4,7 @@
 # Copy the FreeBSD src/lib/libdwarf directory contents to dist.  Run
 # this script and you're done.
 #
-# lib/ is built as SUBDIR from external/lib/Makefile.
+# lib/ is built as SUBDIR from lib/Makefile.
 #
 # Use the following template to import
 #  cvs import src/external/bsd/libdwarf/dist FreeBSD FreeBSD-X-Y-Z
Index: external/bsd/libelf/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libelf/prepare-import.sh,v
retrieving revision 1.2
diff -u -r1.2 prepare-import.sh
--- external/bsd/libelf/prepare-import.sh       29 Dec 2009 16:56:25 -0000      
1.2
+++ external/bsd/libelf/prepare-import.sh       22 Nov 2010 18:46:22 -0000
@@ -4,7 +4,7 @@
 # Copy the FreeBSD src/lib/libelf directory contents to dist.  Run
 # this script and you're done.
 #
-# lib/ is built as SUBDIR from external/lib/Makefile.
+# lib/ is built as SUBDIR from lib/Makefile.
 #
 # Use the following template to import
 #  cvs import src/external/bsd/libelf/dist FreeBSD FreeBSD-X-Y-Z
Index: external/bsd/libevent/prepare-import.sh
===================================================================
RCS file: /cvsroot/src/external/bsd/libevent/prepare-import.sh,v
retrieving revision 1.1
diff -u -r1.1 prepare-import.sh
--- external/bsd/libevent/prepare-import.sh     2 Nov 2009 10:03:56 -0000       
1.1
+++ external/bsd/libevent/prepare-import.sh     22 Nov 2010 18:46:22 -0000
@@ -5,7 +5,7 @@
 # to dist.  Run this script and check for additional files and
 # directories to prune, only relevant content is included.
 #
-# lib/ is built as SUBDIR from external/lib/Makefile, and
+# lib/ is built as SUBDIR from lib/Makefile, and
 # the regression tests are used from tests/lib/libevent
 #
 # Use the following template to import


Home | Main Index | Thread Index | Old Index