Update to 3.1.3.

Changes from 3.1.2 to 3.1.3
---------------------------
1. Gawk now follows POSIX in handling of local numeric formats for
   input, output and number/string conversions.
2. Multibyte detection improved.  See README_d/README.multibyte for more
   info about multibyte locales.
3. Handling of `close' made more POSIX-compliant for POSIXLY_CORRECT,
   see the documentation.
4. The record reading code was redone, again.  This time it's much
   better. Really!
5. For RS = "\n" and RS = "", gawk now only sets RT when it has changed.
   This provides considerable performance improvement.
6. `match' now sets all the subscripts in the third argument array
   correctly, even if not all subexpressions matched.
7. Updated to Automake 1.7.5.  configure.in renamed configure.ac.
8. C-style switch statements are available, but must be enabled at
   compile time via `configure --enable-switch'.  For 3.2 they'll be
   enabled by default. Thanks to Michael Benzinger for the initial
   code.
9. %c now always prints no more than one character, whatever
   precision is provided.
10. strtonum(<number>) now works again.
11. Gawk is now much better about scalar/array typing of global
    uninitiailzed variables passed as parameters. Once the parameter
    is then used one way or the other, the global var's type is
    adjusted accordingly.  Thanks to Stepan Kasal for the original
    (considerable) changes.
12. Dynamic function loading under Windows32 should now be possible. See
    README_d/README.pcdynamic. Thanks to Patrick T.J. McPhee for the changes.
13. Updated to gettext 0.12.1.
14. Gawk now follows historical practice and POSIX for the return
    value of `rand': It's now  0 <= N < 1.

Changes from 3.1.1 to 3.1.2
---------------------------
1. Loops of the form:
	for (iggy in foo)
		next
   no longer leak memory.
2. gawk -v FIELDWIDTHS="..." now sets PROCINFO["FS"] correctly.
3. All builtin operations and functions should now fully evaluate their
   arguments so that side effects take place correctly.
4. Fixed a logic bug in gsub/gensub for matches to null strings that occurred
   later in the string after a nonnull match.
5. getgroups code now works on Ultrix again.
6. Completely new version of the full GNU regex engine now in place.
7. Argument parsing and variable assignment has been cleaned up.
8. An I/O bug on HP-UX has been documented and worked around. See
   README_d/README.hpux.
9. awklib/grcat should now compile correctly.
10. Updated to automake 1.7.3, autoconf 2.57 and gettext 0.11.5 ; thanks to
    Paul Eggert for the initial automake and autoconf work.
11. As a result of #6, removed the use of the dfa code from GNU grep.
12. It is now possible to use ptys for |& two-way pipes instead of
    pipes.  The basic plumbing for this was provided by Paolo Bonzini.
    To make this happen:
    	command = "unix command etc"
	PROCINFO[command, "pty"] = 1
	print ... |& command
	command |& getline stuff
    In other words, set the element in PROCINFO *before* opening the
    two-way pipe, and then gawk will use ptys instead of pipes.
    On systems without ptys or where all the ptys are in use, gawk
    will fall back to using plain pipes.
13. Fixed a regex matching across buffer boundaries bug, with a
    heuristic.  See io.c:rsre_get_a_record.
14. Profiling no longer dumps core if there are extension functions in place.
15. Grammar and scanner cleaned up, courtesy of Stepen Kasal, to hopefully
    once and for all fix the `/=' operator vs. `/=.../' regex ambiguity.
    Lots of other grammar simplifications applied, as well.
16. BINMODE should work now on more Windows ports.
17. Updated to bison 1.875.  Includes fix to bisonfix.sed script.
18. The NODE structure is now 20% (8 bytes) smaller (on x86, anyway), which
    should help conserve memory.
19. Builds not in the source directory should work again.
20. Arrays now use 2 NODE's per element instead of three. Combined with
    #18, (on the x86) this reduces the overhead from 120 bytes per element
    to just 64 bytes: almost a 50% improvement.
21. Programs that make heavy use of changing IGNORECASE should now be
    much faster, particularly if using a regular expression for FS or RS.
    IGNORECASE now correctly affects RS regex record splitting, as well.
22. IGNORECASE no longer affects single-character field splitting (FS = "c"),
    or single-character record splitting (RS = "c").
    This cleans up some weird behavior, and makes gawk better match the
    documentation, which says it only affects regex-based field splitting
    and record splitting.
    The documentation on this was improved, too.
23. The framework in test/ has been simplified, making it much easier to
    add new tests while keeping the size of Makefile.am reasonable. Thanks
    for this to Stepan Kasal.
24. --lint=invalid causes lint warnings only about stuff that's actually
    invalid.  This needs additional work.
25. More translations.
26. The `get_a_record' routine has been revamped (currently by splitting it
    into three variants).  This should improve long-term maintainability.
27. `match' now adds more entries to 3rd array arg:
	match("the big dog", /([a-z]+) ([a-z]+) ([a-z]+)/, data)
    fills in variables:
    	data[1, "start"], data[1, "length"], and so on.
28. New `asorti' function with same interface as `asort', but sorts indices
    instead of values.
29. Documentation updated to FDL 1.2.
30. New `configure' option --disable-lint at compile time disables lint
    checking.  With GCC dead-code-elimination, cuts almost 200K off the
    executable size on GNU/Linux x86.  Presumably speeds up runtime.
    Using this will cause some of the tests in the test suite to fail.
    This option may be removed at a later date.
31. Various minor cleanups, see the ChangeLog for details.

6 files changed, 43 insertions, 52 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 5741f1c7119..5472ff1d232 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2003/08/09 12:30:52 seb Exp $
-# FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
+# $NetBSD: Makefile,v 1.19 2003/10/05 15:49:06 wiz Exp $
+#
 
-DISTNAME=	gawk-3.1.1
-PKGREVISION=	1
+DISTNAME=	gawk-3.1.3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
@@ -12,14 +11,10 @@ COMMENT=	GNU awk
 
 CONFLICTS=	ja-gawk-[0-9]*
 
-# 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
-EVAL_PREFIX+=		GETTEXT_PREFIX=gettext
 TEST_DIRS=		${WRKSRC}
 TEST_TARGET=		check
 
@@ -34,10 +29,5 @@ BUILD_DEFS+=		GAWK_ENABLE_PORTALS
 CONFIGURE_ARGS+=	--enable-portals
 .endif
 
-pre-configure:
-	${RM} -f ${WRKSRC}/po/Makefile.in.in
-	${CP} ${GETTEXT_PREFIX}/share/gettext/po/Makefile.in.in \
-		 ${WRKSRC}/po/Makefile.in.in
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 77c25bcb9c9..167121df3ec 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/04 20:57:21 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/10/05 15:49:06 wiz Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -10,6 +10,7 @@ libexec/awk/grcat
 libexec/awk/pwcat
 man/man1/gawk.1
 man/man1/igawk.1
+man/man1/pgawk.1
 share/awk/assert.awk
 share/awk/bits2str.awk
 share/awk/cliff_rand.awk
@@ -27,11 +28,15 @@ share/awk/passwd.awk
 share/awk/readable.awk
 share/awk/rewind.awk
 share/awk/round.awk
+share/awk/zerofile.awk
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gawk.mo
 ${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/pt_BR/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gawk.mo
 @dirrm share/awk
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index eef5612b280..a1b94bda238 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.9 2003/07/04 20:57:22 seb Exp $
+$NetBSD: distinfo,v 1.10 2003/10/05 15:49:06 wiz Exp $
 
-SHA1 (gawk-3.1.1.tar.gz) = 0cdfff32cebd43519dc6027424b74439d98cc5db
-Size (gawk-3.1.1.tar.gz) = 1875134 bytes
-SHA1 (patch-aa) = 77dd89bd66daf46946d45e00979058fdcc04f648
-SHA1 (patch-ab) = 2110d61001524f973a59d7a6947c38178674eda8
-SHA1 (patch-ac) = 5bc12ac7dbf7cbd1d5fd70ffde78e42074069468
-SHA1 (patch-ad) = 81ed27305a80da999fa47c3287f6a4a49f189f25
-SHA1 (patch-ae) = 654beb3821050557102dfd6236ae663ee0fe9082
+SHA1 (gawk-3.1.3.tar.gz) = 0900eab07506ecff1ce52756e687a810149bb296
+Size (gawk-3.1.3.tar.gz) = 2078246 bytes
+SHA1 (patch-aa) = 24c4ef1d8484554b86d3d1441cd4b945aea0a1e2
+SHA1 (patch-ab) = 2af7895637c0889edfb192e203fee447656a033c
+SHA1 (patch-ac) = 2d9cf9fed0630ef3d6642092458af13520530a86
 SHA1 (patch-af) = dac29f99def7a70f17aaeb1cb3662ce48008755c
-SHA1 (patch-ag) = da832e4c992f7cd97dd30aa450eafac1e98c482a
-SHA1 (patch-ah) = 2071627abc6a57eb5ebb866525c642c270681d5b
diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa
index 396ce85f5fe..09cdbf042e9 100644
--- a/lang/gawk/patches/patch-aa
+++ b/lang/gawk/patches/patch-aa
@@ -1,16 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2002/12/12 03:17:14 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2003/10/05 15:49:06 wiz Exp $
 
---- Makefile.am.orig	Sun Apr 28 10:27:54 2002
+--- Makefile.am.orig	Mon May 19 13:58:24 2003
 +++ Makefile.am
-@@ -137,10 +137,7 @@ install-exec-hook:
- 	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
+@@ -137,9 +137,7 @@ install-exec-hook:
  	cd $(DESTDIR)$(bindir); \
- 	$(LN) gawk $$fullname ; \
--	$(LN) pgawk p$$fullname ; \
--	if [ ! -f awk ]; \
--	then	$(LN_S) gawk awk; \
+ 	$(LN) gawk $$fullname 2>/dev/null ; \
+ 	$(LN) pgawk p$$fullname 2>/dev/null ; \
+-	if [ ! -f awk$(EXEEXT) ]; \
+-	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
 -	fi; exit 0)
-+	$(LN) pgawk p$$fullname; exit 0) 
++	exit 0)
  
  # Undo the above when uninstalling
  uninstall-links:
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
index e4ced614d50..5b4c26593cf 100644
--- a/lang/gawk/patches/patch-ab
+++ b/lang/gawk/patches/patch-ab
@@ -1,25 +1,24 @@
-$NetBSD: patch-ab,v 1.7 2003/06/07 16:03:05 jmmv Exp $
+$NetBSD: patch-ab,v 1.8 2003/10/05 15:49:06 wiz Exp $
 
---- Makefile.in.orig	Mon Apr 29 10:36:46 2002
+--- Makefile.in.orig	Fri Jul  4 19:49:07 2003
 +++ Makefile.in
-@@ -224,7 +224,7 @@ awkdatadir = @datadir@/awk
- # stuff for compiling gawk/pgawk
- DEFPATH = "\".$(PATH_SEPARATOR)$(awkdatadir)\""
+@@ -78,7 +78,7 @@ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
  
 -DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(datadir)/locale\""
 +DEFS = -DDEFPATH=$(DEFPATH) -DHAVE_CONFIG_H -DGAWK -DLOCALEDIR="\"$(prefix)/$(PKGLOCALEDIR)/locale\""
- 
- INCLUDES = -I$(srcdir)/intl
- 
-@@ -760,10 +760,7 @@ install-exec-hook:
- 	(fullname=gawk-`./gawk --version | sed 1q | awk '{print $$3}'` ; \
+ DEPDIR = @DEPDIR@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -888,9 +888,7 @@ install-exec-hook:
  	cd $(DESTDIR)$(bindir); \
- 	$(LN) gawk $$fullname ; \
--	$(LN) pgawk p$$fullname ; \
--	if [ ! -f awk ]; \
--	then	$(LN_S) gawk awk; \
+ 	$(LN) gawk $$fullname 2>/dev/null ; \
+ 	$(LN) pgawk p$$fullname 2>/dev/null ; \
+-	if [ ! -f awk$(EXEEXT) ]; \
+-	then	$(LN_S) gawk$(EXEEXT) awk$(EXEEXT); \
 -	fi; exit 0)
-+	$(LN) pgawk p$$fullname; exit 0) 
++	exit 0)
  
  # Undo the above when uninstalling
  uninstall-links:
diff --git a/lang/gawk/patches/patch-ac b/lang/gawk/patches/patch-ac
index 40ecee23cfa..7f770f2ddd1 100644
--- a/lang/gawk/patches/patch-ac
+++ b/lang/gawk/patches/patch-ac
@@ -1,11 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2002/12/12 03:17:14 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2003/10/05 15:49:06 wiz Exp $
 
---- awk.h.orig	Tue Apr 16 07:40:18 2002
-+++ awk.h	Sat Dec  7 21:05:58 2002
-@@ -77,5 +77,5 @@
+--- awk.h.orig	Sun Jun 29 14:52:40 2003
++++ awk.h
+@@ -73,7 +73,7 @@ extern int errno;
+ #ifdef HAVE_SIGNUM_H
  #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
+ #include <wchar.h>