aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2022-03-07 17:50:11 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2022-03-07 18:10:55 +0000
commit5726e1d60f8a3d92891ced1d34c1cf814517a318 (patch)
tree8957e5d2696ae40b31a6177f50286c99ba18e711
parentcd5af35730a260662c24e63d50a6c2762b206c94 (diff)
devel/bison: Update to 3.8.2
-rw-r--r--devel/bison/Makefile2
-rw-r--r--devel/bison/distinfo6
-rw-r--r--devel/bison/files/patch-Makefile.in29
-rw-r--r--devel/bison/files/patch-lib-config.in.h4
-rw-r--r--devel/bison/pkg-plist11
5 files changed, 31 insertions, 21 deletions
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index bbf520ca79d0..814a28cce9a6 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,7 +1,7 @@
# Created by: Jerry Hicks
PORTNAME= bison
-PORTVERSION= 3.7.6
+PORTVERSION= 3.8.2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNU
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index be3f22dcd961..ea598b19fcb1 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618319934
-SHA256 (bison-3.7.6.tar.xz) = 67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf
-SIZE (bison-3.7.6.tar.xz) = 2627180
+TIMESTAMP = 1632690789
+SHA256 (bison-3.8.2.tar.xz) = 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
+SIZE (bison-3.8.2.tar.xz) = 2817324
diff --git a/devel/bison/files/patch-Makefile.in b/devel/bison/files/patch-Makefile.in
index 685d0d369d4b..06d8ec132766 100644
--- a/devel/bison/files/patch-Makefile.in
+++ b/devel/bison/files/patch-Makefile.in
@@ -1,8 +1,8 @@
% sed -i .orig -e 's|$(docdir)/examples|$(datarootdir)/examples/bison|' Makefile.in
---- Makefile.in.orig 2021-01-23 15:41:15 UTC
+--- Makefile.in.orig 2021-09-11 06:28:41 UTC
+++ Makefile.in
-@@ -3123,11 +3123,11 @@ extexi = $(top_srcdir)/examples/extexi
+@@ -3425,11 +3425,11 @@ extexi = $(top_srcdir)/examples/extexi
extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(EXTEXIFLAGS) $(doc) --
extracted = $(mfcalc_extracted) $(rpcalc_extracted) \
$(calcxx_extracted) $(simple_extracted)
@@ -17,7 +17,7 @@
@ENABLE_BISTROMATHIC_TRUE@nodist_examples_c_bistromathic_bistromathic_SOURCES = examples/c/bistromathic/parse.y
@ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_CPPFLAGS = \
@ENABLE_BISTROMATHIC_TRUE@ -DBISON_LOCALEDIR='"$(localdir)"' \
-@@ -3137,14 +3137,14 @@ bistromathicdir = $(docdir)/examples/c/bistromathic
+@@ -3439,7 +3439,7 @@ bistromathicdir = $(docdir)/examples/c/bistromathic
@ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_CFLAGS = $(TEST_CFLAGS)
@ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_LDADD = -lm $(LIBREADLINE) $(LIBINTL)
dist_bistromathic_DATA = examples/c/bistromathic/parse.y examples/c/bistromathic/Makefile examples/c/bistromathic/README.md
@@ -26,15 +26,16 @@
nodist_examples_c_calc_calc_SOURCES = examples/c/calc/calc.y
# Don't use gnulib's system headers.
- examples_c_calc_calc_CPPFLAGS = -I$(top_srcdir)/examples/c/calc -I$(top_builddir)/examples/c/calc
- examples_c_calc_calc_CFLAGS = $(TEST_CFLAGS)
- dist_calc_DATA = examples/c/calc/calc.y examples/c/calc/Makefile examples/c/calc/README.md
+@@ -3453,7 +3453,7 @@ nodist_examples_c_glr_c___types_SOURCES = examples/c/g
+ examples_c_glr_c___types_CPPFLAGS = -I$(top_srcdir)/examples/c/glr -I$(top_builddir)/examples/c/glr
+ examples_c_glr_c___types_CFLAGS = $(TEST_CFLAGS)
+ dist_glr_DATA = examples/c/glr/c++-types.y examples/c/glr/Makefile examples/c/glr/README.md
-lexcalcdir = $(docdir)/examples/c/lexcalc
+lexcalcdir = $(datarootdir)/examples/bison/c/lexcalc
@FLEX_WORKS_TRUE@nodist_examples_c_lexcalc_lexcalc_SOURCES = examples/c/lexcalc/parse.y examples/c/lexcalc/parse.h examples/c/lexcalc/scan.l
@FLEX_WORKS_TRUE@examples_c_lexcalc_lexcalc_CPPFLAGS = -I$(top_srcdir)/examples/c/lexcalc -I$(top_builddir)/examples/c/lexcalc
dist_lexcalc_DATA = examples/c/lexcalc/parse.y examples/c/lexcalc/scan.l examples/c/lexcalc/Makefile examples/c/lexcalc/README.md
-@@ -3155,17 +3155,17 @@ nodist_examples_c_mfcalc_mfcalc_SOURCES = $(mfcalc_sou
+@@ -3464,17 +3464,17 @@ nodist_examples_c_mfcalc_mfcalc_SOURCES = $(mfcalc_sou
examples_c_mfcalc_mfcalc_CPPFLAGS = -I$(top_srcdir)/examples/c/mfcalc -I$(top_builddir)/examples/c/mfcalc
examples_c_mfcalc_mfcalc_CFLAGS = $(TEST_CFLAGS)
examples_c_mfcalc_mfcalc_LDADD = -lm
@@ -55,7 +56,7 @@
@FLEX_WORKS_TRUE@nodist_examples_c_reccalc_reccalc_SOURCES = examples/c/reccalc/parse.y examples/c/reccalc/scan.h examples/c/reccalc/scan.c
@FLEX_WORKS_TRUE@examples_c_reccalc_reccalc_CPPFLAGS = -I$(top_srcdir)/examples/c/reccalc -I$(top_builddir)/examples/c/reccalc
-@@ -3182,10 +3182,10 @@ nodist_examples_c_rpcalc_rpcalc_SOURCES = $(rpcalc_sou
+@@ -3491,10 +3491,10 @@ nodist_examples_c_rpcalc_rpcalc_SOURCES = $(rpcalc_sou
examples_c_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/c/rpcalc
examples_c_rpcalc_rpcalc_CFLAGS = $(TEST_CFLAGS)
examples_c_rpcalc_rpcalc_LDADD = -lm
@@ -68,7 +69,7 @@
calcxx_sources_extracted = \
examples/c++/calc++/driver.cc \
examples/c++/calc++/driver.hh \
-@@ -3208,7 +3208,7 @@ calcxx_sources = \
+@@ -3517,7 +3517,7 @@ calcxx_sources = \
@ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@nodist_examples_c___calc___calc___SOURCES = $(calcxx_sources)
@ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@examples_c___calc___calc___CPPFLAGS = -I$(top_srcdir)/examples/c++/calc++ -I$(top_builddir)/examples/c++/calc++
@ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@examples_c___calc___calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
@@ -76,14 +77,18 @@
+calcxxdir = $(datarootdir)/examples/bison/c++/calc++
calcxx_DATA = $(calcxx_extracted)
dist_calcxx_DATA = examples/c++/calc++/README.md examples/c++/calc++/Makefile
- cxx_DATA = $(simple_extracted)
-@@ -3223,13 +3223,13 @@ simple_sources = $(simple_extracted)
+ glrxxdir = $(docdir)/examples/c++/glr
+@@ -3542,17 +3542,17 @@ simple_sources = $(simple_extracted)
@ENABLE_CXX11_TRUE@examples_c___variant_11_CXXFLAGS = $(CXX11_CXXFLAGS) $(WARN_CXXFLAGS_TEST)
@ENABLE_CXX11_TRUE@examples_c___variant_11_CPPFLAGS = -I$(top_builddir)
dist_cxx_DATA = examples/c++/README.md examples/c++/Makefile examples/c++/variant.yy examples/c++/variant-11.yy
-ddir = $(docdir)/examples/d
+ddir = $(datarootdir)/examples/bison/d
- dist_d_DATA = examples/d/calc.y examples/d/Makefile examples/d/README.md
+ dist_d_DATA = examples/d/README.md
+ calcddir = $(docdir)/examples/d/calc
+ dist_calcd_DATA = examples/d/calc/calc.y examples/d/calc/Makefile
+ simpleddir = $(docdir)/examples/d/simple
+ dist_simpled_DATA = examples/d/simple/calc.y examples/d/simple/Makefile
-javadir = $(docdir)/examples/java
+javadir = $(datarootdir)/examples/bison/java
dist_java_DATA = examples/java/README.md
diff --git a/devel/bison/files/patch-lib-config.in.h b/devel/bison/files/patch-lib-config.in.h
index 695db5bd26f8..35b389eb8336 100644
--- a/devel/bison/files/patch-lib-config.in.h
+++ b/devel/bison/files/patch-lib-config.in.h
@@ -1,6 +1,6 @@
---- lib/config.in.h.orig 2021-01-23 14:24:00 UTC
+--- lib/config.in.h.orig 2021-09-10 09:15:27 UTC
+++ lib/config.in.h
-@@ -1603,7 +1603,7 @@
+@@ -1918,7 +1918,7 @@
|| (defined _MSC_VER && 1900 <= _MSC_VER)) \
&& 0)
/* [[noreturn]] is not practically usable, because with it the syntax
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index c1aa02e07374..5a5e38036ff3 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -5,7 +5,6 @@ share/aclocal/bison-i18n.m4
%%DATADIR%%/bison-default.css
%%DATADIR%%/m4sugar/foreach.m4
%%DATADIR%%/m4sugar/m4sugar.m4
-%%DATADIR%%/skeletons/README-D.txt
%%DATADIR%%/skeletons/bison.m4
%%DATADIR%%/skeletons/c++-skel.m4
%%DATADIR%%/skeletons/c++.m4
@@ -16,6 +15,7 @@ share/aclocal/bison-i18n.m4
%%DATADIR%%/skeletons/d.m4
%%DATADIR%%/skeletons/glr.c
%%DATADIR%%/skeletons/glr.cc
+%%DATADIR%%/skeletons/glr2.cc
%%DATADIR%%/skeletons/java-skel.m4
%%DATADIR%%/skeletons/java.m4
%%DATADIR%%/skeletons/lalr1.cc
@@ -36,6 +36,13 @@ share/aclocal/bison-i18n.m4
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/examples/c/glr/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/examples/c/glr/README.md
+%%PORTDOCS%%%%DOCSDIR%%/examples/c/glr/c++-types.y
+%%PORTDOCS%%%%DOCSDIR%%/examples/d/calc/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/examples/d/calc/calc.y
+%%PORTDOCS%%%%DOCSDIR%%/examples/d/simple/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/examples/d/simple/calc.y
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.md
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/Makefile
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c++/README.md
@@ -72,9 +79,7 @@ share/aclocal/bison-i18n.m4
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/reccalc/scan.l
%%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/README.md
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Calc.y
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Makefile