summaryrefslogtreecommitdiff
path: root/shells/bash2
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2005-05-05 14:42:55 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2005-05-05 14:42:55 +0000
commit7082598552af5d57e406f83c8b33646d6c03825c (patch)
treec67d300b497c8033b3a67d6d547443e7ded36bb7 /shells/bash2
parent- Update to 0.6.5 (diff)
Fix this patch file.
PR: 69873 Submitted by: Dave Evans <root@hclb.demon.co.uk>
Notes
Notes: svn path=/head/; revision=134658
Diffstat (limited to 'shells/bash2')
-rw-r--r--shells/bash2/Makefile2
-rw-r--r--shells/bash2/files/patch-redir.c31
2 files changed, 12 insertions, 21 deletions
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 99ffea9dd5f8..ca18f044f30b 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bash
PORTVERSION= 2.05b.007
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/bash2/files/patch-redir.c b/shells/bash2/files/patch-redir.c
index ea8c49cb57a0..259e4b1d87bc 100644
--- a/shells/bash2/files/patch-redir.c
+++ b/shells/bash2/files/patch-redir.c
@@ -1,20 +1,11 @@
-Index: files/patch-redir.c
-===================================================================
-RCS file: files/patch-redir.c
-diff -N files/patch-redir.c
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ files/patch-redir.c 20 Jun 2004 15:40:43 -0000
-@@ -0,0 +1,11 @@
-+--- redir.c.orig Sun Jun 20 18:00:47 2004
-++++ redir.c Sun Jun 20 18:01:25 2004
-+@@ -263,7 +263,7 @@
-+ int herelen, n, e;
-+
-+ herestr = expand_string_to_string (redirectee->word, 0);
-+- herelen = strlen (herestr);
-++ herelen = (herestr == NULL) ? 0 : strlen (herestr);
-+
-+ n = write (fd, herestr, herelen);
-+ if (n == herelen)
-
-
+--- redir.c.orig Tue Mar 12 12:27:38 2002
++++ redir.c Thu May 5 07:41:18 2005
+@@ -263,7 +263,7 @@ write_here_string (fd, redirectee)
+ int herelen, n, e;
+
+ herestr = expand_string_to_string (redirectee->word, 0);
+- herelen = strlen (herestr);
++ herelen = (herestr == NULL) ? 0 : strlen (herestr);
+
+ n = write (fd, herestr, herelen);
+ if (n == herelen)