Merge branch 'vendor/FILE'
authorPeter Avalos <pavalos@theshell.com>
Sun, 21 Jun 2009 00:48:42 +0000 (14:48 -1000)
committerPeter Avalos <pavalos@theshell.com>
Sun, 21 Jun 2009 00:48:42 +0000 (14:48 -1000)
1  2 
Makefile_upgrade.inc
contrib/file/src/apprentice.c
lib/libmagic/Makefile
lib/libmagic/config.h

index 74af46a,0000000..a331288
mode 100644,000000..100644
--- /dev/null
@@@ -1,1116 -1,0 +1,1118 @@@
 +# $DragonFly: src/Makefile_upgrade.inc,v 1.36 2008/11/24 17:40:02 hasso Exp $
 +#
 +# Append all obsolete files to this file
 +# Avoid constructs like {foo,bar}.  It is parsed by /bin/sh
 +
 +TO_REMOVE+=/usr/libexec/named-xfer
 +TO_REMOVE+=/usr/bin/dnsquery
 +TO_REMOVE+=/usr/bin/dnskeygen
 +TO_REMOVE+=/usr/sbin/ndc
 +TO_REMOVE+=/usr/bin/dnssec-makekeyset
 +TO_REMOVE+=/usr/bin/dnssec-signkey
 +TO_REMOVE+=/usr/share/man/man8/dnssec-makekeyset.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/dnssec-makekeyset.8.gz
 +TO_REMOVE+=/usr/share/man/man8/dnssec-signkey.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/dnssec-signkey.8.gz
 +TO_REMOVE+=/usr/lib/gcc2/crtbegin.o
 +TO_REMOVE+=/usr/lib/gcc2/crtbeginS.o
 +TO_REMOVE+=/usr/lib/gcc2/crtend.o
 +TO_REMOVE+=/usr/lib/gcc2/crtendS.o
 +TO_REMOVE+=/usr/lib/gcc3/crtbegin.o
 +TO_REMOVE+=/usr/lib/gcc3/crtbeginS.o
 +TO_REMOVE+=/usr/lib/gcc3/crtend.o
 +TO_REMOVE+=/usr/lib/gcc3/crtendS.o
 +TO_REMOVE+=/usr/lib/crtbegin.o
 +TO_REMOVE+=/usr/lib/crtbeginS.o
 +TO_REMOVE+=/usr/lib/crtend.o
 +TO_REMOVE+=/usr/lib/crtendS.o
 +TO_REMOVE+=/usr/include/dev/netif/wi/if_wavelan_ieee.h
 +TO_REMOVE+=/usr/include/net/if_ieee80211.h
 +TO_REMOVE+=/usr/sbin/pccardc
 +TO_REMOVE+=/usr/sbin/pccardd
 +TO_REMOVE+=/usr/share/examples/etc/defaults/pccard.conf
 +TO_REMOVE+=/usr/share/man/man5/pccard.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/pccard.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man8/pccardc.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/pccardc.8.gz
 +TO_REMOVE+=/usr/share/man/man8/pccardd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/pccardd.8.gz
 +TO_REMOVE+=/usr/share/man/man8/rc.pccard.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rc.pccard.8.gz
 +TO_REMOVE+=/etc/defaults/pccard
 +TO_REMOVE+=/etc/rc.d/pccard
 +TO_REMOVE+=/etc/defaults/pccard.conf
 +TO_REMOVE+=/usr/lib/gcc3
 +TO_REMOVE+=/usr/libexec/gcc3
 +TO_REMOVE+=/usr/libdata/ldscripts
 +TO_REMOVE+=/usr/libdata/gcc2
 +TO_REMOVE+=/usr/libdata/gcc3
 +TO_REMOVE+=/usr/libexec/elf
 +TO_REMOVE+=/usr/libexec/aout
 +TO_REMOVE+=/usr/bin/gcc2
 +TO_REMOVE+=/usr/bin/gcc3
 +TO_REMOVE+=/usr/include/g++
 +TO_REMOVE+=/usr/bin/genassym
 +TO_REMOVE+=/usr/bin/gensetdefs
 +TO_REMOVE+=/usr/bin/nawk
 +TO_REMOVE+=/usr/bin/ptx
 +TO_REMOVE+=/usr/bin/send-pr
 +TO_REMOVE+=/usr/share/man/man8/genassym.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/genassym.8.gz
 +TO_REMOVE+=/usr/share/man/man8/gensetdefs.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/gensetdefs.8.gz
 +TO_REMOVE+=/usr/share/man/man1/cccp.1.gz
 +TO_REMOVE+=/usr/share/man/man1/gawk.1.gz
 +TO_REMOVE+=/usr/share/man/man1/nawk.1.gz
 +TO_REMOVE+=/usr/share/man/man1/send-pr.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/cccp.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gawk.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/nawk.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/send-pr.1.gz
 +TO_REMOVE+=/usr/libexec/cc1
 +TO_REMOVE+=/usr/libexec/cc1obj
 +TO_REMOVE+=/usr/libexec/cc1plus
 +TO_REMOVE+=/usr/libexec/cpp
 +TO_REMOVE+=/usr/libexec/cpp0
 +TO_REMOVE+=/usr/libexec/f771
 +TO_REMOVE+=/usr/libexec/objformat
 +TO_REMOVE+=/usr/libexec/binutils212/cc1
 +TO_REMOVE+=/usr/libexec/binutils212/cc1obj
 +TO_REMOVE+=/usr/libexec/binutils212/cc1plus
 +TO_REMOVE+=/usr/libexec/binutils212/cpp
 +TO_REMOVE+=/usr/libexec/binutils212/cpp0
 +TO_REMOVE+=/usr/libexec/binutils212/f771
 +TO_REMOVE+=/usr/libexec/binutils212/objformat
 +TO_REMOVE+=/usr/libexec/binutils214/cc1
 +TO_REMOVE+=/usr/libexec/binutils214/cc1obj
 +TO_REMOVE+=/usr/libexec/binutils214/cc1plus
 +TO_REMOVE+=/usr/libexec/binutils214/cpp
 +TO_REMOVE+=/usr/libexec/binutils214/cpp0
 +TO_REMOVE+=/usr/libexec/binutils214/f771
 +TO_REMOVE+=/usr/libexec/binutils214/objformat
 +TO_REMOVE+=/usr/lib/libgcc.a
 +TO_REMOVE+=/usr/lib/libgcc_p.a
 +TO_REMOVE+=/usr/lib/libobjc.a
 +TO_REMOVE+=/usr/lib/libobjc_p.a
 +TO_REMOVE+=/usr/lib/libstdc++.a
 +TO_REMOVE+=/usr/lib/libstdc++.so
 +TO_REMOVE+=/usr/lib/libstdc++.so.3
 +TO_REMOVE+=/usr/lib/libstdc++_p.a
 +TO_REMOVE+=/usr/libexec/binutils214
 +TO_REMOVE+=/usr/libexec/binutils215
 +TO_REMOVE+=/usr/bin/makewhatis
 +TO_REMOVE+=/usr/sbin/prebind
 +TO_REMOVE+=/modules/checkpt.ko
 +TO_REMOVE+=/usr/share/man/man1aout
 +TO_REMOVE+=/usr/share/man/cat1aout
 +TO_REMOVE+=/usr/share/man/en.ISO8859-1/man1aout
 +TO_REMOVE+=/usr/share/man/en.ISO8859-1/cat1aout
 +TO_REMOVE+=/usr/libdata/perl
 +TO_REMOVE+=/usr/bin/find2perl
 +TO_REMOVE+=/usr/bin/perl5
 +TO_REMOVE+=/usr/bin/perl5.00503
 +TO_REMOVE+=/usr/bin/pod2latex
 +TO_REMOVE+=/usr/bin/pod2text
 +TO_REMOVE+=/usr/bin/sperl5
 +TO_REMOVE+=/usr/bin/sperl5.00503
 +TO_REMOVE+=/usr/bin/splain
 +TO_REMOVE+=/usr/bin/suidperl
 +TO_REMOVE+=/usr/bin/a2p
 +TO_REMOVE+=/usr/bin/c2ph
 +TO_REMOVE+=/usr/bin/h2ph
 +TO_REMOVE+=/usr/bin/h2xs
 +TO_REMOVE+=/usr/bin/perlbug
 +TO_REMOVE+=/usr/bin/perlcc
 +TO_REMOVE+=/usr/bin/pl2pm
 +TO_REMOVE+=/usr/bin/pod2html
 +TO_REMOVE+=/usr/bin/pod2man
 +TO_REMOVE+=/usr/bin/s2p
 +TO_REMOVE+=/usr/share/man/cat1/a2p.1.gz
 +TO_REMOVE+=/usr/share/man/man1/a2p.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/c2ph.1.gz
 +TO_REMOVE+=/usr/share/man/man1/c2ph.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/h2ph.1.gz
 +TO_REMOVE+=/usr/share/man/man1/h2ph.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/h2xs.1.gz
 +TO_REMOVE+=/usr/share/man/man1/h2xs.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlbug.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlbug.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlcc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlcc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/pl2pm.1.gz
 +TO_REMOVE+=/usr/share/man/man1/pl2pm.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/pod2html.1.gz
 +TO_REMOVE+=/usr/share/man/man1/pod2html.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/pod2man.1.gz
 +TO_REMOVE+=/usr/share/man/man1/pod2man.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/s2p.1.gz
 +TO_REMOVE+=/usr/share/man/man1/s2p.1.gz
 +TO_REMOVE+=/usr/lib/libperl.a
 +TO_REMOVE+=/usr/lib/libperl.so
 +TO_REMOVE+=/usr/lib/libperl.so.3
 +TO_REMOVE+=/usr/lib/libperl_p.a
 +TO_REMOVE+=/usr/share/man/cat1/perl5004delta.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perl5004delta.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlapio.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlapio.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlbook.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlbook.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlbot.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlbot.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlcall.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlcall.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldata.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldata.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldebug.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldebug.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldelta.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldelta.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldiag.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldiag.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldoc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldoc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perldsc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perldsc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlembed.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlembed.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq1.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq1.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq2.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq2.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq3.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq3.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq4.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq4.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq5.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq5.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq6.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq6.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq7.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq7.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq8.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq8.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfaq9.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfaq9.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlform.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlform.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlfunc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlfunc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlguts.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlguts.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlhist.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlhist.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlipc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlipc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perllocale.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perllocale.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perllol.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perllol.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlmod.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlmod.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlmodinstall.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlmodinstall.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlmodlib.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlmodlib.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlobj.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlobj.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlop.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlop.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlopentut.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlopentut.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlpod.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlpod.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlport.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlport.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlre.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlre.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlref.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlref.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlreftut.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlreftut.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlrun.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlrun.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlsec.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlsec.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlstyle.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlstyle.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlsub.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlsub.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlsyn.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlsyn.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlthrtut.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlthrtut.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perltie.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perltie.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perltoc.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perltoc.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perltoot.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perltoot.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perltrap.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perltrap.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlvar.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlvar.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlxs.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlxs.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perlxstut.1.gz
 +TO_REMOVE+=/usr/share/man/man1/perlxstut.1.gz
 +TO_REMOVE+=/usr/share/man/man7/style.perl.7.gz
 +TO_REMOVE+=/usr/share/man/cat7/style.perl.7.gz
 +TO_REMOVE+=/usr/share/perl
 +TO_REMOVE+=/usr/share/examples/bc
 +TO_REMOVE+=/usr/share/man/man1/perl.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/perl.1.gz
 +TO_REMOVE+=/usr/include/gmp
 +TO_REMOVE+=/usr/include/mp.h
 +TO_REMOVE+=/usr/lib/libmp.a
 +TO_REMOVE+=/usr/lib/libmp_p.a
 +TO_REMOVE+=/usr/lib/libmp.so
 +TO_REMOVE+=/usr/lib/libmp.so.3
 +TO_REMOVE+=/usr/lib/libgmp.a
 +TO_REMOVE+=/usr/lib/libgmp_p.a
 +TO_REMOVE+=/usr/lib/libgmp.so
 +TO_REMOVE+=/usr/lib/libgmp.so.3
 +TO_REMOVE+=/etc/rc.d/ntpdate
 +TO_REMOVE+=/usr/sbin/ntpdate
 +TO_REMOVE+=/modules/if_wx.ko
 +TO_REMOVE+=/usr/share/man/man4/wx.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/wx.4.gz
 +TO_REMOVE+=/dev/rwcd*
 +TO_REMOVE+=/dev/rwst*
 +TO_REMOVE+=/dev/wcd*
 +TO_REMOVE+=/dev/wd*
 +TO_REMOVE+=/dev/wfd*
 +TO_REMOVE+=/usr/share/man/man4/wst.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/wst.4.gz
 +TO_REMOVE+=/usr/share/man/man4/euc.4.gz
 +TO_REMOVE+=/usr/share/man/man4/utf2.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/euc.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/utf2.4.gz
 +TO_REMOVE+=/usr/share/syscons/keymaps/jp.pc98.iso.kbd
 +TO_REMOVE+=/usr/share/syscons/keymaps/jp.pc98.kbd
 +TO_REMOVE+=/etc/rc.d/bootconf.sh
 +TO_REMOVE+=/etc/rc.d/lkm1
 +TO_REMOVE+=/etc/rc.d/lkm2
 +TO_REMOVE+=/etc/rc.d/lkm3
 +TO_REMOVE+=/etc/rc.d/mountall
 +TO_REMOVE+=/etc/rc.d/pcvt
 +TO_REMOVE+=/etc/rc.d/wscons
 +TO_REMOVE+=/modules/canbus.ko
 +TO_REMOVE+=/usr/lib/libkeycap.a
 +TO_REMOVE+=/usr/lib/libkeycap_p.a
 +TO_REMOVE+=/usr/share/man/man4/pcvt.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/pcvt.4.gz
 +TO_REMOVE+=/usr/share/man/man4/vt.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/vt.4.gz
 +TO_REMOVE+=/usr/share/man/man5/keycap.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/keycap.5.gz
 +TO_REMOVE+=/usr/share/man/man8/ispcvt.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ispcvt.8.gz
 +TO_REMOVE+=/usr/share/misc/keycap.pcvt
 +TO_REMOVE+=/usr/share/misc/fonts
 +TO_REMOVE+=/usr/share/misc/pcvtfonts
 +TO_REMOVE+=/usr/share/pcvt
 +TO_REMOVE+=/usr/share/man/man1/battd.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/battd.1.gz
 +TO_REMOVE+=/usr/include/machine/bus_pc98.h
 +TO_REMOVE+=/usr/share/man/man4/pcic.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/pcic.4.gz
 +TO_REMOVE+=/usr/share/info/cpp2.info.gz
 +TO_REMOVE+=/usr/share/info/gcc2.info.gz
 +TO_REMOVE+=/usr/sbin/diskpart
 +TO_REMOVE+=/usr/sbin/ibcs2
 +TO_REMOVE+=/usr/sbin/linux
 +TO_REMOVE+=/usr/sbin/ntp-genkeys
 +TO_REMOVE+=/usr/sbin/ntpdc
 +TO_REMOVE+=/usr/sbin/ntptime
 +TO_REMOVE+=/usr/sbin/ntptimeset
 +TO_REMOVE+=/usr/sbin/ntptrace
 +TO_REMOVE+=/usr/sbin/scriptdump
 +TO_REMOVE+=/usr/sbin/svr4
 +TO_REMOVE+=/usr/bin/cvsbug
 +TO_REMOVE+=/usr/bin/gdbreplay
 +TO_REMOVE+=/usr/bin/gperf
 +TO_REMOVE+=/usr/bin/joy
 +TO_REMOVE+=/usr/bin/minigzip
 +TO_REMOVE+=/usr/bin/ntpq
 +TO_REMOVE+=/usr/bin/perldoc
 +TO_REMOVE+=/usr/bin/sendbug
 +TO_REMOVE+=/usr/share/man/man1/gasp.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gasp.1.gz
 +TO_REMOVE+=/usr/share/man/man1/gperf.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gperf.1.gz
 +TO_REMOVE+=/usr/share/man/man1/minigzip.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/minigzip.1.gz
 +TO_REMOVE+=/usr/share/man/man1/sendbug.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/sendbug.1.gz
 +TO_REMOVE+=/usr/share/man/man9/suser_xxx.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/suser_xxx.9.gz
 +TO_REMOVE+=/usr/share/man/man9/NDINIT.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/NDINIT.9.gz
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-stable-supfile
 +TO_REMOVE+=/usr/share/nls/*/.cat
 +TO_REMOVE+=/usr/include/machine/pcvt_ioctl.h
 +TO_REMOVE+=/usr/include/net/bpf_compat.h
 +TO_REMOVE+=/usr/include/netinet/ipprotosw.h
 +TO_REMOVE+=/usr/include/rune.h
 +TO_REMOVE+=/usr/include/runetype.h
 +TO_REMOVE+=/modules/if_snc.ko
 +TO_REMOVE+=/usr/include/machine/gencount.h
 +TO_REMOVE+=/usr/sbin/cursor
 +TO_REMOVE+=/usr/sbin/fontedit
 +TO_REMOVE+=/usr/sbin/ispcvt
 +TO_REMOVE+=/usr/sbin/kcon
 +TO_REMOVE+=/usr/sbin/loadfont
 +TO_REMOVE+=/usr/sbin/mcon
 +TO_REMOVE+=/usr/sbin/scon
 +TO_REMOVE+=/usr/sbin/vt220keys
 +TO_REMOVE+=/usr/sbin/vttest
 +TO_REMOVE+=/usr/share/man/man1/cursor.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/cursor.1.gz
 +TO_REMOVE+=/usr/share/man/man1/fontedit.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/fontedit.1.gz
 +TO_REMOVE+=/usr/share/man/man1/kcon.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/kcon.1.gz
 +TO_REMOVE+=/usr/share/man/man1/loadfont.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/loadfont.1.gz
 +TO_REMOVE+=/usr/share/man/man1/mcon.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/mcon.1.gz
 +TO_REMOVE+=/usr/share/man/man1/scon.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/scon.1.gz
 +TO_REMOVE+=/usr/share/man/man1/vt220keys.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/vt220keys.1.gz
 +TO_REMOVE+=/usr/share/man/man1/vttest.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/vttest.1.gz
 +TO_REMOVE+=/usr/share/man/man3/keycap.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/keycap.3.gz
 +TO_REMOVE+=/usr/share/man/man3/kgetent.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/kgetent.3.gz
 +TO_REMOVE+=/usr/share/man/man3/kgetflag.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/kgetflag.3.gz
 +TO_REMOVE+=/usr/share/man/man3/kgetnum.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/kgetnum.3.gz
 +TO_REMOVE+=/usr/share/man/man3/kgetstr.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/kgetstr.3.gz
 +TO_REMOVE+=/usr/share/man/man3/dft_fgbg.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/dft_fgbg.3.gz
 +TO_REMOVE+=/usr/share/man/man3/dllockinit.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/dllockinit.3.gz
 +TO_REMOVE+=/usr/share/man/man3/dynamic_fieldinfo.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/dynamic_fieldinfo.3.gz
 +TO_REMOVE+=/usr/share/man/man3/fgetrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/fgetrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/fputrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/fputrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/fungetrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/fungetrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/mbmb.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/mbmb.3.gz
 +TO_REMOVE+=/usr/share/man/man3/mbrrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/mbrrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/mbrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/mbrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/menu_attribs.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/menu_attribs.3.gz
 +TO_REMOVE+=/usr/share/man/man3/multibyte.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/multibyte.3.gz
 +TO_REMOVE+=/usr/share/man/man3/rune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/rune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/setinvalidrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/setinvalidrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/setrunelocale.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/setrunelocale.3.gz
 +TO_REMOVE+=/usr/share/man/man3/sgetrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/sgetrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/sputrune.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/sputrune.3.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_entry_gname_w.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_entry_gname_w.3.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_entry_uname_w.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_entry_uname_w.3.gz
 +TO_REMOVE+=/usr/share/man/man3/dbm_dirnfo.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/dbm_dirnfo.3.gz
 +TO_REMOVE+=/usr/share/man/man3/exp10.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/exp10.3.gz
 +TO_REMOVE+=/usr/share/man/man3/exp10f.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/exp10f.3.gz
 +TO_REMOVE+=/usr/share/man/man5/drivers.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/drivers.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man5/ntp.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/ntp.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man5/ntp.keys.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/ntp.keys.5.gz
 +TO_REMOVE+=/usr/share/man/man8/ibcs2.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ibcs2.8.gz
 +TO_REMOVE+=/usr/share/man/man8/joy.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/joy.8.gz
 +TO_REMOVE+=/usr/share/man/man8/linux.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/linux.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntp-genkeys.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntp-genkeys.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntpdate.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntpdate.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntpdc.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntpdc.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntpq.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntpq.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntptime.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntptime.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ntptrace.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntptrace.8.gz
 +TO_REMOVE+=/usr/share/man/man8/picobsd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/picobsd.8.gz
 +TO_REMOVE+=/usr/share/man/man8/svr4.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/svr4.8.gz
 +TO_REMOVE+=/usr/share/man/man8/sysinstall.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/sysinstall.8.gz
 +TO_REMOVE+=/usr/share/man/man8/cvsbug.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/cvsbug.8.gz
 +TO_REMOVE+=/usr/share/man/man8/diskpart.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/diskpart.8.gz
 +TO_REMOVE+=/usr/share/zoneinfo/Africa/Timbuktu
 +TO_REMOVE+=/usr/share/zoneinfo/America/Argentina/ComodRivadavia
 +TO_REMOVE+=/usr/share/zoneinfo/America/Indianapolis
 +TO_REMOVE+=/usr/share/zoneinfo/America/Louisville
 +TO_REMOVE+=/usr/share/zoneinfo/Europe/Belfast
 +TO_REMOVE+=/usr/share/zoneinfo/Pacific/Yap
 +TO_REMOVE+=/usr/share/zoneinfo/America/Coral_Harbour
 +TO_REMOVE+=/usr/share/zoneinfo/Africa/Asmera
 +TO_REMOVE+=/usr/share/zoneinfo/Atlantic/Faeroe
 +TO_REMOVE+=/usr/share/zoneinfo/SystemV
 +TO_REMOVE+=/etc/rc.d/altqd
 +TO_REMOVE+=/etc/rc.d/network
 +TO_REMOVE+=/etc/rc.d/network1
 +TO_REMOVE+=/etc/rc.d/network2
 +TO_REMOVE+=/etc/rc.d/network3
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-dfports-supfile
 +TO_REMOVE+=/etc/periodic/weekly/400.status-pkg
 +TO_REMOVE+=/usr/share/man/man7/ports.7.gz
 +TO_REMOVE+=/usr/share/man/cat7/ports.7.gz
 +TO_REMOVE+=/usr/share/man/man9/SPLASSERT.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/SPLASSERT.9.gz
 +TO_REMOVE+=/usr/share/man/man9/spl.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/spl.9.gz
 +TO_REMOVE+=/usr/share/man/man9/spl0.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/spl0.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splbio.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splbio.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splclock.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splclock.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splhigh.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splhigh.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splimp.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splimp.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splnet.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splnet.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splsoftclock.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splsoftclock.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splsofttty.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splsofttty.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splstatclock.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splstatclock.9.gz
 +TO_REMOVE+=/usr/share/man/man9/spltty.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/spltty.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splvm.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splvm.9.gz
 +TO_REMOVE+=/usr/share/man/man9/splx.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/splx.9.gz
 +TO_REMOVE+=/modules/if_owi.ko
 +TO_REMOVE+=/modules/umap.ko
 +TO_REMOVE+=/sbin/mount_umap
 +TO_REMOVE+=/usr/share/man/man8/mount_umap.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/mount_umap.8.gz
 +TO_REMOVE+=/usr/share/man/man3/isinff.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/isinff.3.gz
 +TO_REMOVE+=/usr/share/man/man3/isnanf.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/isnanf.3.gz
 +TO_REMOVE+=/modules/ibcs2.ko
 +TO_REMOVE+=/usr/share/examples/ibcs2
 +TO_REMOVE+=/modules/streams.ko
 +TO_REMOVE+=/usr/share/man/man4/i386/streams.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/streams.4.gz
 +TO_REMOVE+=/modules/svr4.ko
 +TO_REMOVE+=/usr/share/man/man4/i386/svr4.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/svr4.4.gz
 +TO_REMOVE+=/usr/include/net/oldbridge
 +TO_REMOVE+=/usr/include/net/bridge/bridge.h
 +TO_REMOVE+=/usr/share/man/man4/oldbridge.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/oldbridge.4.gz
 +TO_REMOVE+=/modules/bridge.ko
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_attach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_attach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_attach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_attach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_detach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_detach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_crypto_wep_crypt.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_crypto_wep_crypt.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_decap.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_decap.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_lookup_node.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_lookup_node.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_timeout_nodes.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_timeout_nodes.9.gz
 +TO_REMOVE+=/usr/share/mk/bsd.port.mk
 +TO_REMOVE+=/usr/share/mk/bsd.port.post.mk
 +TO_REMOVE+=/usr/share/mk/bsd.port.pre.mk
 +TO_REMOVE+=/usr/share/mk/bsd.port.subdir.mk
 +TO_REMOVE+=/usr/share/mk/bsd.dfport.mk
 +TO_REMOVE+=/usr/share/mk/bsd.dfport.post.mk
 +TO_REMOVE+=/usr/share/mk/bsd.dfport.pre.mk
 +TO_REMOVE+=/var/db/port.mkversion
 +TO_REMOVE+=/usr/share/mk/bsd.kern.mk
 +TO_REMOVE+=/modules/pcic.ko
 +TO_REMOVE+=/usr/share/man/man4/worm.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/worm.4.gz
 +TO_REMOVE+=/usr/include/sys/wormio.h
 +TO_REMOVE+=/usr/share/doc/ncurses
 +TO_REMOVE+=/usr/share/man/man8/brconfig.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/brconfig.8.gz
 +TO_REMOVE+=/usr/sbin/brconfig
 +TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc2.mk
 +TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc3.mk
 +TO_REMOVE+=/modules/coda.ko
 +TO_REMOVE+=/dev/zs0
 +TO_REMOVE+=/usr/share/man/man3/archive_read_open_file.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_read_open_file.3.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_write_open_file.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_write_open_file.3.gz
 +TO_REMOVE+=/usr/include/emmintrin.h
 +TO_REMOVE+=/usr/include/pmmintrin.h
 +TO_REMOVE+=/usr/include/mmintrin.h
 +TO_REMOVE+=/usr/share/man/man9/reallocf.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/reallocf.9.gz
 +TO_REMOVE+=/usr/share/man/man9/suser_proc.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/suser_proc.9.gz
 +TO_REMOVE+=/usr/share/man/man3/NgSendMsgReply.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/NgSendMsgReply.3.gz
 +TO_REMOVE+=/usr/share/man/man9/kobj_class_compile_static.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/kobj_class_compile_static.9.gz
 +TO_REMOVE+=/usr/include/machine/resource.h
 +TO_REMOVE+=/usr/libexec/lukemftpd
 +TO_REMOVE+=/usr/share/man/man8/lukemftpd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/lukemftpd.8.gz
 +TO_REMOVE+=/usr/share/man/man5/ftpd.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/ftpd.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man5/ftpusers.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/ftpusers.5.gz
 +TO_REMOVE+=/usr/include/machine/dvcfg.h
 +TO_REMOVE+=/usr/share/man/man8/boot_i386.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/boot_i386.8.gz
 +TO_REMOVE+=/usr/share/man/man9/malloc.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/malloc.9.gz
 +TO_REMOVE+=/usr/share/man/man9/free.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/free.9.gz
 +TO_REMOVE+=/usr/share/man/man9/realloc.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/realloc.9.gz
 +TO_REMOVE+=/usr/share/man/man2/sys_get_tls_area.2.gz
 +TO_REMOVE+=/usr/share/man/cat2/sys_get_tls_area.2.gz
 +TO_REMOVE+=/usr/share/man/man2/sys_set_tls_area.2.gz
 +TO_REMOVE+=/usr/share/man/cat2/sys_set_tls_area.2.gz
 +TO_REMOVE+=/modules/snd.ko
 +TO_REMOVE+=/modules/snd_pcm.ko
 +TO_REMOVE+=/usr/share/man/man4/snd.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/snd.4.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR0.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR0.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR1.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR1.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR2.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR2.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR3.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR3.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR4.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR4.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR5.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR5.9.gz
 +TO_REMOVE+=/usr/share/man/man9/CTR6.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/CTR6.9.gz
 +TO_REMOVE+=/usr/share/man/man9/asleep.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/asleep.9.gz
 +TO_REMOVE+=/usr/share/man/man9/await.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/await.9.gz
 +TO_REMOVE+=/usr/include/machine/physio_proc.h
 +TO_REMOVE+=/usr/include/c++/4.0
 +TO_REMOVE+=/usr/lib/gcc40
 +TO_REMOVE+=/usr/libexec/gcc40
 +TO_REMOVE+=/usr/libdata/gcc40
 +TO_REMOVE+=/usr/share/man/man1/cpp40.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/cpp40.1.gz
 +TO_REMOVE+=/usr/share/man/man1/g++40.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/g++40.1.gz
 +TO_REMOVE+=/usr/share/man/man1/gcc40.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gcc40.1.gz
 +TO_REMOVE+=/usr/share/man/man1/gcov40.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gcov40.1.gz
 +TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc40.mk
 +TO_REMOVE+=/usr/bin/gtar
 +TO_REMOVE+=/usr/share/man/man9/fuswintr.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/fuswintr.9.gz
 +TO_REMOVE+=/usr/share/man/man9/suswintr.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/suswintr.9.gz
 +TO_REMOVE+=/usr/share/man/man9/MULTI_DRIVER_MODULE.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/MULTI_DRIVER_MODULE.9.gz
 +TO_REMOVE+=/usr/share/man/man4/kame.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/kame.4.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_read_set_bytes_per_block.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_read_set_bytes_per_block.3.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_write_prepare.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_write_prepare.3.gz
 +TO_REMOVE+=/usr/share/man/man3/archive_write_set_callbacks.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/archive_write_set_callbacks.3.gz
 +TO_REMOVE+=/usr/share/examples/cvsup/OpenDarwin-supfile
 +TO_REMOVE+=/usr/share/man/man9/bus_generic_map_intr.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/bus_generic_map_intr.9.gz
 +TO_REMOVE+=/usr/share/man/man9/VOP_BWRITE.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/VOP_BWRITE.9.gz
 +TO_REMOVE+=/usr/include/net/hostcache.h
 +TO_REMOVE+=/usr/include/netinet/in_hostcache.h
 +TO_REMOVE+=/usr/include/libdisk.h
 +TO_REMOVE+=/usr/lib/libdisk.a
 +TO_REMOVE+=/usr/share/man/man3/libdisk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/libdisk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Open_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Open_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Clone_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Clone_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Free_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Free_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Debug_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Debug_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Set_Bios_Geom.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Set_Bios_Geom.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Delete_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Delete_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Collapse_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Collapse_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Collapse_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Collapse_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Create_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Create_Chunk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/All_FreeBSD.3.gz
 +TO_REMOVE+=/usr/share/man/man3/All_FreeBSD.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CheckRules.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CheckRules.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Disk_Names.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Disk_Names.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Set_Boot_Mgr.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Set_Boot_Mgr.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Set_Boot_Blocks.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Set_Boot_Blocks.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Write_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Write_Disk.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Next_Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Next_Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Prev_Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Prev_Cyl_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Next_Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Next_Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Prev_Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Prev_Track_Aligned.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/Create_Chunk_DWIM.3.gz
 +TO_REMOVE+=/usr/share/man/man3/Create_Chunk_DWIM.3.gz
 +TO_REMOVE+=/usr/share/man/man3/MakeDev.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/MakeDev.3.gz
 +TO_REMOVE+=/usr/share/man/man3/MakeDevDisk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/MakeDevDisk.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/ShowChunkFlags.3.gz
 +TO_REMOVE+=/usr/share/man/man3/ShowChunkFlags.3.gz
 +TO_REMOVE+=/usr/share/man/man3/ChunkCanBeRoot.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/ChunkCanBeRoot.3.gz
 +TO_REMOVE+=/usr/share/man/man3/slice_type_name.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/slice_type_name.3.gz
 +TO_REMOVE+=/dev/mcd*
 +TO_REMOVE+=/dev/scd*
 +TO_REMOVE+=/usr/share/man/man4/i386/mcd.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/mcd.4.gz
 +TO_REMOVE+=/usr/share/man/man4/i386/scd.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/scd.4.gz
 +TO_REMOVE+=/etc/rc.d/archdep
 +TO_REMOVE+=/usr/share/man/man4/sata.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/sata.4.gz
 +TO_REMOVE+=/usr/share/man/man4/snd_emu10kx.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/snd_emu10kx.4.gz
 +TO_REMOVE+=/usr/share/man/cat9/cpu_switch.9.gz
 +TO_REMOVE+=/usr/share/man/man9/cpu_switch.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/mi_switch.9.gz
 +TO_REMOVE+=/usr/share/man/man9/mi_switch.9.gz
 +TO_REMOVE+=/usr/libexec/getNAME
 +TO_REMOVE+=/usr/share/man/man1/getNAME.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/getNAME.1.gz
 +TO_REMOVE+=/modules/daemon_saver.ko
 +TO_REMOVE+=/usr/include/net/if_arc.h
 +TO_REMOVE+=/usr/include/net/iso88025.h
 +TO_REMOVE+=/usr/include/netinet/if_fddi.h
 +TO_REMOVE+=/usr/share/man/cat4/cm.4.gz
 +TO_REMOVE+=/usr/share/man/man4/cm.4.gz
 +TO_REMOVE+=/usr/share/man/man4/i386/oltr.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/oltr.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/fea.4.gz
 +TO_REMOVE+=/usr/share/man/man4/fea.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/fpa.4.gz
 +TO_REMOVE+=/usr/share/man/man4/fpa.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/fla.4.gz
 +TO_REMOVE+=/usr/share/man/man4/fla.4.gz
 +TO_REMOVE+=/usr/share/man/man4/nv.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/nv.4.gz
 +TO_REMOVE+=/modules/if_nv.ko
 +TO_REMOVE+=/usr/share/man/mann
 +TO_REMOVE+=/usr/share/man/catn
 +TO_REMOVE+=/usr/share/man/ja/mann
 +TO_REMOVE+=/usr/share/man/ja/catn
 +TO_REMOVE+=/usr/share/man/en.ISO8859-1/catn
 +TO_REMOVE+=/usr/share/man/man9/psignal.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/psignal.9.gz
 +TO_REMOVE+=/usr/share/openssl/man/man7/Modes_of_DES.7.gz
 +TO_REMOVE+=/usr/share/openssl/man/cat7/Modes_of_DES.7.gz
 +TO_REMOVE+=/usr/include/bus/usb/usbdevs.h
 +TO_REMOVE+=/usr/include/bus/usb/usbdevs_data.h
 +TO_REMOVE+=/usr/share/man/man9/callout_handle_init.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/callout_handle_init.9.gz
 +TO_REMOVE+=/usr/include/net/intrq.h
 +TO_REMOVE+=/usr/share/games/fortune/freebsd-tips
 +TO_REMOVE+=/usr/share/games/fortune/freebsd-tips.dat
 +TO_REMOVE+=/usr/share/man/man8/rc.atm.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rc.atm.8.gz
 +TO_REMOVE+=/usr/share/man/man8/rc.early.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rc.early.8.gz
 +TO_REMOVE+=/usr/share/man/man8/rc.network.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rc.network.8.gz
 +TO_REMOVE+=/usr/share/man/man8/rc.serial.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rc.serial.8.gz
 +TO_REMOVE+=/usr/share/man/man8/i386/rc.i386.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/i386/rc.i386.8.gz
 +TO_REMOVE+=/usr/include/sys/xrpuio.h
 +TO_REMOVE+=/etc/rc.d/kldxref
 +TO_REMOVE+=/usr/share/man/man1/gtar.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/gtar.1.gz
 +TO_REMOVE+=/etc/mtree/BSD.x11.dist
 +TO_REMOVE+=/etc/mtree/BSD.x11-4.dist
 +TO_REMOVE+=/usr/share/doc/handbook
 +TO_REMOVE+=/usr/share/examples/BSD_daemon
 +TO_REMOVE+=/usr/share/examples/FreeBSD_version
 +TO_REMOVE+=/usr/share/examples/worm
 +TO_REMOVE+=/usr/share/examples/tcsh/csh-mode.el
 +TO_REMOVE+=/usr/share/man/man5/pbm.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/pbm.5.gz
 +TO_REMOVE+=/usr/sbin/wicontrol
 +TO_REMOVE+=/usr/share/man/man8/wicontrol.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/wicontrol.8.gz
 +TO_REMOVE+=/usr/sbin/ntpd
 +TO_REMOVE+=/etc/rc.d/ntpd
 +TO_REMOVE+=/usr/share/man/man8/ntpd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/ntpd.8.gz
 +TO_REMOVE+=/usr/share/man/man5/ntpd.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/ntpd.conf.5.gz
 +TO_REMOVE+=/usr/share/examples/etc/ntpd.conf
 +TO_REMOVE+=/usr/share/man/cat8/raycontrol.8.gz
 +TO_REMOVE+=/usr/share/man/man8/raycontrol.8.gz
 +TO_REMOVE+=/usr/sbin/raycontrol
 +TO_REMOVE+=/modules/if_ray.ko
 +TO_REMOVE+=/usr/share/man/cat4/i386/ray.4.gz
 +TO_REMOVE+=/usr/share/man/man4/i386/ray.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/awi.4.gz
 +TO_REMOVE+=/usr/share/man/man4/awi.4.gz
 +TO_REMOVE+=/modules/if_gx.ko
 +TO_REMOVE+=/usr/share/man/cat4/gx.4.gz
 +TO_REMOVE+=/usr/share/man/man4/gx.4.gz
 +TO_REMOVE+=/usr/sbin/acxcontrol
 +TO_REMOVE+=/usr/share/man/man8/acxcontrol.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/acxcontrol.8.gz
 +TO_REMOVE+=/usr/sbin/btpin
 +TO_REMOVE+=/usr/sbin/rfcomm_sppd
 +TO_REMOVE+=/usr/sbin/sdpquery
 +TO_REMOVE+=/usr/include/vfs/hammer/hammer_alist.h
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-cvs-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-doc-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-gnats-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-ports-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-stable-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-standard-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-www-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/refuse
 +TO_REMOVE+=/usr/share/examples/cvsup/refuse.README
 +TO_REMOVE+=/modules/umsm.ko
 +TO_REMOVE+=/usr/share/man/man4/umsm.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/umsm.4.gz
 +TO_REMOVE+=/usr/share/groff_font/devlj4/Makefile
 +TO_REMOVE+=/usr/share/groff_font/devlj4/special.map
 +TO_REMOVE+=/usr/share/groff_font/devlj4/text.map
 +TO_REMOVE+=/modules/if_ipw.ko
 +TO_REMOVE+=/usr/share/man/cat4/ipw.4.gz
 +TO_REMOVE+=/usr/share/man/man4/ipw.4.gz
 +TO_REMOVE+=/usr/sbin/ipwcontrol
 +TO_REMOVE+=/usr/share/man/cat8/ipwcontrol.8.gz
 +TO_REMOVE+=/usr/share/man/man8/ipwcontrol.8.gz
 +TO_REMOVE+=/usr/share/zoneinfo/Asia/Calcutta
 +TO_REMOVE+=/usr/share/zoneinfo/Asia/Saigon
 +TO_REMOVE+=/usr/share/man/cat9/mono_time.9.gz
 +TO_REMOVE+=/usr/share/man/man9/mono_time.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/runtime.9.gz
 +TO_REMOVE+=/usr/share/man/man9/runtime.9.gz
 +TO_REMOVE+=/usr/share/i18n/csmapper/CP/CP932EXT%UCS.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/CP/UCS%CP932EXT.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/KS/KSC5601%UCS.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/KS/UCS%KSC5601.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/Big5%UCS.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/KOI8-R%UCS.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/KOI8-U%UCS.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/UCS%Big5.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/UCS%KOI8-R.mps
 +TO_REMOVE+=/usr/share/i18n/csmapper/MISC/UCS%KOI8-U.mps
 +TO_REMOVE+=/usr/share/i18n/esdb/MISC/Big5.esdb
 +TO_REMOVE+=/usr/share/i18n/esdb/MISC/GB18030.esdb
 +TO_REMOVE+=/usr/share/i18n/esdb/MISC/KOI8-R.esdb
 +TO_REMOVE+=/usr/share/i18n/esdb/MISC/KOI8-U.esdb
 +TO_REMOVE+=/usr/share/man/cat3/_rand48.3.gz
 +TO_REMOVE+=/usr/share/man/man3/_rand48.3.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_alloc_node.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_alloc_node.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_dup_bss.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_dup_bss.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_free_allnodes.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_free_allnodes.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_attach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_node_attach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_detach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_node_detach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_node_lateattach.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_node_lateattach.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/ieee80211_wep_crypt.9.gz
 +TO_REMOVE+=/usr/share/man/man9/ieee80211_wep_crypt.9.gz
 +TO_REMOVE+=/usr/share/man/cat3/el_data_get.3.gz
 +TO_REMOVE+=/usr/share/man/man3/el_data_get.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/el_data_set.3.gz
 +TO_REMOVE+=/usr/share/man/man3/el_data_set.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/pam_fail_delay.3.gz
 +TO_REMOVE+=/usr/share/man/man3/pam_fail_delay.3.gz
 +TO_REMOVE+=/usr/share/man/cat5/pam.d.5.gz
 +TO_REMOVE+=/usr/share/man/man5/pam.d.5.gz
 +TO_REMOVE+=/usr/share/man/cat8/pam.8.gz
 +TO_REMOVE+=/usr/share/man/man8/pam.8.gz
 +TO_REMOVE+=/usr/bin/f77
 +TO_REMOVE+=/usr/bin/g77
 +TO_REMOVE+=/usr/libexec/gcc34/f77
 +TO_REMOVE+=/usr/libexec/gcc34/f771
 +TO_REMOVE+=/usr/libexec/gcc34/g77
 +TO_REMOVE+=/usr/lib/gcc34/libfrtbegin.a
 +TO_REMOVE+=/usr/lib/gcc34/libfrtbegin.so
 +TO_REMOVE+=/usr/lib/gcc34/libfrtbegin.so.1
 +TO_REMOVE+=/usr/lib/gcc34/libg2c.a
 +TO_REMOVE+=/usr/lib/gcc34/libg2c.so
 +TO_REMOVE+=/usr/lib/gcc34/libg2c.so.3
 +TO_REMOVE+=/usr/lib/gcc34/profile/libfrtbegin.a
 +TO_REMOVE+=/usr/lib/gcc34/profile/libg2c.a
 +TO_REMOVE+=/usr/share/info/g77.info.gz
 +TO_REMOVE+=/usr/share/man/cat1/f77.1.gz
 +TO_REMOVE+=/usr/share/man/man1/f77.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/g77.1.gz
 +TO_REMOVE+=/usr/share/man/man1/g77.1.gz
 +TO_REMOVE+=/usr/share/info/dc.info.gz
 +TO_REMOVE+=/usr/share/info/gmp.info.gz
 +TO_REMOVE+=/usr/share/info/bzip2.info.gz
 +TO_REMOVE+=/usr/share/info/gasp.info.gz
 +TO_REMOVE+=/usr/share/info/gperf.info.gz
 +TO_REMOVE+=/usr/share/info/gxxint.info.gz
 +TO_REMOVE+=/usr/share/info/iostream.info.gz
 +TO_REMOVE+=/usr/share/info/ptx.info.gz
 +TO_REMOVE+=/usr/share/info/send-pr.info.gz
 +TO_REMOVE+=/usr/share/info/cpp40.info.gz
 +TO_REMOVE+=/usr/share/info/cppinternals40.info.gz
 +TO_REMOVE+=/usr/share/info/gcc40.info.gz
 +TO_REMOVE+=/usr/share/info/gccint40.info.gz
 +TO_REMOVE+=/usr/share/info/tar.info.gz
 +TO_REMOVE+=/usr/include/readline/chardefs.h
 +TO_REMOVE+=/usr/include/readline/keymaps.h
 +TO_REMOVE+=/usr/include/readline/rlconf.h
 +TO_REMOVE+=/usr/include/readline/rlstdc.h
 +TO_REMOVE+=/usr/include/readline/rltypedefs.h
 +TO_REMOVE+=/usr/lib/libhistory.a
 +TO_REMOVE+=/usr/lib/libreadline.a
 +TO_REMOVE+=/usr/lib/profile/libhistory.a
 +TO_REMOVE+=/usr/lib/profile/libreadline.a
 +TO_REMOVE+=/usr/share/info/history.info.gz
 +TO_REMOVE+=/usr/share/info/readline.info.gz
 +TO_REMOVE+=/usr/share/info/rluserman.info.gz
 +TO_REMOVE+=/usr/share/man/cat3/readline.3.gz
 +TO_REMOVE+=/usr/share/man/man3/readline.3.gz
 +TO_REMOVE+=/usr/share/man/cat5/types.5.gz
 +TO_REMOVE+=/usr/share/man/man5/types.5.gz
 +TO_REMOVE+=/usr/include/commands.h
 +TO_REMOVE+=/usr/include/confed.h
 +TO_REMOVE+=/usr/include/diskutil.h
 +TO_REMOVE+=/usr/include/functions.h
 +TO_REMOVE+=/usr/include/package.h
 +TO_REMOVE+=/usr/include/sysids.h
 +TO_REMOVE+=/usr/include/uiutil.h
 +TO_REMOVE+=/usr/share/man/cat4/i386/acpi_toshiba.4.gz
 +TO_REMOVE+=/usr/share/man/man4/i386/acpi_toshiba.4.gz
 +TO_REMOVE+=/etc/rc.d/dhcpd
 +TO_REMOVE+=/etc/rc.d/dhcrelay
 +TO_REMOVE+=/usr/include/dhcpctl.h
 +TO_REMOVE+=/usr/lib/libdhcpctl.a
 +TO_REMOVE+=/usr/lib/libomapi.a
 +TO_REMOVE+=/usr/lib/profile/libdhcpctl.a
 +TO_REMOVE+=/usr/lib/profile/libomapi.a
 +TO_REMOVE+=/usr/sbin/dhcpd
 +TO_REMOVE+=/usr/sbin/dhcrelay
 +TO_REMOVE+=/usr/sbin/omshell
 +TO_REMOVE+=/usr/share/man/cat1/omshell.1.gz
 +TO_REMOVE+=/usr/share/man/man1/omshell.1.gz
 +TO_REMOVE+=/usr/share/man/cat3/dhcpctl.3.gz
 +TO_REMOVE+=/usr/share/man/man3/dhcpctl.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/omapi.3.gz
 +TO_REMOVE+=/usr/share/man/man3/omapi.3.gz
 +TO_REMOVE+=/usr/share/man/cat5/dhcp-eval.5.gz
 +TO_REMOVE+=/usr/share/man/man5/dhcp-eval.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/dhcp-options.5.gz
 +TO_REMOVE+=/usr/share/man/man5/dhcp-options.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/dhcpd.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man5/dhcpd.conf.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/dhcpd.leases.5.gz
 +TO_REMOVE+=/usr/share/man/man5/dhcpd.leases.5.gz
 +TO_REMOVE+=/usr/share/man/cat8/dhcpd.8.gz
 +TO_REMOVE+=/usr/share/man/man8/dhcpd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/dhcrelay.8.gz
 +TO_REMOVE+=/usr/share/man/man8/dhcrelay.8.gz
 +TO_REMOVE+=/usr/include/machine/pci_cfgreg.h
 +TO_REMOVE+=/usr/include/libusbhid.h
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-cvs-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-preview-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_2-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_4-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_6-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_8-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_10-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release1_12-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-release2_0-supfile
 +TO_REMOVE+=/usr/share/examples/cvsup/DragonFly-src-supfile
 +TO_REMOVE+=/usr/include/pcap-bpf.h
 +TO_REMOVE+=/etc/rc.d/nfslocking
 +TO_REMOVE+=/usr/sbin/pmap_dump
 +TO_REMOVE+=/usr/sbin/pmap_set
 +TO_REMOVE+=/usr/sbin/portmap
 +TO_REMOVE+=/usr/share/man/cat8/portmap.8.gz
 +TO_REMOVE+=/usr/share/man/man8/portmap.8.gz
 +TO_REMOVE+=/usr/share/examples/etc/host.conf
 +TO_REMOVE+=/usr/share/man/cat3/regsterrpc.3.gz
 +TO_REMOVE+=/usr/share/man/man3/regsterrpc.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/svc_getreg.3.gz
 +TO_REMOVE+=/usr/share/man/man3/svc_getreg.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/svc_getregset.3.gz
 +TO_REMOVE+=/usr/share/man/man3/svc_getregset.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/xdr_authunix_parms.3.gz
 +TO_REMOVE+=/usr/share/man/man3/xdr_authunix_parms.3.gz
 +TO_REMOVE+=/usr/share/man/cat9/KTR_LOG_PTR.9.gz
 +TO_REMOVE+=/usr/share/man/man9/KTR_LOG_PTR.9.gz
 +TO_REMOVE+=/usr/libexec/rexecd
 +TO_REMOVE+=/usr/share/man/man8/rexecd.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/rexecd.8.gz
 +TO_REMOVE+=/usr/bin/key
 +TO_REMOVE+=/usr/share/man/man1/key.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/key.1.gz
 +TO_REMOVE+=/usr/bin/keyinfo
 +TO_REMOVE+=/usr/share/man/man1/keyinfo.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/keyinfo.1.gz
 +TO_REMOVE+=/usr/bin/keyinit
 +TO_REMOVE+=/usr/share/man/man1/keyinit.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/keyinit.1.gz
 +TO_REMOVE+=/usr/lib/libskey.a
 +TO_REMOVE+=/usr/lib/profile/libskey.a
 +TO_REMOVE+=/usr/include/skey.h
 +TO_REMOVE+=/usr/share/man/man1/skey.1.gz
 +TO_REMOVE+=/usr/share/man/cat1/skey.1.gz
 +TO_REMOVE+=/usr/share/man/man3/skey.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skey.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skeylookup.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skeylookup.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skeyverify.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skeyverify.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skeychallenge.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skeychallenge.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skeyinfo.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skeyinfo.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skeyaccess.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skeyaccess.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skey_getpass.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skey_getpass.3.gz
 +TO_REMOVE+=/usr/share/man/man3/skey_crypt.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/skey_crypt.3.gz
 +TO_REMOVE+=/usr/share/man/man5/skey.access.5.gz
 +TO_REMOVE+=/usr/share/man/cat5/skey.access.5.gz
 +TO_REMOVE+=/etc/pam.d/xserver
 +TO_REMOVE+=/usr/include/machine/cronyx.h
 +TO_REMOVE+=/usr/share/man/man4/i386/cx.4.gz
 +TO_REMOVE+=/usr/share/man/cat4/i386/cx.4.gz
 +TO_REMOVE+=/usr/share/zoneinfo/Asia/Katmandu
 +TO_REMOVE+=/usr/share/man/man3/__svc_getcallercreds.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/__svc_getcallercreds.3.gz
 +TO_REMOVE+=/usr/share/vi/perl
 +TO_REMOVE+=/usr/share/vi/tcl
 +TO_REMOVE+=/usr/sbin/iwicontrol
 +TO_REMOVE+=/usr/share/man/man8/iwicontrol.8.gz
 +TO_REMOVE+=/usr/share/man/cat8/iwicontrol.8.gz
 +TO_REMOVE+=/usr/share/man/man9/objcache_reclaim_list.9.gz
 +TO_REMOVE+=/usr/share/man/cat9/objcache_reclaim_list.9.gz
 +TO_REMOVE+=/usr/share/man/cat3/timezone.3.gz
 +TO_REMOVE+=/usr/share/man/man3/timezone.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/addr2ascii.3.gz
 +TO_REMOVE+=/usr/share/man/man3/addr2ascii.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/ascii2addr.3.gz
 +TO_REMOVE+=/usr/share/man/man3/ascii2addr.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_EMPTY.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_EMPTY.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_ENTRY.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_ENTRY.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FIRST.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FIRST.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FOREACH.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FOREACH.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_FOREACH_REVERSE.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_FOREACH_REVERSE.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_HEAD.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_HEAD.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_HEAD_INITIALIZER.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_HEAD_INITIALIZER.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INIT.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INIT.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_AFTER.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_AFTER.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_BEFORE.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_BEFORE.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_HEAD.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_HEAD.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_INSERT_TAIL.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_INSERT_TAIL.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_LAST.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_LAST.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_NEXT.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_NEXT.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_PREV.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_PREV.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/CIRCLEQ_REMOVE.3.gz
 +TO_REMOVE+=/usr/share/man/man3/CIRCLEQ_REMOVE.3.gz
 +TO_REMOVE+=/usr/share/man/cat3/fts_getstream.3.gz
 +TO_REMOVE+=/usr/share/man/man3/fts_getstream.3.gz
 +TO_REMOVE+=/usr/lib/gcc34/gcrt1.o
 +TO_REMOVE+=/usr/lib/gcc34/crt1.o
 +TO_REMOVE+=/usr/lib/gcc34/crti.o
 +TO_REMOVE+=/usr/lib/gcc34/crtn.o
 +TO_REMOVE+=/usr/lib/gcc41/gcrt1.o
 +TO_REMOVE+=/usr/lib/gcc41/crt1.o
 +TO_REMOVE+=/usr/lib/gcc41/crti.o
 +TO_REMOVE+=/usr/lib/gcc41/crtn.o
 +TO_REMOVE+=/etc/rc.d/atm2.sh
 +TO_REMOVE+=/etc/rc.d/atm3.sh
 +TO_REMOVE+=/etc/rc.d/rcconf.sh
 +TO_REMOVE+=/usr/share/man/cat9/namei.9.gz
 +TO_REMOVE+=/usr/share/man/man9/namei.9.gz
 +TO_REMOVE+=/usr/share/man/cat5/host.conf.5.gz
 +TO_REMOVE+=/usr/share/man/man5/host.conf.5.gz
++TO_REMOVE+=/usr/share/misc/magic.mime
++TO_REMOVE+=/usr/share/misc/magic.mime.mgc
@@@ -516,26 -550,76 +550,78 @@@ apprentice_sort(const void *a, const vo
                return 1;
  }
  
+ private void
+ set_test_type(struct magic *mstart, struct magic *m)
+ {
+       switch (m->type) {
+       case FILE_BYTE:
+       case FILE_SHORT:
+       case FILE_LONG:
+       case FILE_DATE:
+       case FILE_BESHORT:
+       case FILE_BELONG:
+       case FILE_BEDATE:
+       case FILE_LESHORT:
+       case FILE_LELONG:
+       case FILE_LEDATE:
+       case FILE_LDATE:
+       case FILE_BELDATE:
+       case FILE_LELDATE:
+       case FILE_MEDATE:
+       case FILE_MELDATE:
+       case FILE_MELONG:
+       case FILE_QUAD:
+       case FILE_LEQUAD:
+       case FILE_BEQUAD:
+       case FILE_QDATE:
+       case FILE_LEQDATE:
+       case FILE_BEQDATE:
+       case FILE_QLDATE:
+       case FILE_LEQLDATE:
+       case FILE_BEQLDATE:
+       case FILE_FLOAT:
+       case FILE_BEFLOAT:
+       case FILE_LEFLOAT:
+       case FILE_DOUBLE:
+       case FILE_BEDOUBLE:
+       case FILE_LEDOUBLE:
+       case FILE_STRING:
+       case FILE_PSTRING:
+       case FILE_BESTRING16:
+       case FILE_LESTRING16:
+               /* binary test, set flag */
+               mstart->flag |= BINTEST;
+               break;
+       case FILE_REGEX:
+       case FILE_SEARCH:
++#ifndef COMPILE_ONLY
+               /* binary test if pattern is not text */
+               if (file_looks_utf8(m->value.us, (size_t)m->vallen, NULL,
+                   NULL) <= 0)
+                       mstart->flag |= BINTEST;
++#endif
+               break;
+       case FILE_DEFAULT:
+               /* can't deduce anything; we shouldn't see this at the
+                  top level anyway */
+               break;
+       case FILE_INVALID:
+       default:
+               /* invalid search type, but no need to complain here */
+               break;
+       }
+ }
  /*
-  * parse from a file
-  * const char *fn: name of magic file
+  * Load and parse one file.
   */
