Module Name:	src
Committed By:	pooka
Date:		Mon Dec 13 10:25:12 UTC 2004

Update of /cvsroot/src/dist/file
In directory ivanova.netbsd.org:/tmp/cvs-serv22707

Log Message:
file 4.12

+ assorted bug fixes
+ switch to 2-clause license


Vendor Tag:	CHRISTOS
Release Tags:	FILE4_12
		
U src/dist/file/ChangeLog
U src/dist/file/README
U src/dist/file/mkinstalldirs
U src/dist/file/Makefile.am
C src/dist/file/Makefile.in
U src/dist/file/acinclude.m4
C src/dist/file/aclocal.m4
U src/dist/file/config.guess
C src/dist/file/config.h.in
U src/dist/file/config.sub
C src/dist/file/configure
C src/dist/file/configure.in
U src/dist/file/depcomp
U src/dist/file/install-sh
U src/dist/file/ltcf-c.sh
U src/dist/file/ltconfig
U src/dist/file/ltmain.sh
U src/dist/file/missing
C src/dist/file/LEGAL.NOTICE
U src/dist/file/MAINT
N src/dist/file/PORTING
C src/dist/file/file2netbsd
U src/dist/file/src/Makefile.am
U src/dist/file/src/magic.h
C src/dist/file/src/magic.c
U src/dist/file/src/print.c
C src/dist/file/src/Makefile.in
C src/dist/file/src/apprentice.c
U src/dist/file/src/softmagic.c
U src/dist/file/src/ascmagic.c
U src/dist/file/src/compress.c
U src/dist/file/src/is_tar.c
C src/dist/file/src/readelf.c
C src/dist/file/src/fsmagic.c
U src/dist/file/src/funcs.c
C src/dist/file/src/file.h
U src/dist/file/src/names.h
U src/dist/file/src/patchlevel.h
U src/dist/file/src/tar.h
U src/dist/file/src/readelf.h
U src/dist/file/src/apptype.c
C src/dist/file/src/file.c
U src/dist/file/src/test.c
U src/dist/file/magic/magic2mime
U src/dist/file/magic/Makefile.am
C src/dist/file/magic/Makefile.in
U src/dist/file/magic/Localstuff
U src/dist/file/magic/Header
U src/dist/file/magic/magic.mime
U src/dist/file/magic/magdir/adventure
U src/dist/file/magic/magdir/acorn
U src/dist/file/magic/magdir/adi
U src/dist/file/magic/magdir/animation
U src/dist/file/magic/magdir/allegro
U src/dist/file/magic/magdir/alliant
U src/dist/file/magic/magdir/alpha
U src/dist/file/magic/magdir/amanda
U src/dist/file/magic/magdir/amigaos
U src/dist/file/magic/magdir/apple
U src/dist/file/magic/magdir/rpm
U src/dist/file/magic/magdir/apl
U src/dist/file/magic/magdir/communications
U src/dist/file/magic/magdir/applix
U src/dist/file/magic/magdir/archive
U src/dist/file/magic/magdir/asterix
U src/dist/file/magic/magdir/att3b
C src/dist/file/magic/magdir/audio
U src/dist/file/magic/magdir/bFLT
U src/dist/file/magic/magdir/blender
U src/dist/file/magic/magdir/blit
U src/dist/file/magic/magdir/bout
U src/dist/file/magic/magdir/bsdi
U src/dist/file/magic/magdir/cad
U src/dist/file/magic/magdir/c-lang
U src/dist/file/magic/magdir/c64
U src/dist/file/magic/magdir/cddb
U src/dist/file/magic/magdir/chi
U src/dist/file/magic/magdir/chord
U src/dist/file/magic/magdir/cisco
U src/dist/file/magic/magdir/citrus
U src/dist/file/magic/magdir/claris
U src/dist/file/magic/magdir/clipper
U src/dist/file/magic/magdir/spec
U src/dist/file/magic/magdir/commands
U src/dist/file/magic/magdir/filesystems
U src/dist/file/magic/magdir/compress
U src/dist/file/magic/magdir/console
U src/dist/file/magic/magdir/convex
U src/dist/file/magic/magdir/ctags
U src/dist/file/magic/magdir/dact
U src/dist/file/magic/magdir/database
U src/dist/file/magic/magdir/diamond
U src/dist/file/magic/magdir/diff
U src/dist/file/magic/magdir/digital
U src/dist/file/magic/magdir/dolby
U src/dist/file/magic/magdir/dump
U src/dist/file/magic/magdir/editors
U src/dist/file/magic/magdir/elf
U src/dist/file/magic/magdir/encore
U src/dist/file/magic/magdir/epoc
N src/dist/file/magic/magdir/esri
U src/dist/file/magic/magdir/fcs
U src/dist/file/magic/magdir/gringotts
U src/dist/file/magic/magdir/flash
U src/dist/file/magic/magdir/fonts
U src/dist/file/magic/magdir/frame
U src/dist/file/magic/magdir/freebsd
U src/dist/file/magic/magdir/fsav
U src/dist/file/magic/magdir/games
U src/dist/file/magic/magdir/geos
U src/dist/file/magic/magdir/gcc
U src/dist/file/magic/magdir/gimp
U src/dist/file/magic/magdir/gnu
U src/dist/file/magic/magdir/grace
U src/dist/file/magic/magdir/hitachi-sh
U src/dist/file/magic/magdir/hdf
U src/dist/file/magic/magdir/human68k
U src/dist/file/magic/magdir/hp
U src/dist/file/magic/magdir/interleaf
U src/dist/file/magic/magdir/ibm370
U src/dist/file/magic/magdir/ibm6000
U src/dist/file/magic/magdir/iff
U src/dist/file/magic/magdir/images
U src/dist/file/magic/magdir/intel
U src/dist/file/magic/magdir/macintosh
U src/dist/file/magic/magdir/island
U src/dist/file/magic/magdir/ispell
U src/dist/file/magic/magdir/java
U src/dist/file/magic/magdir/jpeg
U src/dist/file/magic/magdir/karma
U src/dist/file/magic/magdir/lecter
U src/dist/file/magic/magdir/lex
U src/dist/file/magic/magdir/lif
U src/dist/file/magic/magdir/linux
U src/dist/file/magic/magdir/lisp
U src/dist/file/magic/magdir/mach
U src/dist/file/magic/magdir/mail.news
U src/dist/file/magic/magdir/magic
U src/dist/file/magic/magdir/mathematica
U src/dist/file/magic/magdir/maple
U src/dist/file/magic/magdir/misctools
U src/dist/file/magic/magdir/mcrypt
U src/dist/file/magic/magdir/matroska
U src/dist/file/magic/magdir/mime
U src/dist/file/magic/magdir/mips
U src/dist/file/magic/magdir/mirage
U src/dist/file/magic/magdir/mlssa
U src/dist/file/magic/magdir/mkid
U src/dist/file/magic/magdir/modem
U src/dist/file/magic/magdir/mmdf
U src/dist/file/magic/magdir/nitpicker
U src/dist/file/magic/magdir/motorola
U src/dist/file/magic/magdir/msdos
U src/dist/file/magic/magdir/msvc
U src/dist/file/magic/magdir/natinst
U src/dist/file/magic/magdir/ncr
U src/dist/file/magic/magdir/netbsd
U src/dist/file/magic/magdir/netscape
U src/dist/file/magic/magdir/news
U src/dist/file/magic/magdir/sendmail
U src/dist/file/magic/magdir/riff
U src/dist/file/magic/magdir/ocaml
U src/dist/file/magic/magdir/octave
U src/dist/file/magic/magdir/olf
U src/dist/file/magic/magdir/os2
U src/dist/file/magic/magdir/os9
U src/dist/file/magic/magdir/osf1
U src/dist/file/magic/magdir/palm
U src/dist/file/magic/magdir/parix
U src/dist/file/magic/magdir/pbm
U src/dist/file/magic/magdir/pdf
U src/dist/file/magic/magdir/pdp
C src/dist/file/magic/magdir/perl
U src/dist/file/magic/magdir/pgp
U src/dist/file/magic/magdir/rtf
U src/dist/file/magic/magdir/pkgadd
U src/dist/file/magic/magdir/plan9
U src/dist/file/magic/magdir/plus5
U src/dist/file/magic/magdir/printer
U src/dist/file/magic/magdir/project
U src/dist/file/magic/magdir/psdbms
U src/dist/file/magic/magdir/psion
U src/dist/file/magic/magdir/pulsar
U src/dist/file/magic/magdir/pyramid
U src/dist/file/magic/magdir/python
U src/dist/file/magic/magdir/revision
U src/dist/file/magic/magdir/sc
U src/dist/file/magic/magdir/sccs
U src/dist/file/magic/magdir/sequent
U src/dist/file/magic/magdir/sgi
U src/dist/file/magic/magdir/sgml
U src/dist/file/magic/magdir/sharc
U src/dist/file/magic/magdir/sinclair
U src/dist/file/magic/magdir/sketch
U src/dist/file/magic/magdir/smalltalk
U src/dist/file/magic/magdir/sniffer
U src/dist/file/magic/magdir/dyadic
U src/dist/file/magic/magdir/softquad
U src/dist/file/magic/magdir/spectrum
U src/dist/file/magic/magdir/sql
U src/dist/file/magic/magdir/sun
U src/dist/file/magic/magdir/sysex
U src/dist/file/magic/magdir/teapot
U src/dist/file/magic/magdir/terminfo
U src/dist/file/magic/magdir/tex
U src/dist/file/magic/magdir/vicar
U src/dist/file/magic/magdir/vax
U src/dist/file/magic/magdir/tgif
U src/dist/file/magic/magdir/ti-8x
U src/dist/file/magic/magdir/timezone
U src/dist/file/magic/magdir/troff
U src/dist/file/magic/magdir/tuxedo
U src/dist/file/magic/magdir/typeset
U src/dist/file/magic/magdir/unknown
U src/dist/file/magic/magdir/uuencode
U src/dist/file/magic/magdir/varied.out
U src/dist/file/magic/magdir/varied.script
N src/dist/file/magic/magdir/virtutech
U src/dist/file/magic/magdir/visx
U src/dist/file/magic/magdir/vms
U src/dist/file/magic/magdir/vmware
U src/dist/file/magic/magdir/vorbis
U src/dist/file/magic/magdir/vxl
U src/dist/file/magic/magdir/wordprocessors
U src/dist/file/magic/magdir/xdelta
U src/dist/file/magic/magdir/xenix
N src/dist/file/magic/magdir/xo65
U src/dist/file/magic/magdir/xwindows
U src/dist/file/magic/magdir/zilog
U src/dist/file/magic/magdir/zyxel
C src/dist/file/doc/libmagic.3
U src/dist/file/doc/Makefile.am
C src/dist/file/doc/Makefile.in
C src/dist/file/doc/file.1
C src/dist/file/doc/magic.5

21 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCHRISTOS:yesterday -jCHRISTOS src/dist/file