Update to 2.3

PR:		101718
Submitted by:	Stanislav Sedov <ssedov@mbsd.msk.ru>

3 files changed, 72 insertions, 34 deletions

diff --git a/devel/bison2/Makefile b/devel/bison2/Makefile
index 679734c73227..d29239c0dca4 100644
--- a/devel/bison2/Makefile
+++ b/devel/bison2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	bison
-PORTVERSION=	2.1
-PORTREVISION=	2
+PORTVERSION=	2.3
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,8 +25,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		MAKEINFO="makeinfo --no-split"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		bison.1
 INFO=		bison
@@ -44,10 +43,25 @@ PLIST_SUB+=	NLS=""
 .error You have `USE_BISON' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-extract:
 	@${RM} -f ${WRKSRC}/doc/bison.info*
 
+#
+# Requires texinfo 4.8 or above
+#
+.if ${OSVERSION} < 601000
+	@${REINPLACE_CMD} "/^@headitem/d" ${WRKSRC}/doc/bison.texinfo
+.endif
+
 post-install:
 	${LN} -sf ${PREFIX}/bin/bison ${PREFIX}/bin/bison2
 
-.include <bsd.port.mk>
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${EXAMPLESDIR}/calc++
+	${INSTALL_DATA} ${WRKSRC}/examples/calc++/*.[chly]* \
+		${EXAMPLESDIR}/calc++
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/bison2/distinfo b/devel/bison2/distinfo
index d429643e0ca7..3278ac334b57 100644
--- a/devel/bison2/distinfo
+++ b/devel/bison2/distinfo
@@ -1,3 +1,3 @@
-MD5 (bison-2.1.tar.bz2) = ef3110077462b1140b2ae612626e8486
-SHA256 (bison-2.1.tar.bz2) = cb960197a77cfe8d36a969daa6eec577e22ca3d8fbae852b2cee5248bf6ae8ec
-SIZE (bison-2.1.tar.bz2) = 1005925
+MD5 (bison-2.3.tar.bz2) = c18640c6ec31a169d351e3117ecce3ec
+SHA256 (bison-2.3.tar.bz2) = b10d7e9e354be72aee4e4911cf19dd27b5c527d4e7200857365b5fcdeea0dffb
+SIZE (bison-2.3.tar.bz2) = 1080319
diff --git a/devel/bison2/pkg-plist b/devel/bison2/pkg-plist
index 5d9090c7b968..9de63dacd3e9 100644
--- a/devel/bison2/pkg-plist
+++ b/devel/bison2/pkg-plist
@@ -1,57 +1,81 @@
-@comment $FreeBSD$
 bin/bison
 bin/bison2
 share/aclocal/bison-i18n.m4
-%%DATADIR%%/c.m4
+%%DATADIR%%/README
 %%DATADIR%%/c++.m4
+%%DATADIR%%/c.m4
 %%DATADIR%%/glr.c
+%%DATADIR%%/glr.cc
 %%DATADIR%%/lalr1.cc
+%%DATADIR%%/location.cc
 %%DATADIR%%/m4sugar/m4sugar.m4
-%%DATADIR%%/README
 %%DATADIR%%/yacc.c
-%%NLS%%share/locale/da/LC_MESSAGES/bison.mo
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-driver.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-driver.hh
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-parser.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-parser.hh
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-parser.yy
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-scanner.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++-scanner.ll
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/calc++.cc
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/location.hh
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/position.hh
+%%PORTDOCS%%%%EXAMPLESDIR%%/calc++/stack.hh
 %%NLS%%share/locale/da/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/de/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/da/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/de/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/es/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/de/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/es/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/et/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/es/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/et/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/et/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/id/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/it/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/id/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/it/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/nl/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/pl/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/pt_BR/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/bison.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/tr/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison-runtime.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/bison.mo
+%%NLS%%share/locale/tr/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_TW/LC_MESSAGES/bison-runtime.mo
+%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/zh_TW
+%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sl
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/rw
-@dirrm %%DATADIR%%/m4sugar
-@dirrm %%DATADIR%%
+%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ro
+%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/pl
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%/calc++
+%%PORTDOCS%%@dirrmtry %%EXAMPLESDIR%%
+@dirrmtry %%DATADIR%%/m4sugar
+@dirrmtry %%DATADIR%%