3 files changed, 34 insertions, 14 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 95b6b9940a24..7e4788391e47 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	bison
-PORTVERSION=	2.3
-PORTREVISION=	4
+PORTVERSION=	2.4.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ade@FreeBSD.org
+MAINTAINER=	johans@stack.nl
 COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
@@ -44,6 +43,7 @@ PLIST_SUB+=	NLS=""
 
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
+	@${REINPLACE_CMD} 's/MANS = yacc.1/MANS =/' ${WRKSRC}/doc/Makefile.in
 
 #
 # Requires texinfo 4.8 or above
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 3278ac334b57..bf76eb14c94d 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,3 +1,3 @@
-MD5 (bison-2.3.tar.bz2) = c18640c6ec31a169d351e3117ecce3ec
-SHA256 (bison-2.3.tar.bz2) = b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
-SIZE (bison-2.3.tar.bz2) = 1080319
+MD5 (bison-2.4.1.tar.bz2) = 84e80a2a192c1a4c02d43fbf2bcc4ca4
+SHA256 (bison-2.4.1.tar.bz2) = 2354469782149e36c644ae7c3e5105895424ed21cda5c05b591cb3dc17068e6b
+SIZE (bison-2.4.1.tar.bz2) = 1467784
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 87d19fca0dd0..2ee3f9be281c 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -1,13 +1,24 @@
 bin/bison
 share/aclocal/bison-i18n.m4
 %%DATADIR%%/README
+%%DATADIR%%/bison.m4
+%%DATADIR%%/c++-skel.m4
 %%DATADIR%%/c++.m4
+%%DATADIR%%/c-skel.m4
 %%DATADIR%%/c.m4
 %%DATADIR%%/glr.c
 %%DATADIR%%/glr.cc
+%%DATADIR%%/java-skel.m4
+%%DATADIR%%/java.m4
 %%DATADIR%%/lalr1.cc
+%%DATADIR%%/lalr1.java
 %%DATADIR%%/location.cc
+%%DATADIR%%/m4sugar/foreach.m4
 %%DATADIR%%/m4sugar/m4sugar.m4
+%%DATADIR%%/xslt/bison.xsl
+%%DATADIR%%/xslt/xml2dot.xsl
+%%DATADIR%%/xslt/xml2text.xsl
+%%DATADIR%%/xslt/xml2xhtml.xsl
 %%DATADIR%%/yacc.c
 %%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-driver.cc
 %%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-driver.hh
@@ -24,10 +35,13 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/da/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/el/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/el/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/bison-runtime.mo
@@ -40,6 +54,8 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/it/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ky/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/bison-runtime.mo
@@ -54,19 +70,23 @@ share/aclocal/bison-i18n.m4
 %%NLS%%share/locale/ro/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/th/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/calc++
-%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry %%DATADIR%%/m4sugar
-@dirrmtry %%DATADIR%%
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/bison.mo
+%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ky
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/calc++
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%/m4sugar
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%