Update to version 4.1.

Package changes:

* remove inclusion of converters/libiconv/buildlink3.mk,
devel/gettext-lib/builtin.mk will take care of that if needed.

Changes since last packaged version (4.0.9):

* // matches the last regular expression even in POSIXLY_CORRECT mode.

* change the way we treat lines which are not terminated by a newline.
Such lines are printed without the terminating newline (as before)
but as soon as more text is sent to the same output stream, the
missing newline is printed, so that the two lines don't concatenate.
The behavior is now independent from POSIXLY_CORRECT because POSIX
actually has undefined behavior in this case, and the new implementation
arguably gives the ``least expected surprise''.  Thanks to Stepan
Kasal for the implementation.

* documentation improvements, with updated references to the POSIX.2
specification

* error messages on I/O errors are better, and -i does not leave temporary
files around (e.g. when running ``sed -i'' on a directory).

* escapes are accepted in the y command (for example: y/o/\n/ transforms
o's into newlines)

* -i option tries to set the owner and group to the same as the input file

* `L' command is deprecated and will be removed in sed 4.2.

* line number addresses are processed differently -- this is supposedly
conformant to POSIX and surely more idiot-proof.  Line number addresses
are not affected by jumping around them: they are activated and
deactivated exactly where the script says, while previously
    5,8b
    1,5d
would actually delete lines 1,2,3,4 and 9 (!).

* multibyte characters are taken in consideration to compute the
operands of s and y, provided you set LC_CTYPE correctly.  They are
also considered by \l, \L, \u, \U, \E.

* [\n] matches either backslash or 'n' when POSIXLY_CORRECT.

* new option --posix, disables all GNU extensions.  POSIXLY_CORRECT only
disables GNU extensions that violate the POSIX standard.

* options -h and -V are not supported anymore, use --help and --version.

* removed documentation for \s and \S which worked incorrectly

* restored correct behavior for \w and \W: match [[:alnum:]_] and
[^[:alnum:]_] (they used to match [[:alpha:]_] and [^[:alpha:]_]

* the special address 0 can only be used in 0,/RE/ or 0~STEP addresses;
other cases give an error (you are hindering portability for no reason
if specifying 0,N and you are giving a dead command if specifying 0
alone).

* when a \ is used to escape the character that would terminate an operand
of the s or y commands, the backslash is removed before the regex is
compiled.  This is left undefined by POSIX; this behavior makes `s+x\+++g'
remove occurrences of `x+', consistently with `s/x\///g'.  (However, if
you enjoy yourself trying `s*x\***g', sed will use the `x*' regex, and you
won't be able to pass down `x\*' while using * as the delimiter; ideas on
how to simplify the parser in this respect, and/or gain more coherent
semantics, are welcome).

5 files changed, 7 insertions, 46 deletions

diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index d78d76b72ea..ee44c71c914 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2004/05/08 15:09:14 uebayasi Exp $
+# $NetBSD: Makefile,v 1.19 2004/06/25 15:17:55 seb Exp $
 #
 
-DISTNAME=	sed-4.0.9
+DISTNAME=	sed-4.1
 PKGNAME=	g${DISTNAME}
 CATEGORIES=	textproc editors
 MASTER_SITES=	${MASTER_SITE_GNU:=sed/}
@@ -27,8 +27,5 @@ CONFIGURE_ARGS+=        --program-prefix=${GNU_PROGRAM_PREFIX}
 PLIST_SUBST+=           GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
 BUILD_DEFS+=            GNU_PROGRAM_PREFIX
 
-CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
-
-.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gsed/PLIST b/textproc/gsed/PLIST
index 473fd9ca45e..3dfcbc93bd7 100644
--- a/textproc/gsed/PLIST
+++ b/textproc/gsed/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2004/03/10 01:56:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/06/25 15:17:55 seb Exp $
 bin/${GNU_PROGRAM_PREFIX}sed
 man/man1/${GNU_PROGRAM_PREFIX}sed.1
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/sed.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/sed.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/sed.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/sed.mo
diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo
index 4d3426b09f5..cfef4b5d81f 100644
--- a/textproc/gsed/distinfo
+++ b/textproc/gsed/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/02/10 08:54:14 grant Exp $
+$NetBSD: distinfo,v 1.8 2004/06/25 15:17:55 seb Exp $
 
-SHA1 (sed-4.0.9.tar.gz) = b11241648a58662d2976fd8384f74be1821fea65
-Size (sed-4.0.9.tar.gz) = 769849 bytes
+SHA1 (sed-4.1.tar.gz) = b5f1f9686dc7e9042d6c77dce45a5cad2cb8f11d
+Size (sed-4.1.tar.gz) = 773204 bytes
 SHA1 (patch-aa) = 781e0da47d5107eb8c24072e1ffefe258fa1fd49
-SHA1 (patch-ac) = c94eb0b500e2c50af14ed443a14991cc4097dd54
-SHA1 (patch-ad) = 4acbb42d539f13cd0b5f0d3f2f01a81d785bb895
 SHA1 (patch-ae) = ac64d18f3aa44777aba71a76a768aa3b8f72f9ff
diff --git a/textproc/gsed/patches/patch-ac b/textproc/gsed/patches/patch-ac
deleted file mode 100644
index cea4da10ea6..00000000000
--- a/textproc/gsed/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/10/07 23:27:06 heinz Exp $
-
---- testsuite/Makefile.tests.orig	2003-03-25 18:02:01.000000000 +0100
-+++ testsuite/Makefile.tests
-@@ -37,9 +37,9 @@ subwrite::
- 	@$(RM) $@.1out $@.wout
- 
- spencer::
--	sh $(srcdir)/$@.sh '$(SED)' < $(srcdir)/$@.inp \
-+	sh -c 'sh $(srcdir)/$@.sh "$(SED)" < $(srcdir)/$@.inp \
- 		| $(TIME) sh | grep failed; \
--	test $$? = 1
-+	test $$? = 1'
- 
- writeout::
- 	$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp >$@.1out 
-@@ -56,7 +56,7 @@ readin:: readin.in2
- 	@$(RM) $@.out 
- 
- eval.in2: $(srcdir)/eval.inp
--	cat $< > $@
-+	cat $? > $@
- 
- eval:: eval.in2
- 	$(TIME) $(SED) -f $(srcdir)/$@.sed < $(srcdir)/$@.inp > $@.out 
diff --git a/textproc/gsed/patches/patch-ad b/textproc/gsed/patches/patch-ad
deleted file mode 100644
index 98ea476e2f4..00000000000
--- a/textproc/gsed/patches/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/10/07 23:27:06 heinz Exp $
-
---- testsuite/spencer.sh.orig	2001-12-16 13:29:55.000000000 +0100
-+++ testsuite/spencer.sh
-@@ -44,4 +44,4 @@ sed2='
- 
- # We use standard sed for this because the test suite is not this
- # file, but spencer.inp!
--sed "$sed1" - | sed "$sed2"
-+sed "$sed1" | sed "$sed2"