Update to 2.01.

Add compression/uncompression definitions for .Z/.gz/.bz2.

4 files changed, 11 insertions, 197 deletions

diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 02435ffde518..aa423f71b97c 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	fd
-PORTVERSION=	2.00b
-PORTREVISION=	1
+PORTVERSION=	2.01
 CATEGORIES=	shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.vector.co.jp/pack/unix/util/file/filer/fd/
diff --git a/shells/fd/distinfo b/shells/fd/distinfo
index 32c682ea4f03..f82eeaf0a2e5 100644
--- a/shells/fd/distinfo
+++ b/shells/fd/distinfo
@@ -1 +1 @@
-MD5 (FD-2.00b.tar.gz) = a0b3da09515bcd904968249e2c74722f
+MD5 (FD-2.01.tar.gz) = 5385bfdaa777ee5d33f60dedc788ee6f
diff --git a/shells/fd/files/patch-_fdrc b/shells/fd/files/patch-_fdrc
index 7a4f731552d2..f2087a44c963 100644
--- a/shells/fd/files/patch-_fdrc
+++ b/shells/fd/files/patch-_fdrc
@@ -1,5 +1,5 @@
---- _fdrc.orig	Wed Mar 27 00:00:00 2002
-+++ _fdrc	Thu Apr 11 22:06:39 2002
+--- _fdrc.orig	Wed May  8 00:00:00 2002
++++ _fdrc	Thu May 16 03:14:24 2002
 @@ -13,2 +13,3 @@
  #SORTTYPE=0
 +FD_SORTTYPE=101
@@ -13,8 +13,8 @@
 +FD_ADJTTY=1
  
 @@ -62,2 +65,3 @@
- #COLUMNS=2
-+FD_COLUMNS=1
+ #DEFCOLUMNS=2
++FD_DEFCOLUMNS=1
  
 @@ -104,2 +108,3 @@
  #ANSICOLOR=0
@@ -71,7 +71,7 @@
 +arch	".aa"	"echo ERROR"			"cat %X.?? | $tar zxf - %TA"
 +
  #(Default)
-@@ -325,2 +372,33 @@
+@@ -325,2 +372,37 @@
  # archiver definition
 +
 +arch	".tar"	"$tar cf %C %T"			"$tar xf %C %TA"
@@ -88,6 +88,10 @@
 +  arch	"$ext"	"$tar cf - %T | bzip2 -9c > %C"	"$tar jxf %C %TA"
 +done
 +
++arch	".Z"	"compress %M"			"uncompress %C"
++arch	".gz"	"gzip -9 %M"			"gzip -d %C"
++arch	".bz2"	"bzip2 -9 %M"			"bzip2 -d %C"
++
 +arch	"/.lzh"	"lha aq %C %TA"			"lha xq %C %TA"
 +
 +for ext in /.zip /.jar; do
