Date: Mon, 23 Oct 2000 11:39:13 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/22252: Update port: lang/nawk to 2000.05.25 Message-ID: <20001023183913.6E56B37B479@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 22252 >Category: ports >Synopsis: Update port: lang/nawk to 2000.05.25 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 23 11:40:02 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.1.1-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2000.05.25 Remove file: patches/patch-aa >How-To-Repeat: >Fix: diff -urN /usr/ports/lang/nawk/Makefile lang/nawk/Makefile --- /usr/ports/lang/nawk/Makefile Wed Apr 12 21:24:30 2000 +++ lang/nawk/Makefile Sat Oct 21 14:26:18 2000 @@ -7,21 +7,23 @@ # PORTNAME= nawk -PORTVERSION= 99.06.20 +PORTVERSION= 2000.05.25 CATEGORIES= lang MASTER_SITES= http://cm.bell-labs.com/who/bwk/ DISTNAME= awk MAINTAINER= obrien@FreeBSD.org -USE_BISON= yes NO_WRKSUBDIR= yes + +USE_BISON= yes MAKEFILE= makefile +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" YACC="bison -y" ALL_TARGET= a.out MAN1= nawk.1 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/a.out ${PREFIX}/bin/nawk - ${INSTALL_MAN} ${WRKSRC}/awk.1 ${PREFIX}/man/man1/nawk.1 + ${INSTALL_MAN} ${WRKSRC}/awk.1 ${MANPREFIX}/man/man1/nawk.1 .include <bsd.port.mk> diff -urN /usr/ports/lang/nawk/distinfo lang/nawk/distinfo --- /usr/ports/lang/nawk/distinfo Mon Nov 29 19:14:15 1999 +++ lang/nawk/distinfo Sat Oct 21 13:47:07 2000 @@ -1 +1 @@ -MD5 (awk.tar.gz) = d85853b63b117415d16daba456c0e6c5 +MD5 (awk.tar.gz) = d4e9204f8d771a078f4e01b4d1363260 diff -urN /usr/ports/lang/nawk/files/patch-aa lang/nawk/files/patch-aa --- /usr/ports/lang/nawk/files/patch-aa Wed Mar 1 16:13:50 2000 +++ lang/nawk/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,25 +0,0 @@ ---- makefile.orig Fri Jul 16 16:47:54 1999 -+++ makefile Wed Mar 1 02:11:09 2000 -@@ -22,16 +22,15 @@ - # THIS SOFTWARE. - # ****************************************************************/ - --CFLAGS = -g --CFLAGS = -O2 --CFLAGS = -+#CFLAGS = -g -+CFLAGS ?= -O2 -+#CFLAGS = - --CC = gcc -Wall -g --CC = /opt/pure/purify/purify cc --CC = cc -+CC ?= gcc -Wall -g -+#CC = /opt/pure/purify/purify 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 diff -urN /usr/ports/lang/nawk/files/patch-ba lang/nawk/files/patch-ba --- /usr/ports/lang/nawk/files/patch-ba Mon Nov 29 19:14:16 1999 +++ lang/nawk/files/patch-ba Sat Oct 21 14:21:43 2000 @@ -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 Fri May 26 03:53:43 2000 ++++ b.c Sat Oct 21 14:21:39 2000 @@ -27,6 +27,9 @@ #define DEBUG @@ -36,19 +36,19 @@ { int i, use, nuse; @@ -285,6 +306,9 @@ - char *cclenter(char *p) /* add a character class */ + char *cclenter(char *argp) /* add a character class */ { int i, c, c2; +#ifdef __FreeBSD__ + int c3; +#endif - char *op, *bp; - static char *buf = 0; - static int bufsz = 100; -@@ -302,6 +326,23 @@ + uschar *p = (uschar *) argp; + uschar *op, *bp; + static uschar *buf = 0; +@@ -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--; @@ -58,18 +58,17 @@ + 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)) ++ if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, 0)) + FATAL("out of space for character class [%.10s...] 2", p); + *bp++ = c3 + 1; + i++; + } + } +#else -+ if (c > c2) { /* empty; ignore */ if (c > c2) { /* empty; ignore */ bp--; i--; -@@ -313,6 +354,7 @@ +@@ -314,6 +354,7 @@ *bp++ = ++c; i++; } diff -urN /usr/ports/lang/nawk/files/patch-bb lang/nawk/files/patch-bb --- /usr/ports/lang/nawk/files/patch-bb Mon Nov 29 19:14:16 1999 +++ lang/nawk/files/patch-bb Sat Oct 21 14:30:49 2000 @@ -1,34 +1,24 @@ -*** main.c.orig Mon Oct 19 18:49:03 1998 ---- main.c Wed Jan 13 17:51:59 1999 -*************** -*** 27,32 **** ---- 27,33 ---- - #define DEBUG - #include <stdio.h> - #include <ctype.h> -+ #include <locale.h> - #include <stdlib.h> - #include <string.h> - #include <signal.h> -*************** -*** 55,61 **** - char *fs = NULL, *marg; - int temp; - -! cmdname = argv[0]; - if (argc == 1) { - fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); - exit(1); ---- 56,67 ---- - char *fs = NULL, *marg; - int temp; - -! setlocale(LC_ALL, ""); -! -! if ((cmdname = strrchr(argv[0], '/')) != NULL) -! cmdname++; -! else -! cmdname = argv[0]; - if (argc == 1) { - fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); - exit(1); +--- main.c.orig Fri May 26 02:56:11 2000 ++++ main.c Sat Oct 21 14:26:46 2000 +@@ -27,6 +27,7 @@ + #define DEBUG + #include <stdio.h> + #include <ctype.h> ++#include <locale.h> + #include <stdlib.h> + #include <string.h> + #include <signal.h> +@@ -55,7 +56,12 @@ + char *fs = NULL, *marg; + int temp; + +- cmdname = argv[0]; ++ setlocale(LC_ALL, ""); ++ ++ if ((cmdname = strrchr(argv[0], '/')) != NULL) ++ cmdname++; ++ else ++ cmdname = argv[0]; + if (argc == 1) { + fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname); + exit(1); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001023183913.6E56B37B479>