From 327e51cbf108c0f1619755494b30617e1089a42f Mon Sep 17 00:00:00 2001 From: Peter Avalos Date: Sat, 20 Jun 2009 11:57:20 -1000 Subject: [PATCH] Move file-4/ to file/. We don't need a versioned directory. --- contrib/{file-4 => file}/ChangeLog | 0 contrib/{file-4 => file}/LEGAL.NOTICE | 0 contrib/{file-4 => file}/MAINT | 0 contrib/{file-4 => file}/README | 0 contrib/{file-4 => file}/doc/file.man | 0 contrib/{file-4 => file}/doc/libmagic.man | 0 contrib/{file-4 => file}/doc/magic.man | 0 contrib/{file-4 => file}/magic/Header | 0 contrib/{file-4 => file}/magic/Localstuff | 0 contrib/{file-4 => file}/magic/Magdir/acorn | 0 contrib/{file-4 => file}/magic/Magdir/adi | 0 contrib/{file-4 => file}/magic/Magdir/adventure | 0 contrib/{file-4 => file}/magic/Magdir/allegro | 0 contrib/{file-4 => file}/magic/Magdir/alliant | 0 contrib/{file-4 => file}/magic/Magdir/alpha | 0 contrib/{file-4 => file}/magic/Magdir/amanda | 0 contrib/{file-4 => file}/magic/Magdir/amigaos | 0 contrib/{file-4 => file}/magic/Magdir/animation | 0 contrib/{file-4 => file}/magic/Magdir/apl | 0 contrib/{file-4 => file}/magic/Magdir/apple | 0 contrib/{file-4 => file}/magic/Magdir/applix | 0 contrib/{file-4 => file}/magic/Magdir/archive | 0 contrib/{file-4 => file}/magic/Magdir/asterix | 0 contrib/{file-4 => file}/magic/Magdir/att3b | 0 contrib/{file-4 => file}/magic/Magdir/audio | 0 contrib/{file-4 => file}/magic/Magdir/bFLT | 0 contrib/{file-4 => file}/magic/Magdir/basis | 0 contrib/{file-4 => file}/magic/Magdir/bflt | 0 contrib/{file-4 => file}/magic/Magdir/blender | 0 contrib/{file-4 => file}/magic/Magdir/blit | 0 contrib/{file-4 => file}/magic/Magdir/bout | 0 contrib/{file-4 => file}/magic/Magdir/bsdi | 0 contrib/{file-4 => file}/magic/Magdir/btsnoop | 0 contrib/{file-4 => file}/magic/Magdir/c-lang | 0 contrib/{file-4 => file}/magic/Magdir/c64 | 0 contrib/{file-4 => file}/magic/Magdir/cad | 0 contrib/{file-4 => file}/magic/Magdir/cafebabe | 0 contrib/{file-4 => file}/magic/Magdir/cddb | 0 contrib/{file-4 => file}/magic/Magdir/chi | 0 contrib/{file-4 => file}/magic/Magdir/chord | 0 contrib/{file-4 => file}/magic/Magdir/cisco | 0 contrib/{file-4 => file}/magic/Magdir/citrus | 0 contrib/{file-4 => file}/magic/Magdir/claris | 0 contrib/{file-4 => file}/magic/Magdir/clipper | 0 contrib/{file-4 => file}/magic/Magdir/commands | 0 contrib/{file-4 => file}/magic/Magdir/communications | 0 contrib/{file-4 => file}/magic/Magdir/compress | 0 contrib/{file-4 => file}/magic/Magdir/console | 0 contrib/{file-4 => file}/magic/Magdir/convex | 0 contrib/{file-4 => file}/magic/Magdir/cracklib | 0 contrib/{file-4 => file}/magic/Magdir/ctags | 0 contrib/{file-4 => file}/magic/Magdir/dact | 0 contrib/{file-4 => file}/magic/Magdir/database | 0 contrib/{file-4 => file}/magic/Magdir/diamond | 0 contrib/{file-4 => file}/magic/Magdir/diff | 0 contrib/{file-4 => file}/magic/Magdir/digital | 0 contrib/{file-4 => file}/magic/Magdir/dolby | 0 contrib/{file-4 => file}/magic/Magdir/dump | 0 contrib/{file-4 => file}/magic/Magdir/dyadic | 0 contrib/{file-4 => file}/magic/Magdir/editors | 0 contrib/{file-4 => file}/magic/Magdir/efi | 0 contrib/{file-4 => file}/magic/Magdir/elf | 0 contrib/{file-4 => file}/magic/Magdir/encore | 0 contrib/{file-4 => file}/magic/Magdir/epoc | 0 contrib/{file-4 => file}/magic/Magdir/esri | 0 contrib/{file-4 => file}/magic/Magdir/fcs | 0 contrib/{file-4 => file}/magic/Magdir/filesystems | 0 contrib/{file-4 => file}/magic/Magdir/flash | 0 contrib/{file-4 => file}/magic/Magdir/fonts | 0 contrib/{file-4 => file}/magic/Magdir/fortran | 0 contrib/{file-4 => file}/magic/Magdir/frame | 0 contrib/{file-4 => file}/magic/Magdir/freebsd | 0 contrib/{file-4 => file}/magic/Magdir/fsav | 0 contrib/{file-4 => file}/magic/Magdir/games | 0 contrib/{file-4 => file}/magic/Magdir/gcc | 0 contrib/{file-4 => file}/magic/Magdir/geos | 0 contrib/{file-4 => file}/magic/Magdir/gimp | 0 contrib/{file-4 => file}/magic/Magdir/gnu | 0 contrib/{file-4 => file}/magic/Magdir/grace | 0 contrib/{file-4 => file}/magic/Magdir/gringotts | 0 contrib/{file-4 => file}/magic/Magdir/hdf | 0 contrib/{file-4 => file}/magic/Magdir/hitachi-sh | 0 contrib/{file-4 => file}/magic/Magdir/hp | 0 contrib/{file-4 => file}/magic/Magdir/human68k | 0 contrib/{file-4 => file}/magic/Magdir/ibm370 | 0 contrib/{file-4 => file}/magic/Magdir/ibm6000 | 0 contrib/{file-4 => file}/magic/Magdir/iff | 0 contrib/{file-4 => file}/magic/Magdir/images | 0 contrib/{file-4 => file}/magic/Magdir/intel | 0 contrib/{file-4 => file}/magic/Magdir/interleaf | 0 contrib/{file-4 => file}/magic/Magdir/island | 0 contrib/{file-4 => file}/magic/Magdir/ispell | 0 contrib/{file-4 => file}/magic/Magdir/java | 0 contrib/{file-4 => file}/magic/Magdir/jpeg | 0 contrib/{file-4 => file}/magic/Magdir/karma | 0 contrib/{file-4 => file}/magic/Magdir/lecter | 0 contrib/{file-4 => file}/magic/Magdir/lex | 0 contrib/{file-4 => file}/magic/Magdir/lif | 0 contrib/{file-4 => file}/magic/Magdir/linux | 0 contrib/{file-4 => file}/magic/Magdir/lisp | 0 contrib/{file-4 => file}/magic/Magdir/mach | 0 contrib/{file-4 => file}/magic/Magdir/macintosh | 0 contrib/{file-4 => file}/magic/Magdir/magic | 0 contrib/{file-4 => file}/magic/Magdir/mail.news | 0 contrib/{file-4 => file}/magic/Magdir/maple | 0 contrib/{file-4 => file}/magic/Magdir/mathematica | 0 contrib/{file-4 => file}/magic/Magdir/matroska | 0 contrib/{file-4 => file}/magic/Magdir/mcrypt | 0 contrib/{file-4 => file}/magic/Magdir/mime | 0 contrib/{file-4 => file}/magic/Magdir/mips | 0 contrib/{file-4 => file}/magic/Magdir/mirage | 0 contrib/{file-4 => file}/magic/Magdir/misctools | 0 contrib/{file-4 => file}/magic/Magdir/mkid | 0 contrib/{file-4 => file}/magic/Magdir/mlssa | 0 contrib/{file-4 => file}/magic/Magdir/mmdf | 0 contrib/{file-4 => file}/magic/Magdir/modem | 0 contrib/{file-4 => file}/magic/Magdir/motorola | 0 contrib/{file-4 => file}/magic/Magdir/msdos | 0 contrib/{file-4 => file}/magic/Magdir/msvc | 0 contrib/{file-4 => file}/magic/Magdir/mup | 0 contrib/{file-4 => file}/magic/Magdir/natinst | 0 contrib/{file-4 => file}/magic/Magdir/ncr | 0 contrib/{file-4 => file}/magic/Magdir/netbsd | 0 contrib/{file-4 => file}/magic/Magdir/netscape | 0 contrib/{file-4 => file}/magic/Magdir/news | 0 contrib/{file-4 => file}/magic/Magdir/nitpicker | 0 contrib/{file-4 => file}/magic/Magdir/ocaml | 0 contrib/{file-4 => file}/magic/Magdir/octave | 0 contrib/{file-4 => file}/magic/Magdir/olf | 0 contrib/{file-4 => file}/magic/Magdir/os2 | 0 contrib/{file-4 => file}/magic/Magdir/os400 | 0 contrib/{file-4 => file}/magic/Magdir/os9 | 0 contrib/{file-4 => file}/magic/Magdir/osf1 | 0 contrib/{file-4 => file}/magic/Magdir/palm | 0 contrib/{file-4 => file}/magic/Magdir/parix | 0 contrib/{file-4 => file}/magic/Magdir/pbm | 0 contrib/{file-4 => file}/magic/Magdir/pdf | 0 contrib/{file-4 => file}/magic/Magdir/pdp | 0 contrib/{file-4 => file}/magic/Magdir/perl | 0 contrib/{file-4 => file}/magic/Magdir/pgp | 0 contrib/{file-4 => file}/magic/Magdir/pkgadd | 0 contrib/{file-4 => file}/magic/Magdir/plan9 | 0 contrib/{file-4 => file}/magic/Magdir/plus5 | 0 contrib/{file-4 => file}/magic/Magdir/printer | 0 contrib/{file-4 => file}/magic/Magdir/project | 0 contrib/{file-4 => file}/magic/Magdir/psdbms | 0 contrib/{file-4 => file}/magic/Magdir/psion | 0 contrib/{file-4 => file}/magic/Magdir/pulsar | 0 contrib/{file-4 => file}/magic/Magdir/pyramid | 0 contrib/{file-4 => file}/magic/Magdir/python | 0 contrib/{file-4 => file}/magic/Magdir/revision | 0 contrib/{file-4 => file}/magic/Magdir/riff | 0 contrib/{file-4 => file}/magic/Magdir/rpm | 0 contrib/{file-4 => file}/magic/Magdir/rtf | 0 contrib/{file-4 => file}/magic/Magdir/sc | 0 contrib/{file-4 => file}/magic/Magdir/sccs | 0 contrib/{file-4 => file}/magic/Magdir/scientific | 0 contrib/{file-4 => file}/magic/Magdir/sendmail | 0 contrib/{file-4 => file}/magic/Magdir/sequent | 0 contrib/{file-4 => file}/magic/Magdir/sgi | 0 contrib/{file-4 => file}/magic/Magdir/sgml | 0 contrib/{file-4 => file}/magic/Magdir/sharc | 0 contrib/{file-4 => file}/magic/Magdir/sinclair | 0 contrib/{file-4 => file}/magic/Magdir/sketch | 0 contrib/{file-4 => file}/magic/Magdir/smalltalk | 0 contrib/{file-4 => file}/magic/Magdir/sniffer | 0 contrib/{file-4 => file}/magic/Magdir/softquad | 0 contrib/{file-4 => file}/magic/Magdir/spec | 0 contrib/{file-4 => file}/magic/Magdir/spectrum | 0 contrib/{file-4 => file}/magic/Magdir/sql | 0 contrib/{file-4 => file}/magic/Magdir/sun | 0 contrib/{file-4 => file}/magic/Magdir/sysex | 0 contrib/{file-4 => file}/magic/Magdir/teapot | 0 contrib/{file-4 => file}/magic/Magdir/terminfo | 0 contrib/{file-4 => file}/magic/Magdir/tex | 0 contrib/{file-4 => file}/magic/Magdir/tgif | 0 contrib/{file-4 => file}/magic/Magdir/ti-8x | 0 contrib/{file-4 => file}/magic/Magdir/timezone | 0 contrib/{file-4 => file}/magic/Magdir/troff | 0 contrib/{file-4 => file}/magic/Magdir/tuxedo | 0 contrib/{file-4 => file}/magic/Magdir/typeset | 0 contrib/{file-4 => file}/magic/Magdir/unicode | 0 contrib/{file-4 => file}/magic/Magdir/unknown | 0 contrib/{file-4 => file}/magic/Magdir/uuencode | 0 contrib/{file-4 => file}/magic/Magdir/varied.out | 0 contrib/{file-4 => file}/magic/Magdir/varied.script | 0 contrib/{file-4 => file}/magic/Magdir/vax | 0 contrib/{file-4 => file}/magic/Magdir/vicar | 0 contrib/{file-4 => file}/magic/Magdir/virtutech | 0 contrib/{file-4 => file}/magic/Magdir/visx | 0 contrib/{file-4 => file}/magic/Magdir/vms | 0 contrib/{file-4 => file}/magic/Magdir/vmware | 0 contrib/{file-4 => file}/magic/Magdir/vorbis | 0 contrib/{file-4 => file}/magic/Magdir/vxl | 0 contrib/{file-4 => file}/magic/Magdir/wordprocessors | 0 contrib/{file-4 => file}/magic/Magdir/xdelta | 0 contrib/{file-4 => file}/magic/Magdir/xenix | 0 contrib/{file-4 => file}/magic/Magdir/xo65 | 0 contrib/{file-4 => file}/magic/Magdir/xwindows | 0 contrib/{file-4 => file}/magic/Magdir/zilog | 0 contrib/{file-4 => file}/magic/Magdir/zyxel | 0 contrib/{file-4 => file}/magic/magic.mime | 0 contrib/{file-4 => file}/magic/magic2mime | 0 contrib/{file-4 => file}/src/apprentice.c | 0 contrib/{file-4 => file}/src/apptype.c | 0 contrib/{file-4 => file}/src/ascmagic.c | 0 contrib/{file-4 => file}/src/compress.c | 0 contrib/{file-4 => file}/src/file.c | 0 contrib/{file-4 => file}/src/file.h | 0 contrib/{file-4 => file}/src/file_opts.h | 0 contrib/{file-4 => file}/src/fsmagic.c | 0 contrib/{file-4 => file}/src/funcs.c | 0 contrib/{file-4 => file}/src/is_tar.c | 0 contrib/{file-4 => file}/src/magic.c | 0 contrib/{file-4 => file}/src/magic.h | 0 contrib/{file-4 => file}/src/names.h | 0 contrib/{file-4 => file}/src/patchlevel.h | 0 contrib/{file-4 => file}/src/print.c | 0 contrib/{file-4 => file}/src/readelf.c | 0 contrib/{file-4 => file}/src/readelf.h | 0 contrib/{file-4 => file}/src/softmagic.c | 0 contrib/{file-4 => file}/src/tar.h | 0 contrib/{file-4 => file}/src/test.c | 0 223 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{file-4 => file}/ChangeLog (100%) rename contrib/{file-4 => file}/LEGAL.NOTICE (100%) rename contrib/{file-4 => file}/MAINT (100%) rename contrib/{file-4 => file}/README (100%) rename contrib/{file-4 => file}/doc/file.man (100%) rename contrib/{file-4 => file}/doc/libmagic.man (100%) rename contrib/{file-4 => file}/doc/magic.man (100%) rename contrib/{file-4 => file}/magic/Header (100%) rename contrib/{file-4 => file}/magic/Localstuff (100%) rename contrib/{file-4 => file}/magic/Magdir/acorn (100%) rename contrib/{file-4 => file}/magic/Magdir/adi (100%) rename contrib/{file-4 => file}/magic/Magdir/adventure (100%) rename contrib/{file-4 => file}/magic/Magdir/allegro (100%) rename contrib/{file-4 => file}/magic/Magdir/alliant (100%) rename contrib/{file-4 => file}/magic/Magdir/alpha (100%) rename contrib/{file-4 => file}/magic/Magdir/amanda (100%) rename contrib/{file-4 => file}/magic/Magdir/amigaos (100%) rename contrib/{file-4 => file}/magic/Magdir/animation (100%) rename contrib/{file-4 => file}/magic/Magdir/apl (100%) rename contrib/{file-4 => file}/magic/Magdir/apple (100%) rename contrib/{file-4 => file}/magic/Magdir/applix (100%) rename contrib/{file-4 => file}/magic/Magdir/archive (100%) rename contrib/{file-4 => file}/magic/Magdir/asterix (100%) rename contrib/{file-4 => file}/magic/Magdir/att3b (100%) rename contrib/{file-4 => file}/magic/Magdir/audio (100%) rename contrib/{file-4 => file}/magic/Magdir/bFLT (100%) rename contrib/{file-4 => file}/magic/Magdir/basis (100%) rename contrib/{file-4 => file}/magic/Magdir/bflt (100%) rename contrib/{file-4 => file}/magic/Magdir/blender (100%) rename contrib/{file-4 => file}/magic/Magdir/blit (100%) rename contrib/{file-4 => file}/magic/Magdir/bout (100%) rename contrib/{file-4 => file}/magic/Magdir/bsdi (100%) rename contrib/{file-4 => file}/magic/Magdir/btsnoop (100%) rename contrib/{file-4 => file}/magic/Magdir/c-lang (100%) rename contrib/{file-4 => file}/magic/Magdir/c64 (100%) rename contrib/{file-4 => file}/magic/Magdir/cad (100%) rename contrib/{file-4 => file}/magic/Magdir/cafebabe (100%) rename contrib/{file-4 => file}/magic/Magdir/cddb (100%) rename contrib/{file-4 => file}/magic/Magdir/chi (100%) rename contrib/{file-4 => file}/magic/Magdir/chord (100%) rename contrib/{file-4 => file}/magic/Magdir/cisco (100%) rename contrib/{file-4 => file}/magic/Magdir/citrus (100%) rename contrib/{file-4 => file}/magic/Magdir/claris (100%) rename contrib/{file-4 => file}/magic/Magdir/clipper (100%) rename contrib/{file-4 => file}/magic/Magdir/commands (100%) rename contrib/{file-4 => file}/magic/Magdir/communications (100%) rename contrib/{file-4 => file}/magic/Magdir/compress (100%) rename contrib/{file-4 => file}/magic/Magdir/console (100%) rename contrib/{file-4 => file}/magic/Magdir/convex (100%) rename contrib/{file-4 => file}/magic/Magdir/cracklib (100%) rename contrib/{file-4 => file}/magic/Magdir/ctags (100%) rename contrib/{file-4 => file}/magic/Magdir/dact (100%) rename contrib/{file-4 => file}/magic/Magdir/database (100%) rename contrib/{file-4 => file}/magic/Magdir/diamond (100%) rename contrib/{file-4 => file}/magic/Magdir/diff (100%) rename contrib/{file-4 => file}/magic/Magdir/digital (100%) rename contrib/{file-4 => file}/magic/Magdir/dolby (100%) rename contrib/{file-4 => file}/magic/Magdir/dump (100%) rename contrib/{file-4 => file}/magic/Magdir/dyadic (100%) rename contrib/{file-4 => file}/magic/Magdir/editors (100%) rename contrib/{file-4 => file}/magic/Magdir/efi (100%) rename contrib/{file-4 => file}/magic/Magdir/elf (100%) rename contrib/{file-4 => file}/magic/Magdir/encore (100%) rename contrib/{file-4 => file}/magic/Magdir/epoc (100%) rename contrib/{file-4 => file}/magic/Magdir/esri (100%) rename contrib/{file-4 => file}/magic/Magdir/fcs (100%) rename contrib/{file-4 => file}/magic/Magdir/filesystems (100%) rename contrib/{file-4 => file}/magic/Magdir/flash (100%) rename contrib/{file-4 => file}/magic/Magdir/fonts (100%) rename contrib/{file-4 => file}/magic/Magdir/fortran (100%) rename contrib/{file-4 => file}/magic/Magdir/frame (100%) rename contrib/{file-4 => file}/magic/Magdir/freebsd (100%) rename contrib/{file-4 => file}/magic/Magdir/fsav (100%) rename contrib/{file-4 => file}/magic/Magdir/games (100%) rename contrib/{file-4 => file}/magic/Magdir/gcc (100%) rename contrib/{file-4 => file}/magic/Magdir/geos (100%) rename contrib/{file-4 => file}/magic/Magdir/gimp (100%) rename contrib/{file-4 => file}/magic/Magdir/gnu (100%) rename contrib/{file-4 => file}/magic/Magdir/grace (100%) rename contrib/{file-4 => file}/magic/Magdir/gringotts (100%) rename contrib/{file-4 => file}/magic/Magdir/hdf (100%) rename contrib/{file-4 => file}/magic/Magdir/hitachi-sh (100%) rename contrib/{file-4 => file}/magic/Magdir/hp (100%) rename contrib/{file-4 => file}/magic/Magdir/human68k (100%) rename contrib/{file-4 => file}/magic/Magdir/ibm370 (100%) rename contrib/{file-4 => file}/magic/Magdir/ibm6000 (100%) rename contrib/{file-4 => file}/magic/Magdir/iff (100%) rename contrib/{file-4 => file}/magic/Magdir/images (100%) rename contrib/{file-4 => file}/magic/Magdir/intel (100%) rename contrib/{file-4 => file}/magic/Magdir/interleaf (100%) rename contrib/{file-4 => file}/magic/Magdir/island (100%) rename contrib/{file-4 => file}/magic/Magdir/ispell (100%) rename contrib/{file-4 => file}/magic/Magdir/java (100%) rename contrib/{file-4 => file}/magic/Magdir/jpeg (100%) rename contrib/{file-4 => file}/magic/Magdir/karma (100%) rename contrib/{file-4 => file}/magic/Magdir/lecter (100%) rename contrib/{file-4 => file}/magic/Magdir/lex (100%) rename contrib/{file-4 => file}/magic/Magdir/lif (100%) rename contrib/{file-4 => file}/magic/Magdir/linux (100%) rename contrib/{file-4 => file}/magic/Magdir/lisp (100%) rename contrib/{file-4 => file}/magic/Magdir/mach (100%) rename contrib/{file-4 => file}/magic/Magdir/macintosh (100%) rename contrib/{file-4 => file}/magic/Magdir/magic (100%) rename contrib/{file-4 => file}/magic/Magdir/mail.news (100%) rename contrib/{file-4 => file}/magic/Magdir/maple (100%) rename contrib/{file-4 => file}/magic/Magdir/mathematica (100%) rename contrib/{file-4 => file}/magic/Magdir/matroska (100%) rename contrib/{file-4 => file}/magic/Magdir/mcrypt (100%) rename contrib/{file-4 => file}/magic/Magdir/mime (100%) rename contrib/{file-4 => file}/magic/Magdir/mips (100%) rename contrib/{file-4 => file}/magic/Magdir/mirage (100%) rename contrib/{file-4 => file}/magic/Magdir/misctools (100%) rename contrib/{file-4 => file}/magic/Magdir/mkid (100%) rename contrib/{file-4 => file}/magic/Magdir/mlssa (100%) rename contrib/{file-4 => file}/magic/Magdir/mmdf (100%) rename contrib/{file-4 => file}/magic/Magdir/modem (100%) rename contrib/{file-4 => file}/magic/Magdir/motorola (100%) rename contrib/{file-4 => file}/magic/Magdir/msdos (100%) rename contrib/{file-4 => file}/magic/Magdir/msvc (100%) rename contrib/{file-4 => file}/magic/Magdir/mup (100%) rename contrib/{file-4 => file}/magic/Magdir/natinst (100%) rename contrib/{file-4 => file}/magic/Magdir/ncr (100%) rename contrib/{file-4 => file}/magic/Magdir/netbsd (100%) rename contrib/{file-4 => file}/magic/Magdir/netscape (100%) rename contrib/{file-4 => file}/magic/Magdir/news (100%) rename contrib/{file-4 => file}/magic/Magdir/nitpicker (100%) rename contrib/{file-4 => file}/magic/Magdir/ocaml (100%) rename contrib/{file-4 => file}/magic/Magdir/octave (100%) rename contrib/{file-4 => file}/magic/Magdir/olf (100%) rename contrib/{file-4 => file}/magic/Magdir/os2 (100%) rename contrib/{file-4 => file}/magic/Magdir/os400 (100%) rename contrib/{file-4 => file}/magic/Magdir/os9 (100%) rename contrib/{file-4 => file}/magic/Magdir/osf1 (100%) rename contrib/{file-4 => file}/magic/Magdir/palm (100%) rename contrib/{file-4 => file}/magic/Magdir/parix (100%) rename contrib/{file-4 => file}/magic/Magdir/pbm (100%) rename contrib/{file-4 => file}/magic/Magdir/pdf (100%) rename contrib/{file-4 => file}/magic/Magdir/pdp (100%) rename contrib/{file-4 => file}/magic/Magdir/perl (100%) rename contrib/{file-4 => file}/magic/Magdir/pgp (100%) rename contrib/{file-4 => file}/magic/Magdir/pkgadd (100%) rename contrib/{file-4 => file}/magic/Magdir/plan9 (100%) rename contrib/{file-4 => file}/magic/Magdir/plus5 (100%) rename contrib/{file-4 => file}/magic/Magdir/printer (100%) rename contrib/{file-4 => file}/magic/Magdir/project (100%) rename contrib/{file-4 => file}/magic/Magdir/psdbms (100%) rename contrib/{file-4 => file}/magic/Magdir/psion (100%) rename contrib/{file-4 => file}/magic/Magdir/pulsar (100%) rename contrib/{file-4 => file}/magic/Magdir/pyramid (100%) rename contrib/{file-4 => file}/magic/Magdir/python (100%) rename contrib/{file-4 => file}/magic/Magdir/revision (100%) rename contrib/{file-4 => file}/magic/Magdir/riff (100%) rename contrib/{file-4 => file}/magic/Magdir/rpm (100%) rename contrib/{file-4 => file}/magic/Magdir/rtf (100%) rename contrib/{file-4 => file}/magic/Magdir/sc (100%) rename contrib/{file-4 => file}/magic/Magdir/sccs (100%) rename contrib/{file-4 => file}/magic/Magdir/scientific (100%) rename contrib/{file-4 => file}/magic/Magdir/sendmail (100%) rename contrib/{file-4 => file}/magic/Magdir/sequent (100%) rename contrib/{file-4 => file}/magic/Magdir/sgi (100%) rename contrib/{file-4 => file}/magic/Magdir/sgml (100%) rename contrib/{file-4 => file}/magic/Magdir/sharc (100%) rename contrib/{file-4 => file}/magic/Magdir/sinclair (100%) rename contrib/{file-4 => file}/magic/Magdir/sketch (100%) rename contrib/{file-4 => file}/magic/Magdir/smalltalk (100%) rename contrib/{file-4 => file}/magic/Magdir/sniffer (100%) rename contrib/{file-4 => file}/magic/Magdir/softquad (100%) rename contrib/{file-4 => file}/magic/Magdir/spec (100%) rename contrib/{file-4 => file}/magic/Magdir/spectrum (100%) rename contrib/{file-4 => file}/magic/Magdir/sql (100%) rename contrib/{file-4 => file}/magic/Magdir/sun (100%) rename contrib/{file-4 => file}/magic/Magdir/sysex (100%) rename contrib/{file-4 => file}/magic/Magdir/teapot (100%) rename contrib/{file-4 => file}/magic/Magdir/terminfo (100%) rename contrib/{file-4 => file}/magic/Magdir/tex (100%) rename contrib/{file-4 => file}/magic/Magdir/tgif (100%) rename contrib/{file-4 => file}/magic/Magdir/ti-8x (100%) rename contrib/{file-4 => file}/magic/Magdir/timezone (100%) rename contrib/{file-4 => file}/magic/Magdir/troff (100%) rename contrib/{file-4 => file}/magic/Magdir/tuxedo (100%) rename contrib/{file-4 => file}/magic/Magdir/typeset (100%) rename contrib/{file-4 => file}/magic/Magdir/unicode (100%) rename contrib/{file-4 => file}/magic/Magdir/unknown (100%) rename contrib/{file-4 => file}/magic/Magdir/uuencode (100%) rename contrib/{file-4 => file}/magic/Magdir/varied.out (100%) rename contrib/{file-4 => file}/magic/Magdir/varied.script (100%) rename contrib/{file-4 => file}/magic/Magdir/vax (100%) rename contrib/{file-4 => file}/magic/Magdir/vicar (100%) rename contrib/{file-4 => file}/magic/Magdir/virtutech (100%) rename contrib/{file-4 => file}/magic/Magdir/visx (100%) rename contrib/{file-4 => file}/magic/Magdir/vms (100%) rename contrib/{file-4 => file}/magic/Magdir/vmware (100%) rename contrib/{file-4 => file}/magic/Magdir/vorbis (100%) rename contrib/{file-4 => file}/magic/Magdir/vxl (100%) rename contrib/{file-4 => file}/magic/Magdir/wordprocessors (100%) rename contrib/{file-4 => file}/magic/Magdir/xdelta (100%) rename contrib/{file-4 => file}/magic/Magdir/xenix (100%) rename contrib/{file-4 => file}/magic/Magdir/xo65 (100%) rename contrib/{file-4 => file}/magic/Magdir/xwindows (100%) rename contrib/{file-4 => file}/magic/Magdir/zilog (100%) rename contrib/{file-4 => file}/magic/Magdir/zyxel (100%) rename contrib/{file-4 => file}/magic/magic.mime (100%) rename contrib/{file-4 => file}/magic/magic2mime (100%) rename contrib/{file-4 => file}/src/apprentice.c (100%) rename contrib/{file-4 => file}/src/apptype.c (100%) rename contrib/{file-4 => file}/src/ascmagic.c (100%) rename contrib/{file-4 => file}/src/compress.c (100%) rename contrib/{file-4 => file}/src/file.c (100%) rename contrib/{file-4 => file}/src/file.h (100%) rename contrib/{file-4 => file}/src/file_opts.h (100%) rename contrib/{file-4 => file}/src/fsmagic.c (100%) rename contrib/{file-4 => file}/src/funcs.c (100%) rename contrib/{file-4 => file}/src/is_tar.c (100%) rename contrib/{file-4 => file}/src/magic.c (100%) rename contrib/{file-4 => file}/src/magic.h (100%) rename contrib/{file-4 => file}/src/names.h (100%) rename contrib/{file-4 => file}/src/patchlevel.h (100%) rename contrib/{file-4 => file}/src/print.c (100%) rename contrib/{file-4 => file}/src/readelf.c (100%) rename contrib/{file-4 => file}/src/readelf.h (100%) rename contrib/{file-4 => file}/src/softmagic.c (100%) rename contrib/{file-4 => file}/src/tar.h (100%) rename contrib/{file-4 => file}/src/test.c (100%) diff --git a/contrib/file-4/ChangeLog b/contrib/file/ChangeLog similarity index 100% rename from contrib/file-4/ChangeLog rename to contrib/file/ChangeLog diff --git a/contrib/file-4/LEGAL.NOTICE b/contrib/file/LEGAL.NOTICE similarity index 100% rename from contrib/file-4/LEGAL.NOTICE rename to contrib/file/LEGAL.NOTICE diff --git a/contrib/file-4/MAINT b/contrib/file/MAINT similarity index 100% rename from contrib/file-4/MAINT rename to contrib/file/MAINT diff --git a/contrib/file-4/README b/contrib/file/README similarity index 100% rename from contrib/file-4/README rename to contrib/file/README diff --git a/contrib/file-4/doc/file.man b/contrib/file/doc/file.man similarity index 100% rename from contrib/file-4/doc/file.man rename to contrib/file/doc/file.man diff --git a/contrib/file-4/doc/libmagic.man b/contrib/file/doc/libmagic.man similarity index 100% rename from contrib/file-4/doc/libmagic.man rename to contrib/file/doc/libmagic.man diff --git a/contrib/file-4/doc/magic.man b/contrib/file/doc/magic.man similarity index 100% rename from contrib/file-4/doc/magic.man rename to contrib/file/doc/magic.man diff --git a/contrib/file-4/magic/Header b/contrib/file/magic/Header similarity index 100% rename from contrib/file-4/magic/Header rename to contrib/file/magic/Header diff --git a/contrib/file-4/magic/Localstuff b/contrib/file/magic/Localstuff similarity index 100% rename from contrib/file-4/magic/Localstuff rename to contrib/file/magic/Localstuff diff --git a/contrib/file-4/magic/Magdir/acorn b/contrib/file/magic/Magdir/acorn similarity index 100% rename from contrib/file-4/magic/Magdir/acorn rename to contrib/file/magic/Magdir/acorn diff --git a/contrib/file-4/magic/Magdir/adi b/contrib/file/magic/Magdir/adi similarity index 100% rename from contrib/file-4/magic/Magdir/adi rename to contrib/file/magic/Magdir/adi diff --git a/contrib/file-4/magic/Magdir/adventure b/contrib/file/magic/Magdir/adventure similarity index 100% rename from contrib/file-4/magic/Magdir/adventure rename to contrib/file/magic/Magdir/adventure diff --git a/contrib/file-4/magic/Magdir/allegro b/contrib/file/magic/Magdir/allegro similarity index 100% rename from contrib/file-4/magic/Magdir/allegro rename to contrib/file/magic/Magdir/allegro diff --git a/contrib/file-4/magic/Magdir/alliant b/contrib/file/magic/Magdir/alliant similarity index 100% rename from contrib/file-4/magic/Magdir/alliant rename to contrib/file/magic/Magdir/alliant diff --git a/contrib/file-4/magic/Magdir/alpha b/contrib/file/magic/Magdir/alpha similarity index 100% rename from contrib/file-4/magic/Magdir/alpha rename to contrib/file/magic/Magdir/alpha diff --git a/contrib/file-4/magic/Magdir/amanda b/contrib/file/magic/Magdir/amanda similarity index 100% rename from contrib/file-4/magic/Magdir/amanda rename to contrib/file/magic/Magdir/amanda diff --git a/contrib/file-4/magic/Magdir/amigaos b/contrib/file/magic/Magdir/amigaos similarity index 100% rename from contrib/file-4/magic/Magdir/amigaos rename to contrib/file/magic/Magdir/amigaos diff --git a/contrib/file-4/magic/Magdir/animation b/contrib/file/magic/Magdir/animation similarity index 100% rename from contrib/file-4/magic/Magdir/animation rename to contrib/file/magic/Magdir/animation diff --git a/contrib/file-4/magic/Magdir/apl b/contrib/file/magic/Magdir/apl similarity index 100% rename from contrib/file-4/magic/Magdir/apl rename to contrib/file/magic/Magdir/apl diff --git a/contrib/file-4/magic/Magdir/apple b/contrib/file/magic/Magdir/apple similarity index 100% rename from contrib/file-4/magic/Magdir/apple rename to contrib/file/magic/Magdir/apple diff --git a/contrib/file-4/magic/Magdir/applix b/contrib/file/magic/Magdir/applix similarity index 100% rename from contrib/file-4/magic/Magdir/applix rename to contrib/file/magic/Magdir/applix diff --git a/contrib/file-4/magic/Magdir/archive b/contrib/file/magic/Magdir/archive similarity index 100% rename from contrib/file-4/magic/Magdir/archive rename to contrib/file/magic/Magdir/archive diff --git a/contrib/file-4/magic/Magdir/asterix b/contrib/file/magic/Magdir/asterix similarity index 100% rename from contrib/file-4/magic/Magdir/asterix rename to contrib/file/magic/Magdir/asterix diff --git a/contrib/file-4/magic/Magdir/att3b b/contrib/file/magic/Magdir/att3b similarity index 100% rename from contrib/file-4/magic/Magdir/att3b rename to contrib/file/magic/Magdir/att3b diff --git a/contrib/file-4/magic/Magdir/audio b/contrib/file/magic/Magdir/audio similarity index 100% rename from contrib/file-4/magic/Magdir/audio rename to contrib/file/magic/Magdir/audio diff --git a/contrib/file-4/magic/Magdir/bFLT b/contrib/file/magic/Magdir/bFLT similarity index 100% rename from contrib/file-4/magic/Magdir/bFLT rename to contrib/file/magic/Magdir/bFLT diff --git a/contrib/file-4/magic/Magdir/basis b/contrib/file/magic/Magdir/basis similarity index 100% rename from contrib/file-4/magic/Magdir/basis rename to contrib/file/magic/Magdir/basis diff --git a/contrib/file-4/magic/Magdir/bflt b/contrib/file/magic/Magdir/bflt similarity index 100% rename from contrib/file-4/magic/Magdir/bflt rename to contrib/file/magic/Magdir/bflt diff --git a/contrib/file-4/magic/Magdir/blender b/contrib/file/magic/Magdir/blender similarity index 100% rename from contrib/file-4/magic/Magdir/blender rename to contrib/file/magic/Magdir/blender diff --git a/contrib/file-4/magic/Magdir/blit b/contrib/file/magic/Magdir/blit similarity index 100% rename from contrib/file-4/magic/Magdir/blit rename to contrib/file/magic/Magdir/blit diff --git a/contrib/file-4/magic/Magdir/bout b/contrib/file/magic/Magdir/bout similarity index 100% rename from contrib/file-4/magic/Magdir/bout rename to contrib/file/magic/Magdir/bout diff --git a/contrib/file-4/magic/Magdir/bsdi b/contrib/file/magic/Magdir/bsdi similarity index 100% rename from contrib/file-4/magic/Magdir/bsdi rename to contrib/file/magic/Magdir/bsdi diff --git a/contrib/file-4/magic/Magdir/btsnoop b/contrib/file/magic/Magdir/btsnoop similarity index 100% rename from contrib/file-4/magic/Magdir/btsnoop rename to contrib/file/magic/Magdir/btsnoop diff --git a/contrib/file-4/magic/Magdir/c-lang b/contrib/file/magic/Magdir/c-lang similarity index 100% rename from contrib/file-4/magic/Magdir/c-lang rename to contrib/file/magic/Magdir/c-lang diff --git a/contrib/file-4/magic/Magdir/c64 b/contrib/file/magic/Magdir/c64 similarity index 100% rename from contrib/file-4/magic/Magdir/c64 rename to contrib/file/magic/Magdir/c64 diff --git a/contrib/file-4/magic/Magdir/cad b/contrib/file/magic/Magdir/cad similarity index 100% rename from contrib/file-4/magic/Magdir/cad rename to contrib/file/magic/Magdir/cad diff --git a/contrib/file-4/magic/Magdir/cafebabe b/contrib/file/magic/Magdir/cafebabe similarity index 100% rename from contrib/file-4/magic/Magdir/cafebabe rename to contrib/file/magic/Magdir/cafebabe diff --git a/contrib/file-4/magic/Magdir/cddb b/contrib/file/magic/Magdir/cddb similarity index 100% rename from contrib/file-4/magic/Magdir/cddb rename to contrib/file/magic/Magdir/cddb diff --git a/contrib/file-4/magic/Magdir/chi b/contrib/file/magic/Magdir/chi similarity index 100% rename from contrib/file-4/magic/Magdir/chi rename to contrib/file/magic/Magdir/chi diff --git a/contrib/file-4/magic/Magdir/chord b/contrib/file/magic/Magdir/chord similarity index 100% rename from contrib/file-4/magic/Magdir/chord rename to contrib/file/magic/Magdir/chord diff --git a/contrib/file-4/magic/Magdir/cisco b/contrib/file/magic/Magdir/cisco similarity index 100% rename from contrib/file-4/magic/Magdir/cisco rename to contrib/file/magic/Magdir/cisco diff --git a/contrib/file-4/magic/Magdir/citrus b/contrib/file/magic/Magdir/citrus similarity index 100% rename from contrib/file-4/magic/Magdir/citrus rename to contrib/file/magic/Magdir/citrus diff --git a/contrib/file-4/magic/Magdir/claris b/contrib/file/magic/Magdir/claris similarity index 100% rename from contrib/file-4/magic/Magdir/claris rename to contrib/file/magic/Magdir/claris diff --git a/contrib/file-4/magic/Magdir/clipper b/contrib/file/magic/Magdir/clipper similarity index 100% rename from contrib/file-4/magic/Magdir/clipper rename to contrib/file/magic/Magdir/clipper diff --git a/contrib/file-4/magic/Magdir/commands b/contrib/file/magic/Magdir/commands similarity index 100% rename from contrib/file-4/magic/Magdir/commands rename to contrib/file/magic/Magdir/commands diff --git a/contrib/file-4/magic/Magdir/communications b/contrib/file/magic/Magdir/communications similarity index 100% rename from contrib/file-4/magic/Magdir/communications rename to contrib/file/magic/Magdir/communications diff --git a/contrib/file-4/magic/Magdir/compress b/contrib/file/magic/Magdir/compress similarity index 100% rename from contrib/file-4/magic/Magdir/compress rename to contrib/file/magic/Magdir/compress diff --git a/contrib/file-4/magic/Magdir/console b/contrib/file/magic/Magdir/console similarity index 100% rename from contrib/file-4/magic/Magdir/console rename to contrib/file/magic/Magdir/console diff --git a/contrib/file-4/magic/Magdir/convex b/contrib/file/magic/Magdir/convex similarity index 100% rename from contrib/file-4/magic/Magdir/convex rename to contrib/file/magic/Magdir/convex diff --git a/contrib/file-4/magic/Magdir/cracklib b/contrib/file/magic/Magdir/cracklib similarity index 100% rename from contrib/file-4/magic/Magdir/cracklib rename to contrib/file/magic/Magdir/cracklib diff --git a/contrib/file-4/magic/Magdir/ctags b/contrib/file/magic/Magdir/ctags similarity index 100% rename from contrib/file-4/magic/Magdir/ctags rename to contrib/file/magic/Magdir/ctags diff --git a/contrib/file-4/magic/Magdir/dact b/contrib/file/magic/Magdir/dact similarity index 100% rename from contrib/file-4/magic/Magdir/dact rename to contrib/file/magic/Magdir/dact diff --git a/contrib/file-4/magic/Magdir/database b/contrib/file/magic/Magdir/database similarity index 100% rename from contrib/file-4/magic/Magdir/database rename to contrib/file/magic/Magdir/database diff --git a/contrib/file-4/magic/Magdir/diamond b/contrib/file/magic/Magdir/diamond similarity index 100% rename from contrib/file-4/magic/Magdir/diamond rename to contrib/file/magic/Magdir/diamond diff --git a/contrib/file-4/magic/Magdir/diff b/contrib/file/magic/Magdir/diff similarity index 100% rename from contrib/file-4/magic/Magdir/diff rename to contrib/file/magic/Magdir/diff diff --git a/contrib/file-4/magic/Magdir/digital b/contrib/file/magic/Magdir/digital similarity index 100% rename from contrib/file-4/magic/Magdir/digital rename to contrib/file/magic/Magdir/digital diff --git a/contrib/file-4/magic/Magdir/dolby b/contrib/file/magic/Magdir/dolby similarity index 100% rename from contrib/file-4/magic/Magdir/dolby rename to contrib/file/magic/Magdir/dolby diff --git a/contrib/file-4/magic/Magdir/dump b/contrib/file/magic/Magdir/dump similarity index 100% rename from contrib/file-4/magic/Magdir/dump rename to contrib/file/magic/Magdir/dump diff --git a/contrib/file-4/magic/Magdir/dyadic b/contrib/file/magic/Magdir/dyadic similarity index 100% rename from contrib/file-4/magic/Magdir/dyadic rename to contrib/file/magic/Magdir/dyadic diff --git a/contrib/file-4/magic/Magdir/editors b/contrib/file/magic/Magdir/editors similarity index 100% rename from contrib/file-4/magic/Magdir/editors rename to contrib/file/magic/Magdir/editors diff --git a/contrib/file-4/magic/Magdir/efi b/contrib/file/magic/Magdir/efi similarity index 100% rename from contrib/file-4/magic/Magdir/efi rename to contrib/file/magic/Magdir/efi diff --git a/contrib/file-4/magic/Magdir/elf b/contrib/file/magic/Magdir/elf similarity index 100% rename from contrib/file-4/magic/Magdir/elf rename to contrib/file/magic/Magdir/elf diff --git a/contrib/file-4/magic/Magdir/encore b/contrib/file/magic/Magdir/encore similarity index 100% rename from contrib/file-4/magic/Magdir/encore rename to contrib/file/magic/Magdir/encore diff --git a/contrib/file-4/magic/Magdir/epoc b/contrib/file/magic/Magdir/epoc similarity index 100% rename from contrib/file-4/magic/Magdir/epoc rename to contrib/file/magic/Magdir/epoc diff --git a/contrib/file-4/magic/Magdir/esri b/contrib/file/magic/Magdir/esri similarity index 100% rename from contrib/file-4/magic/Magdir/esri rename to contrib/file/magic/Magdir/esri diff --git a/contrib/file-4/magic/Magdir/fcs b/contrib/file/magic/Magdir/fcs similarity index 100% rename from contrib/file-4/magic/Magdir/fcs rename to contrib/file/magic/Magdir/fcs diff --git a/contrib/file-4/magic/Magdir/filesystems b/contrib/file/magic/Magdir/filesystems similarity index 100% rename from contrib/file-4/magic/Magdir/filesystems rename to contrib/file/magic/Magdir/filesystems diff --git a/contrib/file-4/magic/Magdir/flash b/contrib/file/magic/Magdir/flash similarity index 100% rename from contrib/file-4/magic/Magdir/flash rename to contrib/file/magic/Magdir/flash diff --git a/contrib/file-4/magic/Magdir/fonts b/contrib/file/magic/Magdir/fonts similarity index 100% rename from contrib/file-4/magic/Magdir/fonts rename to contrib/file/magic/Magdir/fonts diff --git a/contrib/file-4/magic/Magdir/fortran b/contrib/file/magic/Magdir/fortran similarity index 100% rename from contrib/file-4/magic/Magdir/fortran rename to contrib/file/magic/Magdir/fortran diff --git a/contrib/file-4/magic/Magdir/frame b/contrib/file/magic/Magdir/frame similarity index 100% rename from contrib/file-4/magic/Magdir/frame rename to contrib/file/magic/Magdir/frame diff --git a/contrib/file-4/magic/Magdir/freebsd b/contrib/file/magic/Magdir/freebsd similarity index 100% rename from contrib/file-4/magic/Magdir/freebsd rename to contrib/file/magic/Magdir/freebsd diff --git a/contrib/file-4/magic/Magdir/fsav b/contrib/file/magic/Magdir/fsav similarity index 100% rename from contrib/file-4/magic/Magdir/fsav rename to contrib/file/magic/Magdir/fsav diff --git a/contrib/file-4/magic/Magdir/games b/contrib/file/magic/Magdir/games similarity index 100% rename from contrib/file-4/magic/Magdir/games rename to contrib/file/magic/Magdir/games diff --git a/contrib/file-4/magic/Magdir/gcc b/contrib/file/magic/Magdir/gcc similarity index 100% rename from contrib/file-4/magic/Magdir/gcc rename to contrib/file/magic/Magdir/gcc diff --git a/contrib/file-4/magic/Magdir/geos b/contrib/file/magic/Magdir/geos similarity index 100% rename from contrib/file-4/magic/Magdir/geos rename to contrib/file/magic/Magdir/geos diff --git a/contrib/file-4/magic/Magdir/gimp b/contrib/file/magic/Magdir/gimp similarity index 100% rename from contrib/file-4/magic/Magdir/gimp rename to contrib/file/magic/Magdir/gimp diff --git a/contrib/file-4/magic/Magdir/gnu b/contrib/file/magic/Magdir/gnu similarity index 100% rename from contrib/file-4/magic/Magdir/gnu rename to contrib/file/magic/Magdir/gnu diff --git a/contrib/file-4/magic/Magdir/grace b/contrib/file/magic/Magdir/grace similarity index 100% rename from contrib/file-4/magic/Magdir/grace rename to contrib/file/magic/Magdir/grace diff --git a/contrib/file-4/magic/Magdir/gringotts b/contrib/file/magic/Magdir/gringotts similarity index 100% rename from contrib/file-4/magic/Magdir/gringotts rename to contrib/file/magic/Magdir/gringotts diff --git a/contrib/file-4/magic/Magdir/hdf b/contrib/file/magic/Magdir/hdf similarity index 100% rename from contrib/file-4/magic/Magdir/hdf rename to contrib/file/magic/Magdir/hdf diff --git a/contrib/file-4/magic/Magdir/hitachi-sh b/contrib/file/magic/Magdir/hitachi-sh similarity index 100% rename from contrib/file-4/magic/Magdir/hitachi-sh rename to contrib/file/magic/Magdir/hitachi-sh diff --git a/contrib/file-4/magic/Magdir/hp b/contrib/file/magic/Magdir/hp similarity index 100% rename from contrib/file-4/magic/Magdir/hp rename to contrib/file/magic/Magdir/hp diff --git a/contrib/file-4/magic/Magdir/human68k b/contrib/file/magic/Magdir/human68k similarity index 100% rename from contrib/file-4/magic/Magdir/human68k rename to contrib/file/magic/Magdir/human68k diff --git a/contrib/file-4/magic/Magdir/ibm370 b/contrib/file/magic/Magdir/ibm370 similarity index 100% rename from contrib/file-4/magic/Magdir/ibm370 rename to contrib/file/magic/Magdir/ibm370 diff --git a/contrib/file-4/magic/Magdir/ibm6000 b/contrib/file/magic/Magdir/ibm6000 similarity index 100% rename from contrib/file-4/magic/Magdir/ibm6000 rename to contrib/file/magic/Magdir/ibm6000 diff --git a/contrib/file-4/magic/Magdir/iff b/contrib/file/magic/Magdir/iff similarity index 100% rename from contrib/file-4/magic/Magdir/iff rename to contrib/file/magic/Magdir/iff diff --git a/contrib/file-4/magic/Magdir/images b/contrib/file/magic/Magdir/images similarity index 100% rename from contrib/file-4/magic/Magdir/images rename to contrib/file/magic/Magdir/images diff --git a/contrib/file-4/magic/Magdir/intel b/contrib/file/magic/Magdir/intel similarity index 100% rename from contrib/file-4/magic/Magdir/intel rename to contrib/file/magic/Magdir/intel diff --git a/contrib/file-4/magic/Magdir/interleaf b/contrib/file/magic/Magdir/interleaf similarity index 100% rename from contrib/file-4/magic/Magdir/interleaf rename to contrib/file/magic/Magdir/interleaf diff --git a/contrib/file-4/magic/Magdir/island b/contrib/file/magic/Magdir/island similarity index 100% rename from contrib/file-4/magic/Magdir/island rename to contrib/file/magic/Magdir/island diff --git a/contrib/file-4/magic/Magdir/ispell b/contrib/file/magic/Magdir/ispell similarity index 100% rename from contrib/file-4/magic/Magdir/ispell rename to contrib/file/magic/Magdir/ispell diff --git a/contrib/file-4/magic/Magdir/java b/contrib/file/magic/Magdir/java similarity index 100% rename from contrib/file-4/magic/Magdir/java rename to contrib/file/magic/Magdir/java diff --git a/contrib/file-4/magic/Magdir/jpeg b/contrib/file/magic/Magdir/jpeg similarity index 100% rename from contrib/file-4/magic/Magdir/jpeg rename to contrib/file/magic/Magdir/jpeg diff --git a/contrib/file-4/magic/Magdir/karma b/contrib/file/magic/Magdir/karma similarity index 100% rename from contrib/file-4/magic/Magdir/karma rename to contrib/file/magic/Magdir/karma diff --git a/contrib/file-4/magic/Magdir/lecter b/contrib/file/magic/Magdir/lecter similarity index 100% rename from contrib/file-4/magic/Magdir/lecter rename to contrib/file/magic/Magdir/lecter diff --git a/contrib/file-4/magic/Magdir/lex b/contrib/file/magic/Magdir/lex similarity index 100% rename from contrib/file-4/magic/Magdir/lex rename to contrib/file/magic/Magdir/lex diff --git a/contrib/file-4/magic/Magdir/lif b/contrib/file/magic/Magdir/lif similarity index 100% rename from contrib/file-4/magic/Magdir/lif rename to contrib/file/magic/Magdir/lif diff --git a/contrib/file-4/magic/Magdir/linux b/contrib/file/magic/Magdir/linux similarity index 100% rename from contrib/file-4/magic/Magdir/linux rename to contrib/file/magic/Magdir/linux diff --git a/contrib/file-4/magic/Magdir/lisp b/contrib/file/magic/Magdir/lisp similarity index 100% rename from contrib/file-4/magic/Magdir/lisp rename to contrib/file/magic/Magdir/lisp diff --git a/contrib/file-4/magic/Magdir/mach b/contrib/file/magic/Magdir/mach similarity index 100% rename from contrib/file-4/magic/Magdir/mach rename to contrib/file/magic/Magdir/mach diff --git a/contrib/file-4/magic/Magdir/macintosh b/contrib/file/magic/Magdir/macintosh similarity index 100% rename from contrib/file-4/magic/Magdir/macintosh rename to contrib/file/magic/Magdir/macintosh diff --git a/contrib/file-4/magic/Magdir/magic b/contrib/file/magic/Magdir/magic similarity index 100% rename from contrib/file-4/magic/Magdir/magic rename to contrib/file/magic/Magdir/magic diff --git a/contrib/file-4/magic/Magdir/mail.news b/contrib/file/magic/Magdir/mail.news similarity index 100% rename from contrib/file-4/magic/Magdir/mail.news rename to contrib/file/magic/Magdir/mail.news diff --git a/contrib/file-4/magic/Magdir/maple b/contrib/file/magic/Magdir/maple similarity index 100% rename from contrib/file-4/magic/Magdir/maple rename to contrib/file/magic/Magdir/maple diff --git a/contrib/file-4/magic/Magdir/mathematica b/contrib/file/magic/Magdir/mathematica similarity index 100% rename from contrib/file-4/magic/Magdir/mathematica rename to contrib/file/magic/Magdir/mathematica diff --git a/contrib/file-4/magic/Magdir/matroska b/contrib/file/magic/Magdir/matroska similarity index 100% rename from contrib/file-4/magic/Magdir/matroska rename to contrib/file/magic/Magdir/matroska diff --git a/contrib/file-4/magic/Magdir/mcrypt b/contrib/file/magic/Magdir/mcrypt similarity index 100% rename from contrib/file-4/magic/Magdir/mcrypt rename to contrib/file/magic/Magdir/mcrypt diff --git a/contrib/file-4/magic/Magdir/mime b/contrib/file/magic/Magdir/mime similarity index 100% rename from contrib/file-4/magic/Magdir/mime rename to contrib/file/magic/Magdir/mime diff --git a/contrib/file-4/magic/Magdir/mips b/contrib/file/magic/Magdir/mips similarity index 100% rename from contrib/file-4/magic/Magdir/mips rename to contrib/file/magic/Magdir/mips diff --git a/contrib/file-4/magic/Magdir/mirage b/contrib/file/magic/Magdir/mirage similarity index 100% rename from contrib/file-4/magic/Magdir/mirage rename to contrib/file/magic/Magdir/mirage diff --git a/contrib/file-4/magic/Magdir/misctools b/contrib/file/magic/Magdir/misctools similarity index 100% rename from contrib/file-4/magic/Magdir/misctools rename to contrib/file/magic/Magdir/misctools diff --git a/contrib/file-4/magic/Magdir/mkid b/contrib/file/magic/Magdir/mkid similarity index 100% rename from contrib/file-4/magic/Magdir/mkid rename to contrib/file/magic/Magdir/mkid diff --git a/contrib/file-4/magic/Magdir/mlssa b/contrib/file/magic/Magdir/mlssa similarity index 100% rename from contrib/file-4/magic/Magdir/mlssa rename to contrib/file/magic/Magdir/mlssa diff --git a/contrib/file-4/magic/Magdir/mmdf b/contrib/file/magic/Magdir/mmdf similarity index 100% rename from contrib/file-4/magic/Magdir/mmdf rename to contrib/file/magic/Magdir/mmdf diff --git a/contrib/file-4/magic/Magdir/modem b/contrib/file/magic/Magdir/modem similarity index 100% rename from contrib/file-4/magic/Magdir/modem rename to contrib/file/magic/Magdir/modem diff --git a/contrib/file-4/magic/Magdir/motorola b/contrib/file/magic/Magdir/motorola similarity index 100% rename from contrib/file-4/magic/Magdir/motorola rename to contrib/file/magic/Magdir/motorola diff --git a/contrib/file-4/magic/Magdir/msdos b/contrib/file/magic/Magdir/msdos similarity index 100% rename from contrib/file-4/magic/Magdir/msdos rename to contrib/file/magic/Magdir/msdos diff --git a/contrib/file-4/magic/Magdir/msvc b/contrib/file/magic/Magdir/msvc similarity index 100% rename from contrib/file-4/magic/Magdir/msvc rename to contrib/file/magic/Magdir/msvc diff --git a/contrib/file-4/magic/Magdir/mup b/contrib/file/magic/Magdir/mup similarity index 100% rename from contrib/file-4/magic/Magdir/mup rename to contrib/file/magic/Magdir/mup diff --git a/contrib/file-4/magic/Magdir/natinst b/contrib/file/magic/Magdir/natinst similarity index 100% rename from contrib/file-4/magic/Magdir/natinst rename to contrib/file/magic/Magdir/natinst diff --git a/contrib/file-4/magic/Magdir/ncr b/contrib/file/magic/Magdir/ncr similarity index 100% rename from contrib/file-4/magic/Magdir/ncr rename to contrib/file/magic/Magdir/ncr diff --git a/contrib/file-4/magic/Magdir/netbsd b/contrib/file/magic/Magdir/netbsd similarity index 100% rename from contrib/file-4/magic/Magdir/netbsd rename to contrib/file/magic/Magdir/netbsd diff --git a/contrib/file-4/magic/Magdir/netscape b/contrib/file/magic/Magdir/netscape similarity index 100% rename from contrib/file-4/magic/Magdir/netscape rename to contrib/file/magic/Magdir/netscape diff --git a/contrib/file-4/magic/Magdir/news b/contrib/file/magic/Magdir/news similarity index 100% rename from contrib/file-4/magic/Magdir/news rename to contrib/file/magic/Magdir/news diff --git a/contrib/file-4/magic/Magdir/nitpicker b/contrib/file/magic/Magdir/nitpicker similarity index 100% rename from contrib/file-4/magic/Magdir/nitpicker rename to contrib/file/magic/Magdir/nitpicker diff --git a/contrib/file-4/magic/Magdir/ocaml b/contrib/file/magic/Magdir/ocaml similarity index 100% rename from contrib/file-4/magic/Magdir/ocaml rename to contrib/file/magic/Magdir/ocaml diff --git a/contrib/file-4/magic/Magdir/octave b/contrib/file/magic/Magdir/octave similarity index 100% rename from contrib/file-4/magic/Magdir/octave rename to contrib/file/magic/Magdir/octave diff --git a/contrib/file-4/magic/Magdir/olf b/contrib/file/magic/Magdir/olf similarity index 100% rename from contrib/file-4/magic/Magdir/olf rename to contrib/file/magic/Magdir/olf diff --git a/contrib/file-4/magic/Magdir/os2 b/contrib/file/magic/Magdir/os2 similarity index 100% rename from contrib/file-4/magic/Magdir/os2 rename to contrib/file/magic/Magdir/os2 diff --git a/contrib/file-4/magic/Magdir/os400 b/contrib/file/magic/Magdir/os400 similarity index 100% rename from contrib/file-4/magic/Magdir/os400 rename to contrib/file/magic/Magdir/os400 diff --git a/contrib/file-4/magic/Magdir/os9 b/contrib/file/magic/Magdir/os9 similarity index 100% rename from contrib/file-4/magic/Magdir/os9 rename to contrib/file/magic/Magdir/os9 diff --git a/contrib/file-4/magic/Magdir/osf1 b/contrib/file/magic/Magdir/osf1 similarity index 100% rename from contrib/file-4/magic/Magdir/osf1 rename to contrib/file/magic/Magdir/osf1 diff --git a/contrib/file-4/magic/Magdir/palm b/contrib/file/magic/Magdir/palm similarity index 100% rename from contrib/file-4/magic/Magdir/palm rename to contrib/file/magic/Magdir/palm diff --git a/contrib/file-4/magic/Magdir/parix b/contrib/file/magic/Magdir/parix similarity index 100% rename from contrib/file-4/magic/Magdir/parix rename to contrib/file/magic/Magdir/parix diff --git a/contrib/file-4/magic/Magdir/pbm b/contrib/file/magic/Magdir/pbm similarity index 100% rename from contrib/file-4/magic/Magdir/pbm rename to contrib/file/magic/Magdir/pbm diff --git a/contrib/file-4/magic/Magdir/pdf b/contrib/file/magic/Magdir/pdf similarity index 100% rename from contrib/file-4/magic/Magdir/pdf rename to contrib/file/magic/Magdir/pdf diff --git a/contrib/file-4/magic/Magdir/pdp b/contrib/file/magic/Magdir/pdp similarity index 100% rename from contrib/file-4/magic/Magdir/pdp rename to contrib/file/magic/Magdir/pdp diff --git a/contrib/file-4/magic/Magdir/perl b/contrib/file/magic/Magdir/perl similarity index 100% rename from contrib/file-4/magic/Magdir/perl rename to contrib/file/magic/Magdir/perl diff --git a/contrib/file-4/magic/Magdir/pgp b/contrib/file/magic/Magdir/pgp similarity index 100% rename from contrib/file-4/magic/Magdir/pgp rename to contrib/file/magic/Magdir/pgp diff --git a/contrib/file-4/magic/Magdir/pkgadd b/contrib/file/magic/Magdir/pkgadd similarity index 100% rename from contrib/file-4/magic/Magdir/pkgadd rename to contrib/file/magic/Magdir/pkgadd diff --git a/contrib/file-4/magic/Magdir/plan9 b/contrib/file/magic/Magdir/plan9 similarity index 100% rename from contrib/file-4/magic/Magdir/plan9 rename to contrib/file/magic/Magdir/plan9 diff --git a/contrib/file-4/magic/Magdir/plus5 b/contrib/file/magic/Magdir/plus5 similarity index 100% rename from contrib/file-4/magic/Magdir/plus5 rename to contrib/file/magic/Magdir/plus5 diff --git a/contrib/file-4/magic/Magdir/printer b/contrib/file/magic/Magdir/printer similarity index 100% rename from contrib/file-4/magic/Magdir/printer rename to contrib/file/magic/Magdir/printer diff --git a/contrib/file-4/magic/Magdir/project b/contrib/file/magic/Magdir/project similarity index 100% rename from contrib/file-4/magic/Magdir/project rename to contrib/file/magic/Magdir/project diff --git a/contrib/file-4/magic/Magdir/psdbms b/contrib/file/magic/Magdir/psdbms similarity index 100% rename from contrib/file-4/magic/Magdir/psdbms rename to contrib/file/magic/Magdir/psdbms diff --git a/contrib/file-4/magic/Magdir/psion b/contrib/file/magic/Magdir/psion similarity index 100% rename from contrib/file-4/magic/Magdir/psion rename to contrib/file/magic/Magdir/psion diff --git a/contrib/file-4/magic/Magdir/pulsar b/contrib/file/magic/Magdir/pulsar similarity index 100% rename from contrib/file-4/magic/Magdir/pulsar rename to contrib/file/magic/Magdir/pulsar diff --git a/contrib/file-4/magic/Magdir/pyramid b/contrib/file/magic/Magdir/pyramid similarity index 100% rename from contrib/file-4/magic/Magdir/pyramid rename to contrib/file/magic/Magdir/pyramid diff --git a/contrib/file-4/magic/Magdir/python b/contrib/file/magic/Magdir/python similarity index 100% rename from contrib/file-4/magic/Magdir/python rename to contrib/file/magic/Magdir/python diff --git a/contrib/file-4/magic/Magdir/revision b/contrib/file/magic/Magdir/revision similarity index 100% rename from contrib/file-4/magic/Magdir/revision rename to contrib/file/magic/Magdir/revision diff --git a/contrib/file-4/magic/Magdir/riff b/contrib/file/magic/Magdir/riff similarity index 100% rename from contrib/file-4/magic/Magdir/riff rename to contrib/file/magic/Magdir/riff diff --git a/contrib/file-4/magic/Magdir/rpm b/contrib/file/magic/Magdir/rpm similarity index 100% rename from contrib/file-4/magic/Magdir/rpm rename to contrib/file/magic/Magdir/rpm diff --git a/contrib/file-4/magic/Magdir/rtf b/contrib/file/magic/Magdir/rtf similarity index 100% rename from contrib/file-4/magic/Magdir/rtf rename to contrib/file/magic/Magdir/rtf diff --git a/contrib/file-4/magic/Magdir/sc b/contrib/file/magic/Magdir/sc similarity index 100% rename from contrib/file-4/magic/Magdir/sc rename to contrib/file/magic/Magdir/sc diff --git a/contrib/file-4/magic/Magdir/sccs b/contrib/file/magic/Magdir/sccs similarity index 100% rename from contrib/file-4/magic/Magdir/sccs rename to contrib/file/magic/Magdir/sccs diff --git a/contrib/file-4/magic/Magdir/scientific b/contrib/file/magic/Magdir/scientific similarity index 100% rename from contrib/file-4/magic/Magdir/scientific rename to contrib/file/magic/Magdir/scientific diff --git a/contrib/file-4/magic/Magdir/sendmail b/contrib/file/magic/Magdir/sendmail similarity index 100% rename from contrib/file-4/magic/Magdir/sendmail rename to contrib/file/magic/Magdir/sendmail diff --git a/contrib/file-4/magic/Magdir/sequent b/contrib/file/magic/Magdir/sequent similarity index 100% rename from contrib/file-4/magic/Magdir/sequent rename to contrib/file/magic/Magdir/sequent diff --git a/contrib/file-4/magic/Magdir/sgi b/contrib/file/magic/Magdir/sgi similarity index 100% rename from contrib/file-4/magic/Magdir/sgi rename to contrib/file/magic/Magdir/sgi diff --git a/contrib/file-4/magic/Magdir/sgml b/contrib/file/magic/Magdir/sgml similarity index 100% rename from contrib/file-4/magic/Magdir/sgml rename to contrib/file/magic/Magdir/sgml diff --git a/contrib/file-4/magic/Magdir/sharc b/contrib/file/magic/Magdir/sharc similarity index 100% rename from contrib/file-4/magic/Magdir/sharc rename to contrib/file/magic/Magdir/sharc diff --git a/contrib/file-4/magic/Magdir/sinclair b/contrib/file/magic/Magdir/sinclair similarity index 100% rename from contrib/file-4/magic/Magdir/sinclair rename to contrib/file/magic/Magdir/sinclair diff --git a/contrib/file-4/magic/Magdir/sketch b/contrib/file/magic/Magdir/sketch similarity index 100% rename from contrib/file-4/magic/Magdir/sketch rename to contrib/file/magic/Magdir/sketch diff --git a/contrib/file-4/magic/Magdir/smalltalk b/contrib/file/magic/Magdir/smalltalk similarity index 100% rename from contrib/file-4/magic/Magdir/smalltalk rename to contrib/file/magic/Magdir/smalltalk diff --git a/contrib/file-4/magic/Magdir/sniffer b/contrib/file/magic/Magdir/sniffer similarity index 100% rename from contrib/file-4/magic/Magdir/sniffer rename to contrib/file/magic/Magdir/sniffer diff --git a/contrib/file-4/magic/Magdir/softquad b/contrib/file/magic/Magdir/softquad similarity index 100% rename from contrib/file-4/magic/Magdir/softquad rename to contrib/file/magic/Magdir/softquad diff --git a/contrib/file-4/magic/Magdir/spec b/contrib/file/magic/Magdir/spec similarity index 100% rename from contrib/file-4/magic/Magdir/spec rename to contrib/file/magic/Magdir/spec diff --git a/contrib/file-4/magic/Magdir/spectrum b/contrib/file/magic/Magdir/spectrum similarity index 100% rename from contrib/file-4/magic/Magdir/spectrum rename to contrib/file/magic/Magdir/spectrum diff --git a/contrib/file-4/magic/Magdir/sql b/contrib/file/magic/Magdir/sql similarity index 100% rename from contrib/file-4/magic/Magdir/sql rename to contrib/file/magic/Magdir/sql diff --git a/contrib/file-4/magic/Magdir/sun b/contrib/file/magic/Magdir/sun similarity index 100% rename from contrib/file-4/magic/Magdir/sun rename to contrib/file/magic/Magdir/sun diff --git a/contrib/file-4/magic/Magdir/sysex b/contrib/file/magic/Magdir/sysex similarity index 100% rename from contrib/file-4/magic/Magdir/sysex rename to contrib/file/magic/Magdir/sysex diff --git a/contrib/file-4/magic/Magdir/teapot b/contrib/file/magic/Magdir/teapot similarity index 100% rename from contrib/file-4/magic/Magdir/teapot rename to contrib/file/magic/Magdir/teapot diff --git a/contrib/file-4/magic/Magdir/terminfo b/contrib/file/magic/Magdir/terminfo similarity index 100% rename from contrib/file-4/magic/Magdir/terminfo rename to contrib/file/magic/Magdir/terminfo diff --git a/contrib/file-4/magic/Magdir/tex b/contrib/file/magic/Magdir/tex similarity index 100% rename from contrib/file-4/magic/Magdir/tex rename to contrib/file/magic/Magdir/tex diff --git a/contrib/file-4/magic/Magdir/tgif b/contrib/file/magic/Magdir/tgif similarity index 100% rename from contrib/file-4/magic/Magdir/tgif rename to contrib/file/magic/Magdir/tgif diff --git a/contrib/file-4/magic/Magdir/ti-8x b/contrib/file/magic/Magdir/ti-8x similarity index 100% rename from contrib/file-4/magic/Magdir/ti-8x rename to contrib/file/magic/Magdir/ti-8x diff --git a/contrib/file-4/magic/Magdir/timezone b/contrib/file/magic/Magdir/timezone similarity index 100% rename from contrib/file-4/magic/Magdir/timezone rename to contrib/file/magic/Magdir/timezone diff --git a/contrib/file-4/magic/Magdir/troff b/contrib/file/magic/Magdir/troff similarity index 100% rename from contrib/file-4/magic/Magdir/troff rename to contrib/file/magic/Magdir/troff diff --git a/contrib/file-4/magic/Magdir/tuxedo b/contrib/file/magic/Magdir/tuxedo similarity index 100% rename from contrib/file-4/magic/Magdir/tuxedo rename to contrib/file/magic/Magdir/tuxedo diff --git a/contrib/file-4/magic/Magdir/typeset b/contrib/file/magic/Magdir/typeset similarity index 100% rename from contrib/file-4/magic/Magdir/typeset rename to contrib/file/magic/Magdir/typeset diff --git a/contrib/file-4/magic/Magdir/unicode b/contrib/file/magic/Magdir/unicode similarity index 100% rename from contrib/file-4/magic/Magdir/unicode rename to contrib/file/magic/Magdir/unicode diff --git a/contrib/file-4/magic/Magdir/unknown b/contrib/file/magic/Magdir/unknown similarity index 100% rename from contrib/file-4/magic/Magdir/unknown rename to contrib/file/magic/Magdir/unknown diff --git a/contrib/file-4/magic/Magdir/uuencode b/contrib/file/magic/Magdir/uuencode similarity index 100% rename from contrib/file-4/magic/Magdir/uuencode rename to contrib/file/magic/Magdir/uuencode diff --git a/contrib/file-4/magic/Magdir/varied.out b/contrib/file/magic/Magdir/varied.out similarity index 100% rename from contrib/file-4/magic/Magdir/varied.out rename to contrib/file/magic/Magdir/varied.out diff --git a/contrib/file-4/magic/Magdir/varied.script b/contrib/file/magic/Magdir/varied.script similarity index 100% rename from contrib/file-4/magic/Magdir/varied.script rename to contrib/file/magic/Magdir/varied.script diff --git a/contrib/file-4/magic/Magdir/vax b/contrib/file/magic/Magdir/vax similarity index 100% rename from contrib/file-4/magic/Magdir/vax rename to contrib/file/magic/Magdir/vax diff --git a/contrib/file-4/magic/Magdir/vicar b/contrib/file/magic/Magdir/vicar similarity index 100% rename from contrib/file-4/magic/Magdir/vicar rename to contrib/file/magic/Magdir/vicar diff --git a/contrib/file-4/magic/Magdir/virtutech b/contrib/file/magic/Magdir/virtutech similarity index 100% rename from contrib/file-4/magic/Magdir/virtutech rename to contrib/file/magic/Magdir/virtutech diff --git a/contrib/file-4/magic/Magdir/visx b/contrib/file/magic/Magdir/visx similarity index 100% rename from contrib/file-4/magic/Magdir/visx rename to contrib/file/magic/Magdir/visx diff --git a/contrib/file-4/magic/Magdir/vms b/contrib/file/magic/Magdir/vms similarity index 100% rename from contrib/file-4/magic/Magdir/vms rename to contrib/file/magic/Magdir/vms diff --git a/contrib/file-4/magic/Magdir/vmware b/contrib/file/magic/Magdir/vmware similarity index 100% rename from contrib/file-4/magic/Magdir/vmware rename to contrib/file/magic/Magdir/vmware diff --git a/contrib/file-4/magic/Magdir/vorbis b/contrib/file/magic/Magdir/vorbis similarity index 100% rename from contrib/file-4/magic/Magdir/vorbis rename to contrib/file/magic/Magdir/vorbis diff --git a/contrib/file-4/magic/Magdir/vxl b/contrib/file/magic/Magdir/vxl similarity index 100% rename from contrib/file-4/magic/Magdir/vxl rename to contrib/file/magic/Magdir/vxl diff --git a/contrib/file-4/magic/Magdir/wordprocessors b/contrib/file/magic/Magdir/wordprocessors similarity index 100% rename from contrib/file-4/magic/Magdir/wordprocessors rename to contrib/file/magic/Magdir/wordprocessors diff --git a/contrib/file-4/magic/Magdir/xdelta b/contrib/file/magic/Magdir/xdelta similarity index 100% rename from contrib/file-4/magic/Magdir/xdelta rename to contrib/file/magic/Magdir/xdelta diff --git a/contrib/file-4/magic/Magdir/xenix b/contrib/file/magic/Magdir/xenix similarity index 100% rename from contrib/file-4/magic/Magdir/xenix rename to contrib/file/magic/Magdir/xenix diff --git a/contrib/file-4/magic/Magdir/xo65 b/contrib/file/magic/Magdir/xo65 similarity index 100% rename from contrib/file-4/magic/Magdir/xo65 rename to contrib/file/magic/Magdir/xo65 diff --git a/contrib/file-4/magic/Magdir/xwindows b/contrib/file/magic/Magdir/xwindows similarity index 100% rename from contrib/file-4/magic/Magdir/xwindows rename to contrib/file/magic/Magdir/xwindows diff --git a/contrib/file-4/magic/Magdir/zilog b/contrib/file/magic/Magdir/zilog similarity index 100% rename from contrib/file-4/magic/Magdir/zilog rename to contrib/file/magic/Magdir/zilog diff --git a/contrib/file-4/magic/Magdir/zyxel b/contrib/file/magic/Magdir/zyxel similarity index 100% rename from contrib/file-4/magic/Magdir/zyxel rename to contrib/file/magic/Magdir/zyxel diff --git a/contrib/file-4/magic/magic.mime b/contrib/file/magic/magic.mime similarity index 100% rename from contrib/file-4/magic/magic.mime rename to contrib/file/magic/magic.mime diff --git a/contrib/file-4/magic/magic2mime b/contrib/file/magic/magic2mime similarity index 100% rename from contrib/file-4/magic/magic2mime rename to contrib/file/magic/magic2mime diff --git a/contrib/file-4/src/apprentice.c b/contrib/file/src/apprentice.c similarity index 100% rename from contrib/file-4/src/apprentice.c rename to contrib/file/src/apprentice.c diff --git a/contrib/file-4/src/apptype.c b/contrib/file/src/apptype.c similarity index 100% rename from contrib/file-4/src/apptype.c rename to contrib/file/src/apptype.c diff --git a/contrib/file-4/src/ascmagic.c b/contrib/file/src/ascmagic.c similarity index 100% rename from contrib/file-4/src/ascmagic.c rename to contrib/file/src/ascmagic.c diff --git a/contrib/file-4/src/compress.c b/contrib/file/src/compress.c similarity index 100% rename from contrib/file-4/src/compress.c rename to contrib/file/src/compress.c diff --git a/contrib/file-4/src/file.c b/contrib/file/src/file.c similarity index 100% rename from contrib/file-4/src/file.c rename to contrib/file/src/file.c diff --git a/contrib/file-4/src/file.h b/contrib/file/src/file.h similarity index 100% rename from contrib/file-4/src/file.h rename to contrib/file/src/file.h diff --git a/contrib/file-4/src/file_opts.h b/contrib/file/src/file_opts.h similarity index 100% rename from contrib/file-4/src/file_opts.h rename to contrib/file/src/file_opts.h diff --git a/contrib/file-4/src/fsmagic.c b/contrib/file/src/fsmagic.c similarity index 100% rename from contrib/file-4/src/fsmagic.c rename to contrib/file/src/fsmagic.c diff --git a/contrib/file-4/src/funcs.c b/contrib/file/src/funcs.c similarity index 100% rename from contrib/file-4/src/funcs.c rename to contrib/file/src/funcs.c diff --git a/contrib/file-4/src/is_tar.c b/contrib/file/src/is_tar.c similarity index 100% rename from contrib/file-4/src/is_tar.c rename to contrib/file/src/is_tar.c diff --git a/contrib/file-4/src/magic.c b/contrib/file/src/magic.c similarity index 100% rename from contrib/file-4/src/magic.c rename to contrib/file/src/magic.c diff --git a/contrib/file-4/src/magic.h b/contrib/file/src/magic.h similarity index 100% rename from contrib/file-4/src/magic.h rename to contrib/file/src/magic.h diff --git a/contrib/file-4/src/names.h b/contrib/file/src/names.h similarity index 100% rename from contrib/file-4/src/names.h rename to contrib/file/src/names.h diff --git a/contrib/file-4/src/patchlevel.h b/contrib/file/src/patchlevel.h similarity index 100% rename from contrib/file-4/src/patchlevel.h rename to contrib/file/src/patchlevel.h diff --git a/contrib/file-4/src/print.c b/contrib/file/src/print.c similarity index 100% rename from contrib/file-4/src/print.c rename to contrib/file/src/print.c diff --git a/contrib/file-4/src/readelf.c b/contrib/file/src/readelf.c similarity index 100% rename from contrib/file-4/src/readelf.c rename to contrib/file/src/readelf.c diff --git a/contrib/file-4/src/readelf.h b/contrib/file/src/readelf.h similarity index 100% rename from contrib/file-4/src/readelf.h rename to contrib/file/src/readelf.h diff --git a/contrib/file-4/src/softmagic.c b/contrib/file/src/softmagic.c similarity index 100% rename from contrib/file-4/src/softmagic.c rename to contrib/file/src/softmagic.c diff --git a/contrib/file-4/src/tar.h b/contrib/file/src/tar.h similarity index 100% rename from contrib/file-4/src/tar.h rename to contrib/file/src/tar.h diff --git a/contrib/file-4/src/test.c b/contrib/file/src/test.c similarity index 100% rename from contrib/file-4/src/test.c rename to contrib/file/src/test.c -- 2.11.4.GIT