CVS commit: src/dist/file

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 11:01:33 UTC 2008

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

Log Message:
mport 4.26

Status:

Vendor Tag:     CHRISTOS
Release Tags:   FILE4_26
                
U src/dist/file/acinclude.m4
C src/dist/file/README
N src/dist/file/configure.ac
C src/dist/file/aclocal.m4
C src/dist/file/Makefile.am
C src/dist/file/Makefile.in
C src/dist/file/config.h.in
C src/dist/file/configure
N src/dist/file/AUTHORS
N src/dist/file/COPYING
U src/dist/file/ChangeLog
N src/dist/file/INSTALL
N src/dist/file/NEWS
N src/dist/file/TODO
N src/dist/file/compile
C src/dist/file/config.guess
C src/dist/file/config.sub
C src/dist/file/depcomp
C src/dist/file/install-sh
U src/dist/file/ltmain.sh
C src/dist/file/missing
C src/dist/file/MAINT
U src/dist/file/src/Makefile.am
C src/dist/file/src/magic.h
N src/dist/file/src/getopt_long.c
C src/dist/file/src/Makefile.in
N src/dist/file/src/asprintf.c
N src/dist/file/src/vasprintf.c
C src/dist/file/src/magic.c
C src/dist/file/src/apprentice.c
C src/dist/file/src/softmagic.c
C src/dist/file/src/ascmagic.c
C src/dist/file/src/compress.c
C src/dist/file/src/is_tar.c
C src/dist/file/src/readelf.c
C src/dist/file/src/print.c
C src/dist/file/src/fsmagic.c
C src/dist/file/src/funcs.c
C src/dist/file/src/file.h
C src/dist/file/src/names.h
C src/dist/file/src/patchlevel.h
C src/dist/file/src/readelf.h
C src/dist/file/src/tar.h
U src/dist/file/src/apptype.c
N src/dist/file/src/file_opts.h
N src/dist/file/src/elfclass.h
N src/dist/file/src/mygetopt.h
C src/dist/file/src/file.c
U src/dist/file/magic/Makefile.am
C src/dist/file/magic/Makefile.in
U src/dist/file/magic/Header
U src/dist/file/magic/Localstuff
N src/dist/file/magic/Magdir/adventure
N src/dist/file/magic/Magdir/acorn
N src/dist/file/magic/Magdir/adi
N src/dist/file/magic/Magdir/animation
N src/dist/file/magic/Magdir/allegro
N src/dist/file/magic/Magdir/alliant
N src/dist/file/magic/Magdir/alpha
N src/dist/file/magic/Magdir/amanda
N src/dist/file/magic/Magdir/amigaos
N src/dist/file/magic/Magdir/apple
N src/dist/file/magic/Magdir/apl
N src/dist/file/magic/Magdir/communications
N src/dist/file/magic/Magdir/applix
N src/dist/file/magic/Magdir/archive
N src/dist/file/magic/Magdir/asterix
N src/dist/file/magic/Magdir/att3b
N src/dist/file/magic/Magdir/audio
N src/dist/file/magic/Magdir/basis
N src/dist/file/magic/Magdir/bflt
N src/dist/file/magic/Magdir/blender
N src/dist/file/magic/Magdir/blit
N src/dist/file/magic/Magdir/bout
N src/dist/file/magic/Magdir/bsdi
N src/dist/file/magic/Magdir/btsnoop
N src/dist/file/magic/Magdir/c-lang
N src/dist/file/magic/Magdir/c64
N src/dist/file/magic/Magdir/cad
N src/dist/file/magic/Magdir/cafebabe
N src/dist/file/magic/Magdir/cddb
N src/dist/file/magic/Magdir/chord
N src/dist/file/magic/Magdir/cisco
N src/dist/file/magic/Magdir/efi
N src/dist/file/magic/Magdir/citrus
N src/dist/file/magic/Magdir/clarion
N src/dist/file/magic/Magdir/claris
N src/dist/file/magic/Magdir/clipper
N src/dist/file/magic/Magdir/commands
N src/dist/file/magic/Magdir/filesystems
N src/dist/file/magic/Magdir/compress
N src/dist/file/magic/Magdir/console
N src/dist/file/magic/Magdir/convex
N src/dist/file/magic/Magdir/cracklib
N src/dist/file/magic/Magdir/ctags
N src/dist/file/magic/Magdir/dact
N src/dist/file/magic/Magdir/database
N src/dist/file/magic/Magdir/diamond
N src/dist/file/magic/Magdir/diff
N src/dist/file/magic/Magdir/digital
N src/dist/file/magic/Magdir/dolby
N src/dist/file/magic/Magdir/dump
N src/dist/file/magic/Magdir/dyadic
N src/dist/file/magic/Magdir/editors
N src/dist/file/magic/Magdir/elf
N src/dist/file/magic/Magdir/encore
N src/dist/file/magic/Magdir/epoc
N src/dist/file/magic/Magdir/erlang
N src/dist/file/magic/Magdir/esri
N src/dist/file/magic/Magdir/fcs
N src/dist/file/magic/Magdir/gnome-keyring
N src/dist/file/magic/Magdir/flash
N src/dist/file/magic/Magdir/fonts
N src/dist/file/magic/Magdir/fortran
N src/dist/file/magic/Magdir/gcc
N src/dist/file/magic/Magdir/frame
N src/dist/file/magic/Magdir/freebsd
N src/dist/file/magic/Magdir/fsav
N src/dist/file/magic/Magdir/games
N src/dist/file/magic/Magdir/geos
N src/dist/file/magic/Magdir/gimp
N src/dist/file/magic/Magdir/gnumeric
N src/dist/file/magic/Magdir/gnu
N src/dist/file/magic/Magdir/gringotts
N src/dist/file/magic/Magdir/grace
N src/dist/file/magic/Magdir/graphviz
N src/dist/file/magic/Magdir/macintosh
N src/dist/file/magic/Magdir/hitachi-sh
N src/dist/file/magic/Magdir/hp
N src/dist/file/magic/Magdir/human68k
N src/dist/file/magic/Magdir/ibm370
N src/dist/file/magic/Magdir/ibm6000
N src/dist/file/magic/Magdir/iff
N src/dist/file/magic/Magdir/images
N src/dist/file/magic/Magdir/inform
N src/dist/file/magic/Magdir/intel
N src/dist/file/magic/Magdir/interleaf
N src/dist/file/magic/Magdir/island
N src/dist/file/magic/Magdir/ispell
N src/dist/file/magic/Magdir/java
N src/dist/file/magic/Magdir/jpeg
N src/dist/file/magic/Magdir/karma
N src/dist/file/magic/Magdir/kde
N src/dist/file/magic/Magdir/lecter
N src/dist/file/magic/Magdir/lex
N src/dist/file/magic/Magdir/lif
N src/dist/file/magic/Magdir/linux
N src/dist/file/magic/Magdir/lisp
N src/dist/file/magic/Magdir/llvm
N src/dist/file/magic/Magdir/lua
N src/dist/file/magic/Magdir/luks
N src/dist/file/magic/Magdir/mach
N src/dist/file/magic/Magdir/mail.news
N src/dist/file/magic/Magdir/magic
N src/dist/file/magic/Magdir/mathematica
N src/dist/file/magic/Magdir/maple
N src/dist/file/magic/Magdir/mathcad
N src/dist/file/magic/Magdir/mercurial
N src/dist/file/magic/Magdir/mup
N src/dist/file/magic/Magdir/matroska
N src/dist/file/magic/Magdir/mcrypt
N src/dist/file/magic/Magdir/mirage
N src/dist/file/magic/Magdir/mime
N src/dist/file/magic/Magdir/mips
N src/dist/file/magic/Magdir/nitpicker
N src/dist/file/magic/Magdir/misctools
N src/dist/file/magic/Magdir/mkid
N src/dist/file/magic/Magdir/mlssa
N src/dist/file/magic/Magdir/mmdf
N src/dist/file/magic/Magdir/modem
N src/dist/file/magic/Magdir/motorola
N src/dist/file/magic/Magdir/mozilla
N src/dist/file/magic/Magdir/msdos
N src/dist/file/magic/Magdir/msvc
N src/dist/file/magic/Magdir/natinst
N src/dist/file/magic/Magdir/ncr
N src/dist/file/magic/Magdir/netbsd
N src/dist/file/magic/Magdir/netscape
N src/dist/file/magic/Magdir/netware
N src/dist/file/magic/Magdir/news
N src/dist/file/magic/Magdir/ocaml
N src/dist/file/magic/Magdir/octave
N src/dist/file/magic/Magdir/olf
N src/dist/file/magic/Magdir/ole2compounddocs
N src/dist/file/magic/Magdir/os2
N src/dist/file/magic/Magdir/os400
N src/dist/file/magic/Magdir/os9
N src/dist/file/magic/Magdir/osf1
N src/dist/file/magic/Magdir/palm
N src/dist/file/magic/Magdir/parix
N src/dist/file/magic/Magdir/pbm
N src/dist/file/magic/Magdir/pdf
N src/dist/file/magic/Magdir/pdp
N src/dist/file/magic/Magdir/perl
N src/dist/file/magic/Magdir/pgp
N src/dist/file/magic/Magdir/pkgadd
N src/dist/file/magic/Magdir/plan9
N src/dist/file/magic/Magdir/plus5
N src/dist/file/magic/Magdir/printer
N src/dist/file/magic/Magdir/project
N src/dist/file/magic/Magdir/psdbms
N src/dist/file/magic/Magdir/psion
N src/dist/file/magic/Magdir/pulsar
N src/dist/file/magic/Magdir/pyramid
N src/dist/file/magic/Magdir/python
N src/dist/file/magic/Magdir/revision
N src/dist/file/magic/Magdir/rpm
N src/dist/file/magic/Magdir/securitycerts
N src/dist/file/magic/Magdir/riff
N src/dist/file/magic/Magdir/rtf
N src/dist/file/magic/Magdir/ruby
N src/dist/file/magic/Magdir/sc
N src/dist/file/magic/Magdir/sccs
N src/dist/file/magic/Magdir/scientific
N src/dist/file/magic/Magdir/sendmail
N src/dist/file/magic/Magdir/sequent
N src/dist/file/magic/Magdir/sgi
N src/dist/file/magic/Magdir/sgml
N src/dist/file/magic/Magdir/sharc
N src/dist/file/magic/Magdir/sinclair
N src/dist/file/magic/Magdir/sketch
N src/dist/file/magic/Magdir/smalltalk
N src/dist/file/magic/Magdir/sniffer
N src/dist/file/magic/Magdir/softquad
N src/dist/file/magic/Magdir/spec
N src/dist/file/magic/Magdir/spectrum
N src/dist/file/magic/Magdir/sql
N src/dist/file/magic/Magdir/sun
N src/dist/file/magic/Magdir/sysex
N src/dist/file/magic/Magdir/teapot
N src/dist/file/magic/Magdir/terminfo
N src/dist/file/magic/Magdir/tex
N src/dist/file/magic/Magdir/tgif
N src/dist/file/magic/Magdir/ti-8x
N src/dist/file/magic/Magdir/timezone
N src/dist/file/magic/Magdir/troff
N src/dist/file/magic/Magdir/tuxedo
N src/dist/file/magic/Magdir/typeset
N src/dist/file/magic/Magdir/varied.script
N src/dist/file/magic/Magdir/unicode
N src/dist/file/magic/Magdir/unknown
N src/dist/file/magic/Magdir/uuencode
N src/dist/file/magic/Magdir/varied.out
N src/dist/file/magic/Magdir/vax
N src/dist/file/magic/Magdir/vicar
N src/dist/file/magic/Magdir/virtutech
N src/dist/file/magic/Magdir/visx
N src/dist/file/magic/Magdir/vms
N src/dist/file/magic/Magdir/vmware
N src/dist/file/magic/Magdir/vorbis
N src/dist/file/magic/Magdir/vxl
N src/dist/file/magic/Magdir/warc
N src/dist/file/magic/Magdir/weak
N src/dist/file/magic/Magdir/windows
N src/dist/file/magic/Magdir/wordprocessors
N src/dist/file/magic/Magdir/xdelta
N src/dist/file/magic/Magdir/xenix
N src/dist/file/magic/Magdir/xilinx
N src/dist/file/magic/Magdir/xo65
N src/dist/file/magic/Magdir/xwindows
N src/dist/file/magic/Magdir/zilog
N src/dist/file/magic/Magdir/zyxel
N src/dist/file/tests/Makefile.am
N src/dist/file/tests/README
N src/dist/file/tests/gedcom.testfile
N src/dist/file/tests/Makefile.in
N src/dist/file/tests/test.c
N src/dist/file/tests/gedcom.magic
N src/dist/file/tests/gedcom.result
U src/dist/file/doc/Makefile.am
C src/dist/file/doc/Makefile.in
N src/dist/file/doc/file.man
N src/dist/file/doc/magic.man
N src/dist/file/doc/libmagic.man
U src/dist/file/python/Makefile.am
U src/dist/file/python/README
U src/dist/file/python/Makefile.in
U src/dist/file/python/example.py
U src/dist/file/python/py_magic.c
U src/dist/file/python/py_magic.h
U src/dist/file/python/setup.py

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

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