Module Name: src Committed By: tron Date: Wed Feb 29 20:07:58 UTC 2012
Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/external/mit: Makefile src/external/mit/xorg/bin/xmlwf: Makefile src/external/mit/xorg/lib: Makefile src/external/mit/xorg/lib/dri: dri.mk src/external/mit/xorg/lib/fontconfig/src: Makefile src/external/mit/xorg/tools/fc-cache: Makefile src/lib: Makefile src/share/mk: bsd.README bsd.hostprog.mk bsd.prog.mk src/x11/lib: Makefile src/x11/lib/fontconfig/src: Makefile Added Files: src/external/mit/expat: Makefile Makefile.inc src/external/mit/expat/bin: Makefile Makefile.inc src/external/mit/expat/bin/xmlwf: Makefile src/external/mit/expat/lib: Makefile Makefile.inc src/external/mit/expat/lib/libexpat: Makefile expat_config.h shlib_version Removed Files: src/external/mit/xorg/lib/expat: Makefile expat_config.h shlib_version src/x11/lib/expat: Makefile shlib_version Log Message: Move "libexpat" from X11 into base which fixes PR lib/40346. This change was approved by the Core Group. To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.158 -r1.159 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.986 -r1.987 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.618 -r1.619 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.140 -r1.141 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1742 -r1.1743 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.211 -r1.212 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1381 -r1.1382 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.133 -r1.134 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.1 -r1.2 src/external/mit/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/expat/Makefile \ src/external/mit/expat/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/bin/Makefile \ src/external/mit/expat/bin/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/bin/xmlwf/Makefile cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/Makefile \ src/external/mit/expat/lib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/mit/expat/lib/libexpat/Makefile \ src/external/mit/expat/lib/libexpat/expat_config.h \ src/external/mit/expat/lib/libexpat/shlib_version cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmlwf/Makefile cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/dri/dri.mk cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/expat/Makefile \ src/external/mit/xorg/lib/expat/shlib_version cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/expat/expat_config.h cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/fontconfig/src/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.181 -r1.182 src/lib/Makefile cvs rdiff -u -r1.293 -r1.294 src/share/mk/bsd.README cvs rdiff -u -r1.66 -r1.67 src/share/mk/bsd.hostprog.mk cvs rdiff -u -r1.273 -r1.274 src/share/mk/bsd.prog.mk cvs rdiff -u -r1.10 -r1.11 src/x11/lib/Makefile cvs rdiff -u -r1.7 -r0 src/x11/lib/expat/Makefile cvs rdiff -u -r1.2 -r0 src/x11/lib/expat/shlib_version cvs rdiff -u -r1.10 -r1.11 src/x11/lib/fontconfig/src/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.84 src/distrib/sets/lists/base/ad.mips64eb:1.85 --- src/distrib/sets/lists/base/ad.mips64eb:1.84 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/ad.mips64eb Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.84 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.85 2012/02/29 20:07:51 tron 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 @@ -93,6 +93,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/64/libexpat.so.2.0 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 @@ -389,6 +391,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/o32/libexpat.so.2.0 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 Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.83 src/distrib/sets/lists/base/ad.mips64el:1.84 --- src/distrib/sets/lists/base/ad.mips64el:1.83 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/ad.mips64el Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.83 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: ad.mips64el,v 1.84 2012/02/29 20:07:51 tron 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 @@ -93,6 +93,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/64/libexpat.so.2.0 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 @@ -389,6 +391,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/o32/libexpat.so.2.0 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 Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.158 src/distrib/sets/lists/base/md.amd64:1.159 --- src/distrib/sets/lists/base/md.amd64:1.158 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/md.amd64 Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.158 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: md.amd64,v 1.159 2012/02/29 20:07:51 tron Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -102,6 +102,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/i386/libexpat.so.2.0 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 Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.149 src/distrib/sets/lists/base/md.sparc64:1.150 --- src/distrib/sets/lists/base/md.sparc64:1.149 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/md.sparc64 Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.149 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: md.sparc64,v 1.150 2012/02/29 20:07:51 tron Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root obsolete ./usr/bin/fdformat base-util-bin @@ -94,6 +94,8 @@ ./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/libexpat.so.2 base-compat-shlib compat,pic +./usr/lib/sparc/libexpat.so.2.0 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 Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.986 src/distrib/sets/lists/base/mi:1.987 --- src/distrib/sets/lists/base/mi:1.986 Thu Feb 16 12:29:11 2012 +++ src/distrib/sets/lists/base/mi Wed Feb 29 20:07:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.986 2012/02/16 12:29:11 wiz Exp $ +# $NetBSD: mi,v 1.987 2012/02/29 20:07:51 tron Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -745,6 +745,7 @@ ./usr/bin/window base-obsolete obsolete ./usr/bin/write base-util-bin ./usr/bin/xargs base-util-bin +./usr/bin/xmlwf base-util-bin ./usr/bin/xz base-util-bin ./usr/bin/xzcat base-util-bin ./usr/bin/yes base-util-bin Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.618 src/distrib/sets/lists/base/shl.mi:1.619 --- src/distrib/sets/lists/base/shl.mi:1.618 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/base/shl.mi Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.618 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: shl.mi,v 1.619 2012/02/29 20:07:52 tron Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -220,6 +220,9 @@ ./usr/lib/libevent.so base-sys-shlib ./usr/lib/libevent.so.3 base-sys-shlib ./usr/lib/libevent.so.3.2 base-sys-shlib +./usr/lib/libexpat.so base-sys-shlib +./usr/lib/libexpat.so.2 base-sys-shlib +./usr/lib/libexpat.so.2.0 base-sys-shlib ./usr/lib/libfetch.so base-sys-shlib ./usr/lib/libfetch.so.3 base-sys-shlib ./usr/lib/libfetch.so.3.0 base-sys-shlib Index: src/distrib/sets/lists/comp/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.71 src/distrib/sets/lists/comp/ad.mips64eb:1.72 --- src/distrib/sets/lists/comp/ad.mips64eb:1.71 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/comp/ad.mips64eb Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.71 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: ad.mips64eb,v 1.72 2012/02/29 20:07:52 tron Exp $ ./usr/bin/elf2aout comp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45 @@ -263,6 +263,10 @@ ./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/libexpat.a comp-c-lib compat +./usr/lib/64/libexpat.so base-sys-shlib compat,pic +./usr/lib/64/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/64/libexpat_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 @@ -848,6 +852,10 @@ ./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/libexpat.a comp-c-lib compat +./usr/lib/o32/libexpat.so base-sys-shlib compat,pic +./usr/lib/o32/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/o32/libexpat_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 @@ -1283,6 +1291,7 @@ ./usr/libdata/debug/usr/lib/64/libedit.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libelf.so.0.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libevent.so.3.2.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/64/libexpat.so.2.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libfetch.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libform.so.6.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat @@ -1435,6 +1444,7 @@ ./usr/libdata/debug/usr/lib/o32/libedit.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libelf.so.0.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libevent.so.3.2.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/o32/libexpat.so.2.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libfetch.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libform.so.6.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat Index: src/distrib/sets/lists/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.71 src/distrib/sets/lists/comp/ad.mips64el:1.72 --- src/distrib/sets/lists/comp/ad.mips64el:1.71 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/comp/ad.mips64el Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.71 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: ad.mips64el,v 1.72 2012/02/29 20:07:52 tron Exp $ ./usr/bin/elf2aout comp-obsolete obsolete ./usr/bin/elf2ecoff comp-sysutil-bin ./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45 @@ -263,6 +263,10 @@ ./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/libexpat.a comp-c-lib compat +./usr/lib/64/libexpat.so base-sys-shlib compat,pic +./usr/lib/64/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/64/libexpat_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 @@ -848,6 +852,10 @@ ./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/libexpat.a comp-c-lib compat +./usr/lib/o32/libexpat.so base-sys-shlib compat,pic +./usr/lib/o32/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/o32/libexpat_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 @@ -1283,6 +1291,7 @@ ./usr/libdata/debug/usr/lib/64/libedit.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libelf.so.0.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libevent.so.3.2.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/64/libexpat.so.2.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libfetch.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libform.so.6.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/64/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat @@ -1435,6 +1444,7 @@ ./usr/libdata/debug/usr/lib/o32/libedit.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libelf.so.0.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libevent.so.3.2.debug comp-sys-debug debug,compat +./usr/libdata/debug/usr/lib/o32/libexpat.so.3.2.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libfetch.so.3.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libform.so.6.0.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/lib/o32/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug,compat Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.157 src/distrib/sets/lists/comp/md.amd64:1.158 --- src/distrib/sets/lists/comp/md.amd64:1.157 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/comp/md.amd64 Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.157 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: md.amd64,v 1.158 2012/02/29 20:07:52 tron Exp $ ./usr/include/amd64 comp-c-include ./usr/include/amd64/ansi.h comp-c-include ./usr/include/amd64/aout_machdep.h comp-c-include @@ -537,6 +537,11 @@ ./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/libexpat.a comp-c-lib compat +./usr/lib/i386/libexpat.so comp-sys-shlib compat,pic +./usr/lib/i386/libexpat_g.a comp-c-proflib compat,debuglib +./usr/lib/i386/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/i386/libexpat_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 @@ -1063,6 +1068,7 @@ ./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/libexpat.so.2.0.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 Index: src/distrib/sets/lists/comp/md.sparc64 diff -u src/distrib/sets/lists/comp/md.sparc64:1.140 src/distrib/sets/lists/comp/md.sparc64:1.141 --- src/distrib/sets/lists/comp/md.sparc64:1.140 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/comp/md.sparc64 Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.140 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: md.sparc64,v 1.141 2012/02/29 20:07:52 tron Exp $ ./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45 ./usr/include/ieeefp.h comp-c-include ./usr/include/sparc comp-c-include @@ -387,6 +387,11 @@ ./usr/lib/sparc/libevent_g.a -unknown- compat,debuglib ./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/libexpat.a comp-c-lib compat +./usr/lib/sparc/libexpat.so base-sys-shlib compat,pic +./usr/lib/sparc/libexpat_g.a -unknown- compat,debuglib +./usr/lib/sparc/libexpat_p.a comp-c-proflib compat,profile +./usr/lib/sparc/libexpat_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_g.a -unknown- compat,debuglib @@ -906,6 +911,7 @@ ./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/libexpat.so.2.0.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 Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1742 src/distrib/sets/lists/comp/mi:1.1743 --- src/distrib/sets/lists/comp/mi:1.1742 Tue Feb 21 10:10:43 2012 +++ src/distrib/sets/lists/comp/mi Wed Feb 29 20:07:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1742 2012/02/21 10:10:43 wiz Exp $ +# $NetBSD: mi,v 1.1743 2012/02/29 20:07:52 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -650,6 +650,8 @@ ./usr/include/evhttp.h comp-c-include ./usr/include/evrpc.h comp-c-include ./usr/include/evutil.h comp-c-include +./usr/include/expat.h comp-c-include +./usr/include/expat_external.h comp-c-include ./usr/include/fcntl.h comp-c-include ./usr/include/fenv.h comp-c-include ./usr/include/fetch.h comp-c-include @@ -2807,6 +2809,9 @@ ./usr/lib/libevent.a comp-c-lib ./usr/lib/libevent_g.a -unknown- debuglib ./usr/lib/libevent_p.a comp-c-proflib profile +./usr/lib/libexpat.a comp-c-lib +./usr/lib/libexpat_g.a -unknown- debuglib +./usr/lib/libexpat_p.a comp-c-proflib profile ./usr/lib/libfetch.a comp-c-lib ./usr/lib/libfetch_g.a -unknown- debuglib ./usr/lib/libfetch_p.a comp-c-proflib profile @@ -3898,6 +3903,7 @@ ./usr/libdata/debug/usr/bin/xargs.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/xgettext.debug comp-c-debug debug ./usr/libdata/debug/usr/bin/xstr.debug comp-c-debug debug +./usr/libdata/debug/usr/bin/xmlwf.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/xz.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/yacc.debug comp-c-debug debug ./usr/libdata/debug/usr/bin/yes.debug comp-util-debug debug @@ -4356,6 +4362,7 @@ ./usr/libdata/lint/llib-ledit.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lelf.ln comp-c-lintlib lint ./usr/libdata/lint/llib-levent.ln comp-c-lintlib lint +./usr/libdata/lint/llib-lexpat.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lfetch.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lform.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lgmp.ln comp-c-lintlib obsolete Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.211 src/distrib/sets/lists/comp/shl.mi:1.212 --- src/distrib/sets/lists/comp/shl.mi:1.211 Tue Feb 28 14:22:22 2012 +++ src/distrib/sets/lists/comp/shl.mi Wed Feb 29 20:07:53 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.211 2012/02/28 14:22:22 joerg Exp $ +# $NetBSD: shl.mi,v 1.212 2012/02/29 20:07:53 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -33,6 +33,7 @@ ./usr/lib/libedit_pic.a comp-c-piclib ./usr/lib/libelf_pic.a comp-c-piclib ./usr/lib/libevent_pic.a comp-c-piclib +./usr/lib/libexpat_pic.a comp-c-piclib ./usr/lib/libfetch_pic.a comp-c-piclib ./usr/lib/libform_pic.a comp-c-piclib ./usr/lib/libg2c_pic.a comp-fortran-lib gcc=3 @@ -264,6 +265,7 @@ ./usr/libdata/debug/usr/lib/libedit.so.3.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libelf.so.0.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libevent.so.3.2.debug comp-sys-debug debug +./usr/libdata/debug/usr/lib/libexpat.so.2.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libform.so.6.0.debug comp-sys-debug debug ./usr/libdata/debug/usr/lib/libg2c.so.2.0.debug comp-sys-debug gcc=3,debug Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1381 src/distrib/sets/lists/man/mi:1.1382 --- src/distrib/sets/lists/man/mi:1.1381 Thu Feb 16 12:29:11 2012 +++ src/distrib/sets/lists/man/mi Wed Feb 29 20:07:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1381 2012/02/16 12:29:11 wiz Exp $ +# $NetBSD: mi,v 1.1382 2012/02/29 20:07:54 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -583,6 +583,7 @@ ./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/xmlwf.0 man-util-catman .cat ./usr/share/man/cat1/xz.0 man-util-catman .cat ./usr/share/man/cat1/xzcat.0 man-util-catman .cat ./usr/share/man/cat1/yes.0 man-util-catman .cat @@ -3504,6 +3505,7 @@ ./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/xmlwf.html man-util-htmlman html ./usr/share/man/html1/xz.html man-util-htmlman html ./usr/share/man/html1/xzcat.html man-util-htmlman html ./usr/share/man/html1/yes.html man-util-htmlman html @@ -6090,6 +6092,7 @@ ./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/xmlwf.1 man-util-man .man ./usr/share/man/man1/xz.1 man-util-man .man ./usr/share/man/man1/xzcat.1 man-util-man .man ./usr/share/man/man1/yes.1 man-util-man .man Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.112 src/distrib/sets/lists/xbase/mi:1.113 --- src/distrib/sets/lists/xbase/mi:1.112 Tue Feb 7 19:13:30 2012 +++ src/distrib/sets/lists/xbase/mi Wed Feb 29 20:07:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.112 2012/02/07 19:13:30 joerg Exp $ +# $NetBSD: mi,v 1.113 2012/02/29 20:07:54 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2568,7 +2568,7 @@ ./usr/X11R7/man/cat1/xmessage.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/xmh.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/xmkmf.0 -unknown- .cat,xorg -./usr/X11R7/man/cat1/xmlwf.0 -unknown- .cat,xorg +./usr/X11R7/man/cat1/xmlwf.0 -obsolete- obsolete ./usr/X11R7/man/cat1/xmodmap.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/xmore.0 -unknown- .cat,xorg ./usr/X11R7/man/cat1/xphelloworld.0 -obsolete- obsolete @@ -2706,7 +2706,7 @@ ./usr/X11R7/man/html1/xmessage.html -unknown- html,xorg ./usr/X11R7/man/html1/xmh.html -unknown- html,xorg ./usr/X11R7/man/html1/xmkmf.html -unknown- html,xorg -./usr/X11R7/man/html1/xmlwf.html -unknown- html,xorg +./usr/X11R7/man/html1/xmlwf.html -obsolete- obsolete ./usr/X11R7/man/html1/xmodmap.html -unknown- html,xorg ./usr/X11R7/man/html1/xmore.html -unknown- html,xorg ./usr/X11R7/man/html1/xphelloworld.html -obsolete- obsolete @@ -2845,7 +2845,7 @@ ./usr/X11R7/man/man1/xmessage.1 -unknown- .man,xorg ./usr/X11R7/man/man1/xmh.1 -unknown- .man,xorg ./usr/X11R7/man/man1/xmkmf.1 -unknown- .man,xorg -./usr/X11R7/man/man1/xmlwf.1 -unknown- .man,xorg +./usr/X11R7/man/man1/xmlwf.1 -obsolete- obsolete ./usr/X11R7/man/man1/xmodmap.1 -unknown- .man,xorg ./usr/X11R7/man/man1/xmore.1 -unknown- .man,xorg ./usr/X11R7/man/man1/xphelloworld.1 -obsolete- obsolete Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.44 src/distrib/sets/lists/xbase/shl.mi:1.45 --- src/distrib/sets/lists/xbase/shl.mi:1.44 Sun Jul 24 00:33:38 2011 +++ src/distrib/sets/lists/xbase/shl.mi Wed Feb 29 20:07:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.44 2011/07/24 00:33:38 mrg Exp $ +# $NetBSD: shl.mi,v 1.45 2012/02/29 20:07:55 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -123,9 +123,9 @@ ./usr/X11R6/lib/libdpstk.so -unknown- x11 ./usr/X11R6/lib/libdpstk.so.1 -unknown- x11 ./usr/X11R6/lib/libdpstk.so.1.0 -unknown- x11 -./usr/X11R6/lib/libexpat.so -unknown- x11 -./usr/X11R6/lib/libexpat.so.4 -unknown- x11 -./usr/X11R6/lib/libexpat.so.4.0 -unknown- x11 +./usr/X11R6/lib/libexpat.so -obsolete- obsolete +./usr/X11R6/lib/libexpat.so.4 -obsolete- obsolete +./usr/X11R6/lib/libexpat.so.4.0 -obsolete- obsolete ./usr/X11R6/lib/libfontconfig.so -unknown- x11 ./usr/X11R6/lib/libfontconfig.so.1 -unknown- x11 ./usr/X11R6/lib/libfontconfig.so.1.0 -unknown- x11 @@ -306,9 +306,9 @@ ./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg ./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg ./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg -./usr/X11R7/lib/libexpat.so -unknown- xorg -./usr/X11R7/lib/libexpat.so.2 -unknown- xorg -./usr/X11R7/lib/libexpat.so.2.0 -unknown- xorg +./usr/X11R7/lib/libexpat.so -obsolete- obsolete +./usr/X11R7/lib/libexpat.so.2 -obsolete- obsolete +./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete ./usr/X11R7/lib/libfontconfig.so -unknown- xorg ./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg ./usr/X11R7/lib/libfontconfig.so.2.0 -unknown- xorg Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.133 src/distrib/sets/lists/xcomp/mi:1.134 --- src/distrib/sets/lists/xcomp/mi:1.133 Sat Oct 22 22:23:50 2011 +++ src/distrib/sets/lists/xcomp/mi Wed Feb 29 20:07:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.133 2011/10/22 22:23:50 jmcneill Exp $ +# $NetBSD: mi,v 1.134 2012/02/29 20:07:55 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -336,7 +336,7 @@ ./usr/X11R6/include/X11/keysym.h -unknown- x11 ./usr/X11R6/include/X11/keysymdef.h -unknown- x11 ./usr/X11R6/include/X11/xpm.h -unknown- x11 -./usr/X11R6/include/expat.h -unknown- x11 +./usr/X11R6/include/expat.h xcomp-obsolete obsolete ./usr/X11R6/include/fontconfig/fcfreetype.h -unknown- x11 ./usr/X11R6/include/fontconfig/fcprivate.h -unknown- x11 ./usr/X11R6/include/fontconfig/fontconfig.h -unknown- x11 @@ -650,9 +650,9 @@ ./usr/X11R6/lib/libdpstk.a -unknown- x11 ./usr/X11R6/lib/libdpstk_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/libdpstk_p.a -unknown- profile,x11 -./usr/X11R6/lib/libexpat.a -unknown- x11 -./usr/X11R6/lib/libexpat_g.a -unknown- debuglib,x11 -./usr/X11R6/lib/libexpat_p.a -unknown- profile,x11 +./usr/X11R6/lib/libexpat.a -obsolete- obsolete +./usr/X11R6/lib/libexpat_g.a -obsolete- obsolete +./usr/X11R6/lib/libexpat_p.a -obsolete- obsolete ./usr/X11R6/lib/libfntstubs.a -unknown- x11 ./usr/X11R6/lib/libfntstubs_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/libfntstubs_p.a -unknown- profile,x11 @@ -5696,8 +5696,8 @@ ./usr/X11R7/include/drm/via_3d_reg.h -unknown- obsolete ./usr/X11R7/include/drm/via_drm.h -unknown- obsolete ./usr/X11R7/include/drm/xgi_drm.h -unknown- obsolete -./usr/X11R7/include/expat.h -unknown- xorg -./usr/X11R7/include/expat_external.h -unknown- xorg +./usr/X11R7/include/expat.h -unknown- obsolete +./usr/X11R7/include/expat_external.h -unknown- obsolete ./usr/X11R7/include/fontconfig/fcfreetype.h -unknown- xorg ./usr/X11R7/include/fontconfig/fcprivate.h -unknown- xorg ./usr/X11R7/include/fontconfig/fontconfig.h -unknown- xorg @@ -6275,9 +6275,9 @@ ./usr/X11R7/lib/libdrm_radeon.a -unknown- xorg ./usr/X11R7/lib/libdrm_radeon_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libdrm_radeon_p.a -unknown- profile,xorg -./usr/X11R7/lib/libexpat.a -unknown- xorg -./usr/X11R7/lib/libexpat_g.a -unknown- debuglib,xorg -./usr/X11R7/lib/libexpat_p.a -unknown- profile,xorg +./usr/X11R7/lib/libexpat.a -unknown- obsolete +./usr/X11R7/lib/libexpat_g.a -unknown- obsolete +./usr/X11R7/lib/libexpat_p.a -unknown- obsolete ./usr/X11R7/lib/libfontconfig.a -unknown- xorg ./usr/X11R7/lib/libfontconfig_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libfontconfig_p.a -unknown- profile,xorg @@ -9490,7 +9490,7 @@ ./usr/libdata/debug/usr/X11R7/bin/xman.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/xmessage.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/xmh.debug -unknown- debug,xorg -./usr/libdata/debug/usr/X11R7/bin/xmlwf.debug -unknown- debug,xorg +./usr/libdata/debug/usr/X11R7/bin/xmlwf.debug -obsolete- obsolete ./usr/libdata/debug/usr/X11R7/bin/xmodmap.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/xmore.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/xphelloworld.debug -obsolete- obsolete @@ -9601,8 +9601,6 @@ ./usr/libdata/lint/llib-ldpstk.ln -unknown- lint,x11 ./usr/libdata/lint/llib-ldrm.ln -unknown- lint,xorg ./usr/libdata/lint/llib-ldrm_radeon.ln -unknown- lint,xorg -./usr/libdata/lint/llib-lexpat.ln -unknown- lint,x11 -./usr/libdata/lint/llib-lexpat.ln -unknown- lint,xorg ./usr/libdata/lint/llib-lfntstubs.ln -unknown- lint,x11 ./usr/libdata/lint/llib-lfontconfig.ln -unknown- lint,x11 ./usr/libdata/lint/llib-lfontconfig.ln -unknown- lint,xorg Index: src/distrib/sets/lists/xcomp/shl.mi diff -u src/distrib/sets/lists/xcomp/shl.mi:1.30 src/distrib/sets/lists/xcomp/shl.mi:1.31 --- src/distrib/sets/lists/xcomp/shl.mi:1.30 Sun Jul 24 00:33:38 2011 +++ src/distrib/sets/lists/xcomp/shl.mi Wed Feb 29 20:07:55 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.30 2011/07/24 00:33:38 mrg Exp $ +# $NetBSD: shl.mi,v 1.31 2012/02/29 20:07:55 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -39,7 +39,7 @@ ./usr/X11R6/lib/libdmx_pic.a -unknown- x11 ./usr/X11R6/lib/libdps_pic.a -unknown- x11 ./usr/X11R6/lib/libdpstk_pic.a -unknown- x11 -./usr/X11R6/lib/libexpat_pic.a -unknown- x11 +./usr/X11R6/lib/libexpat_pic.a -obsolete- obsolete ./usr/X11R6/lib/libfontconfig_pic.a -unknown- x11 ./usr/X11R6/lib/libfontenc_pic.a -unknown- x11 ./usr/X11R6/lib/libfreetype_pic.a -unknown- x11 @@ -93,7 +93,7 @@ ./usr/X11R7/lib/libXxf86vm_pic.a -unknown- xorg ./usr/X11R7/lib/libdrm_pic.a -unknown- xorg ./usr/X11R7/lib/libdrm_radeon_pic.a -unknown- xorg -./usr/X11R7/lib/libexpat_pic.a -unknown- xorg +./usr/X11R7/lib/libexpat_pic.a -obsolete- obsolete ./usr/X11R7/lib/libfontconfig_pic.a -unknown- xorg ./usr/X11R7/lib/libfontenc_pic.a -unknown- xorg ./usr/X11R7/lib/libfreetype_pic.a -unknown- xorg @@ -175,7 +175,7 @@ ./usr/libdata/debug/usr/X11R6/lib/libdmx.so.1.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libdps.so.1.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libdpstk.so.1.0.debug -unknown- x11,debug -./usr/libdata/debug/usr/X11R6/lib/libexpat.so.4.0.debug -unknown- x11,debug +./usr/libdata/debug/usr/X11R6/lib/libexpat.so.4.0.debug -obsolete- obsolete ./usr/libdata/debug/usr/X11R6/lib/libfontconfig.so.1.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libfontenc.so.1.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libfreetype.so.9.0.debug -unknown- x11,debug @@ -231,7 +231,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libXxf86vm.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.3.debug -unknown- xorg,debug Index: src/external/mit/Makefile diff -u src/external/mit/Makefile:1.1 src/external/mit/Makefile:1.2 --- src/external/mit/Makefile:1.1 Sun Oct 31 11:29:06 2010 +++ src/external/mit/Makefile Wed Feb 29 20:07:55 2012 @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1 2010/10/31 11:29:06 mbalmer Exp $ +# $NetBSD: Makefile,v 1.2 2012/02/29 20:07:55 tron Exp $ -SUBDIR+= lua +SUBDIR+= expat lua .include <bsd.subdir.mk> Index: src/external/mit/xorg/bin/xmlwf/Makefile diff -u src/external/mit/xorg/bin/xmlwf/Makefile:1.3 src/external/mit/xorg/bin/xmlwf/Makefile:1.4 --- src/external/mit/xorg/bin/xmlwf/Makefile:1.3 Sun May 15 21:32:47 2011 +++ src/external/mit/xorg/bin/xmlwf/Makefile Wed Feb 29 20:07:56 2012 @@ -1,16 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2011/05/15 21:32:47 christos Exp $ +# $NetBSD: Makefile,v 1.4 2012/02/29 20:07:56 tron Exp $ -.include <bsd.own.mk> +.include <bsd.init.mk> -PROG= xmlwf - -.PATH: ${X11SRCDIR.expat}/xmlwf ${X11SRCDIR.expat}/doc - -SRCS= codepage.c unixfilemap.c xmlfile.c xmlwf.c -CPPFLAGS+=-DHAVE_UNISTD_H - -LDADD+= -lexpat -DPADD+= ${LIBEXPAT} +SYMLINKS+= /usr/bin/xmlwf ${BINDIR}/xmlwf .include <bsd.x11.mk> .include <bsd.prog.mk> Index: src/external/mit/xorg/lib/Makefile diff -u src/external/mit/xorg/lib/Makefile:1.24 src/external/mit/xorg/lib/Makefile:1.25 --- src/external/mit/xorg/lib/Makefile:1.24 Wed Feb 23 20:03:58 2011 +++ src/external/mit/xorg/lib/Makefile Wed Feb 29 20:07:56 2012 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2011/02/23 20:03:58 mrg Exp $ +# $NetBSD: Makefile,v 1.25 2012/02/29 20:07:56 tron Exp $ # build libraries for xorg -SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \ +SUBDIR= libfontenc freetype libFS libICE libOSMesa \ libXau libXdmcp libdrm libpciaccess .WAIT .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" SUBDIR+=libdrm_intel Index: src/external/mit/xorg/lib/dri/dri.mk diff -u src/external/mit/xorg/lib/dri/dri.mk:1.10 src/external/mit/xorg/lib/dri/dri.mk:1.11 --- src/external/mit/xorg/lib/dri/dri.mk:1.10 Sun May 23 21:31:52 2010 +++ src/external/mit/xorg/lib/dri/dri.mk Wed Feb 29 20:07:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: dri.mk,v 1.10 2010/05/23 21:31:52 mrg Exp $ +# $NetBSD: dri.mk,v 1.11 2012/02/29 20:07:56 tron Exp $ # XXX DRI_LIB_DEPS @@ -43,7 +43,6 @@ LIB= ${MODULE}_dri LIBDIR= ${X11USRLIBDIR}/modules/dri LIBDPLIBS+= drm ${.CURDIR}/../../libdrm -LIBDPLIBS+= expat ${.CURDIR}/../../expat LIBDPLIBS+= m ${NETBSDSRCDIR}/lib/libm LIBDPLIBS+= mesa_dri ${.CURDIR}/../libmesa # to find mesa_dri.so Index: src/external/mit/xorg/lib/fontconfig/src/Makefile diff -u src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7 src/external/mit/xorg/lib/fontconfig/src/Makefile:1.8 --- src/external/mit/xorg/lib/fontconfig/src/Makefile:1.7 Thu Aug 11 23:15:38 2011 +++ src/external/mit/xorg/lib/fontconfig/src/Makefile Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/08/11 23:15:38 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2012/02/29 20:07:57 tron Exp $ .include <bsd.own.mk> @@ -84,7 +84,7 @@ MAN= FcAtomicCreate.3 FcAtomicDeleteNew. MAN+= fonts-conf.5 LIBDPLIBS=\ - expat ${.CURDIR}/../../expat \ + expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ freetype ${.CURDIR}/../../freetype # XXX FONTCONFIG_PATH was arbitrarily chosen Index: src/external/mit/xorg/tools/fc-cache/Makefile diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.5 src/external/mit/xorg/tools/fc-cache/Makefile:1.6 --- src/external/mit/xorg/tools/fc-cache/Makefile:1.5 Wed Aug 10 10:34:48 2011 +++ src/external/mit/xorg/tools/fc-cache/Makefile Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2011/08/10 10:34:48 tsutsui Exp $ +# $NetBSD: Makefile,v 1.6 2012/02/29 20:07:57 tron Exp $ NOMAN= 1 @@ -8,7 +8,7 @@ HOSTPROG= fc-cache FONTCONFIG= ${X11SRCDIR.fontconfig} FREETYPE= ${X11SRCDIR.freetype} -EXPAT= ${X11SRCDIR.expat}/ +EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist .PATH: ${FONTCONFIG}/fc-cache SRCS.fc-cache= fc-cache.c Index: src/lib/Makefile diff -u src/lib/Makefile:1.181 src/lib/Makefile:1.182 --- src/lib/Makefile:1.181 Tue Feb 7 19:13:31 2012 +++ src/lib/Makefile Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.181 2012/02/07 19:13:31 joerg Exp $ +# $NetBSD: Makefile,v 1.182 2012/02/29 20:07:57 tron Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include <bsd.own.mk> @@ -66,6 +66,7 @@ SUBDIR+= ../external/bsd/liblzf/lib SUBDIR+= ../external/bsd/libpcap/lib SUBDIR+= ../external/mit/lua/lib +SUBDIR+= ../external/mit/expat/lib SUBDIR+= ../external/public-domain/sqlite/lib SUBDIR+= ../external/public-domain/xz/lib Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.293 src/share/mk/bsd.README:1.294 --- src/share/mk/bsd.README:1.293 Fri Feb 17 00:00:02 2012 +++ src/share/mk/bsd.README Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.293 2012/02/17 00:00:02 joerg Exp $ +# $NetBSD: bsd.README,v 1.294 2012/02/29 20:07:57 tron Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -1412,6 +1412,7 @@ DPADD Additional dependencies for the p LIBDNS?= ${DESTDIR}/usr/lib/libdns.a LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a LIBEVENT?= ${DESTDIR}/usr/lib/libevent.a + LIBEXPAT?= ${DESTDIR}/usr/lib/libexpat.a LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a LIBFORM?= ${DESTDIR}/usr/lib/libform.a LIBFL?= ${DESTDIR}/usr/lib/libfl.a @@ -1523,7 +1524,6 @@ DPADD Additional dependencies for the p LIBXXF86MISC?= ${DESTDIR}/usr/X11R7/lib/libXxf86misc.a LIBXXF86VM?= ${DESTDIR}/usr/X11R7/lib/libXxf86vm.a LIBDPS?= ${DESTDIR}/usr/X11R7/lib/libdps.a - LIBEXPAT?= ${DESTDIR}/usr/X11R7/lib/libexpat.a LIBFNTSTUBS?= ${DESTDIR}/usr/X11R7/lib/libfntstubs.a LIBFONTCACHE?= ${DESTDIR}/usr/X11R7/lib/libfontcache.a LIBFONTCONFIG?= ${DESTDIR}/usr/X11R7/lib/libfontconfig.a Index: src/share/mk/bsd.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.66 src/share/mk/bsd.hostprog.mk:1.67 --- src/share/mk/bsd.hostprog.mk:1.66 Thu Oct 13 22:08:20 2011 +++ src/share/mk/bsd.hostprog.mk Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.66 2011/10/13 22:08:20 joerg Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.67 2012/02/29 20:07:57 tron Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include <bsd.init.mk> @@ -21,6 +21,7 @@ LIBDBM?= /usr/lib/libdbm.a LIBDES?= /usr/lib/libdes.a LIBEDIT?= /usr/lib/libedit.a LIBEVENT?= /usr/lib/libevent.a +LIBEXPAT?= /usr/lib/libexpat.a LIBFETCH?= /usr/lib/libfetch.a LIBFORM?= /usr/lib/libform.a LIBGCC?= /usr/lib/libgcc.a Index: src/share/mk/bsd.prog.mk diff -u src/share/mk/bsd.prog.mk:1.273 src/share/mk/bsd.prog.mk:1.274 --- src/share/mk/bsd.prog.mk:1.273 Tue Feb 21 01:41:09 2012 +++ src/share/mk/bsd.prog.mk Wed Feb 29 20:07:57 2012 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.273 2012/02/21 01:41:09 matt Exp $ +# $NetBSD: bsd.prog.mk,v 1.274 2012/02/29 20:07:57 tron Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .ifndef HOSTPROG @@ -107,6 +107,7 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o dns \ edit \ event \ + expat \ fetch \ fl \ form \ @@ -246,7 +247,6 @@ PAM_STATIC_DPADD= Xxf86misc \ Xxf86vm \ dps \ - expat \ fntstubs \ fontcache \ fontconfig \ Index: src/x11/lib/Makefile diff -u src/x11/lib/Makefile:1.10 src/x11/lib/Makefile:1.11 --- src/x11/lib/Makefile:1.10 Sat Sep 24 13:51:46 2005 +++ src/x11/lib/Makefile Wed Feb 29 20:07:57 2012 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2005/09/24 13:51:46 chs Exp $ +# $NetBSD: Makefile,v 1.11 2012/02/29 20:07:57 tron Exp $ # we encode the inter-library dependencies in the SUBDIR order: # each library depends on at least one library in the previous group. SUBDIR=\ - X11 ICE Xau freetype2 expat FS fontenc lbxutil psres xtrans Xdmcp \ + X11 ICE Xau freetype2 FS fontenc lbxutil psres xtrans Xdmcp \ .WAIT \ SM Xext oldX fontconfig Xmuu Xpm \ .WAIT \ Index: src/x11/lib/fontconfig/src/Makefile diff -u src/x11/lib/fontconfig/src/Makefile:1.10 src/x11/lib/fontconfig/src/Makefile:1.11 --- src/x11/lib/fontconfig/src/Makefile:1.10 Thu Sep 22 15:42:57 2005 +++ src/x11/lib/fontconfig/src/Makefile Wed Feb 29 20:07:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/22 15:42:57 chs Exp $ +# $NetBSD: Makefile,v 1.11 2012/02/29 20:07:58 tron Exp $ .include <bsd.own.mk> @@ -10,14 +10,12 @@ SRCS= fcatomic.c fcblanks.c fccache.c fc fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcstr.c fcxml.c LIBDPLIBS=\ - expat ${.CURDIR}/../../expat \ freetype ${.CURDIR}/../../freetype2 MAN= fontconfig.3 CPPFLAGS+= ${X11FLAGS.THREADS} -CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \ - -I${X11SRCDIR.xc}/extras/expat/lib +CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 CPPFLAGS+= -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT CPPFLAGS+= -DXFREE86_FT2 Added files: Index: src/external/mit/expat/Makefile diff -u /dev/null src/external/mit/expat/Makefile:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/Makefile Wed Feb 29 20:07:56 2012 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $ + +SUBDIR+= lib .WAIT bin + +.include <bsd.subdir.mk> Index: src/external/mit/expat/Makefile.inc diff -u /dev/null src/external/mit/expat/Makefile.inc:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/Makefile.inc Wed Feb 29 20:07:56 2012 @@ -0,0 +1,14 @@ +# $NetBSD: Makefile.inc,v 1.1 2012/02/29 20:07:56 tron Exp $ + +.include <bsd.own.mk> + +EXPATDIR= ${NETBSDSRCDIR}/external/mit/expat +EXPATSRCDIR= ${NETBSDSRCDIR}/external/mit/expat/dist + +.for _LIB in expat +.if !defined(EXPATOBJDIR.${_LIB}) +EXPATOBJDIR.${_LIB}!= cd ${EXPATDIR}/lib/lib${_LIB} && ${PRINTOBJDIR} +.MAKEOVERRIDES+= EXPATOBJDIR.${_LIB} +.endif +EXPATLIB.${_LIB}= ${EXPATOBJDIR.${_LIB}}/lib${_LIB}.a +.endfor Index: src/external/mit/expat/bin/Makefile diff -u /dev/null src/external/mit/expat/bin/Makefile:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/bin/Makefile Wed Feb 29 20:07:56 2012 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $ + +SUBDIR+= xmlwf + +.include <bsd.subdir.mk> Index: src/external/mit/expat/bin/Makefile.inc diff -u /dev/null src/external/mit/expat/bin/Makefile.inc:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/bin/Makefile.inc Wed Feb 29 20:07:56 2012 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile.inc,v 1.1 2012/02/29 20:07:56 tron Exp $ + +BINDIR?= /usr/bin + +CPPFLAGS+= -I${EXPATSRCDIR}/lib + +LDADD+= -L${EXPATOBJDIR.expat} -lexpat +DPADD+= ${EXPATLIB.expat} + +.include "../Makefile.inc" Index: src/external/mit/expat/bin/xmlwf/Makefile diff -u /dev/null src/external/mit/expat/bin/xmlwf/Makefile:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/bin/xmlwf/Makefile Wed Feb 29 20:07:56 2012 @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $ + +.include <bsd.init.mk> + +PROG= xmlwf + +.PATH: ${EXPATSRCDIR}/xmlwf ${EXPATSRCDIR}/doc + +SRCS= codepage.c unixfilemap.c xmlfile.c xmlwf.c +CPPFLAGS+=-DHAVE_UNISTD_H + +.include <bsd.prog.mk> Index: src/external/mit/expat/lib/Makefile diff -u /dev/null src/external/mit/expat/lib/Makefile:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/lib/Makefile Wed Feb 29 20:07:56 2012 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $ + +SUBDIR+= libexpat + +.include <bsd.subdir.mk> Index: src/external/mit/expat/lib/Makefile.inc diff -u /dev/null src/external/mit/expat/lib/Makefile.inc:1.1 --- /dev/null Wed Feb 29 20:07:58 2012 +++ src/external/mit/expat/lib/Makefile.inc Wed Feb 29 20:07:56 2012 @@ -0,0 +1,3 @@ +# $NetBSD: Makefile.inc,v 1.1 2012/02/29 20:07:56 tron Exp $ + +.include "../Makefile.inc" Index: src/external/mit/expat/lib/libexpat/Makefile diff -u /dev/null src/external/mit/expat/lib/libexpat/Makefile:1.1 --- /dev/null Wed Feb 29 20:07:59 2012 +++ src/external/mit/expat/lib/libexpat/Makefile Wed Feb 29 20:07:56 2012 @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1 2012/02/29 20:07:56 tron Exp $ + +.include <bsd.init.mk> + +LIB= expat + +.PATH: ${EXPATSRCDIR}/lib +SRCS= xmlparse.c xmlrole.c xmltok.c + +INCS= expat.h expat_external.h +INCSDIR= /usr/include + +CPPFLAGS+= -I${EXPATSRCDIR} -I${.CURDIR} +CPPFLAGS+= -DHAVE_EXPAT_CONFIG_H +COPTS.xmlparse.c= -Wno-error # macppc +COPTS.xmlrole.c= -Wno-error # macppc +COPTS.xmltok.c= -Wno-error # macppc + +.include <bsd.lib.mk> + +gaga: + @echo MKLINT=${MKLINT} + @echo LSRCS=${LSRCS} + @echo LOBJS=${LOBJS} Index: src/external/mit/expat/lib/libexpat/expat_config.h diff -u /dev/null src/external/mit/expat/lib/libexpat/expat_config.h:1.1 --- /dev/null Wed Feb 29 20:07:59 2012 +++ src/external/mit/expat/lib/libexpat/expat_config.h Wed Feb 29 20:07:56 2012 @@ -0,0 +1,95 @@ +/* expat_config.h. Generated by configure. */ +/* expat_config.h.in. Generated from configure.in by autoheader. */ + +#include <sys/endian.h> + +/* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ +#define BYTEORDER BYTE_ORDER + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the <memory.h> header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 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 you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "expat-b...@libexpat.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "expat" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "expat 2.0.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "expat" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.0.1" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* whether byteorder is bigendian */ +/* #undef WORDS_BIGENDIAN */ + +/* Define to specify how much context to retain around the current parse + point. */ +#define XML_CONTEXT_BYTES 1024 + +/* Define to make parameter entity parsing functionality available. */ +#define XML_DTD 1 + +/* Define to make XML Namespaces functionality available. */ +#define XML_NS 1 + +/* Define to __FUNCTION__ or "" if `__func__' does not conform to ANSI C. */ +/* #undef __func__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `long' if <sys/types.h> does not define. */ +/* #undef off_t */ + +/* Define to `unsigned' if <sys/types.h> does not define. */ +/* #undef size_t */ Index: src/external/mit/expat/lib/libexpat/shlib_version diff -u /dev/null src/external/mit/expat/lib/libexpat/shlib_version:1.1 --- /dev/null Wed Feb 29 20:07:59 2012 +++ src/external/mit/expat/lib/libexpat/shlib_version Wed Feb 29 20:07:56 2012 @@ -0,0 +1,5 @@ +# $NetBSD: shlib_version,v 1.1 2012/02/29 20:07:56 tron Exp $ +# +# XXX netbsd xsrc had major=4 +major=2 +minor=0