Update to findutils-4.2.31 and enable DESTDIR support.

The list of changes from 4.1 is long and includes a range of performance
improvements, portability fixes and a locate(1) security fix. Most of the
pkgsrc patches have also been merged or otherwise fixed upstream.

15 files changed, 97 insertions, 231 deletions

diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
index 9e0a1b43a29..273f7cb997f 100644
--- a/sysutils/findutils/Makefile
+++ b/sysutils/findutils/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2006/11/10 14:44:33 tv Exp $
+# $NetBSD: Makefile,v 1.26 2007/10/16 00:45:52 tnn Exp $
 
-DISTNAME=	findutils-4.1
-PKGREVISION=	6
+DISTNAME=	findutils-4.2.31
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU:=findutils/}
 
@@ -10,13 +9,11 @@ HOMEPAGE=	http://www.gnu.org/software/findutils/findutils.html
 COMMENT=	The GNU find, xargs and locate utilities
 
 GNU_CONFIGURE=		YES
-CONFIGURE_HAS_INFODIR=	NO
-CONFIGURE_HAS_MANDIR=	NO
-MAKE_FLAGS+=		infodir=${GNU_CONFIGURE_INFODIR:Q}
-MAKE_FLAGS+=		mandir=${GNU_CONFIGURE_MANDIR:Q}
-LDFLAGS.IRIX+=		-lgen
+INFO_FILES=		YES
+PKG_DESTDIR_SUPPORT=	user-destdir
+USE_PKGLOCALEDIR=	YES
 
-INFO_FILES=		# PLIST
+LDFLAGS.IRIX+=		-lgen
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST
index 4b263f224f3..fe897c7e8ae 100644
--- a/sysutils/findutils/PLIST
+++ b/sysutils/findutils/PLIST
@@ -1,14 +1,50 @@
-@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:05:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/10/16 00:45:52 tnn Exp $
 bin/${GNU_PROGRAM_PREFIX}find
-bin/${GNU_PROGRAM_PREFIX}xargs
 bin/${GNU_PROGRAM_PREFIX}locate
 bin/${GNU_PROGRAM_PREFIX}updatedb
+bin/${GNU_PROGRAM_PREFIX}xargs
 info/find.info
-libexec/${GNU_PROGRAM_PREFIX}frcode
-libexec/${GNU_PROGRAM_PREFIX}code
 libexec/${GNU_PROGRAM_PREFIX}bigram
+libexec/${GNU_PROGRAM_PREFIX}code
+libexec/${GNU_PROGRAM_PREFIX}frcode
 man/man1/${GNU_PROGRAM_PREFIX}find.1
-man/man1/${GNU_PROGRAM_PREFIX}xargs.1
 man/man1/${GNU_PROGRAM_PREFIX}locate.1
 man/man1/${GNU_PROGRAM_PREFIX}updatedb.1
+man/man1/${GNU_PROGRAM_PREFIX}xargs.1
 man/man5/${GNU_PROGRAM_PREFIX}locatedb.5
+share/locale/be/LC_MESSAGES/findutils.mo
+share/locale/bg/LC_MESSAGES/findutils.mo
+share/locale/ca/LC_MESSAGES/findutils.mo
+share/locale/da/LC_MESSAGES/findutils.mo
+share/locale/de/LC_MESSAGES/findutils.mo
+share/locale/el/LC_MESSAGES/findutils.mo
+share/locale/eo/LC_MESSAGES/findutils.mo
+share/locale/es/LC_MESSAGES/findutils.mo
+share/locale/et/LC_MESSAGES/findutils.mo
+share/locale/fi/LC_MESSAGES/findutils.mo
+share/locale/fr/LC_MESSAGES/findutils.mo
+share/locale/ga/LC_MESSAGES/findutils.mo
+share/locale/gl/LC_MESSAGES/findutils.mo
+share/locale/hr/LC_MESSAGES/findutils.mo
+share/locale/hu/LC_MESSAGES/findutils.mo
+share/locale/id/LC_MESSAGES/findutils.mo
+share/locale/it/LC_MESSAGES/findutils.mo
+share/locale/ja/LC_MESSAGES/findutils.mo
+share/locale/ko/LC_MESSAGES/findutils.mo
+share/locale/lg/LC_MESSAGES/findutils.mo
+share/locale/ms/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
+share/locale/pt_BR/LC_MESSAGES/findutils.mo
+share/locale/ro/LC_MESSAGES/findutils.mo
+share/locale/ru/LC_MESSAGES/findutils.mo
+share/locale/rw/LC_MESSAGES/findutils.mo
+share/locale/sk/LC_MESSAGES/findutils.mo
+share/locale/sl/LC_MESSAGES/findutils.mo
+share/locale/sr/LC_MESSAGES/findutils.mo
+share/locale/sv/LC_MESSAGES/findutils.mo
+share/locale/tr/LC_MESSAGES/findutils.mo
+share/locale/vi/LC_MESSAGES/findutils.mo
+share/locale/zh_CN/LC_MESSAGES/findutils.mo
+share/locale/zh_TW/LC_MESSAGES/findutils.mo
diff --git a/sysutils/findutils/distinfo b/sysutils/findutils/distinfo
index 83b2a626318..f73c9a513fc 100644
--- a/sysutils/findutils/distinfo
+++ b/sysutils/findutils/distinfo
@@ -1,17 +1,8 @@
-$NetBSD: distinfo,v 1.12 2006/03/20 18:05:22 jlam Exp $
+$NetBSD: distinfo,v 1.13 2007/10/16 00:45:52 tnn Exp $
 
