pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/textproc/grep Update to grep-2.5.3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6be513a64b5c
branches:  trunk
changeset: 539565:6be513a64b5c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 08 12:16:43 2008 +0000

description:
Update to grep-2.5.3.
Main changes are move to GPLv3 and several updated translations.
Also some bugfixes (at least the ones we had patched in pkgsrc).
Sorry, not more specific because NEWS isn't properly maintained.

diffstat:

 textproc/grep/Makefile         |  14 +++++++-------
 textproc/grep/PLIST            |  27 +++++++++++++++++++++++----
 textproc/grep/distinfo         |  11 ++++-------
 textproc/grep/patches/patch-aa |  19 -------------------
 textproc/grep/patches/patch-ab |  33 ---------------------------------
 textproc/grep/patches/patch-ac |  13 -------------
 6 files changed, 34 insertions(+), 83 deletions(-)

diffs (182 lines):

diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/Makefile
--- a/textproc/grep/Makefile    Sat Mar 08 11:15:03 2008 +0000
+++ b/textproc/grep/Makefile    Sat Mar 08 12:16:43 2008 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2006/04/13 18:23:38 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/08 12:16:43 tnn Exp $
 #
 
-DISTNAME=      grep-2.5.1
-PKGREVISION=   4
+DISTNAME=      grep-2.5.3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,14 +10,15 @@
 HOMEPAGE=      http://www.gnu.org/software/grep/grep.html
 COMMENT=       GNU grep
 
-USE_PKGLOCALEDIR=      YES
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         YES
-
 CONFIGURE_ARGS+=       --disable-perl-regexp
-
+USE_PKGLOCALEDIR=      YES
 USE_TOOLS+=            makeinfo msgfmt
+INFO_FILES=            # PLIST
 TEXINFO_REQD=          4.0