- private int
apprentice_file(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
-     const char *fn, int action)
+ private void
load_1(struct magic_set *ms, int action, const char *fn, int *errs,
+    struct magic_entry **marray, uint32_t *marraycount)
  {
-       private const char hdr[] =
-               "cont\toffset\ttype\topcode\tmask\tvalue\tdesc";
-       FILE *f;
        char line[BUFSIZ];
-       int errs = 0;
-       struct magic_entry *marray;
-       uint32_t marraycount, i, mentrycount = 0;
        size_t lineno = 0;
-       ms->flags |= MAGIC_CHECK;       /* Enable checks for parsed files */
-       f = fopen(ms->file = fn, "r");
+       FILE *f = fopen(ms->file = fn, "r");
        if (f == NULL) {
                if (errno != ENOENT)
                        file_error(ms, errno, "cannot read magic file `%s'",
index 6142a74,0000000..d8e7136
mode 100644,000000..100644
--- /dev/null
@@@ -1,65 -1,0 +1,63 @@@
- SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\
-       is_tar.c magic.c print.c readelf.c softmagic.c
 +# $DragonFly: src/lib/libmagic/Makefile,v 1.19 2007/05/28 18:42:39 pavalos Exp $
 +
 +CONTRIBDIR=   ${.CURDIR}/../../contrib/file/src
 +MAGICDIR= ${CONTRIBDIR}/../magic
 +.PATH: ${CONTRIBDIR}
 +
 +MAGIC=        /usr/share/misc/magic
 +
 +LIB=  magic
 +SHLIB_MAJOR=  2
 +
- CLEANFILES+=  magic magic.mgc magic.mime.mgc magic.mime.lnk libmagic.3
++SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c \
++      compress.c encoding.c fsmagic.c funcs.c \
++      is_tar.c magic.c print.c readcdf.c readelf.c softmagic.c
 +INCS= magic.h
 +
 +LIBMAGIC_CDEFS = -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
 +CFLAGS+= ${LIBMAGIC_CDEFS}
 +CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}
 +
 +MAN=  libmagic.3
 +
 +MLINKS+=      libmagic.3 magic_open.3
 +MLINKS+=      libmagic.3 magic_close.3
 +MLINKS+=      libmagic.3 magic_error.3
 +MLINKS+=      libmagic.3 magic_errno.3
 +MLINKS+=      libmagic.3 magic_file.3
 +MLINKS+=      libmagic.3 magic_buffer.3
 +MLINKS+=      libmagic.3 magic_setflags.3
 +MLINKS+=      libmagic.3 magic_check.3
 +MLINKS+=      libmagic.3 magic_compile.3
 +MLINKS+=      libmagic.3 magic_load.3
 +
- FILES=                magic magic.mgc ${MAGICDIR}/magic.mime magic.mime.mgc
++CLEANFILES+=  magic magic.mgc libmagic.3
 +
- all: ${LIB} magic.mgc magic.mime.mgc
++FILES=                magic magic.mgc
 +FILESDIR=     /usr/share/misc
 +
 +MAGFILES=     ${MAGICDIR}/Header ${MAGICDIR}/Localstuff\
 +              ${MAGICDIR}/Magdir/[a-z]*
 +
 +libmagic.3: ${CONTRIBDIR}/../doc/libmagic.man
 +          sed -e s@__CSECTION__@1@g \
 +              -e s@__FSECTION__@5@g \
 +              -e s@__MAGIC__@${MAGIC}@g ${.ALLSRC} > ${.TARGET}
 +
-  
- magic.mime.mgc: mkmagic.nx ${MAGICDIR}/magic.mime
-       ./mkmagic.nx ${MAGICDIR}/magic.mime
++all: ${LIB} magic.mgc
 +
 +magic: ${MAGFILES}
 +      cat ${.ALLSRC} > ${.TARGET}
 +
 +magic.mgc: mkmagic.nx magic
 +      ./mkmagic.nx magic
 +
 +CLEANFILES+=   mkmagic.nx
 +build-tools: mkmagic.nx
 +
 +NXCFLAGS=     ${LIBMAGIC_CDEFS} -DCOMPILE_ONLY -I${.OBJDIR} -I- -I${.CURDIR} -I${CONTRIBDIR}
 +NXCFLAGS+=    -DBOOTSTRAPPING
 +mkmagic.nx: file.h apprentice.c funcs.c magic.c print.c
 +      ${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}
 +
 +.include <bsd.lib.mk>
index ee4be9b,0000000..705ae07
mode 100644,000000..100644
--- /dev/null
@@@ -1,235 -1,0 +1,271 @@@
- /* $DragonFly: src/lib/libmagic/config.h,v 1.12 2008/01/19 23:44:59 pavalos Exp $ */
 +/* config.h.  Generated from config.h.in by configure.  */
- /* config.h.in.  Generated from configure.in by autoheader.  */
++/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
- /* Use the builtin ELF recognition code */
++/* Define in built-in ELF support is used */
 +#define BUILTIN_ELF 1
 +
- /* Recognize ELF core files */
++/* Define for ELF core file support */
 +#define ELFCORE 1
 +
- /* */
- /* #undef HAVE_DAYLIGHT */
++/* Define to 1 if you have the `asprintf' function. */
++#define HAVE_ASPRINTF 1
++
++/* HAVE_DAYLIGHT */
++#define HAVE_DAYLIGHT 1
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#define HAVE_DLFCN_H 1
 +
++/* Define to 1 if you have the <err.h> header file. */
++#define HAVE_ERR_H 1
++
 +/* Define to 1 if you have the <fcntl.h> header file. */
 +#define HAVE_FCNTL_H 1
 +
++/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
++#define HAVE_FSEEKO 1
++
 +/* Define to 1 if you have the <getopt.h> header file. */
 +#define HAVE_GETOPT_H 1
 +
 +/* Define to 1 if you have the `getopt_long' function. */
 +#define HAVE_GETOPT_LONG 1
 +
++/* Define to 1 if the system has the type `int32_t'. */
++#define HAVE_INT32_T 1
++
++/* Define to 1 if the system has the type `int64_t'. */
++#define HAVE_INT64_T 1
++
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#define HAVE_INTTYPES_H 1
 +
 +/* Define to 1 if you have the `z' library (-lz). */
 +#define HAVE_LIBZ 1
 +
 +/* Define to 1 if you have the <limits.h> header file. */
 +#define HAVE_LIMITS_H 1
 +
 +/* Define to 1 if you have the <locale.h> header file. */
 +#define HAVE_LOCALE_H 1
 +
- /* */
- #define HAVE_LONG_LONG 1
 +/* Define to 1 if you have the `mbrtowc' function. */
 +#define HAVE_MBRTOWC 1
 +
 +/* Define to 1 if <wchar.h> declares mbstate_t. */
 +#define HAVE_MBSTATE_T 1
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#define HAVE_MEMORY_H 1
 +
 +/* Define to 1 if you have the `mkstemp' function. */
 +#define HAVE_MKSTEMP 1
 +
 +/* Define to 1 if you have the `mmap' function. */
 +#define HAVE_MMAP 1
 +
- /* Define to 1 if you have the `snprintf' function. */
- #define HAVE_SNPRINTF 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 `strerror' function. */
 +#define HAVE_STRERROR 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 `strlcat' function. */
++#define HAVE_STRLCAT 1
++
++/* Define to 1 if you have the `strlcpy' function. */
++#define HAVE_STRLCPY 1
++
 +/* Define to 1 if you have the `strndup' function. */
 +#define HAVE_STRNDUP 1
 +
 +/* Define to 1 if you have the `strtof' function. */
- /* #undef HAVE_STRTOF */
++#define HAVE_STRTOF 1
 +
 +/* Define to 1 if you have the `strtoul' function. */
 +#define HAVE_STRTOUL 1
 +
++/* HAVE_STRUCT_OPTION */
++#define HAVE_STRUCT_OPTION 1
++
 +/* Define to 1 if `st_rdev' is member of `struct stat'. */
 +#define HAVE_STRUCT_STAT_ST_RDEV 1
 +
- /* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
-    `HAVE_STRUCT_STAT_ST_RDEV' instead. */
- #define HAVE_ST_RDEV 1
++/* Define to 1 if `tm_gmtoff' is member of `struct tm'. */
++#define HAVE_STRUCT_TM_TM_GMTOFF 1
++
++/* Define to 1 if `tm_zone' is member of `struct tm'. */
++#define HAVE_STRUCT_TM_TM_ZONE 1
 +
 +/* Define to 1 if you have the <sys/mman.h> header file. */
 +#define HAVE_SYS_MMAN_H 1
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#define HAVE_SYS_STAT_H 1
 +
 +/* Define to 1 if you have the <sys/time.h> header file. */
 +#define HAVE_SYS_TIME_H 1
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#define HAVE_SYS_TYPES_H 1
 +
 +/* Define to 1 if you have the <sys/utime.h> header file. */
 +/* #undef HAVE_SYS_UTIME_H */
 +
 +/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 +#define HAVE_SYS_WAIT_H 1
 +
- /* */
++/* HAVE_TM_ISDST */
 +#define HAVE_TM_ISDST 1
 +
 +/* HAVE_TM_ZONE */
 +#define HAVE_TM_ZONE 1
 +
 +/* HAVE_TZNAME */
 +#define HAVE_TZNAME 1
 +
++/* Define to 1 if the system has the type `uint16_t'. */
++#define HAVE_UINT16_T 1
++
++/* Define to 1 if the system has the type `uint32_t'. */
++#define HAVE_UINT32_T 1
++
++/* Define to 1 if the system has the type `uint64_t'. */
++#define HAVE_UINT64_T 1
++
++/* Define to 1 if the system has the type `uint8_t'. */
++#define HAVE_UINT8_T 1
++
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#define HAVE_UNISTD_H 1
 +
 +/* Define to 1 if you have the `utime' function. */
 +#define HAVE_UTIME 1
 +
 +/* Define to 1 if you have the `utimes' function. */
 +#define HAVE_UTIMES 1
 +
 +/* Define to 1 if you have the <utime.h> header file. */
 +#define HAVE_UTIME_H 1
 +
- /* Define to 1 if you have the `vsnprintf' function. */
- #define HAVE_VSNPRINTF 1
++/* Define to 1 if you have the `vasprintf' function. */
++#define HAVE_VASPRINTF 1
 +
 +#ifndef BOOTSTRAPPING
 +/* Define to 1 if you have the <wchar.h> header file. */
 +#define HAVE_WCHAR_H 1
 +
 +/* Define to 1 if you have the <wctype.h> header file. */
 +#define HAVE_WCTYPE_H 1
 +
 +/* Define to 1 if you have the `wcwidth' function. */
 +#define HAVE_WCWIDTH 1
- #endif        /* BOOTSTRAPPING */
++#endif /* BOOTSTRAPPING */
 +
 +/* Define to 1 if you have the <zlib.h> header file. */
 +#define HAVE_ZLIB_H 1
 +
 +/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
 +   */
 +/* #undef MAJOR_IN_MKDEV */
 +
 +/* Define to 1 if `major', `minor', and `makedev' are declared in
 +   <sysmacros.h>. */
 +/* #undef MAJOR_IN_SYSMACROS */
 +
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++/* #undef NO_MINUS_C_MINUS_O */
++
 +/* Name of package */
 +#define PACKAGE "file"
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#define PACKAGE_BUGREPORT ""
 +
 +/* Define to the full name of this package. */
 +#define PACKAGE_NAME ""
 +
 +/* Define to the full name and version of this package. */
 +#define PACKAGE_STRING ""
 +
 +/* Define to the one symbol short name of this package. */
 +#define PACKAGE_TARNAME ""
 +
 +/* Define to the version of this package. */
 +#define PACKAGE_VERSION ""
 +
- /* */
- #define SIZEOF_INT64_T 8
- /* */
- #define SIZEOF_UINT16_T 2
- /* */
- #define SIZEOF_UINT32_T 4
- /* */
- #define SIZEOF_UINT64_T 8
- /* */
- #define SIZEOF_UINT8_T 1
++/* The size of `long long', as computed by sizeof. */
++#define SIZEOF_LONG_LONG 8
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#define STDC_HEADERS 1
 +
 +/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 +/* #undef TM_IN_SYS_TIME */
 +
 +/* Version number of package */
- #define VERSION "4.23"
++#define VERSION "5.03"
 +
 +/* Number of bits in a file offset, on hosts where this is settable. */
 +/* #undef _FILE_OFFSET_BITS */
 +
 +/* Enable GNU extensions on systems that have them.  */
 +#ifndef _GNU_SOURCE
 +# define _GNU_SOURCE 1
 +#endif
 +
++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
++/* #undef _LARGEFILE_SOURCE */
++
 +/* Define for large files, on AIX-style hosts. */
 +/* #undef _LARGE_FILES */
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +/* #undef const */
 +
- /* */
- /* #undef int32_t */
- /* */
- /* #undef int64_t */
 +/* Define to a type if <wchar.h> does not define. */
 +/* #undef mbstate_t */
 +
 +/* Define to `long int' if <sys/types.h> does not define. */
 +/* #undef off_t */
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +/* #undef size_t */
 +
- /* */
- /* #undef uint16_t */
- /* */
- /* #undef uint32_t */
 +
- /* */
- /* #undef uint64_t */
++#ifndef HAVE_UINT8_T
++typedef unsigned char uint8_t;
++#endif
++#ifndef HAVE_UINT16_T
++typedef unsigned short uint16_t;
++#endif
++#ifndef HAVE_UINT32_T
++typedef unsigned int uint32_t;
++#endif
++#ifndef HAVE_INT32_T
++typedef int int32_t;
++#endif
++#ifndef HAVE_UINT64_T
++#if SIZEOF_LONG_LONG == 8
++typedef unsigned long long uint64_t;
++#else
++typedef unsigned long uint64_t;
++#endif
++#endif
++#ifndef HAVE_INT64_T
++#if SIZEOF_LONG_LONG == 8
++typedef long long int64_t;
++#else
++typedef long int64_t;
++#endif
++#endif
 +
- /* */
- /* #undef uint8_t */