Update from version 4.26 to 5.00.

Pkgsrc changes:
 o Adapt patch-aa to new file

Upstream changes:

2008-12-12 15:50  Christos Zoulas <christos@zoulas.com>

       * fix initial offset calculation for non 4K sector files

       * add loop limits to avoid DoS attacks by constructing
         looping sector references.

2008-12-03 13:05  Christos Zoulas <christos@zoulas.com>

       * fix memory botches on cdf file parsing.

       * exit with non-zero value for any error, not just for the last
         file processed.

2008-11-09 20:42  Charles Longeau <chl@tuxfamily.org>

       * Replace all str{cpy,cat} functions with strl{cpy,cat}
       * Ensure that strl{cpy,cat} are included in libmagic,
         as needed.

2008-11-06 18:18  Christos Zoulas <christos@zoulas.com>

       * Handle ID3 format files.

2008-11-06 23:00  Reuben Thomas <rrt@sc3d.org>

       * Fix --mime, --mime-type and --mime-encoding under new scheme.

       * Rename "ascii" to "text" and add "encoding" test.

       * Return a precise ("utf-16le" or "utf-16be") MIME charset for
         UTF-16.

       * Fix error in comment caused by automatic indentation adding
         words!

2008-11-06 10:35  Christos Zoulas <christos@astron.com>

       * use memchr instead of strchr because the string
         might not be NUL terminated (Scott MacVicar)

2008-11-03 07:31  Reuben Thomas <rrt@sc3d.org>

       * Fix a printf with a non-literal format string.

       * Fix formatting and punctuation of help for "--apple".

2008-10-30 11:00  Reuben Thomas <rrt@sc3d.org>

       * Correct words counts in comments of struct magic.

       * Fix handle_annotation to allow both Apple and MIME types to be
         printed, and to return correct code if MIME type is
         printed (1, not 0) or if there's an error (-1 not 1).

       * Fix output of charset for MIME type (precede with semi-colon;
         fixes Debian bug #501460).

       * Fix potential attacks via conversion specifications in magic
         strings.

       * Add a FIXME for Debian bug #488562 (magic files should be
         read in a defined order, by sorting the names).

2008-10-18 16:45  Christos Zoulas <christos@astron.com>

       * Added APPLE file creator/type

2008-10-12 10:20  Christos Zoulas <christos@astron.com>

       * Added CDF parsing

2008-10-09 16:40  Christos Zoulas <christos@astron.com>

       * filesystem and msdos patches (Joerg Jenderek)

2008-10-09 13:20  Christos Zoulas <christos@astron.com>

       * correct --exclude documentation issues: remove troff and fortran
         and rename "token" to "tokens". (Randy McMurchy)

2008-10-01 10:30  Christos Zoulas <christos@astron.com>

       * Read ~/.magic in addition to the default magic file not instead
         of, as documented in the man page.

2008-09-10 21:30  Reuben Thomas  <rrt@sc3d.org>

       * Comment out graphviz patterns, as they match too many files.

2008-08-25 23:56  Reuben Thomas  <rrt@sc3d.org>

       * Add text/x-lua MIME type for Lua scripts.

       * Escape { in regex in graphviz patterns.

3 files changed, 14 insertions, 12 deletions

diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index a975c7e4950..735711e4f6d 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2009/01/25 12:30:47 obache Exp $
+# $NetBSD: Makefile,v 1.20 2009/03/10 23:30:00 he Exp $
 
-DISTNAME=		file-4.26
+DISTNAME=		file-5.00
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.gw.com/mirrors/pub/unix/file/
 MASTER_SITES+=		ftp://ftp.astron.com/pub/file/
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 91539a522cd..ff7bf7f7350 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2008/10/29 20:50:16 christos Exp $
+$NetBSD: distinfo,v 1.10 2009/03/10 23:30:00 he Exp $
 
-SHA1 (file-4.26.tar.gz) = 412cdac5cd778d867e2d91a01b09858be1998ec3
-RMD160 (file-4.26.tar.gz) = e8b84e01d1f43faedfe676afc92c2cba4a01ecdf
-Size (file-4.26.tar.gz) = 584803 bytes
-SHA1 (patch-aa) = 1d3d41162ee3b02c62f610b9e043d0e535419304
+SHA1 (file-5.00.tar.gz) = e58033dfefa44782aa34155751ce88c86c4c1244
+RMD160 (file-5.00.tar.gz) = 840170735f4b7478093da46fee521df9b1082bdc
+Size (file-5.00.tar.gz) = 600905 bytes
+SHA1 (patch-aa) = 10af71d97693e50d99533c15b6461d5ce680ca5f
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
index a9afe581aa6..bccf914e806 100644
--- a/sysutils/file/patches/patch-aa
+++ b/sysutils/file/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2008/10/29 20:50:16 christos Exp $
+$NetBSD: patch-aa,v 1.5 2009/03/10 23:30:00 he Exp $
 
---- src/Makefile.in.orig	2008-09-03 16:03:38.601850000 +0200
-+++ src/Makefile.in	2008-09-03 16:04:07.409017000 +0200
-@@ -195,10 +195,10 @@
+Make pkgsrc file look in @sysconfdir@/magic first.
+
+--- src/Makefile.in.orig	2009-02-03 21:16:19.000000000 +0100
++++ src/Makefile.in
+@@ -197,10 +197,10 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -14,4 +16,4 @@ $NetBSD: patch-aa,v 1.4 2008/10/29 20:50:16 christos Exp $
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
  AM_CFLAGS = @WARNINGS@
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
- 	compress.c is_tar.c readelf.c print.c fsmagic.c \
+ 	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \