Update to 4.1.5:

Sed 4.1.5

* fix parsing of a negative character class not including a closed bracket,
  like [^]] or [^]a-z].

* fix parsing of [ inside an y command, like y/[/A/.

* output the result of commands a, r, R when a q command is found.

----------------------------------------------------------------------------
Sed 4.1.4

* \B correctly means "not on a word boundary" rather than "inside a word"

* bugfixes for platform without internationalization

* more thorough testing framework for tarballs (`make full-distcheck')

----------------------------------------------------------------------------
Sed 4.1.3

* regex addresses do not use leftmost-longest matching.  In other words,
  /.\+/ only looks for a single character, and does not try to find as
  many of them as possible like it used to do.

* added a note to BUGS and the manual about changed interpretation
  of `s|abc\|def||', and about localization issues.

* fixed --disable-nls build problems on Solaris.

* fixed `make check' in non-English locales.

* `make check' tests the regex library by default if the included regex
  is used (regex tests had to be enabled separately up to now).

----------------------------------------------------------------------------
Sed 4.1.2

* fix bug in 'y' command in multi-byte character sets

* fix severe bug in parsing of ranges with an embedded open bracket

* fix off-by-one error when printing a "bad command" error

6 files changed, 27 insertions, 43 deletions

diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 42235f1de5f..bb6bb8e58d3 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2007/02/22 19:27:13 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/03/08 18:53:56 wiz Exp $
 #
 
-DISTNAME=	sed-4.1.1
+DISTNAME=	sed-4.1.5
 PKGNAME=	g${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	textproc editors
 MASTER_SITES=	${MASTER_SITE_GNU:=sed/}
 
@@ -15,14 +14,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
-CONFIG_STATUS_OVERRIDE=	# empty
+INFO_FILES=		YES
+TEST_TARGET=		check
 
 # at least Solaris-2.9 has issues with grep/egrep
 USE_TOOLS+=		grep makeinfo
 
-INFO_FILES=		# PLIST
-
-TEST_TARGET=		check
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GNU_PROGRAM_PREFIX)
diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo
index 36a93f3c48e..aa13a44b97f 100644
--- a/textproc/gsed/distinfo
+++ b/textproc/gsed/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2006/04/07 16:59:00 jlam Exp $
+$NetBSD: distinfo,v 1.12 2007/03/08 18:53:57 wiz Exp $
 
-SHA1 (sed-4.1.1.tar.gz) = db8ad840cac711b35bd54e88fa6698f202799473
-RMD160 (sed-4.1.1.tar.gz) = fefb7848fa9b7cbca921c7efd9dee3f87779161d
-Size (sed-4.1.1.tar.gz) = 771356 bytes
-SHA1 (patch-aa) = 781e0da47d5107eb8c24072e1ffefe258fa1fd49
-SHA1 (patch-ac) = 409d2d80289d7de2105164c1a22d2153abdffd80
-SHA1 (patch-ad) = f3d70da3213442926f9bf88121e618ebed59c6dd
+SHA1 (sed-4.1.5.tar.gz) = 8e575e8a44568392d5b6e089eab5da5cdbd45885
+RMD160 (sed-4.1.5.tar.gz) = 49b12e99a55c6d2e78ad236f0205e63e46444173
+Size (sed-4.1.5.tar.gz) = 799584 bytes
+SHA1 (patch-ad) = e2b22a19f65d2fc3cb676c787479b15db131f896
+SHA1 (patch-ae) = 2091cccb70a8017d8e6fd356874681b51f366890
diff --git a/textproc/gsed/patches/patch-aa b/textproc/gsed/patches/patch-aa
deleted file mode 100644
index 034dfac2e73..00000000000
--- a/textproc/gsed/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/06/14 00:04:56 grant Exp $
-
---- configure.orig	Fri Apr 11 16:21:09 2003
-+++ configure
-@@ -5257,7 +5257,7 @@ else
- fi
- 
- 
--: ${TEXI2HTML=texi2html -monolithic}
-+TEXI2HTML="texi2html -monolithic"
- 
- 
- echo "$as_me:$LINENO: checking how to build HTML documentation" >&5
diff --git a/textproc/gsed/patches/patch-ac b/textproc/gsed/patches/patch-ac
deleted file mode 100644
index 3b4697f04de..00000000000
--- a/textproc/gsed/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2004/07/07 11:33:10 seb Exp $
-
---- intl/Makefile.in.orig	2004-01-07 13:57:35.000000000 +0000
-+++ intl/Makefile.in
-@@ -37,6 +37,7 @@ gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
- 
-+install_sh = @install_sh@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- mkinstalldirs = $(mkdir_p)
diff --git a/textproc/gsed/patches/patch-ad b/textproc/gsed/patches/patch-ad
index b668e2c672e..3b6f279f8d5 100644
--- a/textproc/gsed/patches/patch-ad
+++ b/textproc/gsed/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2004/07/07 11:33:10 seb Exp $
+$NetBSD: patch-ad,v 1.4 2007/03/08 18:53:57 wiz Exp $
 
---- po/Makefile.in.in.orig	2004-06-29 18:11:31.000000000 +0000
+--- po/Makefile.in.in.orig	2004-11-09 18:04:18.000000000 +0000
 +++ po/Makefile.in.in
-@@ -26,6 +26,7 @@ datadir = @datadir@
+@@ -24,6 +24,7 @@ datadir = @datadir@
  localedir = $(datadir)/locale
  gettextsrcdir = $(datadir)/gettext/po
  
 +install_sh = @install_sh@
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
- mkinstalldirs = $(mkdir_p)
+ MKINSTALLDIRS = @MKINSTALLDIRS@
diff --git a/textproc/gsed/patches/patch-ae b/textproc/gsed/patches/patch-ae
new file mode 100644
index 00000000000..c3a1c07785f
--- /dev/null
+++ b/textproc/gsed/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2007/03/08 18:53:58 wiz Exp $
+
+--- lib/regex_internal.h.orig	2005-12-06 08:50:56.000000000 +0000
++++ lib/regex_internal.h
+@@ -410,7 +410,7 @@ static unsigned int re_string_context_at
+ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+ #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+ 
+-#include <alloca.h>
++#include <stdlib.h>
+ 
+ #ifndef _LIBC
+ # if HAVE_ALLOCA