Import of pkgsrc-2014Q1

sysutils/file/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2012/10/23 19:51:01 asau Exp $
+# $NetBSD: Makefile,v 1.29 2014/03/12 18:35:48 wiz Exp $
 
-DISTNAME=		file-5.11
+DISTNAME=		file-5.17
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.astron.com/pub/file/
 

sysutils/file/builtin.mk

@@ -1,11 +1,12 @@
-# $NetBSD: builtin.mk,v 1.6 2009/03/09 17:47:36 cube Exp $
+# $NetBSD: builtin.mk,v 1.7 2013/11/23 12:10:13 obache Exp $
 
 BUILTIN_PKG:=	file
 
-BUILTIN_FIND_FILES_VAR:=	H_FILE BIN_FILE
-BUILTIN_FIND_FILES.H_FILE=	/usr/include/magic.h
+BUILTIN_FIND_HEADERS_VAR:=	H_FILE
+BUILTIN_FIND_HEADERS.H_FILE=	magic.h
 BUILTIN_FIND_GREP.H_FILE=	magic_file
-BUILTIN_FIND_FILES.BIN_FILE=	/bin/file /usr/bin/file
+BUILTIN_FIND_FILES_VAR:=	BIN_FILE
+BUILTIN_FIND_FILES.BIN_FILE=	${TOOLS_PLATFORM.file} /bin/file /usr/bin/file
 
 .include "../../mk/buildlink3/bsd.builtin.mk"
 

sysutils/file/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2012/03/30 03:53:54 taca Exp $
+$NetBSD: distinfo,v 1.16 2014/03/12 19:43:17 wiz Exp $
 
-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
+SHA1 (file-5.17.tar.gz) = f7e837a0d3e4f40a02ffe7da5e146b967448e0d8
+RMD160 (file-5.17.tar.gz) = 288210bdb07b3b8aa61affa3fb8b2d64a7e021da
+Size (file-5.17.tar.gz) = 709991 bytes
+SHA1 (patch-aa) = d3aa3667e3d28ac1268b83de2de372ba083705fc
+SHA1 (patch-src_getline.c) = 23365ae99c8c5a4c4ff4e0d94b83798d12335112

sysutils/file/patches/patch-aa

@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.6 2012/03/30 03:53:54 taca Exp $
+$NetBSD: patch-aa,v 1.7 2014/03/12 18:35:49 wiz Exp $
 
 Make pkgsrc file look in @sysconfdir@/magic first.
 
---- src/Makefile.in.orig	2012-02-21 19:17:04.000000000 +0000
-+++ src/Makefile.in
-@@ -240,10 +240,10 @@ target_alias = @target_alias@
+--- 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 @@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
@@ -14,6 +14,6 @@ Make pkgsrc file look in @sysconfdir@/magic first.
  include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
- AM_CFLAGS = @WARNINGS@
+ AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \

sysutils/file/patches/patch-src_getline.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_getline.c,v 1.1 2014/03/12 19:43:17 wiz Exp $
+
+Export getline symbol if missing.
+
+--- src/getline.c.orig	2013-01-11 19:36:54.000000000 +0000
++++ src/getline.c
+@@ -76,7 +76,7 @@ getdelim(char **buf, size_t *bufsiz, int
+ 	}
+ }
+ 
+-ssize_t
++public ssize_t
+ getline(char **buf, size_t *bufsiz, FILE *fp)
+ {
+ 	return getdelim(buf, bufsiz, '\n', fp);