diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1998-10-21 19:16:55 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1998-10-21 19:16:55 +0000 |
| commit | f247a0fb25e3eda2403a770ed7ba69334fd58252 (patch) | |
| tree | 45d7481bb67e6edde50e5b976c2a834d8c58564e /shells | |
| parent | enable gawk (diff) | |
upgrade to 6.08.00
Notes
Notes:
svn path=/head/; revision=14150
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/tcsh/Makefile | 8 | ||||
| -rw-r--r-- | shells/tcsh/distinfo | 2 | ||||
| -rw-r--r-- | shells/tcsh/files/patch-ad | 83 |
3 files changed, 5 insertions, 88 deletions
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile index 265bc425eca0..1de41d3b11cd 100644 --- a/shells/tcsh/Makefile +++ b/shells/tcsh/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: tcsh -# Version required: 6.07.02 +# Version required: 6.08 # Date created: 22 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.20 1998/07/04 03:09:24 steve Exp $ +# $Id: Makefile,v 1.21 1998/08/27 02:34:07 max Exp $ # -DISTNAME= tcsh-6.07 -PKGNAME= tcsh-6.07.02 +DISTNAME= tcsh-6.08 +PKGNAME= tcsh-6.08.00 CATEGORIES= shells MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index 87e4635683bf..66856cb26835 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1 +1 @@ -MD5 (tcsh-6.07.tar.gz) = 18a9d8091c6da38ebdd63ab509324eb5 +MD5 (tcsh-6.08.tar.gz) = e16e0f08b324e67f654ecab554042967 diff --git a/shells/tcsh/files/patch-ad b/shells/tcsh/files/patch-ad deleted file mode 100644 index 490b9f6b044b..000000000000 --- a/shells/tcsh/files/patch-ad +++ /dev/null @@ -1,83 +0,0 @@ -*** glob.c.orig Sat Nov 13 03:40:56 1993 ---- glob.c Mon Dec 16 03:09:07 1996 -*************** -*** 139,144 **** ---- 139,165 ---- - #define M_SET META('[') - #define ismeta(c) (((c)&M_META) != 0) - -+ int collate_range_cmp (c1, c2) -+ int c1, c2; -+ { -+ #if defined(NLS) && defined(LC_COLLATE) -+ static char s1[2], s2[2]; -+ int ret; -+ #endif -+ -+ c1 &= 0xFF; -+ c2 &= 0xFF; -+ #if defined(NLS) && defined(LC_COLLATE) -+ if (c1 == c2) -+ return (0); -+ s1[0] = c1; -+ s2[0] = c2; -+ if ((ret = strcoll(s1, s2)) != 0) -+ return (ret); -+ #endif -+ return (c1 - c2); -+ } -+ - /* - * Need to dodge two kernel bugs: - * opendir("") != opendir(".") -*************** -*** 646,652 **** - ++pat; - while (((c = *pat++) & M_MASK) != M_END) { - if ((*pat & M_MASK) == M_RNG) { -! if (c <= k && k <= pat[1]) - ok = 1; - pat += 2; - } ---- 667,675 ---- - ++pat; - while (((c = *pat++) & M_MASK) != M_END) { - if ((*pat & M_MASK) == M_RNG) { -! if ( collate_range_cmp(CHAR(c), CHAR(k)) <= 0 -! && collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0 -! ) - ok = 1; - pat += 2; - } -*** sh.glob.c.orig Sun May 14 00:49:17 1995 ---- sh.glob.c Thu Oct 31 18:04:28 1996 -*************** -*** 85,90 **** ---- 85,91 ---- - static void pword __P((int)); - static void psave __P((int)); - static void backeval __P((Char *, bool)); -+ extern int collate_range_cmp __P((int, int)); - - static Char * - globtilde(nv, s) -*************** -*** 1038,1045 **** - if (match) - continue; - if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { -! match = (stringc <= (*pattern & TRIM) && -! (*(pattern-2) & TRIM) <= stringc); - pattern++; - } - else ---- 1039,1047 ---- - if (match) - continue; - if (rangec == '-' && *(pattern-2) != '[' && *pattern != ']') { -! match = ( collate_range_cmp(stringc, *pattern & TRIM) <= 0 -! && collate_range_cmp(*(pattern-2) & TRIM, stringc) <= 0 -! ); - pattern++; - } - else |