summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/gsed/Makefile5
-rw-r--r--textproc/gsed/distinfo4
-rw-r--r--textproc/gsed/patches/patch-ac25
-rw-r--r--textproc/gsed/patches/patch-ad10
4 files changed, 41 insertions, 3 deletions
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 74044e6d195..c6fc6a55306 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/08/09 11:27:47 seb Exp $
+# $NetBSD: Makefile,v 1.14 2003/10/07 23:27:06 heinz Exp $
#
DISTNAME= sed-4.0.7
@@ -14,8 +14,9 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
-INFO_FILES= sed.info
+INFO_FILES= sed.info
+TEST_TARGET= check
.include "../../mk/bsd.prefs.mk"
.if defined(GNU_PROGRAM_PREFIX)
diff --git a/textproc/gsed/distinfo b/textproc/gsed/distinfo
index afdd57bd06d..9571944d6ee 100644
--- a/textproc/gsed/distinfo
+++ b/textproc/gsed/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/06/14 00:04:55 grant Exp $
+$NetBSD: distinfo,v 1.4 2003/10/07 23:27:19 heinz Exp $
SHA1 (sed-4.0.7.tar.gz) = 8b5c421b1496b01d97e43551fc961590cfe55aa6
Size (sed-4.0.7.tar.gz) = 693903 bytes
SHA1 (patch-aa) = 781e0da47d5107eb8c24072e1ffefe258fa1fd49
SHA1 (patch-ab) = f6444085f93339afa41ab7a5cc6e8f6a6fd05f40
+SHA1 (patch-ac) = c94eb0b500e2c50af14ed443a14991cc4097dd54
+SHA1 (patch-ad) = 4acbb42d539f13cd0b5f0d3f2f01a81d785bb895
diff --git a/textproc/gsed/patches/patch-ac b/textproc/gsed/patches/patch-ac
new file mode 100644
index 00000000000..cea4da10ea6
--- /dev/null
+++ b/textproc/gsed/patches/patch-ac
@@ -0,0 +1,25 @@
+$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
new file mode 100644
index 00000000000..98ea476e2f4
--- /dev/null
+++ b/textproc/gsed/patches/patch-ad
@@ -0,0 +1,10 @@
+$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"