pkgsrc changes:

  - Updating package for file from 5.00 to 5.03
  - Adding/updating patch which prevents non-gcc is invoked
    with gcc's warning options

Upstream changes:
2009-05-06  10:25  Christos Zoulas <christos@zoulas.com>
        * Avoid null dereference in cdf code (Drew Yao)
        * More cdf bounds checks and overflow checks

2009-05-01  18:37  Christos Zoulas <christos@zoulas.com>
        * Buffer overflow fixes from Drew Yao

2009-04-30  17:10  Christos Zoulas <christos@zoulas.com>
        * Fix more cdf lossage. All the documents I have
          right now print the correct information.

2009-03-27  18:43  Christos Zoulas <christos@zoulas.com>
        * don't print \012- separators in the same magic entry
          if it consists of multiple magic printing lines.

2009-03-23  10:20  Christos Zoulas <christos@zoulas.com>
        * Avoid file descriptor leak in compress code from
          (Daniel Novotny)

2009-03-18  16:50  Christos Zoulas <christos@zoulas.com>
        * Allow escaping of relation characters, so that we can say \^[A-Z]
          and the ^ is not eaten as a relation char.
        * Fix troff and fortran to their previous glory using
          regex. This was broken since their removel from ascmagic.

2009-03-10  16:50  Christos Zoulas <christos@zoulas.com>
        * don't use strlen in strndup() (Toby Peterson)

2009-03-10  7:45  Christos Zoulas <christos@zoulas.com>
        * avoid c99 syntax.

2009-02-23 15:45  Christos Zoulas <christos@zoulas.com>
        * make the cdf code use the buffer first if available,
          and then the fd code.

5 files changed, 43 insertions, 15 deletions

diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index fa837c57810..4413fbadfd6 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2009/03/21 20:55:58 sno Exp $
+# $NetBSD: Makefile,v 1.22 2009/05/21 15:58:17 sno Exp $
 
-DISTNAME=		file-5.00
+DISTNAME=		file-5.03
 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/PLIST b/sysutils/file/PLIST
index e120180a3a9..696ed51dbd9 100644
--- a/sysutils/file/PLIST
+++ b/sysutils/file/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2008/10/29 20:50:16 christos Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/05/21 15:58:17 sno Exp $
 bin/file
 include/magic.h
 lib/libmagic.la
 man/man1/file.1
 man/man3/libmagic.3
 man/man5/magic.5
-share/file/magic.mgc
-@dirrm share/file
+share/misc/magic.mgc
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
index bdfa45cb9c5..9cb647b96e5 100644
--- a/sysutils/file/distinfo
+++ b/sysutils/file/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2009/03/21 20:55:58 sno Exp $
+$NetBSD: distinfo,v 1.12 2009/05/21 15:58:17 sno Exp $
 
-SHA1 (file-5.00.tar.gz) = e58033dfefa44782aa34155751ce88c86c4c1244
-RMD160 (file-5.00.tar.gz) = 840170735f4b7478093da46fee521df9b1082bdc
-Size (file-5.00.tar.gz) = 600905 bytes
+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) = 614f3be95bf9f79a91de94b8579d8b6953f17cfe
+SHA1 (patch-ab) = a5d1433d4d5f10bb6ea1f503731fc90af7fa5de3
+SHA1 (patch-ac) = 9f93eef22ea3265b6c8be03252e8ab3abb1c64cc
+SHA1 (patch-az) = 1f8d0c0f19cbfb20ffda82cefac73914ebd21394
diff --git a/sysutils/file/patches/patch-ab b/sysutils/file/patches/patch-ab
index eca94092749..c8daabd3c5a 100644
--- a/sysutils/file/patches/patch-ab
+++ b/sysutils/file/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2009/03/21 20:55:58 sno Exp $
+$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-02-03 20:16:11.000000000 +0000
-+++ configure	2009-03-11 07:34:46.000000000 +0000
-@@ -23934,17 +23934,17 @@
+--- 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
+-if test "$GCC" = no; then
 -   WARNINGS=
 -   { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
diff --git a/sysutils/file/patches/patch-ac b/sysutils/file/patches/patch-ac
new file mode 100644
index 00000000000..4962e804685
--- /dev/null
+++ b/sysutils/file/patches/patch-ac
@@ -0,0 +1,27 @@
+$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