diff --git a/shells/fd/files/patch-input.c b/shells/fd/files/patch-input.c
deleted file mode 100644
index b96651d9f2d9..000000000000
--- a/shells/fd/files/patch-input.c
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -u ../old/FD-2.00b/input.c ./input.c
---- ../old/FD-2.00b/input.c	Wed Mar 27 00:00:00 2002
-+++ ./input.c	Fri Apr 12 12:01:19 2002
-@@ -1047,8 +1047,11 @@
- char *s;
- int cx, len, plen, max, linemax, comline, cont;
- {
-+# if	!MSDOS || !defined (_NOORIGSHELL)
-+	int bq;
-+# endif
- 	char *cp1, *cp2, **argv;
--	int i, l, ins, top, fix, argc, quote, quoted;
-+	int i, l, ins, top, fix, argc, quote, quoted, hasmeta;
- 
- 	if (selectlist && cont > 0) {
- 		selectfile(tmpfilepos++, NULL);
-@@ -1056,17 +1059,26 @@
- 		return(0);
- 	}
- 
--	for (i = top = 0, quote = '\0'; i < cx; i++) {
--		if (s[i] == quote) quote = '\0';
-+# if	!MSDOS || !defined (_NOORIGSHELL)
-+	bq = 0;
-+# endif
-+	quote = '\0';
-+	quoted = 0;
-+	for (i = top = 0; i < cx; i++) {
-+		if (s[i] == quote) {
-+			if (quote == '"') quoted = i;
-+# if	!MSDOS || !defined (_NOORIGSHELL)
-+			if (quote == '\'') quoted = i;
-+# endif
-+			quote = '\0';
-+		}
- 		else if (iskanji1(s, i)) i++;
- 		else if (quote);
--# if	MSDOS && defined (_NOORIGSHELL)
- 		else if (s[i] == '"') quote = s[i];
--# else
--		else if (s[i] == '"' || s[i] == '\'') quote = s[i];
-+# if	!MSDOS || !defined (_NOORIGSHELL)
-+		else if (s[i] == '\'') quote = s[i];
- 		else if (s[i] == '`') {
--			top = i + 1;
--			quote = s[i];
-+			if ((bq = 1 - bq)) top = i + 1;
- 		}
- # endif
- 		else if (s[i] == '=' || strchr(CMDLINE_DELIM, s[i]))
-@@ -1076,13 +1088,6 @@
- 		putterm(t_bell);
- 		return(0);
- 	}
--# if	MSDOS && defined (_NOORIGSHELL)
--	quoted = (!quote && cx > 0 && s[cx - 1] == '"')
--# else
--	if (quote == '`') quote = '\0';
--	quoted = (!quote && cx > 0 && s[cx - 1] == '"' || s[cx - 1] == '\'')
--# endif
--		? s[cx - 1] : '\0';
- 	if (comline && top > 0) {
- 		for (i = top - 1; i >= 0; i--)
- 			if (s[i] != ' ' && s[i] != '\t') break;
-@@ -1092,6 +1097,14 @@
- 	cp1 = malloc2(cx - top + 1);
- 	strncpy2(cp1, s + top, cx - top);
- 	cp1 = evalpath(cp1, 1);
-+	hasmeta = 0;
-+	for (i = 0; cp1[i]; i++) {
-+		if (strchr(METACHAR, cp1[i])) {
-+			hasmeta = 1;
-+			break;
-+		}
-+		if (iskanji1(cp1, i)) i++;
-+	}
- 
- 	if (selectlist && cont < 0) {
- 		argv = (char **)malloc2(1 * sizeof(char *));
-@@ -1128,13 +1141,11 @@
- 	}
- 
- 	cp1 = findcommon(argc, argv);
--	fix = 0;
--	if (argc == 1 && cp1) {
--		if (isdelim(cp1, (int)strlen(cp1) - 1)) fix--;
--		else fix++;
--	}
-+	fix = '\0';
-+	if (argc == 1 && cp1)
-+		fix = ((cp2 = strrdelim(cp1, 0)) && !*(cp2 + 1)) ? _SC_ : ' ';
- 
--	if (!cp1 || ((ins = (int)strlen(cp1) - ins) <= 0 && fix <= 0)) {
-+	if (!cp1 || ((ins = (int)strlen(cp1) - ins) <= 0 && fix != ' ')) {
- 		if (cont <= 0) {
- 			putterm(t_bell);
- 			l = 0;
-@@ -1157,12 +1168,25 @@
- 	free(argv);
- 
- 	l = 0;
--	if (!quote && !quoted && len < max) {
--		for (i = 0; cp1[i]; i++) {
--			if (strchr(METACHAR, cp1[i])) break;
--			if (iskanji1(cp1, i)) i++;
-+	if (!hasmeta) for (i = 0; cp1[i]; i++) {
-+		if (strchr(METACHAR, cp1[i])) {
-+			hasmeta = 1;
-+			break;
-+		}
-+		if (iskanji1(cp1, i)) i++;
-+	}
-+
-+	if (hasmeta) {
-+		if (quote);
-+		else if (quoted) {
-+			quote = s[quoted];
-+			setcursor(vlen(s, quoted), plen, max, linemax);
-+			deletechar(s, quoted, len, plen, max, linemax, 1);
-+			delshift(s, quoted, len--, 1);
-+			l--;
-+			setcursor(vlen(s, --cx), plen, max, linemax);
- 		}
--		if (cp1[i]) {
-+		else if (len < max) {
- 			setcursor(vlen(s, top), plen, max, linemax);
- 			insertchar(s, top, len, plen, max, linemax, 1);
- 			insshift(s, top, len++, 1);
-@@ -1171,43 +1195,30 @@
- 			putch2(quote);
- 			setcursor(vlen(s, ++cx), plen, max, linemax);
- 		}
-+		else hasmeta = 0;
- 	}
- 
- 	cp2 = cp1 + (int)strlen(cp1) - ins;
--	if (quote && fix < 0 && len + 1 < max) {
--		i = insertstr(s, cx, len, plen,
--			max, linemax, cp2, ins - 1, quote);
--		l += i;
-+	if (fix == _SC_) {
-+		ins--;
-+		if (!hasmeta) quote = '\0';
-+	}
-+	i = insertstr(s, cx, len, plen, max, linemax, cp2, ins, quote);
-+	l += i;
-+	if (fix && (len += i) < max) {
- 		cx += i;
--		insertchar(s, cx, len, plen, max, linemax, 1);
--		insshift(s, cx, len++, 1);
--		l++;
--		s[cx++] = quote;
--		putcursor(quote, 1);
--		insertchar(s, cx, len, plen, max, linemax, 1);
--		insshift(s, cx, len, 1);
--		l++;
--		s[cx] = _SC_;
--		putcursor(_SC_, 1);
--	}
--	else {
--		i = insertstr(s, cx, len, plen, max, linemax, cp2, ins, quote);
--		l += i;
--		if (fix > 0 && (len += i) < max) {
--			cx += i;
--			if (quote && len + 1 < max) {
--				insertchar(s, cx, len, plen, max, linemax, 1);
--				insshift(s, cx, len++, 1);
--				l++;
--				s[cx++] = quote;
--				putcursor(quote, 1);
--			}
-+		if (quote && len + 1 < max) {
- 			insertchar(s, cx, len, plen, max, linemax, 1);
--			insshift(s, cx, len, 1);
-+			insshift(s, cx, len++, 1);
- 			l++;
--			s[cx] = ' ';
--			putcursor(' ', 1);
-+			s[cx++] = quote;
-+			putcursor(quote, 1);
- 		}
-+		insertchar(s, cx, len, plen, max, linemax, 1);
-+		insshift(s, cx, len, 1);
-+		l++;
-+		s[cx] = fix;
-+		putcursor(fix, 1);
- 	}
- 
- 	free(cp1);