diff options
| author | obrien <obrien@FreeBSD.org> | 2000-11-03 18:01:02 +0800 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-11-03 18:01:02 +0800 |
| commit | d821b76461a7a782d68a7d56590c3fb0bce04b11 (patch) | |
| tree | 7600661d472176d468b7deaba5c216cb36caea16 /lang | |
| parent | 4ae7ad60ee9a37aaeeba3da34ef1b82d9710f0e7 (diff) | |
| download | freebsd-ports-graphics-d821b76461a7a782d68a7d56590c3fb0bce04b11.tar.gz freebsd-ports-graphics-d821b76461a7a782d68a7d56590c3fb0bce04b11.tar.zst freebsd-ports-graphics-d821b76461a7a782d68a7d56590c3fb0bce04b11.zip | |
Update to the 30-Oct-2000 version.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/nawk/Makefile | 2 | ||||
| -rw-r--r-- | lang/nawk/distinfo | 2 | ||||
| -rw-r--r-- | lang/nawk/files/patch-aa | 15 | ||||
| -rw-r--r-- | lang/nawk/files/patch-ba | 55 |
4 files changed, 35 insertions, 39 deletions
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile index cd1816c1813..bfe5c7fe682 100644 --- a/lang/nawk/Makefile +++ b/lang/nawk/Makefile @@ -7,7 +7,7 @@ # PORTNAME= nawk -PORTVERSION= 99.06.20 +PORTVERSION= 20001030 CATEGORIES= lang MASTER_SITES= http://cm.bell-labs.com/who/bwk/ DISTNAME= awk diff --git a/lang/nawk/distinfo b/lang/nawk/distinfo index b1f4a6e33ff..0995ea3174c 100644 --- a/lang/nawk/distinfo +++ b/lang/nawk/distinfo @@ -1 +1 @@ -MD5 (awk.tar.gz) = d85853b63b117415d16daba456c0e6c5 +MD5 (awk.tar.gz) = 8fa6fa79f1524f6113099fe91c063571 diff --git a/lang/nawk/files/patch-aa b/lang/nawk/files/patch-aa index 8f95d33468d..f14c7a0467a 100644 --- a/lang/nawk/files/patch-aa +++ b/lang/nawk/files/patch-aa @@ -1,6 +1,6 @@ ---- makefile.orig Fri Jul 16 16:47:54 1999 -+++ makefile Wed Mar 1 02:11:09 2000 -@@ -22,16 +22,15 @@ +--- makefile.orig Thu May 25 10:55:45 2000 ++++ makefile Fri Nov 3 01:56:39 2000 +@@ -22,13 +22,13 @@ # THIS SOFTWARE. # ****************************************************************/ @@ -14,12 +14,9 @@ -CC = gcc -Wall -g -CC = /opt/pure/purify/purify cc -CC = cc -+CC ?= gcc -Wall -g ++#CC = cc -Wall -g +#CC = /opt/pure/purify/purify cc -+#CC = cc ++CC ?= cc YACC = bison -y --YACC = yacc - YFLAGS = -d - - OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o + YACC = yacc diff --git a/lang/nawk/files/patch-ba b/lang/nawk/files/patch-ba index 3429b8e926f..8c2df0c544c 100644 --- a/lang/nawk/files/patch-ba +++ b/lang/nawk/files/patch-ba @@ -1,5 +1,5 @@ ---- b.c.orig Mon May 10 07:26:44 1999 -+++ b.c Mon Nov 29 02:10:52 1999 +--- b.c.orig Sun Sep 24 17:18:38 2000 ++++ b.c Fri Nov 3 01:59:32 2000 @@ -27,6 +27,9 @@ #define DEBUG @@ -35,45 +35,44 @@ fa *makedfa(char *s, int anchor) /* returns dfa for reg expr s */ { int i, use, nuse; -@@ -285,6 +306,9 @@ - char *cclenter(char *p) /* add a character class */ - { +@@ -287,6 +308,9 @@ int i, c, c2; + uschar *p = (uschar *) argp; + uschar *op, *bp; +#ifdef __FreeBSD__ -+ int c3; ++ int c3; +#endif - char *op, *bp; - static char *buf = 0; + static uschar *buf = 0; static int bufsz = 100; -@@ -302,6 +326,23 @@ + +@@ -303,6 +327,22 @@ c2 = *p++; if (c2 == '\\') - c2 = quoted(&p); + c2 = quoted((char **) &p); +#ifdef __FreeBSD__ -+ if (collate_range_cmp(c, c2) > 0) { -+ bp--; -+ i--; -+ continue; -+ } -+ for (c3 = 0; c3 < (1 << CHAR_BIT) - 1; c3++) { -+ if (collate_range_cmp(c, c3) <= 0 && -+ collate_range_cmp(c3, c2) <= 0) { -+ if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0)) -+ FATAL("out of space for character class [%.10s...] 2", p); -+ *bp++ = c3 + 1; -+ i++; -+ } -+ } -+#else -+ if (c > c2) { /* empty; ignore */ ++ if (collate_range_cmp(c, c2) > 0) { ++ bp--; ++ i--; ++ continue; ++ } ++ for (c3 = 0; c3 < (1 << CHAR_BIT) - 1; c3++) { ++ if (collate_range_cmp(c, c3) <= 0 && ++ collate_range_cmp(c3, c2) <= 0) { ++ if (!adjbuf(&buf, &bufsz, bp-buf+2, 100, &bp, 0)) ++ FATAL("out of space for character class [%.10s...] 2", p); ++ *bp++ = c3 + 1; ++ i++; ++ } ++ } ++#else /*FreeBSD*/ if (c > c2) { /* empty; ignore */ bp--; i--; -@@ -313,6 +354,7 @@ +@@ -314,6 +354,7 @@ *bp++ = ++c; i++; } -+#endif ++#endif /*FreeBSD*/ continue; } } |