update to gawk-3.1.1. While here, make this work again under NetBSD since

this gawk version is newer than the version shipped with 1.6 and has some
potentially useful features such as 2 way pipes which allow easy access to
the sort(1) command.


Changes from 3.1.0 to 3.1.1
---------------------------

1. Six new translations.

2. Having more than 4 different value for OFMT and/or CONVFMT now works.

3. The handling of dynamic regexes is now more more sane, esp. w.r.t.
   the profiling code.  The profiling code has been fixed in several
   places.

4. The return value of index("", "") is now 1.

5. Gawk should no longer close fd 0 in child processes.

6. Fixed test for strtod semantics and regenerated configure.

7. Gawk can now be built with byacc; an accidental bison dependency was
   removed.

8. yyerror() will no longer dump core on long source lines.

9. Gawk now correctly queries getgroups(2) to figure out how many groups
   the process has.

10. New configure option to force use of included strftime, e.g. on
    Solaris systems. See `./configure --help' for the details. Replaced
    the included strftime.c with the one from textutils.

11. OS/2 port has been updated.

12. Multi-byte character support has been added, courtesy of IBM Japan.

13. The `for (iggy in foo) delete foo[iggy]' -> `delete foo' optimisation
    now works.

14. Upgraded to gettext 0.11.2 and automake 1.5.

15. Full gettext compatibility (new dcngettext function).

16. The O'Reilly copyedits and indexing changes for the documentation have
    been folded into the texinfo version of the manuals.

17. A humongously long value for the AWKPATH environment variable will no
    longer dump core.

18. Configuration / Installation issues have been straightened out in
    Makefile.am.

9 files changed, 136 insertions, 23 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index c4c64b5d1ab..21073391bfa 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2002/11/30 14:55:06 grant Exp $
+# $NetBSD: Makefile,v 1.10 2002/12/12 03:17:13 dmcmahill Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
-DISTNAME=	gawk-3.1.0
+DISTNAME=	gawk-3.1.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
@@ -9,16 +9,17 @@ MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
 COMMENT=	GNU awk
 
-ONLY_FOR_PLATFORM=	SunOS-*-*       # in NetBSD base system
-
 # We need ${GETTEXT_PREFIX}/share/gettext/po/Makefile.in.in.
 BUILD_DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
 USE_BUILDLINK2=		# defined
+USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
 USE_PKGLOCALEDIR=	# defined
 TEXINFO_OVERRIDE=	# defined
 EVAL_PREFIX+=		GETTEXT_PREFIX=gettext
+TEST_DIRS=		${WRKSRC}
+TEST_TARGET=		check
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 7f42da542c0..4662d83b5f5 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/04 13:58:26 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/12 03:17:13 dmcmahill Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
 bin/pgawk
+bin/p${PKGNAME}
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gawk.info
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gawkinet.info
 info/gawk.info
@@ -30,6 +31,12 @@ share/awk/passwd.awk
 share/awk/readable.awk
 share/awk/rewind.awk
 share/awk/round.awk
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gawk.mo
 @dirrm share/awk
 @dirrm libexec/awk
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index 8b0b1d22505..3cc48de4ed8 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.6 2002/11/30 14:55:06 grant Exp $
+$NetBSD: distinfo,v 1.7 2002/12/12 03:17:13 dmcmahill Exp $
 
-SHA1 (gawk-3.1.0.tar.gz) = c41fd1d7277c839abc39727b5f9fa823f13ae17e
-Size (gawk-3.1.0.tar.gz) = 1614873 bytes
-SHA1 (patch-aa) = e97ecd85a9ff5d5c5aeb66d00242211e95594be8
+SHA1 (gawk-3.1.1.tar.gz) = 0cdfff32cebd43519dc6027424b74439d98cc5db
+Size (gawk-3.1.1.tar.gz) = 1875134 bytes
+SHA1 (patch-aa) = 77dd89bd66daf46946d45e00979058fdcc04f648
+SHA1 (patch-ab) = f5404d87a83eac6ca7340a8d1a37abc66e3dbaf7
+SHA1 (patch-ac) = 5bc12ac7dbf7cbd1d5fd70ffde78e42074069468
+SHA1 (patch-ad) = 81ed27305a80da999fa47c3287f6a4a49f189f25
+SHA1 (patch-ae) = 654beb3821050557102dfd6236ae663ee0fe9082
+SHA1 (patch-af) = dac29f99def7a70f17aaeb1cb3662ce48008755c
diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa
index bcd58e3e606..396ce85f5fe 100644
--- a/lang/gawk/patches/patch-aa
+++ b/lang/gawk/patches/patch-aa
@@ -1,24 +1,16 @@
-$NetBSD: patch-aa,v 1.3 2002/11/30 14:55:06 grant Exp $
+$NetBSD: patch-aa,v 1.4 2002/12/12 03:17:14 dmcmahill Exp $
 
---- Makefile.in.orig	Wed May 16 03:09:12 2001
-+++ Makefile.in	Sun Dec  1 01:54:01 2002
-@@ -214,7 +214,7 @@
- 
- DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
- 
--INCLUDES = -I. -I$(srcdir) -I$(srcdir)/intl
-+INCLUDES = -I. -I$(srcdir)
- 
- # We want hard links for install-exec-hook, below
- LN = ln
-@@ -755,9 +755,7 @@
+--- Makefile.am.orig	Sun Apr 28 10:27:54 2002
++++ Makefile.am
+@@ -137,10 +137,7 @@ install-exec-hook:
  	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
  	cd $(DESTDIR)$(bindir); \
  	$(LN) gawk $$fullname ; \
