Do not install yacc.1. Addresses PR 45161 by Thomas Cort.

Add comment to patch-aa while here.

5 files changed, 24 insertions, 6 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index d6a28a9107f..25eb739f927 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2011/07/12 14:12:13 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2011/08/06 17:15:42 wiz Exp $
 
 DISTNAME=		bison-2.5
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=bison/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index 73b5d96184c..aca07aa2bd3 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.21 2011/07/12 14:12:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.22 2011/08/06 17:15:43 wiz Exp $
 bin/bison
 info/bison.info
 lib/liby.a
 man/man1/bison.1
-man/man1/yacc.1
 share/aclocal/bison-i18n.m4
 share/bison/README
 share/bison/bison.m4
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 61e135ee59e..c7efbfe14dd 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.26 2011/07/12 14:12:13 wiz Exp $
+$NetBSD: distinfo,v 1.27 2011/08/06 17:15:43 wiz Exp $
 
 SHA1 (bison-2.5.tar.bz2) = 907319624fe4f4c5f9e2c3e23601041ac636ae31
 RMD160 (bison-2.5.tar.bz2) = 9f90e477c9c397a8b136aa7bcee887767d94eea7
 Size (bison-2.5.tar.bz2) = 2030863 bytes
-SHA1 (patch-aa) = dbc64816b60aebba81125aea0cdc8bb648aa114f
+SHA1 (patch-aa) = 7e83fa995e9406a67811b56fff2a25ef0feb06cf
+SHA1 (patch-doc_Makefile.in) = 11371a773019ada76396d36334abc6c8cac75ec6
diff --git a/devel/bison/patches/patch-aa b/devel/bison/patches/patch-aa
index f3706af6954..b1a6ee43f17 100644
--- a/devel/bison/patches/patch-aa
+++ b/devel/bison/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2008/11/07 12:32:32 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2011/08/06 17:15:43 wiz Exp $
+
+Do not create yacc executable.
 
 --- src/Makefile.in.orig	2008-11-02 21:59:45.000000000 +0000
 +++ src/Makefile.in
diff --git a/devel/bison/patches/patch-doc_Makefile.in b/devel/bison/patches/patch-doc_Makefile.in
new file mode 100644
index 00000000000..4f32e148420
--- /dev/null
+++ b/devel/bison/patches/patch-doc_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_Makefile.in,v 1.1 2011/08/06 17:15:43 wiz Exp $
+
+Do not install yacc(1).
+
+--- doc/Makefile.in.orig	2011-05-14 22:24:27.000000000 +0000
++++ doc/Makefile.in
+@@ -1133,7 +1133,7 @@ remove_time_stamp = \
+ MOSTLYCLEANFILES = $(srcdir)/*.t
+ SUFFIXES = .x .1
+ PREPATH = $(top_builddir)/src
+-nodist_man_MANS = yacc.1
++nodist_man_MANS = 
+ DOXYGEN = doxygen
+ edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+ 	   -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \