Changes 2.13:

** Bug fixes
  grep -i, in a multi-byte locale, when matching a line containing a character
  like the UTF-8 Turkish I-with-dot (U+0130) (whose lower-case representation
  occupies fewer bytes), would print an incomplete output line.
  Similarly, with a matched line containing a character (e.g., the Latin
  capital I in a Turkish UTF-8 locale), where the lower-case representation
  occupies more bytes, grep could print garbage.
  [bug introduced in grep-2.6]

  --include and --exclude can again be combined, and again apply to
  the command line, e.g., "grep --include='*.[ch]' --exclude='system.h'
  PATTERN *" again reads all *.c and *.h files except for system.h.
  [bug introduced in grep-2.6]

** New features
  'grep' without -z now treats a sparse file as binary, if it can
  easily determine that the file is sparse.

** Dropped features
  Bootstrapping with Makefile.boot has been broken since grep 2.6,
  and was removed.

4 files changed, 19 insertions, 45 deletions

diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile
index 9e5b802c096..452702cf58a 100644
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2012/06/01 19:47:46 cheusov Exp $
-#
+# $NetBSD: Makefile,v 1.28 2012/08/03 13:07:54 adam Exp $
 
-DISTNAME=	grep-2.5.3
-PKGREVISION=	3
+DISTNAME=	grep-2.13
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=grep/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/grep/grep.html
@@ -14,18 +12,17 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--disable-perl-regexp
-USE_PKGLOCALEDIR=	YES
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		makeinfo msgfmt
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-perl-regexp
+CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ENV+=		MKDIR_P=${INSTALL_DATA_DIR:Q}
 INFO_FILES=		yes
 TEXINFO_REQD=		4.0
-CONFIGURE_ENV+=		MKDIR_P=${INSTALL_DATA_DIR:Q}
 
 INSTALLATION_DIRS=	gnu/bin gnu/man/man1
 
-CONFIGURE_ARGS+=	--program-prefix=g
-
 post-install:
 .for g n in  bin/ggrep gnu/bin/grep   bin/gegrep gnu/bin/egrep \
              bin/gfgrep gnu/bin/fgrep   \
diff --git a/textproc/grep/PLIST b/textproc/grep/PLIST
index fbcbb92a609..fb02ec3e3b4 100644
--- a/textproc/grep/PLIST
+++ b/textproc/grep/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/06/01 19:47:46 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/08/03 13:07:54 adam Exp $
 bin/gegrep
 bin/gfgrep
 bin/ggrep
@@ -35,19 +35,23 @@ 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/ky/LC_MESSAGES/grep.mo
+share/locale/lt/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/pa/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/sk/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/th/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_CN/LC_MESSAGES/grep.mo
 share/locale/zh_TW/LC_MESSAGES/grep.mo
diff --git a/textproc/grep/distinfo b/textproc/grep/distinfo
index d63e8cbe1f7..cbcd7a5ced2 100644
--- a/textproc/grep/distinfo
+++ b/textproc/grep/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2008/03/11 02:18:22 tnn Exp $
+$NetBSD: distinfo,v 1.10 2012/08/03 13:07:54 adam Exp $
 
-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
-SHA1 (patch-aa) = 4b25015c920849a3fd5bd13a544eb87029223d36
+SHA1 (grep-2.13.tar.xz) = 6bc69e3c5613f9d099fbba5308e9f7005ecb112b
+RMD160 (grep-2.13.tar.xz) = cd386db8796c80e64c90afafd94baad40ba9b6e3
+Size (grep-2.13.tar.xz) = 1191516 bytes
diff --git a/textproc/grep/patches/patch-aa b/textproc/grep/patches/patch-aa
deleted file mode 100644
index d062bf33804..00000000000
--- a/textproc/grep/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/03/11 02:18:22 tnn Exp $
-
---- src/search.c.orig	2007-06-28 20:57:19.000000000 +0200
-+++ src/search.c
-@@ -280,18 +280,18 @@ GEAcompile (char const *pattern, size_t 
- #ifndef EGREP_PROGRAM
- COMPILE_FCT(Gcompile)
- {
--  return GEAcompile (pattern, size,
-+  GEAcompile (pattern, size,
- 		     RE_SYNTAX_GREP | RE_HAT_LISTS_NOT_NEWLINE);
- }
- 
- COMPILE_FCT(Acompile)
- {
--  return GEAcompile (pattern, size, RE_SYNTAX_AWK);
-+  GEAcompile (pattern, size, RE_SYNTAX_AWK);
- }
- 
- COMPILE_FCT(Ecompile)
- {
--  return GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP);
-+  GEAcompile (pattern, size, RE_SYNTAX_POSIX_EGREP);
- }
- #endif /* !EGREP_PROGRAM */
-