Index: head/devel/bison/Makefile
===================================================================
--- head/devel/bison/Makefile	(revision 486525)
+++ head/devel/bison/Makefile	(revision 486526)
@@ -1,42 +1,43 @@
 # Created by: Jerry Hicks
 # $FreeBSD$
 
 PORTNAME=	bison
-PORTVERSION=	3.1
-PORTREVISION=	1
+PORTVERSION=	3.2.2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Parser generator from FSF, (mostly) compatible with Yacc
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	m4>=1.4.16,1:devel/m4
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
 
 OPTIONS_DEFINE=	DOCS EXAMPLES NLS
 OPTIONS_SUB=	yes
 
+USES=		charsetfix localbase makeinfo perl5 tar:xz
+USE_PERL5=	build
+
 CONFIGURE_ARGS=	--disable-yacc
 .ifdef QEMU_EMULATING
 # XXX bug 224740: configure hangs
 CONFIGURE_ENV=	gl_cv_func_printf_enomem=no
 .endif
 GNU_CONFIGURE=	yes
+LIBS+=		-lm
 TEST_TARGET=	check
-USE_PERL5=	build
-USES=		charsetfix localbase makeinfo perl5 tar:xz
 
 INFO=		bison
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(docdir)\(/examples\)|$$(datarootdir)\1/bison|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(.*\) _Noreturn void|_Noreturn \1 void|' ${WRKSRC}/data/*.c ${WRKSRC}/lib/*.[ch]
 
 .include <bsd.port.mk>
Index: head/devel/bison/distinfo
===================================================================
--- head/devel/bison/distinfo	(revision 486525)
+++ head/devel/bison/distinfo	(revision 486526)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536249060
-SHA256 (bison-3.1.tar.xz) = 7c2464ad6cb7b513b2c350a092d919327e1f63d12ff024836acbb504475da5c6
-SIZE (bison-3.1.tar.xz) = 1990536
+TIMESTAMP = 1542892924
+SHA256 (bison-3.2.2.tar.xz) = 6f950f24e4d0745c7cc870e36d04f4057133ce0f31d6b4564e6f510a7d3ffafa
+SIZE (bison-3.2.2.tar.xz) = 2091244
Index: head/devel/bison/pkg-plist
===================================================================
--- head/devel/bison/pkg-plist	(revision 486525)
+++ head/devel/bison/pkg-plist	(revision 486526)
@@ -1,112 +1,116 @@
 bin/bison
 man/man1/bison.1.gz
 share/aclocal/bison-i18n.m4
 %%DATADIR%%/README
 %%DATADIR%%/bison.m4
 %%DATADIR%%/c++-skel.m4
 %%DATADIR%%/c++.m4
 %%DATADIR%%/c-like.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%%/stack.hh
 %%DATADIR%%/variant.hh
 %%DATADIR%%/xslt/bison.xsl
 %%DATADIR%%/xslt/xml2dot.xsl
 %%DATADIR%%/xslt/xml2text.xsl
 %%DATADIR%%/xslt/xml2xhtml.xsl
 %%DATADIR%%/yacc.c
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/simple.yy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/variant-11.yy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/variant.yy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/calc++.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/driver.cc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/driver.hh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/parser.yy
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/calc++/scanner.ll
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mfcalc/calc.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mfcalc/mfcalc.y
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpcalc/rpcalc.y
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/variant.yy
 %%NLS%%share/locale/ast/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/da/LC_MESSAGES/bison-runtime.mo
 %%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/eo/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/eo/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/fi/LC_MESSAGES/bison.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
 %%NLS%%share/locale/ga/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/id/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bison-runtime.mo
 %%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/lv/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
 %%NLS%%share/locale/nb/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/bison-runtime.mo
 %%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/sl/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/bison.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_CN/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/bison.mo