3 files changed, 51 insertions, 34 deletions

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 0ba2e18d8da2..5d774834a7f6 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bison
-PORTVERSION=	3.2.2
+PORTVERSION=	3.3.2
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
@@ -22,7 +22,7 @@ OPTIONS_SUB=	yes
 USES=		charsetfix localbase makeinfo perl5 tar:xz
 USE_PERL5=	build
 
-CONFIGURE_ARGS=	--disable-yacc
+CONFIGURE_ARGS=	--disable-yacc --enable-relocatable
 .ifdef QEMU_EMULATING
 # XXX bug 224740: configure hangs
 CONFIGURE_ENV=	gl_cv_func_printf_enomem=no
@@ -38,6 +38,6 @@ 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]
+	@${REINPLACE_CMD} -e 's|\(.*\) _Noreturn void|_Noreturn \1 void|' ${WRKSRC}/data/skeletons/*.c ${WRKSRC}/lib/*.[ch]
 
 .include <bsd.port.mk>
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 751b14e4f279..c3ad1f6b3ea7 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542892924
-SHA256 (bison-3.2.2.tar.xz) = 6f950f24e4d0745c7cc870e36d04f4057133ce0f31d6b4564e6f510a7d3ffafa
-SIZE (bison-3.2.2.tar.xz) = 2091244
+TIMESTAMP = 1549295888
+SHA256 (bison-3.3.2.tar.xz) = 039ee45b61d95e5003e7e8376f9080001b4066ff357bde271b7faace53b9d804
+SIZE (bison-3.3.2.tar.xz) = 2108612
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 4b9c4951bff0..53486481a18d 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -2,50 +2,67 @@ 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%%/skeletons/README-D.txt
+%%DATADIR%%/skeletons/bison.m4
+%%DATADIR%%/skeletons/c++-skel.m4
+%%DATADIR%%/skeletons/c++.m4
+%%DATADIR%%/skeletons/c-like.m4
+%%DATADIR%%/skeletons/c-skel.m4
+%%DATADIR%%/skeletons/c.m4
+%%DATADIR%%/skeletons/d-skel.m4
+%%DATADIR%%/skeletons/d.m4
+%%DATADIR%%/skeletons/glr.c
+%%DATADIR%%/skeletons/glr.cc
+%%DATADIR%%/skeletons/java-skel.m4
+%%DATADIR%%/skeletons/java.m4
+%%DATADIR%%/skeletons/lalr1.cc
+%%DATADIR%%/skeletons/lalr1.d
+%%DATADIR%%/skeletons/lalr1.java
+%%DATADIR%%/skeletons/location.cc
+%%DATADIR%%/skeletons/stack.hh
+%%DATADIR%%/skeletons/variant.hh
+%%DATADIR%%/skeletons/yacc.c
 %%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%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/calc++.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/driver.cc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/driver.hh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/parser.yy
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/calc++/scanner.ll
 %%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%%/c/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/parse.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/scan.l
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/mfcalc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/mfcalc/calc.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/mfcalc/mfcalc.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/rpcalc.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Calc.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.md
 %%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