Update file from 5.03 to 5.11.

Changes are too may to write here but includes security fix CVE-2012-1571.

Add LICENSE, too.

6 files changed, 12 insertions, 85 deletions

diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index e74f9ac16b9..8047ed7d2ab 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.25 2012/01/23 20:54:09 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2012/03/30 03:53:54 taca Exp $
 
-DISTNAME=		file-5.03
-PKGREVISION=		1
+DISTNAME=		file-5.11
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.astron.com/pub/file/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 #HOMEPAGE=
 COMMENT=		Tool for determining file type
+LICENSE=		2-clause-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index 3a8dfe1e6e0..986d3093b40 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.13 2012/01/23 20:54:09 joerg Exp $
+$NetBSD: distinfo,v 1.14 2012/03/30 03:53:54 taca Exp $
 
-SHA1 (file-5.03.tar.gz) = f659a4e1fa96fbdc99c924ea8e2dc07319f046c1
-RMD160 (file-5.03.tar.gz) = bf9fcf85e40dc4ec9cdcdc806107dc88207c6e5b
-Size (file-5.03.tar.gz) = 616266 bytes
-SHA1 (patch-aa) = 10af71d97693e50d99533c15b6461d5ce680ca5f
-SHA1 (patch-ab) = a5d1433d4d5f10bb6ea1f503731fc90af7fa5de3
-SHA1 (patch-ac) = 9f93eef22ea3265b6c8be03252e8ab3abb1c64cc
-SHA1 (patch-doc_file.man) = af66ddac0d3ac82976866ef9bb7ab008ff5c6d34
+SHA1 (file-5.11.tar.gz) = df8ffe8759ec8cd85a98dc98e858563ea2555f64
+RMD160 (file-5.11.tar.gz) = 68885d838c1f3836e6fada4c4ea6c88c8699fdf2
+Size (file-5.11.tar.gz) = 610019 bytes
+SHA1 (patch-aa) = 6ec37d8666176693c5ead69333cf27f10664e630
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
index bccf914e806..e9ea988c82e 100644
--- a/sysutils/file/patches/patch-aa
+++ b/sysutils/file/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2009/03/10 23:30:00 he Exp $
+$NetBSD: patch-aa,v 1.6 2012/03/30 03:53:54 taca Exp $
 
 Make pkgsrc file look in @sysconfdir@/magic first.
 
---- src/Makefile.in.orig	2009-02-03 21:16:19.000000000 +0100
+--- src/Makefile.in.orig	2012-02-21 19:17:04.000000000 +0000
 +++ src/Makefile.in
-@@ -197,10 +197,10 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -240,10 +240,10 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -MAGIC = $(pkgdatadir)/magic
diff --git a/sysutils/file/patches/patch-ab b/sysutils/file/patches/patch-ab
deleted file mode 100644
index c8daabd3c5a..00000000000
--- a/sysutils/file/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/05/21 15:58:18 sno Exp $
-
-If $gcc is unset, original comparisation fails badly
-regardless 'if test  = no' or 'if test "" = no'
-
---- configure.orig	2009-05-18 17:20:11.000000000 +0000
-+++ configure	2009-05-18 17:21:26.000000000 +0000
-@@ -23563,17 +23563,17 @@
- fi
- else
- 
--if test "$GCC" = no; then
--   WARNINGS=
--   { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--else
-+if test "$GCC" = yes; then
-    { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-    WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-        -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
-+else
-+   WARNINGS=
-+   { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- fi
- 
diff --git a/sysutils/file/patches/patch-ac b/sysutils/file/patches/patch-ac
deleted file mode 100644
index 4962e804685..00000000000
--- a/sysutils/file/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/05/21 15:58:18 sno Exp $
-
-If $gcc is unset, original comparisation fails badly
-regardless 'if test  = no' or 'if test "" = no'
-
---- configure.ac.orig	2009-05-18 17:20:17.000000000 +0000
-+++ configure.ac	2009-05-18 17:22:15.000000000 +0000
-@@ -130,15 +130,15 @@
-        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
- fi], [
--if test "$GCC" = no; then
--   WARNINGS=
--   AC_MSG_RESULT(no)
--else
-+if test "$GCC" = yes; then
-    AC_MSG_RESULT(yes)
-    WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-        -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
-        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
-+else
-+   WARNINGS=
-+   AC_MSG_RESULT(no)
- fi])
- 
- dnl Checks for functions
diff --git a/sysutils/file/patches/patch-doc_file.man b/sysutils/file/patches/patch-doc_file.man
deleted file mode 100644
index 4547233b611..00000000000
--- a/sysutils/file/patches/patch-doc_file.man
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-doc_file.man,v 1.1 2012/01/23 20:54:09 joerg Exp $
-
---- doc/file.man.orig	2012-01-23 19:18:16.000000000 +0000
-+++ doc/file.man
-@@ -175,7 +175,7 @@ Exclude the test named in
- .Ar testname
- from the list of tests made to determine the file type. Valid test names
- are:
--.Bl -tag -width
-+.Bl -tag -width compress
- .It apptype
- .Dv EMX
- application type (only on EMX).