Update to 2.2:

* The distribution terms for all Bison-generated parsers now permit
  using the parsers in nonfree programs.  Previously, this permission
  was granted only for Bison-generated LALR(1) parsers in C.

* %name-prefix changes the namespace name in C++ outputs.

* The C++ parsers export their token_type.

* Bison now allows multiple %union declarations, and concatenates
  their contents together.

* New warning: unused values
  Right-hand side symbols whose values are not used are reported,
  if the symbols have destructors.  For instance:

     exp: exp "?" exp ":" exp { $1 ? $1 : $3; }
	| exp "+" exp
	;

  will trigger a warning about $$ and $5 in the first rule, and $3 in
  the second ($1 is copied to $$ by the default rule).  This example
  most likely contains three errors, and could be rewritten as:

     exp: exp "?" exp ":" exp
	    { $$ = $1 ? $3 : $5; free ($1 ? $5 : $3); free ($1); }
	| exp "+" exp
	    { $$ = $1 ? $1 : $3; if ($1) free ($3); }
	;

  However, if the original actions were really intended, memory leaks
  and all, the warnings can be suppressed by letting Bison believe the
  values are used, e.g.:

     exp: exp "?" exp ":" exp { $1 ? $1 : $3; (void) ($$, $5); }
	| exp "+" exp         { $$ = $1; (void) $3; }
	;

  If there are mid-rule actions, the warning is issued if no action
  uses it.  The following triggers no warning: $1 and $3 are used.

     exp: exp { push ($1); } '+' exp { push ($3); sum (); };

  The warning is intended to help catching lost values and memory leaks.
  If a value is ignored, its associated memory typically is not reclaimed.

* %destructor vs. YYABORT, YYACCEPT, and YYERROR.
  Destructors are now called when user code invokes YYABORT, YYACCEPT,
  and YYERROR, for all objects on the stack, other than objects
  corresponding to the right-hand side of the current rule.

* %expect, %expect-rr
  Incorrect numbers of expected conflicts are now actual errors,
  instead of warnings.

* GLR, YACC parsers.
  The %parse-params are available in the destructors (and the
  experimental printers) as per the documentation.

* Bison now warns if it finds a stray `$' or `@' in an action.

* %require "VERSION"
  This specifies that the grammar file depends on features implemented
  in Bison version VERSION or higher.

* lalr1.cc: The token and value types are now class members.
  The tokens were defined as free form enums and cpp macros.  YYSTYPE
  was defined as a free form union.  They are now class members:
  tokens are enumerations of the `yy::parser::token' struct, and the
  semantic values have the `yy::parser::semantic_type' type.

  If you do not want or can update to this scheme, the directive
  `%define "global_tokens_and_yystype" "1"' triggers the global
  definition of tokens and YYSTYPE.  This change is suitable both
  for previous releases of Bison, and this one.

  If you wish to update, then make sure older version of Bison will
  fail using `%require "2.2"'.

* DJGPP support added.

3 files changed, 11 insertions, 8 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 3c15c423a1b..161b1d41fff 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2006/05/03 15:41:05 minskim Exp $
+# $NetBSD: Makefile,v 1.60 2006/05/30 19:25:23 wiz Exp $
 
-DISTNAME=		bison-2.1
-PKGREVISION=		1
+DISTNAME=		bison-2.2
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index a6186cfca95..5a7c29ffe33 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/05/03 15:41:05 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/05/30 19:25:23 wiz Exp $
 bin/bison
 info/bison.info
 lib/liby.a
@@ -8,7 +8,9 @@ share/bison/README
 share/bison/c++.m4
 share/bison/c.m4
 share/bison/glr.c
+share/bison/glr.cc
 share/bison/lalr1.cc
+share/bison/location.cc
 share/bison/m4sugar/m4sugar.m4
 share/bison/yacc.c
 share/locale/da/LC_MESSAGES/bison-runtime.mo
@@ -47,11 +49,13 @@ share/locale/ru/LC_MESSAGES/bison-runtime.mo
 share/locale/ru/LC_MESSAGES/bison.mo
 share/locale/rw/LC_MESSAGES/bison-runtime.mo
 share/locale/rw/LC_MESSAGES/bison.mo
+share/locale/sl/LC_MESSAGES/bison-runtime.mo
 share/locale/sv/LC_MESSAGES/bison-runtime.mo
 share/locale/sv/LC_MESSAGES/bison.mo
 share/locale/tr/LC_MESSAGES/bison-runtime.mo
 share/locale/tr/LC_MESSAGES/bison.mo
 share/locale/vi/LC_MESSAGES/bison-runtime.mo
 share/locale/vi/LC_MESSAGES/bison.mo
+share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
 @dirrm share/bison/m4sugar
 @dirrm share/bison
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 60b3141791b..eaab2582112 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2005/09/30 13:51:25 wiz Exp $
+$NetBSD: distinfo,v 1.18 2006/05/30 19:25:23 wiz Exp $
 
-SHA1 (bison-2.1.tar.bz2) = 0a3a5b3a506e4c406e6a82640058d3a29a309b84
-RMD160 (bison-2.1.tar.bz2) = 43967931eb04635547277bbd0152b45414420299
-Size (bison-2.1.tar.bz2) = 1005925 bytes
+SHA1 (bison-2.2.tar.bz2) = b01691c83cc0d08d3c03e32c494f6b03381ecd21
+RMD160 (bison-2.2.tar.bz2) = c31ff04eeebdfc3fe1bef860daeb7c979d9054af
+Size (bison-2.2.tar.bz2) = 1077707 bytes
 SHA1 (patch-aa) = 48ae980971419ede0a45dc5aac7d302586d3826e