git: e3d0156e5555 - main - Revert "devel/bison: Update to 3.8.2"

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Andree <mandree_at_FreeBSD.org>
Date: Sat, 13 Nov 2021 10:46:22 UTC
The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e3d0156e5555db9686c365fa89633811e5bf3090

commit e3d0156e5555db9686c365fa89633811e5bf3090
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2021-11-13 10:45:26 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2021-11-13 10:45:26 +0000

    Revert "devel/bison: Update to 3.8.2"
    
    This reverts commit 09a2196b7a5ad825caac29f37ef8233317a62855.
    This wasn't approved by the maintainer and may require more testing.
    
    @sunpoet: My apologies for not rebasing/rearranging the mailman commits.
---
 devel/bison/Makefile                |  8 +--
 devel/bison/distinfo                |  6 +--
 devel/bison/files/patch-Makefile.in | 97 +++++++++++++++++++++++++++++++++++++
 devel/bison/pkg-plist               | 11 ++---
 4 files changed, 105 insertions(+), 17 deletions(-)

diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 049cfa33adc9..bbf520ca79d0 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jerry Hicks
 
 PORTNAME=	bison
-PORTVERSION=	3.8.2
+PORTVERSION=	3.7.6
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
@@ -15,13 +15,12 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
 
-USES=		charsetfix compiler:c11 cpe gmake iconv localbase makeinfo perl5 readline tar:xz
+USES=		charsetfix compiler:c11 cpe iconv localbase makeinfo perl5 readline tar:xz
 USE_PERL5=	build
 
 CONFIGURE_ARGS=	--disable-yacc --enable-relocatable
 GNU_CONFIGURE=	yes
 LIBS+=		-lm
-TEST_ARGS+=	${_MAKE_JOBS}
 TEST_TARGET=	check
 
 INFO=		bison
@@ -37,7 +36,4 @@ NLS_CONFIGURE_OFF=	ac_cv_libtextstyle=no
 NLS_LIB_DEPENDS=	libtextstyle.so:devel/libtextstyle
 NLS_USES=		gettext
 
-post-patch:
-		${REINPLACE_CMD} -E 's|\$$\(docdir\)/examples|\$$\(datarootdir\)/examples/bison|' ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index 198cd87cf24c..be3f22dcd961 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635685033
-SHA256 (bison-3.8.2.tar.xz) = 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
-SIZE (bison-3.8.2.tar.xz) = 2817324
+TIMESTAMP = 1618319934
+SHA256 (bison-3.7.6.tar.xz) = 67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf
+SIZE (bison-3.7.6.tar.xz) = 2627180
diff --git a/devel/bison/files/patch-Makefile.in b/devel/bison/files/patch-Makefile.in
new file mode 100644
index 000000000000..685d0d369d4b
--- /dev/null
+++ b/devel/bison/files/patch-Makefile.in
@@ -0,0 +1,97 @@
+% sed -i .orig -e 's|$(docdir)/examples|$(datarootdir)/examples/bison|' Makefile.in
+
+--- Makefile.in.orig	2021-01-23 15:41:15 UTC
++++ Makefile.in
+@@ -3123,11 +3123,11 @@ extexi = $(top_srcdir)/examples/extexi
+ extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(EXTEXIFLAGS) $(doc) --
+ extracted = $(mfcalc_extracted) $(rpcalc_extracted) \
+ 	$(calcxx_extracted) $(simple_extracted)
+-examplesdir = $(docdir)/examples
++examplesdir = $(datarootdir)/examples/bison
+ dist_examples_DATA = examples/README.md
+-cdir = $(docdir)/examples/c
++cdir = $(datarootdir)/examples/bison/c
+ dist_c_DATA = examples/c/README.md
+-bistromathicdir = $(docdir)/examples/c/bistromathic
++bistromathicdir = $(datarootdir)/examples/bison/c/bistromathic
+ @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
+ @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
+-calcdir = $(docdir)/examples/c/calc
++calcdir = $(datarootdir)/examples/bison/c/calc
+ 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
+-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
+ 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
+-mfcalcdir = $(docdir)/examples/c/mfcalc
++mfcalcdir = $(datarootdir)/examples/bison/c/mfcalc
+ mfcalc_DATA = $(mfcalc_extracted)
+ dist_mfcalc_DATA = examples/c/mfcalc/Makefile
+-pushcalcdir = $(docdir)/examples/c/pushcalc
++pushcalcdir = $(datarootdir)/examples/bison/c/pushcalc
+ nodist_examples_c_pushcalc_calc_SOURCES = examples/c/pushcalc/calc.y
+ 
+ # Don't use gnulib's system headers.
+ examples_c_pushcalc_calc_CPPFLAGS = -I$(top_srcdir)/examples/c/pushcalc -I$(top_builddir)/examples/c/pushcalc
+ examples_c_pushcalc_calc_CFLAGS = $(TEST_CFLAGS)
+ dist_pushcalc_DATA = examples/c/pushcalc/calc.y examples/c/pushcalc/Makefile examples/c/pushcalc/README.md
+-reccalcdir = $(docdir)/examples/c/reccalc
++reccalcdir = $(datarootdir)/examples/bison/c/reccalc
+ @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
+ examples_c_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/c/rpcalc
+ examples_c_rpcalc_rpcalc_CFLAGS = $(TEST_CFLAGS)
+ examples_c_rpcalc_rpcalc_LDADD = -lm
+-rpcalcdir = $(docdir)/examples/c/rpcalc
++rpcalcdir = $(datarootdir)/examples/bison/c/rpcalc
+ rpcalc_DATA = $(rpcalc_extracted)
+ dist_rpcalc_DATA = examples/c/rpcalc/Makefile
+-cxxdir = $(docdir)/examples/c++
++cxxdir = $(datarootdir)/examples/bison/c++
+ calcxx_sources_extracted = \
+   examples/c++/calc++/driver.cc					\
+   examples/c++/calc++/driver.hh					\
+@@ -3208,7 +3208,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)
+-calcxxdir = $(docdir)/examples/c++/calc++
++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)
+ @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
+-javadir = $(docdir)/examples/java
++javadir = $(datarootdir)/examples/bison/java
+ dist_java_DATA = examples/java/README.md
+-java_calcdir = $(docdir)/examples/java/calc
++java_calcdir = $(datarootdir)/examples/bison/java/calc
+ dist_java_calc_DATA = examples/java/calc/Calc.y examples/java/calc/Makefile
+-java_simpledir = $(docdir)/examples/java/simple
++java_simpledir = $(datarootdir)/examples/bison/java/simple
+ dist_java_simple_DATA = examples/java/simple/Calc.y examples/java/simple/Makefile
+ 
+ # Non-gnulib sources in Bison's internal library.
diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 07646066a6cb..c1aa02e07374 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -5,6 +5,7 @@ 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
@@ -15,7 +16,6 @@ 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
@@ -56,9 +56,6 @@ share/aclocal/bison-i18n.m4
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/calc.y
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/c++-types.y
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/parse.y
@@ -75,11 +72,9 @@ 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/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc/calc.y
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/simple/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/simple/calc.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc.y
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Calc.y
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Makefile