+-	$(LN) pgawk p$$fullname ; \
 -	if [ ! -f awk ]; \
 -	then	$(LN_S) gawk awk; \
 -	fi; exit 0)
-+	exit 0)
++	$(LN) pgawk p$$fullname; exit 0) 
  
  # Undo the above when uninstalling
  uninstall-links:
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
new file mode 100644
index 00000000000..83901557150
--- /dev/null
+++ b/lang/gawk/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.6 2002/12/12 03:17:14 dmcmahill Exp $
+
+--- Makefile.in.orig	Mon Apr 29 10:36:46 2002
++++ Makefile.in
+@@ -224,7 +224,7 @@ awkdatadir = @datadir@/awk
+ # stuff for compiling gawk/pgawk
+ DEFPATH = "\".$(PATH_SEPARATOR)$(awkdatadir)\""
+ 
+-DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
++DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"/usr/pkg/share/locale\""
+ 
+ INCLUDES = -I$(srcdir)/intl
+ 
+@@ -760,10 +760,7 @@ install-exec-hook:
+ 	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
+ 	cd $(DESTDIR)$(bindir); \
+ 	$(LN) gawk $$fullname ; \
+-	$(LN) pgawk p$$fullname ; \
+-	if [ ! -f awk ]; \
+-	then	$(LN_S) gawk awk; \
+-	fi; exit 0)
++	$(LN) pgawk p$$fullname; exit 0) 
+ 
+ # Undo the above when uninstalling
+ uninstall-links:
diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac
new file mode 100644
index 00000000000..40ecee23cfa
--- /dev/null
+++ b/lang/gawk/patches/patch-ac
@@ -0,0 +1,11 @@
+$NetBSD: patch-ac,v 1.5 2002/12/12 03:17:14 dmcmahill Exp $
+
+--- awk.h.orig	Tue Apr 16 07:40:18 2002
++++ awk.h	Sat Dec  7 21:05:58 2002
+@@ -77,5 +77,5 @@
+ #include <signum.h>
+ #endif
+-#if defined(HAVE_MBRLEN) && defined(HAVE_MBRTOWC) && defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H)
++#if defined(HAVE_MBRLEN) && defined(HAVE_MBRTOWC) && defined(HAVE_WCHAR_H) && defined(HAVE_WCTYPE_H) && !defined(__NetBSD__)
+ /* We can handle multibyte strings.  */
+ #define MBS_SUPPORT
diff --git a/lang/gawk/patches/patch-ad b/lang/gawk/patches/patch-ad
new file mode 100644
index 00000000000..dfb80783805
--- /dev/null
+++ b/lang/gawk/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/12/12 03:17:14 dmcmahill Exp $
+
+--- dfa.c.orig	Tue Apr 16 07:57:13 2002
++++ dfa.c
+@@ -46,7 +46,7 @@ extern void free();
+ #include <strings.h>
+ #endif
+ 
+-#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
++#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && !defined(__NetBSD__)
+ /* We can handle multibyte string.  */
+ # define MBS_SUPPORT
+ #endif
diff --git a/lang/gawk/patches/patch-ae b/lang/gawk/patches/patch-ae
new file mode 100644
index 00000000000..93e0cf6de3f
--- /dev/null
+++ b/lang/gawk/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/12/12 03:17:14 dmcmahill Exp $
+
+--- regex.c.orig	Wed Apr 17 07:42:40 2002
++++ regex.c
+@@ -51,7 +51,7 @@
+ # include <sys/types.h>
+ #endif
+ 
+-#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
++#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC && !defined(__NetBSD__)
+ /* We can handle multibyte string.  */
+ # define MBS_SUPPORT
+ # if !WIDE_CHAR_SUPPORT
diff --git a/lang/gawk/patches/patch-af b/lang/gawk/patches/patch-af
new file mode 100644
index 00000000000..b539218c2b7
--- /dev/null
+++ b/lang/gawk/patches/patch-af
@@ -0,0 +1,46 @@
+$NetBSD: patch-af,v 1.1 2002/12/12 03:17:15 dmcmahill Exp $
+
+hit with big hammer.  Unfortunately awk.h #define's proc which
+breaks 'struct proc' so we make sure we pull all that stuff in first.
+
+--- io.c.orig	Tue Apr 16 07:57:44 2002
++++ io.c
+@@ -23,6 +23,38 @@
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+  */
+ 
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <sys/param.h>
++#include <sys/ioctl.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/wait.h>
++
++#include <netinet/in.h>
++#include <netinet/in_systm.h>
++#include <netinet/ip.h>
++
++#include <arpa/ftp.h>
++#include <arpa/inet.h>
++
++#include <ctype.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <limits.h>
++#include <netdb.h>
++#include <pwd.h>
++#include <setjmp.h>
++#include <signal.h>
++#include <stdarg.h>
++#include <stddef.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <termios.h>
++#include <unistd.h>
++#endif
++
+ #include "awk.h"
+ 
+ #ifdef HAVE_SYS_PARAM_H