Update to 3.0.2:

* Noteworthy changes in release 3.0.2 (2013-12-05) [stable]

** Bug fixes

*** Generated source files when errors are reported

  When warnings are issued and -Werror is set, bison would still generate
  the source files (*.c, *.h...).  As a consequence, some runs of "make"
  could fail the first time, but not the second (as the files were generated
  anyway).

  This is fixed: bison no longer generates this source files, but, of
  course, still produces the various reports (*.output, *.xml, etc.).

*** %empty is used in reports

  Empty right-hand sides are denoted by '%empty' in all the reports (text,
  dot, XML and formats derived from it).

*** YYERROR and variants

  When C++ variant support is enabled, an error triggered via YYERROR, but
  not caught via error recovery, resulted in a double deletion.

* Noteworthy changes in release 3.0.1 (2013-11-12) [stable]

** Bug fixes

*** Errors in caret diagnostics

  On some platforms, some errors could result in endless diagnostics.

*** Fixes of the -Werror option

  Options such as "-Werror -Wno-error=foo" were still turning "foo"
  diagnostics into errors instead of warnings.  This is fixed.

  Actually, for consistency with GCC, "-Wno-error=foo -Werror" now also
  leaves "foo" diagnostics as warnings.  Similarly, with "-Werror=foo
  -Wno-error", "foo" diagnostics are now errors.

*** GLR Predicates

  As demonstrated in the documentation, one can now leave spaces between
  "%?" and its "{".

*** Installation

  The yacc.1 man page is no longer installed if --disable-yacc was
  specified.

*** Fixes in the test suite

  Bugs and portability issues.

4 files changed, 8 insertions, 36 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 969ada34b20..c034227727f 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2013/11/09 05:36:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2013/12/06 12:02:46 wiz Exp $
 
-DISTNAME=	bison-3.0
-PKGREVISION=	1
+DISTNAME=	bison-3.0.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=	.tar.xz
@@ -17,6 +16,7 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		grep gm4:run msgfmt flex perl:build
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-yacc
 CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libintl=yes
 CONFIGURE_ENV+=		ac_cv_prog_M4=${TOOLS_PATH.gm4}
 
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index e5ec9727a27..9bd5b433ecd 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.26 2013/07/28 12:43:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2013/12/06 12:02:46 wiz Exp $
 bin/bison
 info/bison.info
-lib/liby.a
 man/man1/bison.1
 share/aclocal/bison-i18n.m4
 share/bison/README
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 74edbbb793b..f74320d2d5e 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.37 2013/07/28 12:43:50 wiz Exp $
+$NetBSD: distinfo,v 1.38 2013/12/06 12:02:46 wiz Exp $
 
-SHA1 (bison-3.0.tar.xz) = 5e32be3773522cf89163a4beb622eeeb4ace90dc
-RMD160 (bison-3.0.tar.xz) = 6b68dfec7e83ab481f3e9d315f779f462dfc3823
-Size (bison-3.0.tar.xz) = 1913532 bytes
-SHA1 (patch-Makefile.in) = e472c53696e55f40711d22b2befbb91fba1f349c
+SHA1 (bison-3.0.2.tar.xz) = aeb1e3544007124009e5203afe86a5676580d444
+RMD160 (bison-3.0.2.tar.xz) = 0a945ce5710a79332fbe594255305f244c24dd74
+Size (bison-3.0.2.tar.xz) = 1927296 bytes
 SHA1 (patch-lib_isnan.c) = c5d2603447064c95e8bbc75a24c09366b752bad6
diff --git a/devel/bison/patches/patch-Makefile.in b/devel/bison/patches/patch-Makefile.in
deleted file mode 100644
index 5b2c334c6a6..00000000000
--- a/devel/bison/patches/patch-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2013/07/28 12:43:50 wiz Exp $
-
-Do not install yacc and its manpage.
-
---- Makefile.in.orig	2013-07-25 15:56:24.000000000 +0000
-+++ Makefile.in
-@@ -2304,7 +2304,7 @@ dist_man_MANS = $(top_srcdir)/doc/bison.
- remove_time_stamp = \
-   sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
- 
--nodist_man_MANS = doc/yacc.1
-+nodist_man_MANS = 
- FIGS_DOT = \
-   doc/figs/example.dot                                          \
-   doc/figs/example-reduce.dot doc/figs/example-shift.dot
-@@ -2536,8 +2536,8 @@ EXTRA_src_bison_SOURCES = \
-   src/scan-gram.l                               \
-   src/scan-skel.l
- 
--bin_SCRIPTS = $(YACC_SCRIPT)
--EXTRA_SCRIPTS = src/yacc
-+bin_SCRIPTS = 
-+EXTRA_SCRIPTS = 
- TESTSUITE_AT = \
-   tests/testsuite.at                            \
-                                                 \