-INFO_FILES=            # PLIST
+CONFIGURE_ENV+=                MKDIR_P=${INSTALL_DATA_DIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/PLIST
--- a/textproc/grep/PLIST       Sat Mar 08 11:15:03 2008 +0000
+++ b/textproc/grep/PLIST       Sat Mar 08 12:16:43 2008 +0000
@@ -1,28 +1,47 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:35 jlam Exp $
-bin/${GNU_PROGRAM_PREFIX}grep
+@comment $NetBSD: PLIST,v 1.7 2008/03/08 12:16:43 tnn Exp $
 bin/${GNU_PROGRAM_PREFIX}egrep
 bin/${GNU_PROGRAM_PREFIX}fgrep
+bin/${GNU_PROGRAM_PREFIX}grep
 info/grep.info
-man/man1/${GNU_PROGRAM_PREFIX}grep.1
+man/man1/${GNU_PROGRAM_PREFIX}egrep.1
 man/man1/${GNU_PROGRAM_PREFIX}fgrep.1
-man/man1/${GNU_PROGRAM_PREFIX}egrep.1
+man/man1/${GNU_PROGRAM_PREFIX}grep.1
+share/locale/af/LC_MESSAGES/grep.mo
+share/locale/be/LC_MESSAGES/grep.mo
+share/locale/bg/LC_MESSAGES/grep.mo
+share/locale/ca/LC_MESSAGES/grep.mo
 share/locale/cs/LC_MESSAGES/grep.mo
+share/locale/da/LC_MESSAGES/grep.mo
 share/locale/de/LC_MESSAGES/grep.mo
 share/locale/el/LC_MESSAGES/grep.mo
 share/locale/eo/LC_MESSAGES/grep.mo
 share/locale/es/LC_MESSAGES/grep.mo
 share/locale/et/LC_MESSAGES/grep.mo
+share/locale/eu/LC_MESSAGES/grep.mo
+share/locale/fi/LC_MESSAGES/grep.mo
 share/locale/fr/LC_MESSAGES/grep.mo
+share/locale/ga/LC_MESSAGES/grep.mo
 share/locale/gl/LC_MESSAGES/grep.mo
+share/locale/he/LC_MESSAGES/grep.mo
 share/locale/hr/LC_MESSAGES/grep.mo
+share/locale/hu/LC_MESSAGES/grep.mo
 share/locale/id/LC_MESSAGES/grep.mo
 share/locale/it/LC_MESSAGES/grep.mo
 share/locale/ja/LC_MESSAGES/grep.mo
 share/locale/ko/LC_MESSAGES/grep.mo
+share/locale/nb/LC_MESSAGES/grep.mo
 share/locale/nl/LC_MESSAGES/grep.mo
 share/locale/no/LC_MESSAGES/grep.mo
 share/locale/pl/LC_MESSAGES/grep.mo
+share/locale/pt/LC_MESSAGES/grep.mo
 share/locale/pt_BR/LC_MESSAGES/grep.mo
+share/locale/ro/LC_MESSAGES/grep.mo
 share/locale/ru/LC_MESSAGES/grep.mo
+share/locale/rw/LC_MESSAGES/grep.mo
 share/locale/sl/LC_MESSAGES/grep.mo
+share/locale/sr/LC_MESSAGES/grep.mo
 share/locale/sv/LC_MESSAGES/grep.mo
+share/locale/tr/LC_MESSAGES/grep.mo
+share/locale/uk/LC_MESSAGES/grep.mo
+share/locale/vi/LC_MESSAGES/grep.mo
+share/locale/zh_TW/LC_MESSAGES/grep.mo
diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/distinfo
--- a/textproc/grep/distinfo    Sat Mar 08 11:15:03 2008 +0000
+++ b/textproc/grep/distinfo    Sat Mar 08 12:16:43 2008 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 14:48:42 agc Exp $
+$NetBSD: distinfo,v 1.8 2008/03/08 12:16:43 tnn Exp $
 
-SHA1 (grep-2.5.1.tar.bz2) = 551db1f0014e44d428e1c3482ac9418ff5d15950
-RMD160 (grep-2.5.1.tar.bz2) = 2386d0678c429d5006618277a663ffe976704aa9
-Size (grep-2.5.1.tar.bz2) = 559232 bytes
-SHA1 (patch-aa) = f08f91903053a32c497c1a8a453116bfa9029ed6
-SHA1 (patch-ab) = 2e92dab9e1a66ad5bc10f08faf68a0926fea6a87
-SHA1 (patch-ac) = f0e672a0f29bc9a41e9918114e527f0ce1947f51
+SHA1 (grep-2.5.3.tar.bz2) = 53227ca9a01d5548448372f9b2e9111adf159f3b
+RMD160 (grep-2.5.3.tar.bz2) = dafa692fd67dfcd1c94115e9831d291b29fa7729
+Size (grep-2.5.3.tar.bz2) = 618184 bytes
diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/patches/patch-aa
--- a/textproc/grep/patches/patch-aa    Sat Mar 08 11:15:03 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/09/18 19:13:54 wiz Exp $
-
---- src/Makefile.in.orig       2002-03-26 17:09:36.000000000 +0100
-+++ src/Makefile.in
-@@ -379,12 +379,12 @@ uninstall-am: uninstall-binPROGRAMS unin
- 
- egrep:
-       echo '#!/bin/sh' >$@
--      echo 'exec grep -E $${1+"$$@"}' >>$@
-+      echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -E $${1+"$$@"}' >>$@
-       chmod a+x $@
- 
- fgrep:
-       echo '#!/bin/sh' >$@
--      echo 'exec grep -F $${1+"$$@"}' >>$@
-+      echo 'exec $(bindir)/'`echo grep|sed '$(transform)'`' -F $${1+"$$@"}' >>$@
-       chmod a+x $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/patches/patch-ab
--- a/textproc/grep/patches/patch-ab    Sat Mar 08 11:15:03 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/07/06 20:36:58 bouyer Exp $
-
---- src/dfa.c.orig     2001-09-26 18:57:55.000000000 +0200
-+++ src/dfa.c  2004-07-06 22:33:02.000000000 +0200
-@@ -44,7 +44,7 @@
- # include <locale.h>
- #endif
- 
--#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
-+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && defined HAVE_WCTYPE
- /* We can handle multibyte string.  */
- # define MBS_SUPPORT
- #endif
-@@ -1052,12 +1052,17 @@
-                         setbit_case_fold (c, ccl);
-                     } else {
-                       /* POSIX locales are painful - leave the decision to libc */
--                      char expr[6] = { '[', c, '-', c2, ']', '\0' };
-+                      char expr[6] = { '[', '\0', '-', '\0', ']', '\0' };
-                       regex_t re;
-+
-+                      expr[1] = c;
-+                      expr[3] = c2;
-                       if (regcomp (&re, expr, case_fold ? REG_ICASE : 0) == REG_NOERROR) {
-                         for (c = 0; c < NOTCHAR; ++c) {
--                          char buf[2] = { c, '\0' };
-+                          char buf[2] = { '\0', '\0' };
-                           regmatch_t mat;
-+
-+                          buf[0] = c;
-                           if (regexec (&re, buf, 1, &mat, 0) == REG_NOERROR
-                                && mat.rm_so == 0 && mat.rm_eo == 1)
-                               setbit_case_fold (c, ccl);
diff -r 34d5a3a6fc75 -r 6be513a64b5c textproc/grep/patches/patch-ac
--- a/textproc/grep/patches/patch-ac    Sat Mar 08 11:15:03 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/12/25 19:50:36 wiz Exp $
-
---- src/search.c.orig  Thu Apr 19 05:42:14 2001
-+++ src/search.c
-@@ -22,7 +22,7 @@
- # include <config.h>
- #endif
- #include <sys/types.h>
--#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
-+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && defined HAVE_WCTYPE
- /* We can handle multibyte string.  */
- # define MBS_SUPPORT
- # include <wchar.h>



Home | Main Index | Thread Index | Old Index