-SHA1 (findutils-4.1.tar.gz) = b91cd03ca4c9659b3e5d40e841c64bfd2e7f25d8
-RMD160 (findutils-4.1.tar.gz) = b66c0aa2e72d378e8c3cb9968ceb68d9138af874
-Size (findutils-4.1.tar.gz) = 294494 bytes
-SHA1 (patch-aa) = d0c4c9f1dcc9471290f170ee3262a77906af996a
-SHA1 (patch-ab) = 13664baa3e9348413416c920776be659d5dc59c3
-SHA1 (patch-ac) = 4a0657f15cb72cbcddc782723943da089434b259
-SHA1 (patch-ad) = 4548d91fe4fc5bc02a7b4f7b85ffa4e83a413219
-SHA1 (patch-ae) = db0debddba28d04954cf96c72e197408c9e6c3ad
-SHA1 (patch-af) = 0ae11b085ebe08d49a13fb1c1211fdb938391f5b
-SHA1 (patch-ag) = 17216ad95a59ba9bdcc8e52f0a99f05d263a9ba3
-SHA1 (patch-ah) = 64ccdeebbb70694d45d16c41a4137bbe125df23b
-SHA1 (patch-ai) = 59c8872a9cef3bb94e35c7eb97a9878bcdb11c51
-SHA1 (patch-aj) = 5fd1d20f75fafa01063982e2ef49f123d4cb4c7d
-SHA1 (patch-ak) = 5e47cf75a7f3bdfad6cfead06bb1643ebeee178d
-SHA1 (patch-am) = 48abd78b11347cdeaa1057d85cab1931feada8e9
+SHA1 (findutils-4.2.31.tar.gz) = e031ddb4f50c8a053d3f216d10f92621c1fa21ba
+RMD160 (findutils-4.2.31.tar.gz) = 0b6775ebf5455e99bf594dd02432d8eeee508ace
+Size (findutils-4.2.31.tar.gz) = 1326294 bytes
+SHA1 (patch-aa) = 30ef7780f4082523ed68aeaff7d4db19c3b68570
+SHA1 (patch-ab) = 782c5c642e8e6883686c36ddc470edc3d063f0f0
+SHA1 (patch-ag) = def96d47ad09cf98b0caf9f44e94df1c0fd611a2
diff --git a/sysutils/findutils/patches/patch-aa b/sysutils/findutils/patches/patch-aa
index ca213710aee..285d1602790 100644
--- a/sysutils/findutils/patches/patch-aa
+++ b/sysutils/findutils/patches/patch-aa
@@ -1,53 +1,22 @@
-$NetBSD: patch-aa,v 1.5 2006/03/20 18:05:22 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2007/10/16 00:45:53 tnn Exp $
 
---- locate/Makefile.in.orig	1994-11-05 09:44:08.000000000 -0500
+--- locate/Makefile.in.orig	2007-05-30 22:06:20.000000000 +0200
 +++ locate/Makefile.in
-@@ -29,7 +29,7 @@ libexecdir = $(exec_prefix)/libexec
- datadir = $(prefix)/share
- sysconfdir = $(prefix)/etc
- sharedstatedir = $(prefix)/com
--localstatedir = $(prefix)/var
+@@ -434,7 +434,7 @@ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = $(datadir)/locale
+-localstatedir = @localstatedir@
 +localstatedir = /var/run
- libdir = $(exec_prefix)/lib
- infodir = $(prefix)/info
- mandir = $(prefix)/man
-@@ -38,6 +38,7 @@ oldincludedir = /usr/include
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- transform = @program_transform_name@
- 
-@@ -68,7 +69,7 @@ DIST_CONF = Makefile.am Makefile.in
- DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -452,7 +452,7 @@ top_srcdir = @top_srcdir@
  
  # The default database to build and search.
