Update to bison 1.32

* Fix Yacc output file names
* Portability fixes
* Italian, Dutch, Swedish, Russian translation
* Many Bug Fixes
* Use of alloca in parsers
* When the generated parser lacks debugging code, YYDEBUG is now 0
  (as POSIX requires) instead of being undefined.
* User Actions
  Bison has always permitted actions such as { $$ = $1 }: it adds the
  ending semicolon.  Now if in Yacc compatibility mode, the semicolon
  is no longer output: one has to write { $$ = $1; }.
* Better C++ compliance
  The output parsers try to respect C++ namespaces.
* Reduced Grammars
  Fixed bugs when reporting useless nonterminals.
* 64 bit hosts
  The parsers work properly on 64 bit hosts.
* Error messages
  Some calls to strerror resulted in scrambled or missing error messages.
* The verbose report includes the rule line numbers.
* Rule line numbers are fixed in traces.
* Parse errors
  Verbose parse error messages from the parsers are better looking.
* Fixed parser memory leaks.
  When the generated parser was using malloc to extend its stacks, the
  previous allocations were not freed.
* Fixed verbose output file.
  Some newlines were missing.
  Some conflicts in state descriptions were missing.
* Fixed conflict report.
  Option -v was needed to get the result.
* Fixed incorrect processing of some invalid input.
* Fixed CPP guards: 9foo.h uses BISON_9FOO_H instead of 9FOO_H.
* %token MY_EOF 0 is supported.
  Before, MY_EOF was silently renumbered as 257.
* doc/refcard.tex is updated.
* %output, %file-prefix, %name-prefix.
* --output
* `--defines' and `--graph' have now an optionnal argument which is the
  output file name. `-d' and `-g' do not change, they do not take any
  argument.
* Portability fixes.
* The output file does not define const, as this caused problems when used
  with common autoconfiguration schemes.  If you still use ancient compilers
  that lack const, compile with the equivalent of the C compiler option
  `-Dconst='.  autoconf's AC_C_CONST macro provides one way to do this.
* Added `-g' and `--graph'.
* The input and the output files has automatically a similar extension.
* NLS support updated; should hopefully be less troublesome.
* Added the old Bison reference card.
* Added `--locations' and `%locations'.
* Added `-S' and `--skeleton'.
* `%raw', `-r', `--raw' is disabled.
* Special characters are escaped when output.  This solves the problems
  of the #line lines with path names including backslashes.
* New directives.
* @$ Automatic location tracking.

8 files changed, 15 insertions, 145 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 39eb42a6005..a4503321342 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2001/07/15 16:34:57 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2002/01/31 13:43:57 mjl Exp $
 
-DISTNAME=		bison-1.28
+DISTNAME=		bison-1.32
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=bison/}
 
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index 52beacc4904..5583f14190b 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:27 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/31 13:43:57 mjl Exp $
 bin/bison
 @unexec install-info --delete %D/info/bison.info %D/info/dir
 info/bison.info
@@ -9,9 +9,15 @@ info/bison.info-4
 info/bison.info-5
 @exec install-info %D/info/bison.info %D/info/dir
 man/man1/bison.1
-share/bison.simple
-share/bison.hairy
+share/bison/bison.simple
+share/bison/bison.hairy
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/bison.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/bison.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/bison.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/bison.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/bison.mo
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index f45ed6fb03e..6ef82418953 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/07/15 16:34:57 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/01/31 13:43:57 mjl Exp $
 
