pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/findutils Update to findutils-4.2.31 and enab...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5d5440e4660
branches:  trunk
changeset: 534290:f5d5440e4660
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Oct 16 00:45:52 2007 +0000

description:
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.

diffstat:

 sysutils/findutils/Makefile         |  15 +++-----
 sysutils/findutils/PLIST            |  46 ++++++++++++++++++++++++---
 sysutils/findutils/distinfo         |  23 ++++---------
 sysutils/findutils/patches/patch-aa |  61 +++++++++---------------------------
 sysutils/findutils/patches/patch-ab |  37 ++++++++++-----------
 sysutils/findutils/patches/patch-ac |  13 -------
 sysutils/findutils/patches/patch-ad |  13 -------
 sysutils/findutils/patches/patch-ae |  13 -------
 sysutils/findutils/patches/patch-af |  12 -------
 sysutils/findutils/patches/patch-ag |  29 ++++++-----------
 sysutils/findutils/patches/patch-ah |  13 -------
 sysutils/findutils/patches/patch-ai |  12 -------
 sysutils/findutils/patches/patch-aj |  14 --------
 sysutils/findutils/patches/patch-ak |  14 --------
 sysutils/findutils/patches/patch-am |  13 -------
 15 files changed, 97 insertions(+), 231 deletions(-)

diffs (truncated from 424 to 300 lines):

diff -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/Makefile
--- a/sysutils/findutils/Makefile       Mon Oct 15 22:32:56 2007 +0000
+++ b/sysutils/findutils/Makefile       Tue Oct 16 00:45:52 2007 +0000
@@ -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,14 +9,12 @@
 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}
+INFO_FILES=            YES
+PKG_DESTDIR_SUPPORT=   user-destdir
+USE_PKGLOCALEDIR=      YES
+
 LDFLAGS.IRIX+=         -lgen
 
-INFO_FILES=            # PLIST
-
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
diff -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/PLIST
--- a/sysutils/findutils/PLIST  Mon Oct 15 22:32:56 2007 +0000
+++ b/sysutils/findutils/PLIST  Tue Oct 16 00:45:52 2007 +0000
@@ -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}bigram
 libexec/${GNU_PROGRAM_PREFIX}code
-libexec/${GNU_PROGRAM_PREFIX}bigram
+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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/distinfo
--- a/sysutils/findutils/distinfo       Mon Oct 15 22:32:56 2007 +0000
+++ b/sysutils/findutils/distinfo       Tue Oct 16 00:45:52 2007 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-aa
--- a/sysutils/findutils/patches/patch-aa       Mon Oct 15 22:32:56 2007 +0000
+++ b/sysutils/findutils/patches/patch-aa       Tue Oct 16 00:45:52 2007 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-ab
--- a/sysutils/findutils/patches/patch-ab       Mon Oct 15 22:32:56 2007 +0000
+++ b/sysutils/findutils/patches/patch-ab       Tue Oct 16 00:45:52 2007 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-ac
--- a/sysutils/findutils/patches/patch-ac       Mon Oct 15 22:32:56 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-ad
--- a/sysutils/findutils/patches/patch-ad       Mon Oct 15 22:32:56 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-ae
--- a/sysutils/findutils/patches/patch-ae       Mon Oct 15 22:32:56 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r f73495cd4e39 -r f5d5440e4660 sysutils/findutils/patches/patch-af
--- a/sysutils/findutils/patches/patch-af       Mon Oct 15 22:32:56 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 */



Home | Main Index | Thread Index | Old Index