+ AUTOMAKE_OPTIONS = std-options
 -LOCATE_DB = $(localstatedir)/locatedb
 +LOCATE_DB = /var/db/locate.database
- 
- PROGRAMS = locate
- LIBPROGRAMS = frcode code bigram
-@@ -96,9 +97,12 @@ install:: install-programs
- 
- install-programs: $(PROGRAMS) $(SCRIPTS)
- 	$(top_srcdir)/mkinstalldirs $(bindir)
--	for p in $(PROGRAMS) $(SCRIPTS); do \
-+	for p in $(PROGRAMS); do \
- 	  $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
- 	done
-+	for p in $(SCRIPTS); do \
-+	  $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+	done
- 
- uninstall:: uninstall-programs
- 
-@@ -145,7 +149,7 @@ install-man:
- 	  echo installing $$man as $$mdir/$$inst; \
- 	  $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- 	  cdir=$(mandir)/cat$$sect; \
--	  if test -d $$cdir; then \
-+	  if false && test -d $$cdir; then \
- 	    echo formatting $$man as $$cdir/$$inst; \
- 	    $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
- 	  fi; \
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = frcode code bigram
+ bin_SCRIPTS = updatedb
+ man_MANS = locate.1 updatedb.1 locatedb.5
diff --git a/sysutils/findutils/patches/patch-ab b/sysutils/findutils/patches/patch-ab
index cafae650214..11c6f4fd8bd 100644
--- a/sysutils/findutils/patches/patch-ab
+++ b/sysutils/findutils/patches/patch-ab
@@ -1,20 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/10 17:32:59 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2007/10/16 00:45:53 tnn Exp $
 
---- configure.old	Fri Dec 10 07:32:53 1999
-+++ configure	Fri Dec 10 07:32:57 1999
-@@ -633,6 +633,7 @@
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
-@@ -2601,6 +2602,7 @@
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@RANLIB@%$RANLIB%g
- s%@SET_MAKE@%$SET_MAKE%g
+--- 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) ; \
diff --git a/sysutils/findutils/patches/patch-ac b/sysutils/findutils/patches/patch-ac
deleted file mode 100644
index adb968b0601..00000000000
--- a/sysutils/findutils/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/03/20 18:05:22 jlam Exp $
-
---- find/Makefile.in.orig	1994-11-05 09:43:52.000000000 -0500
-+++ find/Makefile.in
-@@ -103,7 +103,7 @@ install-man:
- 	  echo installing $$man as $$mdir/$$inst; \
- 	  $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- 	  cdir=$(mandir)/cat$$sect; \
--	  if test -d $$cdir; then \
-+	  if false && test -d $$cdir; then \
- 	    echo formatting $$man as $$cdir/$$inst; \
- 	    $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
- 	  fi; \
diff --git a/sysutils/findutils/patches/patch-ad b/sysutils/findutils/patches/patch-ad
deleted file mode 100644
index b7ae20a0f11..00000000000
--- a/sysutils/findutils/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2006/03/20 18:05:22 jlam Exp $
-
---- xargs/Makefile.in.orig	1994-11-05 09:44:18.000000000 -0500
-+++ xargs/Makefile.in
-@@ -102,7 +102,7 @@ install-man:
- 	  echo installing $$man as $$mdir/$$inst; \
- 	  $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- 	  cdir=$(mandir)/cat$$sect; \
--	  if test -d $$cdir; then \
-+	  if false && test -d $$cdir; then \
- 	    echo formatting $$man as $$cdir/$$inst; \
- 	    $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
- 	  fi; \
diff --git a/sysutils/findutils/patches/patch-ae b/sysutils/findutils/patches/patch-ae
deleted file mode 100644
index 600f59c76da..00000000000
--- a/sysutils/findutils/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- find/defs.h	Wed Nov  2 15:59:15 1994
-+++ find/defs.h	Tue May  2 15:30:31 2000
-@@ -301,7 +301,7 @@
- boolean mark_stat P_((struct predicate *tree));
- 
- /* util.c */
--char *basename P_((char *fname));
-+char *basename2 P_((char *fname));
- struct predicate *get_new_pred P_((void));
- struct predicate *get_new_pred_chk_op P_((void));
- struct predicate *insert_primary P_((boolean (*pred_func )()));
diff --git a/sysutils/findutils/patches/patch-af b/sysutils/findutils/patches/patch-af
deleted file mode 100644
index 9448b199838..00000000000
--- a/sysutils/findutils/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- find/parser.c	Wed Nov  2 15:59:19 1994
-+++ find/parser.c	Tue May  2 15:33:12 2000
-@@ -52,7 +52,6 @@
- #define lstat stat
- #endif
- 
--char *strstr ();
- int lstat ();
- int stat ();
- #ifndef atol /* for Linux */
diff --git a/sysutils/findutils/patches/patch-ag b/sysutils/findutils/patches/patch-ag
index 8828a522b55..8478542cfb3 100644
--- a/sysutils/findutils/patches/patch-ag
+++ b/sysutils/findutils/patches/patch-ag
@@ -1,24 +1,15 @@
-$NetBSD: patch-ag,v 1.3 2005/10/11 02:03:18 jschauma Exp $
+$NetBSD: patch-ag,v 1.4 2007/10/16 00:45:55 tnn Exp $
 
