CVS commit: src/dist/file

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

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 12:16:52 UTC 2008

Modified Files:
        src/dist/file: MAINT Makefile.am Makefile.in README aclocal.m4
            config.guess config.h.in config.sub configure depcomp install-sh
            missing
        src/dist/file/doc: file.1 libmagic.3
        src/dist/file/magic: Makefile.am Makefile.in
        src/dist/file/magic/magdir: archive audio commands filesystems msdos
            perl riff sgi
        src/dist/file/src: Makefile.in apprentice.c ascmagic.c compress.c
            file.c file.h fsmagic.c funcs.c is_tar.c magic.c magic.h names.h
            patchlevel.h print.c readelf.c readelf.h softmagic.c tar.h
Removed Files:
        src/dist/file: LEGAL.NOTICE PORTING configure.in file2netbsd ltcf-c.sh
            ltconfig mkinstalldirs
        src/dist/file/magic: magic.mime magic2mime
        src/dist/file/magic/magdir: chi hdf
        src/dist/file/src: test.c

Log Message:
resolve conflicts, fix build.


To generate a diff of this commit:
cvs rdiff -r1.6 -r0 src/dist/file/LEGAL.NOTICE
cvs rdiff -r1.5 -r1.6 src/dist/file/MAINT src/dist/file/config.guess \
    src/dist/file/config.sub src/dist/file/install-sh
cvs rdiff -r1.2 -r1.3 src/dist/file/Makefile.am
cvs rdiff -r1.14 -r1.15 src/dist/file/Makefile.in src/dist/file/config.h.in
cvs rdiff -r1.1.1.1 -r0 src/dist/file/PORTING src/dist/file/ltcf-c.sh \
    src/dist/file/ltconfig
cvs rdiff -r1.6 -r1.7 src/dist/file/README
cvs rdiff -r1.12 -r1.13 src/dist/file/aclocal.m4
cvs rdiff -r1.18 -r1.19 src/dist/file/configure
cvs rdiff -r1.17 -r0 src/dist/file/configure.in
cvs rdiff -r1.4 -r1.5 src/dist/file/depcomp src/dist/file/missing
cvs rdiff -r1.18 -r0 src/dist/file/file2netbsd
cvs rdiff -r1.4 -r0 src/dist/file/mkinstalldirs
cvs rdiff -r1.16 -r1.17 src/dist/file/doc/file.1
cvs rdiff -r1.9 -r1.10 src/dist/file/doc/libmagic.3
cvs rdiff -r1.1.1.11 -r1.2 src/dist/file/magic/Makefile.am
cvs rdiff -r1.15 -r1.16 src/dist/file/magic/Makefile.in
cvs rdiff -r1.5 -r0 src/dist/file/magic/magic.mime
cvs rdiff -r1.1.1.3 -r0 src/dist/file/magic/magic2mime
cvs rdiff -r1.7 -r1.8 src/dist/file/magic/magdir/archive
cvs rdiff -r1.12 -r1.13 src/dist/file/magic/magdir/audio
cvs rdiff -r1.1.1.1 -r0 src/dist/file/magic/magdir/chi \
    src/dist/file/magic/magdir/hdf
cvs rdiff -r1.4 -r1.5 src/dist/file/magic/magdir/commands \
    src/dist/file/magic/magdir/perl
cvs rdiff -r1.6 -r1.7 src/dist/file/magic/magdir/filesystems \
    src/dist/file/magic/magdir/msdos src/dist/file/magic/magdir/sgi
cvs rdiff -r1.8 -r1.9 src/dist/file/magic/magdir/riff
cvs rdiff -r1.13 -r1.14 src/dist/file/src/Makefile.in \
    src/dist/file/src/readelf.c
cvs rdiff -r1.17 -r1.18 src/dist/file/src/apprentice.c
cvs rdiff -r1.6 -r1.7 src/dist/file/src/ascmagic.c \
    src/dist/file/src/fsmagic.c
cvs rdiff -r1.7 -r1.8 src/dist/file/src/compress.c \
    src/dist/file/src/patchlevel.h
cvs rdiff -r1.19 -r1.20 src/dist/file/src/file.c
cvs rdiff -r1.15 -r1.16 src/dist/file/src/file.h
cvs rdiff -r1.9 -r1.10 src/dist/file/src/funcs.c \
    src/dist/file/src/softmagic.c
cvs rdiff -r1.5 -r1.6 src/dist/file/src/is_tar.c src/dist/file/src/names.h \
    src/dist/file/src/tar.h
cvs rdiff -r1.18 -r1.19 src/dist/file/src/magic.c
cvs rdiff -r1.4 -r1.5 src/dist/file/src/magic.h src/dist/file/src/readelf.h
cvs rdiff -r1.8 -r1.9 src/dist/file/src/print.c
cvs rdiff -r1.4 -r0 src/dist/file/src/test.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.