5 files changed, 39 insertions, 55 deletions

diff --git a/devel/Makefile b/devel/Makefile
index bd0783db2cbc..3b05dd39eceb 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -81,6 +81,7 @@
     SUBDIR += bicyclerepair
     SUBDIR += bin86
     SUBDIR += bison
+    SUBDIR += bison2
     SUBDIR += bison-devel
     SUBDIR += bisongen
     SUBDIR += bitkeeper
diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 6f584afd7e83..7fa945f01b51 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	bison
-PORTVERSION=	1.875
-PORTREVISION=	4
+PORTVERSION=	2.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +17,7 @@ COMMENT=	A parser generator from FSF, (mostly) compatible with Yacc
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=	bison-1.7[0-9]* bison-2.[0-9]*
+CONFLICTS=	bison-1.*
 
 NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
@@ -47,6 +46,6 @@ post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 
 post-install:
-	${LN} -sf ${PREFIX}/bin/bison ${PREFIX}/bin/bison1875
+	${LN} -sf ${PREFIX}/bin/bison ${PREFIX}/bin/bison2
 
 .include <bsd.port.mk>
diff --git a/devel/bison2/distinfo b/devel/bison2/distinfo
index ff1e1c63113b..d429643e0ca7 100644
--- a/devel/bison2/distinfo
+++ b/devel/bison2/distinfo
@@ -1,2 +1,3 @@
-MD5 (bison-1.875.tar.bz2) = b7f8027b249ebd4dd0cc948943a71af0
-SIZE (bison-1.875.tar.bz2) = 814922
+MD5 (bison-2.1.tar.bz2) = ef3110077462b1140b2ae612626e8486
+SHA256 (bison-2.1.tar.bz2) = cb960197a77cfe8d36a969daa6eec577e22ca3d8fbae852b2cee5248bf6ae8ec
+SIZE (bison-2.1.tar.bz2) = 1005925
diff --git a/devel/bison2/files/patch-data::yacc.c b/devel/bison2/files/patch-data::yacc.c
deleted file mode 100644
index d30764ae6230..000000000000
--- a/devel/bison2/files/patch-data::yacc.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- data/yacc.c.orig	Sat Dec 28 00:36:02 2002
-+++ data/yacc.c	Sun Dec  5 14:26:50 2004
-@@ -465,7 +465,13 @@
- 
- #define YYACCEPT	goto yyacceptlab
- #define YYABORT		goto yyabortlab
--#define YYERROR		goto yyerrlab1
-+#define YYERROR		]b4_location_if([do	\
-+			{			\
-+			  yylerrsp = ylap;	\
-+			  *++yylerrsp = yyloc;	\
-+			  goto yyerrlab1;	\
-+			} while (0)],		\
-+			[goto yyerrlab1])[
- 
- /* Like YYERROR except do call yyerror.  This remains here temporarily
-    to ease the transition to the new meaning of YYERROR, for GCC.
-@@ -1103,29 +1109,13 @@
- 
-   /* Else will try to reuse lookahead token after shifting the error
-      token.  */
--  goto yyerrlab2;
-+  goto yyerrlab1;
- 
- 
- /*----------------------------------------------------.
- | yyerrlab1 -- error raised explicitly by an action.  |
- `----------------------------------------------------*/
- yyerrlab1:
--
--  /* Suppress GCC warning that yyerrlab1 is unused when no action
--     invokes YYERROR.  */
--#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
--  __attribute__ ((__unused__))
--#endif
--
--]b4_location_if([  yylerrsp = yylsp;
--  *++yylerrsp = yyloc;])[
--  goto yyerrlab2;
--
--
--/*---------------------------------------------------------------.
--| yyerrlab2 -- pop states until the error token can be shifted.  |
--`---------------------------------------------------------------*/
--yyerrlab2:
-   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
- 
-   for (;;)
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 71e3b6972fff..84f8fcce67fb 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -1,27 +1,58 @@
 @comment $FreeBSD$
 bin/bison
-bin/bison1875
+bin/bison2
 bin/yacc
 lib/liby.a
+share/aclocal/bison-i18n.m4
 %%DATADIR%%/c.m4
+%%DATADIR%%/c++.m4
 %%DATADIR%%/glr.c
 %%DATADIR%%/lalr1.cc
 %%DATADIR%%/m4sugar/m4sugar.m4
 %%DATADIR%%/README
 %%DATADIR%%/yacc.c
 %%NLS%%share/locale/da/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/da/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/et/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/id/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/bison-runtime.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/bison-runtime.mo
 @dirrm %%DATADIR%%/m4sugar
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/aclocal 2>/dev/null || true