Import of pkgsrc-2016Q3

sysutils/file/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2015/05/23 13:11:07 bsiegert Exp $
+# $NetBSD: Makefile,v 1.39 2016/06/16 15:27:49 fhajny Exp $
 
-DISTNAME=		file-5.22
-PKGREVISION=		1
+DISTNAME=		file-5.28
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.astron.com/pub/file/
 
@@ -29,12 +28,10 @@ BUILDLINK_TRANSFORM+=	opt:-Wextra:-W
 .endif
 # gcc<3 does not know -Wunused-parameter
 .if !empty(CC_VERSION:Mgcc-2*)
-BUILDLINK_TRANSFORM+=  rm:-Wunused-parameter
+BUILDLINK_TRANSFORM+=	rm:-Wunused-parameter
 .endif
 
-.if ${LOWER_OPSYS} == "aix"
-CFLAGS+=	-D_LINUX_SOURCE_COMPAT
-.endif
+CFLAGS.AIX+=	-D_LINUX_SOURCE_COMPAT
 
 .include "../../devel/zlib/buildlink3.mk"
 

sysutils/file/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2015/05/23 13:11:07 bsiegert Exp $
+$NetBSD: distinfo,v 1.28 2016/06/16 16:16:44 fhajny Exp $
 
-SHA1 (file-5.22.tar.gz) = 20fa06592291555f2b478ea2fb70b53e9e8d1f7c
-RMD160 (file-5.22.tar.gz) = 73b5e5c128a6ecb2b870590728cc9013fe0c9dbb
-Size (file-5.22.tar.gz) = 732556 bytes
-SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc
-SHA1 (patch-src_compress.c) = 63407a3103bb1e77a5c8f1a5e859eb884ad55b3a
+SHA1 (file-5.28.tar.gz) = 1b789a93bea54da3119d98986468cd90b1e571bf
+RMD160 (file-5.28.tar.gz) = ea054e34e1aa73ffe386f5401dfabbc9bda29a44
+SHA512 (file-5.28.tar.gz) = 42136505e21b14396e3af4e0d3f349687176cf0771d2dc9fed3599a30c7bab59184459f1e51033bce2d6ee0e292eba034bdfda727decca1219c1b3419e6bbfdc
+Size (file-5.28.tar.gz) = 777859 bytes
+SHA1 (patch-aa) = dc787ea0d77d7ba88bcb1e17d38b26b13153a1c5
+SHA1 (patch-magic_Magdir_bioinformatics) = 6a12477ff915911abe409782877a810ad1725d26
 SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
-SHA1 (patch-src_softmagic.c) = 5952a49b75b1a6968179cd61f28e7731caeb3e17

sysutils/file/patches/patch-aa

@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2014/03/12 18:35:49 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2016/06/16 15:27:49 fhajny Exp $
 
 Make pkgsrc file look in @sysconfdir@/magic first.
 
---- src/Makefile.in.orig	2014-02-13 00:29:38.000000000 +0100
-+++ src/Makefile.in	2014-03-06 20:10:48.215956295 +0100
-@@ -326,10 +326,10 @@
+--- src/Makefile.in.orig	2016-06-13 23:44:06.000000000 +0000
++++ src/Makefile.in
+@@ -337,10 +337,10 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -MAGIC = $(pkgdatadir)/magic
 +MAGIC = @sysconfdir@/magic
  lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
+ nodist_include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
  AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@

sysutils/file/patches/patch-magic_Magdir_bioinformatics

@@ -0,0 +1,17 @@
+$NetBSD: patch-magic_Magdir_bioinformatics,v 1.2 2016/06/16 16:16:45 fhajny Exp $
+
+Fix unbalanced parantheses in regex.
+
+Upstream bug reported: http://bugs.gw.com/view.php?id=558
+
+--- magic/Magdir/bioinformatics.orig	2016-02-14 15:53:53.000000000 +0000
++++ magic/Magdir/bioinformatics
+@@ -163,7 +163,7 @@
+ # SAM Alignment MAPQ
+ >>>>0		regex	=^([^\t]+\t){4}[0-9]{1,3}\t		
+ # SAM Alignment CIGAR
+->>>>>0		regex	=\t\\*|([0-9]+[MIDNSHPX=])+)\t		
++>>>>>0		regex	=\t(\\*|([0-9]+[MIDNSHPX=])+)\t		
+ # SAM Alignment RNEXT
+ >>>>>>0		regex	=\t(\\*|=|[!-()+->?-~][!-~]*)\t		
+ # SAM Alignment PNEXT

sysutils/file/patches/patch-src_compress.c

@@ -1,15 +0,0 @@
-$NetBSD: patch-src_compress.c,v 1.1 2015/03/27 18:57:43 bsiegert Exp $
-sig_t is not defined by default on SunOS
-
---- src/compress.c.orig	2014-12-16 16:07:12.000000000 +0000
-+++ src/compress.c
-@@ -59,6 +59,9 @@ FILE_RCSID("@(#)$File: compress.c,v 1.77
- #define BUILTIN_DECOMPRESS
- #include <zlib.h>
- #endif
-+#ifdef __sun
-+typedef void (*sig_t)(int);
-+#endif
- 
- private const struct {
- 	const char magic[8];

sysutils/file/patches/patch-src_softmagic.c

@@ -1,20 +0,0 @@
-$NetBSD: patch-src_softmagic.c,v 1.1 2015/05/23 13:11:07 bsiegert Exp $
-
-contains fix from 
-https://github.com/file/file/commit/3046c231e1a2fcdd5033bea0603c23f435a00bd7
-
---- src/softmagic.c.orig	2015-01-01 17:07:34.000000000 +0000
-+++ src/softmagic.c
-@@ -1116,10 +1116,8 @@ mcopy(struct magic_set *ms, union VALUET
- 				bytecnt = m->str_range;
- 			}
- 
--			if (bytecnt == 0)
--				bytecnt = 8192;
--			if (bytecnt > nbytes)
--				bytecnt = nbytes;
-+			if (bytecnt == 0 || bytecnt > nbytes - offset)
-+				bytecnt = nbytes - offset;
- 
- 			buf = RCAST(const char *, s) + offset;
- 			end = last = RCAST(const char *, s) + bytecnt;