-SHA1 (bison-1.28.tar.gz) = d11dc896f4642ff432345a5b037505ab0b8791e8
-Size (bison-1.28.tar.gz) = 420341 bytes
-SHA1 (patch-aa) = aecc589ead50fef86dab2d16bae7fd3cf91b21c5
-SHA1 (patch-ab) = 069b0d0db61255b53cac1cdb8ca6dee7d883231c
-SHA1 (patch-ae) = 3df6fff1b06e813d1b5e39152e301d253c837484
-SHA1 (patch-af) = 874d359014fe72aa922e840b20db6736a09fbe0e
-SHA1 (patch-ag) = 558dcc5e5b63a80b497a799f881003118c3691b1
+SHA1 (bison-1.32.tar.gz) = 381cac43289aabefedc3dd04f724431b5485bdc9
+Size (bison-1.32.tar.gz) = 721047 bytes
+SHA1 (patch-ae) = 38fec3b66833750f58633a5ea1aa9a62d7d4a3b1
diff --git a/devel/bison/patches/patch-aa b/devel/bison/patches/patch-aa
deleted file mode 100644
index b8c1913584f..00000000000
--- a/devel/bison/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/08/24 12:51:25 agc Exp $
-
---- doc/bison.texinfo-orig	Thu Feb 18 18:56:43 1999
-+++ doc/bison.texinfo	Thu Feb 18 18:56:09 1999
-@@ -38,7 +38,7 @@
- @ifinfo
- @format
- START-INFO-DIR-ENTRY
--* bison: (bison).	GNU Project parser generator (yacc replacement).
-+* bison: (bison).		GNU Project parser generator (yacc replacement).
- END-INFO-DIR-ENTRY
- @end format
- @end ifinfo
diff --git a/devel/bison/patches/patch-ab b/devel/bison/patches/patch-ab
deleted file mode 100644
index 29720460ed8..00000000000
--- a/devel/bison/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/08/24 12:51:25 agc Exp $
-
-Use mkstemp(3) to make temporary files.
-
---- src/files.c.orig	Sun Oct 15 21:01:30 1995
-+++ src/files.c	Mon Sep 14 15:58:01 1998
-@@ -235,12 +235,64 @@
-   tmpattrsfile = mktemp(stringappend(tmp_base, tmp_len, "atXXXXXX"));
-   tmptabfile = mktemp(stringappend(tmp_base, tmp_len, "taXXXXXX"));
-   tmpdefsfile = mktemp(stringappend(tmp_base, tmp_len, "deXXXXXX"));
-+  if (! noparserflag)
-+    faction = tryopen(actfile, "w+");
-+  fattrs = tryopen(tmpattrsfile,"w+");
-+  ftable = tryopen(tmptabfile, "w+");
-+
-+  if (definesflag)
-+    {
-+      defsfile = stringappend(name_base, base_length, ".h");
-+      fdefines = tryopen(tmpdefsfile, "w+");
-+    }
-+#else
-+#ifdef __NetBSD__
-+{
-+	int	tmpdefsfd;
-+	
-+  if (! noparserflag &&
-+    (faction = fdopen(mkstemp(actfile = stringappend(tmp_base, tmp_len, "act.XXXXXX")), "w+")) == (FILE *) NULL) {
-+      fprintf(stderr, "%s: ", program_name);
-+      perror(actfile);
-+      done(2);
-+  }
-+  if ((fattrs = fdopen(mkstemp(tmpattrsfile = stringappend(tmp_base, tmp_len, "attrs.XXXXXX")), "w+")) == (FILE *) NULL) {
-+      fprintf(stderr, "%s: ", program_name);
-+      perror(tmpattrsfile);
-+      done(2);
-+  }
-+  if ((ftable = fdopen(mkstemp(tmptabfile = stringappend(tmp_base, tmp_len, "tab.XXXXXX")), "w+")) == (FILE *) NULL) {
-+      fprintf(stderr, "%s: ", program_name);
-+      perror(tmptabfile);
-+      done(2);
-+  }
-+  if ((tmpdefsfd = mkstemp(tmpdefsfile = stringappend(tmp_base, tmp_len, "defs.XXXXXX"))) < 0) {
-+      fprintf(stderr, "%s: ", program_name);
-+      perror(tmpdefsfile);
-+      done(2);
-+  }
-+  if (definesflag) {
-+      defsfile = stringappend(name_base, base_length, ".h");
-+      fdefines = fdopen(tmpdefsfd, "w+");
-+  }
-+}
- #else
-   if (! noparserflag)
-     actfile = mktemp(stringappend(tmp_base, tmp_len, "act.XXXXXX"));
-   tmpattrsfile = mktemp(stringappend(tmp_base, tmp_len, "attrs.XXXXXX"));
-   tmptabfile = mktemp(stringappend(tmp_base, tmp_len, "tab.XXXXXX"));
-   tmpdefsfile = mktemp(stringappend(tmp_base, tmp_len, "defs.XXXXXX"));
-+  if (! noparserflag)
-+    faction = tryopen(actfile, "w+");
-+  fattrs = tryopen(tmpattrsfile,"w+");
-+  ftable = tryopen(tmptabfile, "w+");
-+
-+  if (definesflag)
-+    {
-+      defsfile = stringappend(name_base, base_length, ".h");
-+      fdefines = tryopen(tmpdefsfile, "w+");
-+    }
-+#endif /* not NetBSD */
- #endif /* not MSDOS */
- 
-   if (! noparserflag)
diff --git a/devel/bison/patches/patch-ae b/devel/bison/patches/patch-ae
deleted file mode 100644
index 9e95a7f4b14..00000000000
--- a/devel/bison/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/02/03 11:48:36 jdolecek Exp $
-
---- src/bison.s1.orig	Mon Mar 22 17:30:00 1999
-+++ src/bison.s1	Thu Feb  3 12:38:24 2000
-@@ -611,7 +611,7 @@ yyerrlab:   /* here on detecting error *
- 	  count = 0;
- 	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
- 	  for (x = (yyn < 0 ? -yyn : 0);
--	       x < (sizeof(yytname) / sizeof(char *)); x++)
-+	       x < (int)(sizeof(yytname) / sizeof(char *)); x++)
- 	    if (yycheck[x + yyn] == x)
- 	      size += strlen(yytname[x]) + 15, count++;
- 	  msg = (char *) malloc(size + 15);
-@@ -623,7 +623,7 @@ yyerrlab:   /* here on detecting error *
- 		{
- 		  count = 0;
- 		  for (x = (yyn < 0 ? -yyn : 0);
--		       x < (sizeof(yytname) / sizeof(char *)); x++)
-+		       x < (int)(sizeof(yytname) / sizeof(char *)); x++)
- 		    if (yycheck[x + yyn] == x)
- 		      {
- 			strcat(msg, count == 0 ? ", expecting `" : " or `");
diff --git a/devel/bison/patches/patch-af b/devel/bison/patches/patch-af
deleted file mode 100644
index 68420bb8a15..00000000000
--- a/devel/bison/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/02/03 18:46:20 jdolecek Exp $
-
---- src/getopt.c.orig	Thu Feb  3 19:23:10 2000
-+++ src/getopt.c	Thu Feb  3 19:23:25 2000
-@@ -79,6 +79,8 @@
- # endif
- #endif
- 
-+#include "system.h"
-+
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.
-    When compiling libc, the _ macro is predefined.  */
diff --git a/devel/bison/patches/patch-ag b/devel/bison/patches/patch-ag
deleted file mode 100644
index a2998308bc8..00000000000
--- a/devel/bison/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/02/28 23:31:06 jlam Exp $
-
---- configure.orig	Tue Jul  6 09:03:05 1999
-+++ configure	Wed Feb 28 18:24:28 2001
-@@ -3556,6 +3556,8 @@
-    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- 	< $srcdir/po/POTFILES.in > po/POTFILES
-   
-+# Use ${PKGLOCALEDIR} to determine the location of the locale files.
-+DATADIRNAME="${PKGLOCALEDIR}"
- 
- # This is necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.