233 files changed, 1 insertions, 2 deletions

diff --git a/contrib/file/ChangeLog b/ChangeLog
index 2beffb0cfd77..2beffb0cfd77 100644
--- a/contrib/file/ChangeLog
+++ b/ChangeLog
diff --git a/contrib/file/FREEBSD-upgrade b/FREEBSD-upgrade
index f6657bcfae59..ee8f7a8fdbe0 100644
--- a/contrib/file/FREEBSD-upgrade
+++ b/FREEBSD-upgrade
@@ -1,5 +1,5 @@
 # ex:ts=8
-$FreeBSD$
+$FreeBSD: vendor/file/dist/contrib/file/FREEBSD-upgrade 169962 2007-05-24 21:59:38Z obrien $
 
 Christos Zoulas `file'
 	originals can be found at: ftp://ftp.astron.com/pub/file/
diff --git a/contrib/file/Header b/Header
index 3ca9b0eb2cc7..3ca9b0eb2cc7 100644
--- a/contrib/file/Header
+++ b/Header
diff --git a/contrib/file/LEGAL.NOTICE b/LEGAL.NOTICE
index 68148e2ffda6..68148e2ffda6 100644
--- a/contrib/file/LEGAL.NOTICE
+++ b/LEGAL.NOTICE
diff --git a/contrib/file/Localstuff b/Localstuff
index 419855fb6220..419855fb6220 100644
--- a/contrib/file/Localstuff
+++ b/Localstuff
diff --git a/contrib/file/MAINT b/MAINT
index 077f9d67dfb4..077f9d67dfb4 100644
--- a/contrib/file/MAINT
+++ b/MAINT
diff --git a/contrib/file/Magdir/acorn b/Magdir/acorn
index 5acb31ee2043..5acb31ee2043 100644
--- a/contrib/file/Magdir/acorn
+++ b/Magdir/acorn
diff --git a/contrib/file/Magdir/adi b/Magdir/adi
index 12d7da59bcde..12d7da59bcde 100644
--- a/contrib/file/Magdir/adi
+++ b/Magdir/adi
diff --git a/contrib/file/Magdir/adventure b/Magdir/adventure
index 405d3cc41ed7..405d3cc41ed7 100644
--- a/contrib/file/Magdir/adventure
+++ b/Magdir/adventure
diff --git a/contrib/file/Magdir/allegro b/Magdir/allegro
index 41f4ad6cd236..41f4ad6cd236 100644
--- a/contrib/file/Magdir/allegro
+++ b/Magdir/allegro
diff --git a/contrib/file/Magdir/alliant b/Magdir/alliant
index 69cf4b44d742..69cf4b44d742 100644
--- a/contrib/file/Magdir/alliant
+++ b/Magdir/alliant
diff --git a/contrib/file/Magdir/alpha b/Magdir/alpha
index c0191fb931e4..c0191fb931e4 100644
--- a/contrib/file/Magdir/alpha
+++ b/Magdir/alpha
diff --git a/contrib/file/Magdir/amanda b/Magdir/amanda
index 2b9565083ee0..2b9565083ee0 100644
--- a/contrib/file/Magdir/amanda
+++ b/Magdir/amanda
diff --git a/contrib/file/Magdir/amigaos b/Magdir/amigaos
index bb98299d89ff..bb98299d89ff 100644
--- a/contrib/file/Magdir/amigaos
+++ b/Magdir/amigaos
diff --git a/contrib/file/Magdir/animation b/Magdir/animation
index 6392f850887e..6392f850887e 100644
--- a/contrib/file/Magdir/animation
+++ b/Magdir/animation
diff --git a/contrib/file/Magdir/apl b/Magdir/apl
index 040043191938..040043191938 100644
--- a/contrib/file/Magdir/apl
+++ b/Magdir/apl
diff --git a/contrib/file/Magdir/apple b/Magdir/apple
index 4a593ea221ec..4a593ea221ec 100644
--- a/contrib/file/Magdir/apple
+++ b/Magdir/apple
diff --git a/contrib/file/Magdir/applix b/Magdir/applix
index 9d348d152450..9d348d152450 100644
--- a/contrib/file/Magdir/applix
+++ b/Magdir/applix
diff --git a/contrib/file/Magdir/archive b/Magdir/archive
index 0b3a9ba92bda..0b3a9ba92bda 100644
--- a/contrib/file/Magdir/archive
+++ b/Magdir/archive
diff --git a/contrib/file/Magdir/asterix b/Magdir/asterix
index d89504a2407f..d89504a2407f 100644
--- a/contrib/file/Magdir/asterix
+++ b/Magdir/asterix
diff --git a/contrib/file/Magdir/att3b b/Magdir/att3b
index 884ad4aa4332..884ad4aa4332 100644
--- a/contrib/file/Magdir/att3b
+++ b/Magdir/att3b
diff --git a/contrib/file/Magdir/audio b/Magdir/audio
index 511da1dc5be0..511da1dc5be0 100644
--- a/contrib/file/Magdir/audio
+++ b/Magdir/audio
diff --git a/contrib/file/Magdir/basis b/Magdir/basis
index 1813c0e0f0a7..1813c0e0f0a7 100644
--- a/contrib/file/Magdir/basis
+++ b/Magdir/basis
diff --git a/contrib/file/Magdir/bflt b/Magdir/bflt
index 5e288d130b07..5e288d130b07 100644
--- a/contrib/file/Magdir/bflt
+++ b/Magdir/bflt
diff --git a/contrib/file/Magdir/blender b/Magdir/blender
index 6ef79507ef9b..6ef79507ef9b 100644
--- a/contrib/file/Magdir/blender
+++ b/Magdir/blender
diff --git a/contrib/file/Magdir/blit b/Magdir/blit
index 7a470ed4a669..7a470ed4a669 100644
--- a/contrib/file/Magdir/blit
+++ b/Magdir/blit
diff --git a/contrib/file/Magdir/bout b/Magdir/bout
index 4cd6f76ef540..4cd6f76ef540 100644
--- a/contrib/file/Magdir/bout
+++ b/Magdir/bout
diff --git a/contrib/file/Magdir/bsdi b/Magdir/bsdi
index ad547599ba83..ad547599ba83 100644
--- a/contrib/file/Magdir/bsdi
+++ b/Magdir/bsdi
diff --git a/contrib/file/Magdir/btsnoop b/Magdir/btsnoop
index 85d867a446d4..85d867a446d4 100644
--- a/contrib/file/Magdir/btsnoop
+++ b/Magdir/btsnoop
diff --git a/contrib/file/Magdir/c-lang b/Magdir/c-lang
index fd3f9aa2491f..fd3f9aa2491f 100644
--- a/contrib/file/Magdir/c-lang
+++ b/Magdir/c-lang
diff --git a/contrib/file/Magdir/c64 b/Magdir/c64
index a224b216346c..a224b216346c 100644
--- a/contrib/file/Magdir/c64
+++ b/Magdir/c64
diff --git a/contrib/file/Magdir/cad b/Magdir/cad
index 757dab6be089..757dab6be089 100644
--- a/contrib/file/Magdir/cad
+++ b/Magdir/cad
diff --git a/contrib/file/Magdir/cafebabe b/Magdir/cafebabe
index 233411c80439..233411c80439 100644
--- a/contrib/file/Magdir/cafebabe
+++ b/Magdir/cafebabe
diff --git a/contrib/file/Magdir/cddb b/Magdir/cddb
index 2ea97eecd296..2ea97eecd296 100644
--- a/contrib/file/Magdir/cddb
+++ b/Magdir/cddb
diff --git a/contrib/file/Magdir/chord b/Magdir/chord
index 3639f3c4917e..3639f3c4917e 100644
--- a/contrib/file/Magdir/chord
+++ b/Magdir/chord
diff --git a/contrib/file/Magdir/cisco b/Magdir/cisco
index 77e3efb5e39d..77e3efb5e39d 100644
--- a/contrib/file/Magdir/cisco
+++ b/Magdir/cisco
diff --git a/contrib/file/Magdir/citrus b/Magdir/citrus
index 6d4479455391..6d4479455391 100644
--- a/contrib/file/Magdir/citrus
+++ b/Magdir/citrus
diff --git a/contrib/file/Magdir/claris b/Magdir/claris
index 368b473260ec..368b473260ec 100644
--- a/contrib/file/Magdir/claris
+++ b/Magdir/claris
diff --git a/contrib/file/Magdir/clipper b/Magdir/clipper
index c325cb8f7c7d..c325cb8f7c7d 100644
--- a/contrib/file/Magdir/clipper
+++ b/Magdir/clipper
diff --git a/contrib/file/Magdir/commands b/Magdir/commands
index 599c190a45ec..599c190a45ec 100644
--- a/contrib/file/Magdir/commands
+++ b/Magdir/commands
diff --git a/contrib/file/Magdir/communications b/Magdir/communications
index 81417ec08371..81417ec08371 100644
--- a/contrib/file/Magdir/communications
+++ b/Magdir/communications
diff --git a/contrib/file/Magdir/compress b/Magdir/compress
index e9be46b76c40..e9be46b76c40 100644
--- a/contrib/file/Magdir/compress
+++ b/Magdir/compress
diff --git a/contrib/file/Magdir/console b/Magdir/console
index 775472d4265c..775472d4265c 100644
--- a/contrib/file/Magdir/console
+++ b/Magdir/console
diff --git a/contrib/file/Magdir/convex b/Magdir/convex
index b1235d7e79a8..b1235d7e79a8 100644
--- a/contrib/file/Magdir/convex
+++ b/Magdir/convex
diff --git a/contrib/file/Magdir/cracklib b/Magdir/cracklib
index 8f7e0d460e5a..8f7e0d460e5a 100644
--- a/contrib/file/Magdir/cracklib
+++ b/Magdir/cracklib
diff --git a/contrib/file/Magdir/ctags b/Magdir/ctags
index 84c5b7f93aad..84c5b7f93aad 100644
--- a/contrib/file/Magdir/ctags
+++ b/Magdir/ctags
diff --git a/contrib/file/Magdir/dact b/Magdir/dact
index 5cca8d961601..5cca8d961601 100644
--- a/contrib/file/Magdir/dact
+++ b/Magdir/dact
diff --git a/contrib/file/Magdir/database b/Magdir/database
index 8f2fc0a76d33..8f2fc0a76d33 100644
--- a/contrib/file/Magdir/database
+++ b/Magdir/database
diff --git a/contrib/file/Magdir/diamond b/Magdir/diamond
index 1abd01e0300f..1abd01e0300f 100644
--- a/contrib/file/Magdir/diamond
+++ b/Magdir/diamond
diff --git a/contrib/file/Magdir/diff b/Magdir/diff
index 187e892a6d30..187e892a6d30 100644
--- a/contrib/file/Magdir/diff
+++ b/Magdir/diff
diff --git a/contrib/file/Magdir/digital b/Magdir/digital
index 615ef7a58cda..615ef7a58cda 100644
--- a/contrib/file/Magdir/digital
+++ b/Magdir/digital
diff --git a/contrib/file/Magdir/dolby b/Magdir/dolby
index 230f738a209d..230f738a209d 100644
--- a/contrib/file/Magdir/dolby
+++ b/Magdir/dolby
diff --git a/contrib/file/Magdir/dump b/Magdir/dump
index addd9549cc78..addd9549cc78 100644
--- a/contrib/file/Magdir/dump
+++ b/Magdir/dump
diff --git a/contrib/file/Magdir/dyadic b/Magdir/dyadic
index e8a9d25d8c0f..e8a9d25d8c0f 100644
--- a/contrib/file/Magdir/dyadic
+++ b/Magdir/dyadic
diff --git a/contrib/file/Magdir/editors b/Magdir/editors
index 0b15bf820ab6..0b15bf820ab6 100644
--- a/contrib/file/Magdir/editors
+++ b/Magdir/editors
diff --git a/contrib/file/Magdir/efi b/Magdir/efi
index 4eec2eb93779..4eec2eb93779 100644
--- a/contrib/file/Magdir/efi
+++ b/Magdir/efi
diff --git a/contrib/file/Magdir/elf b/Magdir/elf
index 464b436aca1d..464b436aca1d 100644
--- a/contrib/file/Magdir/elf
+++ b/Magdir/elf
diff --git a/contrib/file/Magdir/encore b/Magdir/encore
index 63cb5d4f9f42..63cb5d4f9f42 100644
--- a/contrib/file/Magdir/encore
+++ b/Magdir/encore
diff --git a/contrib/file/Magdir/epoc b/Magdir/epoc
index 29bd94799b20..29bd94799b20 100644
--- a/contrib/file/Magdir/epoc
+++ b/Magdir/epoc
diff --git a/contrib/file/Magdir/esri b/Magdir/esri
index 35c34923e056..35c34923e056 100644
--- a/contrib/file/Magdir/esri
+++ b/Magdir/esri
diff --git a/contrib/file/Magdir/fcs b/Magdir/fcs
index ac4b02c81cf8..ac4b02c81cf8 100644
--- a/contrib/file/Magdir/fcs
+++ b/Magdir/fcs
diff --git a/contrib/file/Magdir/filesystems b/Magdir/filesystems
index 20b257bc3a4c..20b257bc3a4c 100644
--- a/contrib/file/Magdir/filesystems
+++ b/Magdir/filesystems
diff --git a/contrib/file/Magdir/flash b/Magdir/flash
index f14b460c702e..f14b460c702e 100644
--- a/contrib/file/Magdir/flash
+++ b/Magdir/flash
diff --git a/contrib/file/Magdir/fonts b/Magdir/fonts
index cf6e0d7cc140..cf6e0d7cc140 100644
--- a/contrib/file/Magdir/fonts
+++ b/Magdir/fonts
diff --git a/contrib/file/Magdir/fortran b/Magdir/fortran
index ce004adb361b..ce004adb361b 100644
--- a/contrib/file/Magdir/fortran
+++ b/Magdir/fortran
diff --git a/contrib/file/Magdir/frame b/Magdir/frame
index 1b397df05799..1b397df05799 100644
--- a/contrib/file/Magdir/frame
+++ b/Magdir/frame
diff --git a/contrib/file/Magdir/freebsd b/Magdir/freebsd
index ee710fab5fd7..ee710fab5fd7 100644
--- a/contrib/file/Magdir/freebsd
+++ b/Magdir/freebsd
diff --git a/contrib/file/Magdir/fsav b/Magdir/fsav
index 4d61bebaa292..4d61bebaa292 100644
--- a/contrib/file/Magdir/fsav
+++ b/Magdir/fsav
diff --git a/contrib/file/Magdir/games b/Magdir/games
index 2dc17da6c625..2dc17da6c625 100644
--- a/contrib/file/Magdir/games
+++ b/Magdir/games
diff --git a/contrib/file/Magdir/gcc b/Magdir/gcc
index ee726f3a5ade..ee726f3a5ade 100644
--- a/contrib/file/Magdir/gcc
+++ b/Magdir/gcc
diff --git a/contrib/file/Magdir/geos b/Magdir/geos
index af1df7b71945..af1df7b71945 100644
--- a/contrib/file/Magdir/geos
+++ b/Magdir/geos
diff --git a/contrib/file/Magdir/gimp b/Magdir/gimp
index 9a9d61e2f79c..9a9d61e2f79c 100644
--- a/contrib/file/Magdir/gimp
+++ b/Magdir/gimp
diff --git a/contrib/file/Magdir/gnu b/Magdir/gnu
index 42d9c7bc68e4..42d9c7bc68e4 100644
--- a/contrib/file/Magdir/gnu
+++ b/Magdir/gnu
diff --git a/contrib/file/Magdir/grace b/Magdir/grace
index a5f143359ec3..a5f143359ec3 100644
--- a/contrib/file/Magdir/grace
+++ b/Magdir/grace
diff --git a/contrib/file/Magdir/gringotts b/Magdir/gringotts
index 6e833a3e1d1b..6e833a3e1d1b 100644
--- a/contrib/file/Magdir/gringotts
+++ b/Magdir/gringotts
diff --git a/contrib/file/Magdir/hitachi-sh b/Magdir/hitachi-sh
index a096eebf1f19..a096eebf1f19 100644
--- a/contrib/file/Magdir/hitachi-sh
+++ b/Magdir/hitachi-sh
diff --git a/contrib/file/Magdir/hp b/Magdir/hp
index 052f09a23996..052f09a23996 100644
--- a/contrib/file/Magdir/hp
+++ b/Magdir/hp
diff --git a/contrib/file/Magdir/human68k b/Magdir/human68k
index d8070f725d04..d8070f725d04 100644
--- a/contrib/file/Magdir/human68k
+++ b/Magdir/human68k
diff --git a/contrib/file/Magdir/ibm370 b/Magdir/ibm370
index 8cd9da27ae6a..8cd9da27ae6a 100644
--- a/contrib/file/Magdir/ibm370
+++ b/Magdir/ibm370
diff --git a/contrib/file/Magdir/ibm6000 b/Magdir/ibm6000
index 6870c3121ade..6870c3121ade 100644
--- a/contrib/file/Magdir/ibm6000
+++ b/Magdir/ibm6000
diff --git a/contrib/file/Magdir/iff b/Magdir/iff
index 3c88f9039c1f..3c88f9039c1f 100644
--- a/contrib/file/Magdir/iff
+++ b/Magdir/iff
diff --git a/contrib/file/Magdir/images b/Magdir/images
index fd9e14f9fd2b..fd9e14f9fd2b 100644
--- a/contrib/file/Magdir/images
+++ b/Magdir/images
diff --git a/contrib/file/Magdir/intel b/Magdir/intel
index 00942c2b2e0a..00942c2b2e0a 100644
--- a/contrib/file/Magdir/intel
+++ b/Magdir/intel
diff --git a/contrib/file/Magdir/interleaf b/Magdir/interleaf
index 3eea3cff2690..3eea3cff2690 100644
--- a/contrib/file/Magdir/interleaf
+++ b/Magdir/interleaf
diff --git a/contrib/file/Magdir/island b/Magdir/island
index 9903cddf9217..9903cddf9217 100644
--- a/contrib/file/Magdir/island
+++ b/Magdir/island
diff --git a/contrib/file/Magdir/ispell b/Magdir/ispell
index 592f064ed63c..592f064ed63c 100644
--- a/contrib/file/Magdir/ispell
+++ b/Magdir/ispell
diff --git a/contrib/file/Magdir/java b/Magdir/java
index 971b72ceb3a4..971b72ceb3a4 100644
--- a/contrib/file/Magdir/java
+++ b/Magdir/java
diff --git a/contrib/file/Magdir/jpeg b/Magdir/jpeg
index af646d6fb920..af646d6fb920 100644
--- a/contrib/file/Magdir/jpeg
+++ b/Magdir/jpeg
diff --git a/contrib/file/Magdir/karma b/Magdir/karma
index 89e77727ea4e..89e77727ea4e 100644
--- a/contrib/file/Magdir/karma
+++ b/Magdir/karma
diff --git a/contrib/file/Magdir/lecter b/Magdir/lecter
index 87c186bab363..87c186bab363 100644
--- a/contrib/file/Magdir/lecter
+++ b/Magdir/lecter
diff --git a/contrib/file/Magdir/lex b/Magdir/lex
index 7b6d0f74a400..7b6d0f74a400 100644
--- a/contrib/file/Magdir/lex
+++ b/Magdir/lex
diff --git a/contrib/file/Magdir/lif b/Magdir/lif
index cf20e4997d83..cf20e4997d83 100644
--- a/contrib/file/Magdir/lif
+++ b/Magdir/lif
diff --git a/contrib/file/Magdir/linux b/Magdir/linux
index fe68013a1653..fe68013a1653 100644
--- a/contrib/file/Magdir/linux
+++ b/Magdir/linux
diff --git a/contrib/file/Magdir/lisp b/Magdir/lisp
index e9c8ba8ec4e6..e9c8ba8ec4e6 100644
--- a/contrib/file/Magdir/lisp
+++ b/Magdir/lisp
diff --git a/contrib/file/Magdir/mach b/Magdir/mach
index cced3a587323..cced3a587323 100644
--- a/contrib/file/Magdir/mach
+++ b/Magdir/mach
diff --git a/contrib/file/Magdir/macintosh b/Magdir/macintosh
index 4acd5c88e170..4acd5c88e170 100644
--- a/contrib/file/Magdir/macintosh
+++ b/Magdir/macintosh
diff --git a/contrib/file/Magdir/magic b/Magdir/magic
index 3bf4e2ee7acb..3bf4e2ee7acb 100644
--- a/contrib/file/Magdir/magic
+++ b/Magdir/magic
diff --git a/contrib/file/Magdir/mail.news b/Magdir/mail.news
index f08261ca3a6e..f08261ca3a6e 100644
--- a/contrib/file/Magdir/mail.news
+++ b/Magdir/mail.news
diff --git a/contrib/file/Magdir/maple b/Magdir/maple
index 6bc75628fc26..6bc75628fc26 100644
--- a/contrib/file/Magdir/maple
+++ b/Magdir/maple
diff --git a/contrib/file/Magdir/mathematica b/Magdir/mathematica
index 0eca5d415d68..0eca5d415d68 100644
--- a/contrib/file/Magdir/mathematica
+++ b/Magdir/mathematica
diff --git a/contrib/file/Magdir/matroska b/Magdir/matroska
index ca00db4b2068..ca00db4b2068 100644
--- a/contrib/file/Magdir/matroska
+++ b/Magdir/matroska
diff --git a/contrib/file/Magdir/mcrypt b/Magdir/mcrypt
index e862f59d7494..e862f59d7494 100644
--- a/contrib/file/Magdir/mcrypt
+++ b/Magdir/mcrypt
diff --git a/contrib/file/Magdir/mime b/Magdir/mime
index 2219094f676c..2219094f676c 100644
--- a/contrib/file/Magdir/mime
+++ b/Magdir/mime
diff --git a/contrib/file/Magdir/mips b/Magdir/mips
index 634eff4106be..634eff4106be 100644
--- a/contrib/file/Magdir/mips
+++ b/Magdir/mips
diff --git a/contrib/file/Magdir/mirage b/Magdir/mirage
index 73c3747bb7fd..73c3747bb7fd 100644
--- a/contrib/file/Magdir/mirage
+++ b/Magdir/mirage
diff --git a/contrib/file/Magdir/misctools b/Magdir/misctools
index bb995bad65c9..bb995bad65c9 100644
--- a/contrib/file/Magdir/misctools
+++ b/Magdir/misctools
diff --git a/contrib/file/Magdir/mkid b/Magdir/mkid
index dfb2d93f4389..dfb2d93f4389 100644
--- a/contrib/file/Magdir/mkid
+++ b/Magdir/mkid
diff --git a/contrib/file/Magdir/mlssa b/Magdir/mlssa
index 21ab61e1d85d..21ab61e1d85d 100644
--- a/contrib/file/Magdir/mlssa
+++ b/Magdir/mlssa
diff --git a/contrib/file/Magdir/mmdf b/Magdir/mmdf
index 72cd9f32581b..72cd9f32581b 100644
--- a/contrib/file/Magdir/mmdf
+++ b/Magdir/mmdf
diff --git a/contrib/file/Magdir/modem b/Magdir/modem
index 73e747e161dc..73e747e161dc 100644
--- a/contrib/file/Magdir/modem
+++ b/Magdir/modem
diff --git a/contrib/file/Magdir/motorola b/Magdir/motorola
index bfe7ea030ee8..bfe7ea030ee8 100644
--- a/contrib/file/Magdir/motorola
+++ b/Magdir/motorola
diff --git a/contrib/file/Magdir/msdos b/Magdir/msdos
index 10ce8aefc045..10ce8aefc045 100644
--- a/contrib/file/Magdir/msdos
+++ b/Magdir/msdos
diff --git a/contrib/file/Magdir/msvc b/Magdir/msvc
index 95853fec9b37..95853fec9b37 100644
--- a/contrib/file/Magdir/msvc
+++ b/Magdir/msvc
diff --git a/contrib/file/Magdir/mup b/Magdir/mup
index fd9a7b1353b5..fd9a7b1353b5 100644
--- a/contrib/file/Magdir/mup
+++ b/Magdir/mup
diff --git a/contrib/file/Magdir/natinst b/Magdir/natinst
index 5deb9dedf779..5deb9dedf779 100644
--- a/contrib/file/Magdir/natinst
+++ b/Magdir/natinst
diff --git a/contrib/file/Magdir/ncr b/Magdir/ncr
index 2faf98ada725..2faf98ada725 100644
--- a/contrib/file/Magdir/ncr
+++ b/Magdir/ncr
diff --git a/contrib/file/Magdir/netbsd b/Magdir/netbsd
index b6aae1ac623e..b6aae1ac623e 100644
--- a/contrib/file/Magdir/netbsd
+++ b/Magdir/netbsd
diff --git a/contrib/file/Magdir/netscape b/Magdir/netscape
index f14227db76cb..f14227db76cb 100644
--- a/contrib/file/Magdir/netscape
+++ b/Magdir/netscape
diff --git a/contrib/file/Magdir/news b/Magdir/news
index 0ac4fa269748..0ac4fa269748 100644
--- a/contrib/file/Magdir/news
+++ b/Magdir/news
diff --git a/contrib/file/Magdir/nitpicker b/Magdir/nitpicker
index c40daecef3ca..c40daecef3ca 100644
--- a/contrib/file/Magdir/nitpicker
+++ b/Magdir/nitpicker
diff --git a/contrib/file/Magdir/ocaml b/Magdir/ocaml
index f8ba976272e6..f8ba976272e6 100644
--- a/contrib/file/Magdir/ocaml
+++ b/Magdir/ocaml
diff --git a/contrib/file/Magdir/octave b/Magdir/octave
index 309314820e45..309314820e45 100644
--- a/contrib/file/Magdir/octave
+++ b/Magdir/octave
diff --git a/contrib/file/Magdir/olf b/Magdir/olf
index e698c36a49ee..e698c36a49ee 100644
--- a/contrib/file/Magdir/olf
+++ b/Magdir/olf
diff --git a/contrib/file/Magdir/os2 b/Magdir/os2
index 99dd63aeabe7..99dd63aeabe7 100644
--- a/contrib/file/Magdir/os2
+++ b/Magdir/os2
diff --git a/contrib/file/Magdir/os400 b/Magdir/os400
index 3dc05bf906e7..3dc05bf906e7 100644
--- a/contrib/file/Magdir/os400
+++ b/Magdir/os400
diff --git a/contrib/file/Magdir/os9 b/Magdir/os9
index ed2ed2ca4b26..ed2ed2ca4b26 100644
--- a/contrib/file/Magdir/os9
+++ b/Magdir/os9
diff --git a/contrib/file/Magdir/osf1 b/Magdir/osf1
index 31166c1f34b7..31166c1f34b7 100644
--- a/contrib/file/Magdir/osf1
+++ b/Magdir/osf1
diff --git a/contrib/file/Magdir/palm b/Magdir/palm
index 79af1f00c36f..79af1f00c36f 100644
--- a/contrib/file/Magdir/palm
+++ b/Magdir/palm
diff --git a/contrib/file/Magdir/parix b/Magdir/parix
index 09965d122ccb..09965d122ccb 100644
--- a/contrib/file/Magdir/parix
+++ b/Magdir/parix
diff --git a/contrib/file/Magdir/pbm b/Magdir/pbm
index 98c15f79485c..98c15f79485c 100644
--- a/contrib/file/Magdir/pbm
+++ b/Magdir/pbm
diff --git a/contrib/file/Magdir/pdf b/Magdir/pdf
index e90214efb9a6..e90214efb9a6 100644
--- a/contrib/file/Magdir/pdf
+++ b/Magdir/pdf
diff --git a/contrib/file/Magdir/pdp b/Magdir/pdp
index 545200529d8b..545200529d8b 100644
--- a/contrib/file/Magdir/pdp
+++ b/Magdir/pdp
diff --git a/contrib/file/Magdir/perl b/Magdir/perl
index a8daee4c647c..a8daee4c647c 100644
--- a/contrib/file/Magdir/perl
+++ b/Magdir/perl
diff --git a/contrib/file/Magdir/pgp b/Magdir/pgp
index 038d098ee4ac..038d098ee4ac 100644
--- a/contrib/file/Magdir/pgp
+++ b/Magdir/pgp
diff --git a/contrib/file/Magdir/pkgadd b/Magdir/pkgadd
index dc8ef5d93ab4..dc8ef5d93ab4 100644
--- a/contrib/file/Magdir/pkgadd
+++ b/Magdir/pkgadd
diff --git a/contrib/file/Magdir/plan9 b/Magdir/plan9
index 58fb071c7bf2..58fb071c7bf2 100644
--- a/contrib/file/Magdir/plan9
+++ b/Magdir/plan9
diff --git a/contrib/file/Magdir/plus5 b/Magdir/plus5
index acf3bf4037b6..acf3bf4037b6 100644
--- a/contrib/file/Magdir/plus5
+++ b/Magdir/plus5
diff --git a/contrib/file/Magdir/printer b/Magdir/printer
index 77ba7809748b..77ba7809748b 100644
--- a/contrib/file/Magdir/printer
+++ b/Magdir/printer
diff --git a/contrib/file/Magdir/project b/Magdir/project
index 04e8865c2eca..04e8865c2eca 100644
--- a/contrib/file/Magdir/project
+++ b/Magdir/project
diff --git a/contrib/file/Magdir/psdbms b/Magdir/psdbms
index f36121fcbcd4..f36121fcbcd4 100644
--- a/contrib/file/Magdir/psdbms
+++ b/Magdir/psdbms
diff --git a/contrib/file/Magdir/psion b/Magdir/psion
index 578ea5906dc5..578ea5906dc5 100644
--- a/contrib/file/Magdir/psion
+++ b/Magdir/psion
diff --git a/contrib/file/Magdir/pulsar b/Magdir/pulsar
index a4a5c21d3d53..a4a5c21d3d53 100644
--- a/contrib/file/Magdir/pulsar
+++ b/Magdir/pulsar
diff --git a/contrib/file/Magdir/pyramid b/Magdir/pyramid
index fe16608436b8..fe16608436b8 100644
--- a/contrib/file/Magdir/pyramid
+++ b/Magdir/pyramid
diff --git a/contrib/file/Magdir/python b/Magdir/python
index 9fac2b9ae707..9fac2b9ae707 100644
--- a/contrib/file/Magdir/python
+++ b/Magdir/python
diff --git a/contrib/file/Magdir/revision b/Magdir/revision
index e47416ab68d0..e47416ab68d0 100644
--- a/contrib/file/Magdir/revision
+++ b/Magdir/revision
diff --git a/contrib/file/Magdir/riff b/Magdir/riff
index 5aa9d109388d..5aa9d109388d 100644
--- a/contrib/file/Magdir/riff
+++ b/Magdir/riff
diff --git a/contrib/file/Magdir/rpm b/Magdir/rpm
index 09ee51b4f026..09ee51b4f026 100644
--- a/contrib/file/Magdir/rpm
+++ b/Magdir/rpm
diff --git a/contrib/file/Magdir/rtf b/Magdir/rtf
index 8e2d4166fa58..8e2d4166fa58 100644
--- a/contrib/file/Magdir/rtf
+++ b/Magdir/rtf
diff --git a/contrib/file/Magdir/sc b/Magdir/sc
index 98599f264781..98599f264781 100644
--- a/contrib/file/Magdir/sc
+++ b/Magdir/sc
diff --git a/contrib/file/Magdir/sccs b/Magdir/sccs
index 11d50b23c003..11d50b23c003 100644
--- a/contrib/file/Magdir/sccs
+++ b/Magdir/sccs
diff --git a/contrib/file/Magdir/scientific b/Magdir/scientific
index 81beac120603..81beac120603 100644
--- a/contrib/file/Magdir/scientific
+++ b/Magdir/scientific
diff --git a/contrib/file/Magdir/sendmail b/Magdir/sendmail
index 7880ab510e62..7880ab510e62 100644
--- a/contrib/file/Magdir/sendmail
+++ b/Magdir/sendmail
diff --git a/contrib/file/Magdir/sequent b/Magdir/sequent
index e6f7b52aacb1..e6f7b52aacb1 100644
--- a/contrib/file/Magdir/sequent
+++ b/Magdir/sequent
diff --git a/contrib/file/Magdir/sgi b/Magdir/sgi
index f7de13800b9f..f7de13800b9f 100644
--- a/contrib/file/Magdir/sgi
+++ b/Magdir/sgi
diff --git a/contrib/file/Magdir/sgml b/Magdir/sgml
index ba6c3ef8971b..ba6c3ef8971b 100644
--- a/contrib/file/Magdir/sgml
+++ b/Magdir/sgml
diff --git a/contrib/file/Magdir/sharc b/Magdir/sharc
index 8c2cae4c25d0..8c2cae4c25d0 100644
--- a/contrib/file/Magdir/sharc
+++ b/Magdir/sharc
diff --git a/contrib/file/Magdir/sinclair b/Magdir/sinclair
index fbad852c50fa..fbad852c50fa 100644
--- a/contrib/file/Magdir/sinclair
+++ b/Magdir/sinclair
diff --git a/contrib/file/Magdir/sketch b/Magdir/sketch
index d31d18464ffd..d31d18464ffd 100644
--- a/contrib/file/Magdir/sketch
+++ b/Magdir/sketch
diff --git a/contrib/file/Magdir/smalltalk b/Magdir/smalltalk
index b8827598c185..b8827598c185 100644
--- a/contrib/file/Magdir/smalltalk
+++ b/Magdir/smalltalk
diff --git a/contrib/file/Magdir/sniffer b/Magdir/sniffer
index 282c44fec454..282c44fec454 100644
--- a/contrib/file/Magdir/sniffer
+++ b/Magdir/sniffer
diff --git a/contrib/file/Magdir/softquad b/Magdir/softquad
index aa1690426475..aa1690426475 100644
--- a/contrib/file/Magdir/softquad
+++ b/Magdir/softquad
diff --git a/contrib/file/Magdir/spec b/Magdir/spec
index bfda30642c73..bfda30642c73 100644
--- a/contrib/file/Magdir/spec
+++ b/Magdir/spec
diff --git a/contrib/file/Magdir/spectrum b/Magdir/spectrum
index ab9fd0467f42..ab9fd0467f42 100644
--- a/contrib/file/Magdir/spectrum
+++ b/Magdir/spectrum
diff --git a/contrib/file/Magdir/sql b/Magdir/sql
index 21c6e515e945..21c6e515e945 100644
--- a/contrib/file/Magdir/sql
+++ b/Magdir/sql
diff --git a/contrib/file/Magdir/sun b/Magdir/sun
index 871071e9996b..871071e9996b 100644
--- a/contrib/file/Magdir/sun
+++ b/Magdir/sun
diff --git a/contrib/file/Magdir/sysex b/Magdir/sysex
index 03d6cdd6b78a..03d6cdd6b78a 100644
--- a/contrib/file/Magdir/sysex
+++ b/Magdir/sysex
diff --git a/contrib/file/Magdir/teapot b/Magdir/teapot
index d9554bfb738e..d9554bfb738e 100644
--- a/contrib/file/Magdir/teapot
+++ b/Magdir/teapot
diff --git a/contrib/file/Magdir/terminfo b/Magdir/terminfo
index 2226ce8cee53..2226ce8cee53 100644
--- a/contrib/file/Magdir/terminfo
+++ b/Magdir/terminfo
diff --git a/contrib/file/Magdir/tex b/Magdir/tex
index 52adb8704a2f..52adb8704a2f 100644
--- a/contrib/file/Magdir/tex
+++ b/Magdir/tex
diff --git a/contrib/file/Magdir/tgif b/Magdir/tgif
index 779883ac8488..779883ac8488 100644
--- a/contrib/file/Magdir/tgif
+++ b/Magdir/tgif
diff --git a/contrib/file/Magdir/ti-8x b/Magdir/ti-8x
index 89e220401c52..89e220401c52 100644
--- a/contrib/file/Magdir/ti-8x
+++ b/Magdir/ti-8x
diff --git a/contrib/file/Magdir/timezone b/Magdir/timezone
index 40e7558f8de1..40e7558f8de1 100644
--- a/contrib/file/Magdir/timezone
+++ b/Magdir/timezone
diff --git a/contrib/file/Magdir/troff b/Magdir/troff
index 01ad88a0b445..01ad88a0b445 100644
--- a/contrib/file/Magdir/troff
+++ b/Magdir/troff
diff --git a/contrib/file/Magdir/tuxedo b/Magdir/tuxedo
index 119afa6a6bab..119afa6a6bab 100644
--- a/contrib/file/Magdir/tuxedo
+++ b/Magdir/tuxedo
diff --git a/contrib/file/Magdir/typeset b/Magdir/typeset
index 2eda7c3e413f..2eda7c3e413f 100644
--- a/contrib/file/Magdir/typeset
+++ b/Magdir/typeset
diff --git a/contrib/file/Magdir/unicode b/Magdir/unicode
index 45a32d4536b7..45a32d4536b7 100644
--- a/contrib/file/Magdir/unicode
+++ b/Magdir/unicode
diff --git a/contrib/file/Magdir/unknown b/Magdir/unknown
index 910cea48e079..910cea48e079 100644
--- a/contrib/file/Magdir/unknown
+++ b/Magdir/unknown
diff --git a/contrib/file/Magdir/uuencode b/Magdir/uuencode
index 7e88619d5ca9..7e88619d5ca9 100644
--- a/contrib/file/Magdir/uuencode
+++ b/Magdir/uuencode
diff --git a/contrib/file/Magdir/varied.out b/Magdir/varied.out
index 6df6fd93a41f..6df6fd93a41f 100644
--- a/contrib/file/Magdir/varied.out
+++ b/Magdir/varied.out
diff --git a/contrib/file/Magdir/varied.script b/Magdir/varied.script
index ab5becef2d63..ab5becef2d63 100644
--- a/contrib/file/Magdir/varied.script
+++ b/Magdir/varied.script
diff --git a/contrib/file/Magdir/vax b/Magdir/vax
index 7dd86ccf53e1..7dd86ccf53e1 100644
--- a/contrib/file/Magdir/vax
+++ b/Magdir/vax
diff --git a/contrib/file/Magdir/vicar b/Magdir/vicar
index ab216eeea816..ab216eeea816 100644
--- a/contrib/file/Magdir/vicar
+++ b/Magdir/vicar
diff --git a/contrib/file/Magdir/virtutech b/Magdir/virtutech
index cea8443b2e60..cea8443b2e60 100644
--- a/contrib/file/Magdir/virtutech
+++ b/Magdir/virtutech
diff --git a/contrib/file/Magdir/visx b/Magdir/visx
index 491996426091..491996426091 100644
--- a/contrib/file/Magdir/visx
+++ b/Magdir/visx
diff --git a/contrib/file/Magdir/vms b/Magdir/vms
index c91186f68c3e..c91186f68c3e 100644
--- a/contrib/file/Magdir/vms
+++ b/Magdir/vms
diff --git a/contrib/file/Magdir/vmware b/Magdir/vmware
index 28e19e57a899..28e19e57a899 100644
--- a/contrib/file/Magdir/vmware
+++ b/Magdir/vmware
diff --git a/contrib/file/Magdir/vorbis b/Magdir/vorbis
index 5957ea0d2782..5957ea0d2782 100644
--- a/contrib/file/Magdir/vorbis
+++ b/Magdir/vorbis
diff --git a/contrib/file/Magdir/vxl b/Magdir/vxl
index d3f55619ebb7..d3f55619ebb7 100644
--- a/contrib/file/Magdir/vxl
+++ b/Magdir/vxl
diff --git a/contrib/file/Magdir/wordprocessors b/Magdir/wordprocessors
index 546d2616d965..546d2616d965 100644
--- a/contrib/file/Magdir/wordprocessors
+++ b/Magdir/wordprocessors
diff --git a/contrib/file/Magdir/xdelta b/Magdir/xdelta
index 80c92dac035f..80c92dac035f 100644
--- a/contrib/file/Magdir/xdelta
+++ b/Magdir/xdelta
diff --git a/contrib/file/Magdir/xenix b/Magdir/xenix
index 1acadec62a01..1acadec62a01 100644
--- a/contrib/file/Magdir/xenix
+++ b/Magdir/xenix
diff --git a/contrib/file/Magdir/xo65 b/Magdir/xo65
index 1020cee58c7b..1020cee58c7b 100644
--- a/contrib/file/Magdir/xo65
+++ b/Magdir/xo65
diff --git a/contrib/file/Magdir/xwindows b/Magdir/xwindows
index 57f3b083f3b3..57f3b083f3b3 100644
--- a/contrib/file/Magdir/xwindows
+++ b/Magdir/xwindows
diff --git a/contrib/file/Magdir/zilog b/Magdir/zilog
index b746e204f5b9..b746e204f5b9 100644
--- a/contrib/file/Magdir/zilog
+++ b/Magdir/zilog
diff --git a/contrib/file/Magdir/zyxel b/Magdir/zyxel
index 12a6abd5de8c..12a6abd5de8c 100644
--- a/contrib/file/Magdir/zyxel
+++ b/Magdir/zyxel
diff --git a/contrib/file/Makefile.am b/Makefile.am
index 730ad3253041..730ad3253041 100644
--- a/contrib/file/Makefile.am
+++ b/Makefile.am
diff --git a/contrib/file/Makefile.in b/Makefile.in
index ba2ef9dfaa68..ba2ef9dfaa68 100644
--- a/contrib/file/Makefile.in
+++ b/Makefile.in
diff --git a/contrib/file/Makefile.std b/Makefile.std
index ff2a9b5ddc92..ff2a9b5ddc92 100644
--- a/contrib/file/Makefile.std
+++ b/Makefile.std
diff --git a/contrib/file/PORTING b/PORTING
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/file/PORTING
+++ b/PORTING
diff --git a/contrib/file/README b/README
index b7e9d559dca8..b7e9d559dca8 100644
--- a/contrib/file/README
+++ b/README
diff --git a/contrib/file/acinclude.m4 b/acinclude.m4
index f92a2d1db95e..f92a2d1db95e 100644
--- a/contrib/file/acinclude.m4
+++ b/acinclude.m4
diff --git a/contrib/file/aclocal.m4 b/aclocal.m4
index c46c0411407a..c46c0411407a 100644
--- a/contrib/file/aclocal.m4
+++ b/aclocal.m4
diff --git a/contrib/file/apprentice.c b/apprentice.c
index 162acfefa591..162acfefa591 100644
--- a/contrib/file/apprentice.c
+++ b/apprentice.c
diff --git a/contrib/file/apptype.c b/apptype.c
index 42cee40e92b9..42cee40e92b9 100644
--- a/contrib/file/apptype.c
+++ b/apptype.c
diff --git a/contrib/file/ascmagic.c b/ascmagic.c
index 8d2d9a763c50..8d2d9a763c50 100644
--- a/contrib/file/ascmagic.c
+++ b/ascmagic.c
diff --git a/contrib/file/compress.c b/compress.c
index 487b1b7f21ca..487b1b7f21ca 100644
--- a/contrib/file/compress.c
+++ b/compress.c
diff --git a/contrib/file/config.h.in b/config.h.in
index 281a4e40e7ed..281a4e40e7ed 100644
--- a/contrib/file/config.h.in
+++ b/config.h.in
diff --git a/contrib/file/configure b/configure
index a81d93d52040..a81d93d52040 100755
--- a/contrib/file/configure
+++ b/configure
diff --git a/contrib/file/configure.in b/configure.in
index ee509e226a1c..ee509e226a1c 100644
--- a/contrib/file/configure.in
+++ b/configure.in
diff --git a/contrib/file/.cvsignore b/contrib/file/.cvsignore
deleted file mode 100644
index d89921897ae6..000000000000
--- a/contrib/file/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te.cache
diff --git a/contrib/file/file.c b/file.c
index 575b951f8178..575b951f8178 100644
--- a/contrib/file/file.c
+++ b/file.c
diff --git a/contrib/file/file.h b/file.h
index ce0f4e263022..ce0f4e263022 100644
--- a/contrib/file/file.h
+++ b/file.h
diff --git a/contrib/file/file.man b/file.man
index 05bf9e71d966..05bf9e71d966 100644
--- a/contrib/file/file.man
+++ b/file.man
diff --git a/contrib/file/file_opts.h b/file_opts.h
index 46bc08ae4b4e..46bc08ae4b4e 100644
--- a/contrib/file/file_opts.h
+++ b/file_opts.h
diff --git a/contrib/file/fsmagic.c b/fsmagic.c
index e04f5981876f..e04f5981876f 100644
--- a/contrib/file/fsmagic.c
+++ b/fsmagic.c
diff --git a/contrib/file/funcs.c b/funcs.c
index 5cf11812fb75..5cf11812fb75 100644
--- a/contrib/file/funcs.c
+++ b/funcs.c
diff --git a/contrib/file/install-sh b/install-sh
index 4fbbae7b7ff9..4fbbae7b7ff9 100755
--- a/contrib/file/install-sh
+++ b/install-sh
diff --git a/contrib/file/is_tar.c b/is_tar.c
index 142b4870f988..142b4870f988 100644
--- a/contrib/file/is_tar.c
+++ b/is_tar.c
diff --git a/contrib/file/libmagic.man b/libmagic.man
index 61e8f27e3d11..61e8f27e3d11 100644
--- a/contrib/file/libmagic.man
+++ b/libmagic.man
diff --git a/contrib/file/magic.c b/magic.c
index 8fba30bfab1b..8fba30bfab1b 100644
--- a/contrib/file/magic.c
+++ b/magic.c
diff --git a/contrib/file/magic.h b/magic.h
index 6041f548c8f9..6041f548c8f9 100644
--- a/contrib/file/magic.h
+++ b/magic.h
diff --git a/contrib/file/magic.man b/magic.man
index 3842b6481c30..3842b6481c30 100644
--- a/contrib/file/magic.man
+++ b/magic.man
diff --git a/contrib/file/magic.mime b/magic.mime
index dfa62de4b8d8..dfa62de4b8d8 100644
--- a/contrib/file/magic.mime
+++ b/magic.mime
diff --git a/contrib/file/magic2mime b/magic2mime
index 26f84d28a160..26f84d28a160 100755
--- a/contrib/file/magic2mime
+++ b/magic2mime
diff --git a/contrib/file/mkinstalldirs b/mkinstalldirs
index ef7e16fdafe2..ef7e16fdafe2 100644
--- a/contrib/file/mkinstalldirs
+++ b/mkinstalldirs
diff --git a/contrib/file/names.h b/names.h
index 509d2a24fc9b..509d2a24fc9b 100644
--- a/contrib/file/names.h
+++ b/names.h
diff --git a/contrib/file/patchlevel.h b/patchlevel.h
index 10a506bfb517..10a506bfb517 100644
--- a/contrib/file/patchlevel.h
+++ b/patchlevel.h
diff --git a/contrib/file/print.c b/print.c
index c28ee2e145f1..c28ee2e145f1 100644
--- a/contrib/file/print.c
+++ b/print.c
diff --git a/contrib/file/readelf.c b/readelf.c
index 3c7472b4d4bb..3c7472b4d4bb 100644
--- a/contrib/file/readelf.c
+++ b/readelf.c
diff --git a/contrib/file/readelf.h b/readelf.h
index 610c310c82a8..610c310c82a8 100644
--- a/contrib/file/readelf.h
+++ b/readelf.h
diff --git a/contrib/file/softmagic.c b/softmagic.c
index 21a0148dd87f..21a0148dd87f 100644
--- a/contrib/file/softmagic.c
+++ b/softmagic.c
diff --git a/contrib/file/tar.h b/tar.h
index 30d386baa6fd..30d386baa6fd 100644
--- a/contrib/file/tar.h
+++ b/tar.h
diff --git a/contrib/file/test.c b/test.c
index 55b78d387c0d..55b78d387c0d 100644
--- a/contrib/file/test.c
+++ b/test.c