[pkgsrc/trunk]: pkgsrc/sysutils/file Fix functionality under NetBSD-current. ...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/80fae214f35c
branches:  trunk
changeset: 372620:80fae214f35c
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Dec 12 03:11:51 2017 +0000

description:
Fix functionality under NetBSD-current. Taken from NetBSD src

Bump PKGREVISION

diffstat:

 sysutils/file/Makefile                      |   3 ++-
 sysutils/file/distinfo                      |   3 ++-
 sysutils/file/patches/patch-src_softmagic.c |  16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diffs (46 lines):

diff -r f463efe628bd -r 80fae214f35c sysutils/file/Makefile
--- a/sysutils/file/Makefile    Mon Dec 11 19:00:32 2017 +0000
+++ b/sysutils/file/Makefile    Tue Dec 12 03:11:51 2017 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2017/09/04 12:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/12/12 03:11:51 ryoon Exp $
 
 DISTNAME=              file-5.32
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.astron.com/pub/file/
 
diff -r f463efe628bd -r 80fae214f35c sysutils/file/distinfo
--- a/sysutils/file/distinfo    Mon Dec 11 19:00:32 2017 +0000
+++ b/sysutils/file/distinfo    Tue Dec 12 03:11:51 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/09/04 12:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.30 2017/12/12 03:11:51 ryoon Exp $
 
 SHA1 (file-5.32.tar.gz) = c2858a8043387d1229d8768ad42762a803d017db
 RMD160 (file-5.32.tar.gz) = b7d41a4c6b2c28d9f202d740e353416e2036c1ef
@@ -6,3 +6,4 @@
 Size (file-5.32.tar.gz) = 797025 bytes
 SHA1 (patch-aa) = dc787ea0d77d7ba88bcb1e17d38b26b13153a1c5
 SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
+SHA1 (patch-src_softmagic.c) = bd8871c9050ca521f02b62066d0023a5fbb2d168
diff -r f463efe628bd -r 80fae214f35c sysutils/file/patches/patch-src_softmagic.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/file/patches/patch-src_softmagic.c       Tue Dec 12 03:11:51 2017 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_softmagic.c,v 1.3 2017/12/12 03:11:51 ryoon Exp $
+
+Fix functionality under NetBSD-current after format check change
+https://mail-index.netbsd.org/source-changes/2017/12/11/msg090400.html
+
+--- src/softmagic.c.orig       2017-07-21 10:29:00.000000000 +0000
++++ src/softmagic.c
+@@ -121,6 +121,8 @@ private const char * __attribute__((__fo
+ file_fmtcheck(struct magic_set *ms, const struct magic *m, const char *def,
+       const char *file, size_t line)
+ {
++      if (strchr(m->desc, '%') == NULL)
++              return m->desc;
+       const char *ptr = fmtcheck(m->desc, def);
+       if (ptr == def)
+               file_magerror(ms,