Import of pkgsrc-2016Q3

sysutils/findutils/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2015/08/26 12:44:32 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2016/05/02 05:18:47 richard Exp $
 
-DISTNAME=	findutils-4.4.2
+DISTNAME=	findutils-4.6.0
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU:=findutils/}
 
@@ -12,7 +13,7 @@ LICENSE=	gnu-gpl-v3 # or later
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake bison	# we patch a .y file, so needs bison
 
 LDFLAGS.IRIX+=		-lgen
 
@@ -23,7 +24,7 @@ AUTO_MKDIRS=		yes
 .include "../../mk/bsd.prefs.mk"
 
 post-install:
-.for f in find locate oldfind updatedb xargs
+.for f in find locate updatedb xargs
 	${LN} -sf ${PREFIX}/bin/g${f} ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/${f}
 	${LN} -sf ${PREFIX}/${PKGMANDIR}/man1/g${f}.1 ${DESTDIR}${PREFIX}/${PKGGNUDIR}${PKGMANDIR}/man1/${f}.1
 .endfor

sysutils/findutils/PLIST

@@ -1,17 +1,14 @@
-@comment $NetBSD: PLIST,v 1.12 2015/08/26 12:44:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/05/02 05:18:47 richard Exp $
 bin/gfind
 bin/glocate
-bin/goldfind
 bin/gupdatedb
 bin/gxargs
 gnu/bin/find
 gnu/bin/locate
-gnu/bin/oldfind
 gnu/bin/updatedb
 gnu/bin/xargs
 gnu/man/man1/find.1
 gnu/man/man1/locate.1
-gnu/man/man1/oldfind.1
 gnu/man/man1/updatedb.1
 gnu/man/man1/xargs.1
 gnu/man/man5/locatedb.5
@@ -48,6 +45,7 @@ share/locale/ko/LC_MESSAGES/findutils.mo
 share/locale/lg/LC_MESSAGES/findutils.mo
 share/locale/lt/LC_MESSAGES/findutils.mo
 share/locale/ms/LC_MESSAGES/findutils.mo
+share/locale/nb/LC_MESSAGES/findutils.mo
 share/locale/nl/LC_MESSAGES/findutils.mo
 share/locale/pl/LC_MESSAGES/findutils.mo
 share/locale/pt/LC_MESSAGES/findutils.mo

sysutils/findutils/distinfo

@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/08/26 12:44:32 wiz Exp $
+$NetBSD: distinfo,v 1.19 2016/01/03 17:00:48 wiz Exp $
 
-SHA1 (findutils-4.4.2.tar.gz) = e8dd88fa2cc58abffd0bfc1eddab9020231bb024
-RMD160 (findutils-4.4.2.tar.gz) = d2954a31d59ca238e18b50be82f1eccf7ad69054
-Size (findutils-4.4.2.tar.gz) = 2149838 bytes
-SHA1 (patch-aa) = 162de59955ded4cf6d53d012511402a672a39b7c
-SHA1 (patch-ab) = 782c5c642e8e6883686c36ddc470edc3d063f0f0
-SHA1 (patch-ag) = 564ef15f6f9719ba33c54049a6e6780608afdf19
-SHA1 (patch-ah) = 213f8984aba51d500cb0d0c8ba2362918e065741
+SHA1 (findutils-4.6.0.tar.gz) = f18e8aaee3f3d4173a1f598001003be8706d28b0
+RMD160 (findutils-4.6.0.tar.gz) = 0745d081f4a53d7e8b6c17dc8235155492ff4d92
+SHA512 (findutils-4.6.0.tar.gz) = 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
+Size (findutils-4.6.0.tar.gz) = 3780154 bytes
+SHA1 (patch-aa) = 6e5a52ddb9764a533b7be56e7bd97c971f091cfe

sysutils/findutils/patches/patch-aa

@@ -1,20 +1,20 @@
-$NetBSD: patch-aa,v 1.7 2008/03/08 11:15:03 tnn Exp $
+$NetBSD: patch-aa,v 1.8 2016/01/03 17:00:48 wiz Exp $
 
---- locate/Makefile.in.orig	2008-02-13 23:37:41.000000000 +0100
+--- locate/Makefile.in.orig	2016-01-03 16:55:46.000000000 +0000
 +++ locate/Makefile.in
-@@ -532,7 +532,7 @@ install_sh = @install_sh@
- libdir = @libdir@
+@@ -1657,7 +1657,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
+ lispdir = @lispdir@
  localedir = $(datadir)/locale
 -localstatedir = @localstatedir@
 +localstatedir = /var/run
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -550,7 +550,7 @@ top_srcdir = @top_srcdir@
- 
+@@ -1682,7 +1682,7 @@ top_srcdir = @top_srcdir@
  # The default database to build and search.
  AUTOMAKE_OPTIONS = std-options
+ AM_CFLAGS = $(WARN_CFLAGS)
 -LOCATE_DB = $(localstatedir)/locatedb
 +LOCATE_DB = /var/db/locate.database
  AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \

sysutils/findutils/patches/patch-ab

@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/10/16 00:45:53 tnn Exp $
-
---- gnulib/lib/Makefile.in.orig	2007-05-30 22:06:19.000000000 +0200
-+++ gnulib/lib/Makefile.in
-@@ -969,12 +969,12 @@ inttypes.h: inttypes_.h
- all-local: charset.alias ref-add.sed ref-del.sed
- install-exec-local: all-local
- 	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
--	if test -f $(charset_alias); then \
-+	if false; then \
- 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
- 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- 	  rm -f $(charset_tmp) ; \
- 	else \
--	  if test $(GLIBC21) = no; then \
-+	  if false; then \
- 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
- 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
- 	    rm -f $(charset_tmp) ; \

sysutils/findutils/patches/patch-ag

@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2015/08/26 12:44:33 wiz Exp $
-
---- find/pred.c.orig	2009-05-16 15:17:01.000000000 +0000
-+++ find/pred.c
-@@ -48,6 +48,10 @@
- #include "error.h"
- #include "verify.h"
- 
-+#ifdef __sgi
-+#include <libgen.h>
-+#endif
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)

sysutils/findutils/patches/patch-ah

@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2011/04/04 11:27:39 drochner Exp $
-
-test fails on NetBSD-current/32bit
-
---- gnulib/lib/mktime.c.orig	2007-12-08 13:47:18.000000000 +0000
-+++ gnulib/lib/mktime.c
-@@ -165,8 +165,10 @@ ydhms_diff (long int year1, long int yda
- 	    int year0, int yday0, int hour0, int min0, int sec0)
- {
-   verify (C99_integer_division, -1 / 2 == 0);
-+#if 0
-   verify (long_int_year_and_yday_are_wide_enough,
- 	  INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
-+#endif
- 
-   /* Compute intervening leap days correctly even if year is negative.
-      Take care to avoid integer overflow here.  */