Fix an FPE error.

PR:		9492
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>

4 files changed, 18 insertions, 41 deletions

diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 7e22209e0f37..dca73ceb675c 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:  nawk
-# Version required:    98.02.11
+# Version required:    98.10.20
 # Date created:        29 April 1998
 # Whom:                Josh Gilliam <josh@quick.net>
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/04 19:21:55 steve Exp $
+# $Id: Makefile,v 1.2 1998/11/10 02:05:09 steve Exp $
 #
 
 DISTNAME=	awk
diff --git a/lang/nawk/files/patch-aa b/lang/nawk/files/patch-aa
index d937fad3764a..182ca8242cda 100644
--- a/lang/nawk/files/patch-aa
+++ b/lang/nawk/files/patch-aa
@@ -1,5 +1,5 @@
 *** makefile.orig	Tue Oct 20 08:48:03 1998
---- makefile	Sun Nov  1 16:32:49 1998
+--- makefile	Wed Jan 13 19:10:37 1999
 ***************
 *** 22,34 ****
   # THIS SOFTWARE.
@@ -19,11 +19,11 @@
   # THIS SOFTWARE.
   # ****************************************************************/
   
-! CFLAGS ?= ${CFLAGS}
-! #CFLAGS = -O
+! #CFLAGS = -g
+! CFLAGS ?= -O
 ! #CC = gcc -Wall -g
 ! #CC = purify cc
-! CC ?= ${CC}
+! CC ?= cc
   
 ! #YACC = bison -y
   YACC = yacc
diff --git a/lang/nawk/files/patch-ba b/lang/nawk/files/patch-ba
index 6682e09ea354..325fea5fb3cb 100644
--- a/lang/nawk/files/patch-ba
+++ b/lang/nawk/files/patch-ba
@@ -1,5 +1,5 @@
-*** b.c.orig	Sun Nov  1 17:14:22 1998
---- b.c	Sun Nov  1 17:23:00 1998
+*** b.c.orig	Mon Oct 19 18:42:53 1998
+--- b.c	Wed Jan 13 17:46:54 1999
 ***************
 *** 27,32 ****
 --- 27,35 ----
@@ -87,11 +87,11 @@
   				continue;
   			}
   		}
-*** main.c.orig	Sun Nov  1 17:24:32 1998
---- main.c	Sun Nov  1 17:28:40 1998
+*** main.c.orig	Mon Oct 19 18:49:03 1998
+--- main.c	Wed Jan 13 17:51:59 1999
 ***************
-*** 27,38 ****
---- 27,43 ----
+*** 27,32 ****
+--- 27,33 ----
   #define DEBUG
   #include <stdio.h>
   #include <ctype.h>
@@ -99,18 +99,8 @@
   #include <stdlib.h>
   #include <string.h>
   #include <signal.h>
-  #include "awk.h"
-  #include "ytab.h"
-  
-+ #ifdef __FreeBSD__
-+ #	include <floatingpoint.h>
-+ #endif
-+ 
-  extern	char	**environ;
-  extern	int	nfields;
-  
 ***************
-*** 55,66 ****
+*** 55,61 ****
   	char *fs = NULL, *marg;
   	int temp;
   
@@ -118,12 +108,7 @@
   	if (argc == 1) {
   		fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
   		exit(1);
-  	}
-  	signal(SIGFPE, fpecatch);
-  	yyin = NULL;
-  	symtab = makesymtab(NSYMTAB);
-  	while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
---- 60,80 ----
+--- 56,67 ----
   	char *fs = NULL, *marg;
   	int temp;
   
@@ -136,12 +121,3 @@
   	if (argc == 1) {
   		fprintf(stderr, "Usage: %s [-f programfile | 'program'] [-Ffieldsep] [-v var=value] [files]\n", cmdname);
   		exit(1);
-  	}
-  	signal(SIGFPE, fpecatch);
-+ #ifdef	__FreeBSD__
-+ 	fpsetround(FP_RN);
-+ 	fpsetmask(0L);
-+ #endif
-  	yyin = NULL;
-  	symtab = makesymtab(NSYMTAB);
-  	while (argc > 1 && argv[1][0] == '-' && argv[1][1] != '\0') {
diff --git a/lang/nawk/pkg-descr b/lang/nawk/pkg-descr
index a2f84fc3c24a..04f8345d59e6 100644
--- a/lang/nawk/pkg-descr
+++ b/lang/nawk/pkg-descr
@@ -1,9 +1,10 @@
+Awk scans input files for specified patterns and can perform an associated
+action when a line of the file matches the pattern.
+
 This is the version of awk described in "The AWK Programming Language",
 by Al Aho, Brian Kernighan, and Peter Weinberger
 (Addison-Wesley, 1988, ISBN 0-201-07981-X).
-
-Awk scans input files for specified patterns and can perform an associated
-action when a line of the file matches the pattern.
+	http://cm.bell-labs.com/cm/cs/awkbook/index.html
 
 -- 
 Josh Gilliam                    <josh@quick.net>