Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE
cycle.

Prune svn:mergeinfo from the new branch, and rename it to RC1.

Update __FreeBSD_version.

Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and
the dvd1.iso packages population.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Convert to usr.bin/ to LIBADD
Reduce overlinking

MFV r267843: update file/libmagic to 5.19.

MFC after: 2 weeks

Update file(1) to version 5.11.

Merge vendor/file/dist@191739, bringing FILE 5.00 to 8-CURRENT.

Christos decided to keep the manpages in mdoc(7) format,
so stop using our own versions of these.

Install the header for libmagic.

PR: 73647
Submitted by: Uranus <uranus@it.muds.net>

Don't try to programatically support running file(1) w/in /usr/obj or other
non-standard install path.

Agreed with: ru

Uncomment the real paths and remove the local debugging paths.

Noticed by: ru (who's faster than 'make world' on my stock src test machine)

The file consumer binary, which depends on the libmagic.

Fixed style of DPADD and LDADD assignments as per style.Makefile(5).

Update for version 3.39.

Install files via FILES.

Update for FILE v3.37.
FreeBSD no longer needs the daylight hack.
(we really should sync our timezone code up ...)

Use a build-tool to create the .mgc files.

Submitted by: ru (partial)
Obtained from: NetBSD (basic idea)
Reviewed by: bde, ru

Clean up this thing a little.

Support the new "-i" (output MIME type strings) option by installing
the MIME files (both regular and precompiled).

Build and use the precompiled magic file. Precompiled magic files have
been supported since version 3.35, however it is just with version 3.36
that file has become verbose about it.

Update to version 3.36.
I had to hack print.c due to some new bits that only compile on NetBSD.
I could not figure what the analogous FreeBSD bits are.

MAN[1-9] -> MAN.

Re-add home born file(1) and magic(5) manual pages. Update them to
current file(1) version (3.33)

Approved by: obrien

Use the vendor's manpages (which are in old -man format) rather than
our modified one based on a much older version of the vendor's manpage.

Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.

$Id$ -> $FreeBSD$

Remove useless `BINOWN=root' now that it is the default.

Remove the etc-magic target since we no longer install the
/etc/magic symlink.

Merge to resolve conflicts with file 3.22 merge.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Restored installation of /etc/magic. It's now a symlink instead of a
file (like /etc/termcap). /usr/src/etc/Makefile depends on there
being an etc-magic install rule here, and who-knows-what depends on
`magic' being in /etc.

Fixed some style bugs - don't use -c for installing files in the obj
directory...

Add another matching algorithhm to do heuristics for international
language text files.

Should finally close PR # bin/1925: file does not consider cyrillic
text..., though i've never got any response from the originator about
my suggestion.

While i was at it, also move out the `magic' file to /usr/share/misc,
there's nothing that magic with this file to justify its life under
/etc.

make install should not install any file in /etc.

Change `install' to `${INSTALL}' so that default install flags can be
specified in the top level Makefiles.

Remove trailing whitespace.

Changes to file(1) for FreeBSD:
- Makefile: bmake the sucker
- file.1, magic.5: replace __MAGIC__ and __SECTION__
- add Magdir/freebsd
- add file to usr.bin/Makefile

A note on the FreeBSD magic entry:
The magic number "000000407" is reported as "impure format". This
stops file(1) telling us that our object files are "PDP-11 executables".
(Saying anything more than "impure format" would probably be bogus.
Submitted by: Geoff.

This commit was generated by cvs2svn to compensate for changes in r2479,
which included commits to RCS files with non-trunk default branches.

Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile