Update to 3.1.5:

Changes from 3.1.4 to 3.1.5
---------------------------

1. The random() suite has been updated to a current FreeBSD version, which
   works on systems with > 32-bit ints.

2. A new option, `--exec' has been added. It's like -f but ends option
   processing.  It also disables `x=y' variable assignments, but not -v.
   It's needed mainly for CGI scripts, so that source code can't be
   passed in as part of the URL.

3. dfa.[ch] have been synced with GNU grep development.  This also fixes
   multiple regex matching problems in multibyte locales.

4. Updated to Automake 1.9.5.

5. Updated to Bison 2.0.

6. The getopt* and regex* files were synchronized with current GLIBC CVS.
   See the ChangeLog for the versions and minor edits made.

7. `configure --disable-nls' now disables just gawk's own translations.
   Gawk continues to work with the locale's numeric formatting.  This
   includes a bug fix in handling the printf ' flag (e.g., %'d).

8. Gawk is now multibyte aware.  This means that index(), length(),
   substr() and match() all work in terms of characters, not bytes.

9. Gawk is now smarter about parsing numeric constants in corner cases.

11. Not closing open redirections no longer causes gawk to exit non-zero.

10. The VMS port has been updated.

11. Changes from Andrew Schorr at the xmlgawk project to provide for
    open hooks from extensions are now included.  This will let the
    xmlgawk extension work in the standard gawk.

12. Updated to gettext 0.14.4. Gawk no longer includes its own copy
    of the gettext `intl' library, following current GNU practice to
    rely on there being an external version thereof.

13. A regexp of the form `//' will now generate a warning that it
    is not a C++ comment from --lint (awk.y).

14. The ^ and ^= operators with an integer exponent now use Exponentiation
    by Squaring. This simultaneously fixes a problem with ^= and a negative
    integer exponent.

15. length(array) now returns the number of elements in the array.  This is
    is a non-standard extension that will fail in POSIX mode.

16. Carriage return characters are now ignored in program source code.

17. Four new translations added.

18. Various minor bugs fixed. See the ChangeLog for the details.

6 files changed, 19 insertions, 131 deletions

diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 820d1df1a8e..2d578379cd2 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2005/07/13 15:21:57 jschauma Exp $
+# $NetBSD: Makefile,v 1.31 2005/09/05 16:58:22 wiz Exp $
 #
 
-DISTNAME=	gawk-3.1.4
-PKGREVISION=	2
+DISTNAME=	gawk-3.1.5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,9 +14,8 @@ CONFLICTS=	ja-gawk-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		# defined
-USE_PKGLOCALEDIR=	# defined
-TEST_DIRS=		${WRKSRC}
+GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 TEST_TARGET=		check
 
 INFO_FILES=	gawk.info gawkinet.info
@@ -30,7 +28,6 @@ LDFLAGS.IRIX+=		-lgen
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gawk
 PKG_SUPPORTED_OPTIONS=	portals
-PKG_OPTIONS_LEGACY_VARS+=	GAWK_ENABLE_PORTALS:portals
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/lang/gawk/PLIST b/lang/gawk/PLIST
index 97229404d69..49dec369d82 100644
--- a/lang/gawk/PLIST
+++ b/lang/gawk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/08/26 00:00:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/09/05 16:58:22 wiz Exp $
 bin/gawk
 bin/${PKGNAME}
 bin/igawk
@@ -33,13 +33,17 @@ ${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/ga/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gawk.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gawk.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gawk.mo
 @dirrm share/awk
 @dirrm libexec/awk
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index b1bd220fa64..532d3aefec1 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.15 2005/05/15 16:38:28 bouyer Exp $
+$NetBSD: distinfo,v 1.16 2005/09/05 16:58:22 wiz Exp $
 
-SHA1 (gawk-3.1.4.tar.bz2) = ba50753eca7518d5a13fa9a1e1333562cd8477ca
-RMD160 (gawk-3.1.4.tar.bz2) = d90e6fcc15cb205cbd7452284c567ab5c6840411
-Size (gawk-3.1.4.tar.bz2) = 1732494 bytes
-SHA1 (patch-aa) = 52740979223e5e9f36ea1f6d758399a946a1ea29
-SHA1 (patch-ab) = c0ffd2cc29104e5fefb123a353388d991dc62635
-SHA1 (patch-af) = 09b66c3552a8792b516845c371163aae41e29c94
+SHA1 (gawk-3.1.5.tar.bz2) = 0d5694461f1c32f1eae41a1c0d7ba0939b47e369
+RMD160 (gawk-3.1.5.tar.bz2) = 8eae0f173fcb344f97d811fa5bb5fd390a76b886
+Size (gawk-3.1.5.tar.bz2) = 1756783 bytes
+SHA1 (patch-ab) = 39a98bd71349e2eb7ac7c6bb67cb2b8617fda6bd
diff --git a/lang/gawk/patches/patch-aa b/lang/gawk/patches/patch-aa
deleted file mode 100644
index c10e33f49e6..00000000000
--- a/lang/gawk/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/01/30 05:34:16 minskim Exp $
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=266519
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=277122
-
---- dfa.c.orig	2004-07-26 09:11:41.000000000 -0500
-+++ dfa.c
-@@ -634,7 +634,7 @@ parse_bracket_exp_mb ()
- 		      work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem;
- 		    }
-  		}
--	      wc = WEOF;
-+	      wc = wc1 = WEOF;
- 	    }
- 	  else
- 	    /* We treat '[' as a normal character here.  */
-@@ -2871,6 +2871,14 @@ dfaexec (struct dfa *d, char const *begi
-   if (MB_CUR_MAX > 1)
-     {
-       int remain_bytes, i;
-+#if 0
-+      /*
-+       * This caching can get things wrong:
-+
-+      printf "ab\n\tb\n" | LC_ALL=de_DE.UTF-8 ./gawk '/^[ \t]/ { print }'
-+
-+       * should print \tb but doesn't
-+       */
-       buf_begin -= buf_offset;
-       if (buf_begin <= (unsigned char const *)begin && (unsigned char const *) end <= buf_end) {
- 	buf_offset = (unsigned char const *)begin - buf_begin;
-@@ -2878,6 +2886,7 @@ dfaexec (struct dfa *d, char const *begi
- 	buf_end = end;
- 	goto go_fast;
-       }
-+#endif
- 
-       buf_offset = 0;
-       buf_begin = begin;
-@@ -2916,7 +2925,9 @@ dfaexec (struct dfa *d, char const *begi
-       mblen_buf[i] = 0;
-       inputwcs[i] = 0; /* sentinel */
-     }
-+#if 0
- go_fast:
-+#endif
- #endif /* MBS_SUPPORT */
- 
-   for (;;)
diff --git a/lang/gawk/patches/patch-ab b/lang/gawk/patches/patch-ab
index 40cac757947..d144afadc49 100644
--- a/lang/gawk/patches/patch-ab
+++ b/lang/gawk/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.9 2004/08/26 00:00:20 wiz Exp $
+$NetBSD: patch-ab,v 1.10 2005/09/05 16:58:22 wiz Exp $
 
---- Makefile.in.orig	2004-08-02 11:16:30.000000000 +0200
+--- Makefile.in.orig	2005-07-26 20:44:03.000000000 +0200
 +++ Makefile.in
-@@ -176,7 +176,7 @@ CPP = @CPP@
+@@ -156,7 +156,7 @@ CFLAGS = @CFLAGS@
+ CPP = @CPP@
  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\""
  DEPDIR = @DEPDIR@
  ECHO_C = @ECHO_C@
  ECHO_N = @ECHO_N@
-@@ -955,9 +955,7 @@ install-exec-hook:
+@@ -936,9 +936,7 @@ install-exec-hook:
  	(cd $(DESTDIR)$(bindir); \
  	$(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
  	$(LN) pgawk$(EXEEXT) pgawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \
diff --git a/lang/gawk/patches/patch-af b/lang/gawk/patches/patch-af
deleted file mode 100644
index b31c5d13b5f..00000000000
--- a/lang/gawk/patches/patch-af
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-af,v 1.2 2005/05/15 16:38:28 bouyer 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
-@@ -2024,7 +2056,6 @@
- 	int pid;
- 	int status = 0;
- 	struct redirect *redp;
--	extern int errno;
- 
- 	hstat = signal(SIGHUP, SIG_IGN);
- 	istat = signal(SIGINT, SIG_IGN);
-@@ -2205,7 +2236,6 @@
- static IOBUF *
- gawk_popen(const char *cmd, struct redirect *rp)
- {
--	extern char *strdup P((const char *));
- 	int current;
- 	char *name;
- 	static char cmdbuf[256];