---- find/pred.c.orig	Mon Oct 10 21:13:02 2005
-+++ find/pred.c	Mon Oct 10 21:14:52 2005
-@@ -15,6 +15,8 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+--- find/pred.c.orig	2007-04-22 17:43:17.000000000 +0200
++++ find/pred.c
+@@ -38,6 +38,10 @@
+ #include "buildcmd.h"
+ #include "yesno.h"
  
-+#define _GNU_SOURCE
-+
- #include <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -26,6 +28,10 @@
- #include "defs.h"
- #include "modetype.h"
- #include "wait.h"
-+
 +#ifdef __sgi
 +#include <libgen.h>
 +#endif
- 
- #if !defined(SIGCHLD) && defined(SIGCLD)
- #define SIGCHLD SIGCLD
++
+ #if ENABLE_NLS
+ # include <libintl.h>
+ # define _(Text) gettext (Text)
diff --git a/sysutils/findutils/patches/patch-ah b/sysutils/findutils/patches/patch-ah
deleted file mode 100644
index 6db337e6d2a..00000000000
--- a/sysutils/findutils/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- find/util.c	Thu Oct 20 00:49:47 1994
-+++ find/util.c	Tue May  2 15:41:59 2000
-@@ -25,7 +25,7 @@
-    compressed into one slash. */
- 
- char *
--basename (fname)
-+basename2 (fname)
-      char *fname;
- {
-   char *p;
diff --git a/sysutils/findutils/patches/patch-ai b/sysutils/findutils/patches/patch-ai
deleted file mode 100644
index 40b2b9bfa39..00000000000
--- a/sysutils/findutils/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- lib/nextelem.c	Tue Sep 27 09:02:45 1994
-+++ lib/nextelem.c	Tue May  2 15:35:12 2000
-@@ -32,7 +32,6 @@
- #endif
- #endif
- 
--char *strdup ();
- void free ();
- 
- /* Return the next element of a colon-separated path.
diff --git a/sysutils/findutils/patches/patch-aj b/sysutils/findutils/patches/patch-aj
deleted file mode 100644
index ec9e6f51cdf..00000000000
--- a/sysutils/findutils/patches/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- xargs/xargs.c	Fri Oct  7 13:21:39 1994
-+++ xargs/xargs.c	Tue May  2 15:39:46 2000
-@@ -60,9 +60,6 @@
- #define memcpy(dest, source, count) (bcopy((source), (dest), (count)))
- #endif
- 
--char *strstr ();
--char *strdup ();
--
- #ifndef _POSIX_SOURCE
- #include <sys/param.h>
- #endif
diff --git a/sysutils/findutils/patches/patch-ak b/sysutils/findutils/patches/patch-ak
deleted file mode 100644
index 7be51e6e7ae..00000000000
--- a/sysutils/findutils/patches/patch-ak
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/06/19 10:44:45 hira Exp $
-
---- find/fstype.c	Thu Nov  3 11:33:48 1994
-+++ find/fstype.c	Tue May  2 15:31:42 2000
-@@ -30,9 +30,6 @@
- extern int errno;
- #endif
- 
--char *strdup ();
--char *strstr ();
--
- static char *filesystem_type_uncached P_((char *path, char *relpath, struct stat *statp));
- static int xatoi P_((char *cp));
- 
diff --git a/sysutils/findutils/patches/patch-am b/sysutils/findutils/patches/patch-am
deleted file mode 100644
index 50a2b6e7449..00000000000
--- a/sysutils/findutils/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/07/29 12:35:07 wiz Exp $
-
---- lib/listfile.c.orig	1994-11-02 21:59:24.000000000 +0100
-+++ lib/listfile.c
-@@ -67,7 +67,7 @@ extern int errno;
- #endif
- 
- #if defined(S_ISLNK)
--int readlink ();
-+#include <unistd.h>
- #endif
- 
- /* Extract or fake data from a `struct stat'.