View | Details | Raw Unified | Return to bug 259577 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/bison/Makefile (-2 / +6 lines)
Lines 1-7 Link Here
1
# Created by: Jerry Hicks
1
# Created by: Jerry Hicks
2
2
3
PORTNAME=	bison
3
PORTNAME=	bison
4
PORTVERSION=	3.7.6
4
PORTVERSION=	3.8.2
5
PORTEPOCH=	1
5
PORTEPOCH=	1
6
CATEGORIES=	devel
6
CATEGORIES=	devel
7
MASTER_SITES=	GNU
7
MASTER_SITES=	GNU
Lines 15-26 LICENSE_FILE= ${WRKSRC}/COPYING Link Here
15
BUILD_DEPENDS=	${RUN_DEPENDS}
15
BUILD_DEPENDS=	${RUN_DEPENDS}
16
RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
16
RUN_DEPENDS=	m4>=1.4.16,1:devel/m4
17
17
18
USES=		charsetfix compiler:c11 cpe iconv localbase makeinfo perl5 readline tar:xz
18
USES=		charsetfix compiler:c11 cpe gmake iconv localbase makeinfo perl5 readline tar:xz
19
USE_PERL5=	build
19
USE_PERL5=	build
20
20
21
CONFIGURE_ARGS=	--disable-yacc --enable-relocatable
21
CONFIGURE_ARGS=	--disable-yacc --enable-relocatable
22
GNU_CONFIGURE=	yes
22
GNU_CONFIGURE=	yes
23
LIBS+=		-lm
23
LIBS+=		-lm
24
TEST_ARGS+=	${_MAKE_JOBS}
24
TEST_TARGET=	check
25
TEST_TARGET=	check
25
26
26
INFO=		bison
27
INFO=		bison
Lines 36-39 NLS_CONFIGURE_OFF= ac_cv_libtextstyle=no Link Here
36
NLS_LIB_DEPENDS=	libtextstyle.so:devel/libtextstyle
37
NLS_LIB_DEPENDS=	libtextstyle.so:devel/libtextstyle
37
NLS_USES=		gettext
38
NLS_USES=		gettext
38
39
40
post-patch:
41
		${REINPLACE_CMD} -E 's|\$$\(docdir\)/examples|\$$\(datarootdir\)/examples/bison|' ${WRKSRC}/Makefile.in
42
39
.include <bsd.port.mk>
43
.include <bsd.port.mk>
(-)b/devel/bison/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1618319934
1
TIMESTAMP = 1635685033
2
SHA256 (bison-3.7.6.tar.xz) = 67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf
2
SHA256 (bison-3.8.2.tar.xz) = 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2
3
SIZE (bison-3.7.6.tar.xz) = 2627180
3
SIZE (bison-3.8.2.tar.xz) = 2817324
(-)a/devel/bison/files/patch-Makefile.in (-97 lines)
Removed Link Here
1
% sed -i .orig -e 's|$(docdir)/examples|$(datarootdir)/examples/bison|' Makefile.in
2
3
--- Makefile.in.orig	2021-01-23 15:41:15 UTC
4
+++ Makefile.in
5
@@ -3123,11 +3123,11 @@ extexi = $(top_srcdir)/examples/extexi
6
 extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(EXTEXIFLAGS) $(doc) --
7
 extracted = $(mfcalc_extracted) $(rpcalc_extracted) \
8
 	$(calcxx_extracted) $(simple_extracted)
9
-examplesdir = $(docdir)/examples
10
+examplesdir = $(datarootdir)/examples/bison
11
 dist_examples_DATA = examples/README.md
12
-cdir = $(docdir)/examples/c
13
+cdir = $(datarootdir)/examples/bison/c
14
 dist_c_DATA = examples/c/README.md
15
-bistromathicdir = $(docdir)/examples/c/bistromathic
16
+bistromathicdir = $(datarootdir)/examples/bison/c/bistromathic
17
 @ENABLE_BISTROMATHIC_TRUE@nodist_examples_c_bistromathic_bistromathic_SOURCES = examples/c/bistromathic/parse.y
18
 @ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_CPPFLAGS = \
19
 @ENABLE_BISTROMATHIC_TRUE@    -DBISON_LOCALEDIR='"$(localdir)"'		\
20
@@ -3137,14 +3137,14 @@ bistromathicdir = $(docdir)/examples/c/bistromathic
21
 @ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_CFLAGS = $(TEST_CFLAGS)
22
 @ENABLE_BISTROMATHIC_TRUE@examples_c_bistromathic_bistromathic_LDADD = -lm $(LIBREADLINE) $(LIBINTL)
23
 dist_bistromathic_DATA = examples/c/bistromathic/parse.y examples/c/bistromathic/Makefile examples/c/bistromathic/README.md
24
-calcdir = $(docdir)/examples/c/calc
25
+calcdir = $(datarootdir)/examples/bison/c/calc
26
 nodist_examples_c_calc_calc_SOURCES = examples/c/calc/calc.y
27
 
28
 # Don't use gnulib's system headers.
29
 examples_c_calc_calc_CPPFLAGS = -I$(top_srcdir)/examples/c/calc -I$(top_builddir)/examples/c/calc
30
 examples_c_calc_calc_CFLAGS = $(TEST_CFLAGS)
31
 dist_calc_DATA = examples/c/calc/calc.y examples/c/calc/Makefile examples/c/calc/README.md
32
-lexcalcdir = $(docdir)/examples/c/lexcalc
33
+lexcalcdir = $(datarootdir)/examples/bison/c/lexcalc
34
 @FLEX_WORKS_TRUE@nodist_examples_c_lexcalc_lexcalc_SOURCES = examples/c/lexcalc/parse.y examples/c/lexcalc/parse.h examples/c/lexcalc/scan.l
35
 @FLEX_WORKS_TRUE@examples_c_lexcalc_lexcalc_CPPFLAGS = -I$(top_srcdir)/examples/c/lexcalc -I$(top_builddir)/examples/c/lexcalc
36
 dist_lexcalc_DATA = examples/c/lexcalc/parse.y examples/c/lexcalc/scan.l examples/c/lexcalc/Makefile examples/c/lexcalc/README.md
37
@@ -3155,17 +3155,17 @@ nodist_examples_c_mfcalc_mfcalc_SOURCES = $(mfcalc_sou
38
 examples_c_mfcalc_mfcalc_CPPFLAGS = -I$(top_srcdir)/examples/c/mfcalc -I$(top_builddir)/examples/c/mfcalc
39
 examples_c_mfcalc_mfcalc_CFLAGS = $(TEST_CFLAGS)
40
 examples_c_mfcalc_mfcalc_LDADD = -lm
41
-mfcalcdir = $(docdir)/examples/c/mfcalc
42
+mfcalcdir = $(datarootdir)/examples/bison/c/mfcalc
43
 mfcalc_DATA = $(mfcalc_extracted)
44
 dist_mfcalc_DATA = examples/c/mfcalc/Makefile
45
-pushcalcdir = $(docdir)/examples/c/pushcalc
46
+pushcalcdir = $(datarootdir)/examples/bison/c/pushcalc
47
 nodist_examples_c_pushcalc_calc_SOURCES = examples/c/pushcalc/calc.y
48
 
49
 # Don't use gnulib's system headers.
50
 examples_c_pushcalc_calc_CPPFLAGS = -I$(top_srcdir)/examples/c/pushcalc -I$(top_builddir)/examples/c/pushcalc
51
 examples_c_pushcalc_calc_CFLAGS = $(TEST_CFLAGS)
52
 dist_pushcalc_DATA = examples/c/pushcalc/calc.y examples/c/pushcalc/Makefile examples/c/pushcalc/README.md
53
-reccalcdir = $(docdir)/examples/c/reccalc
54
+reccalcdir = $(datarootdir)/examples/bison/c/reccalc
55
 @FLEX_WORKS_TRUE@nodist_examples_c_reccalc_reccalc_SOURCES = examples/c/reccalc/parse.y examples/c/reccalc/scan.h examples/c/reccalc/scan.c
56
 @FLEX_WORKS_TRUE@examples_c_reccalc_reccalc_CPPFLAGS = -I$(top_srcdir)/examples/c/reccalc -I$(top_builddir)/examples/c/reccalc
57
 
58
@@ -3182,10 +3182,10 @@ nodist_examples_c_rpcalc_rpcalc_SOURCES = $(rpcalc_sou
59
 examples_c_rpcalc_rpcalc_CPPFLAGS = -I$(top_builddir)/examples/c/rpcalc
60
 examples_c_rpcalc_rpcalc_CFLAGS = $(TEST_CFLAGS)
61
 examples_c_rpcalc_rpcalc_LDADD = -lm
62
-rpcalcdir = $(docdir)/examples/c/rpcalc
63
+rpcalcdir = $(datarootdir)/examples/bison/c/rpcalc
64
 rpcalc_DATA = $(rpcalc_extracted)
65
 dist_rpcalc_DATA = examples/c/rpcalc/Makefile
66
-cxxdir = $(docdir)/examples/c++
67
+cxxdir = $(datarootdir)/examples/bison/c++
68
 calcxx_sources_extracted = \
69
   examples/c++/calc++/driver.cc					\
70
   examples/c++/calc++/driver.hh					\
71
@@ -3208,7 +3208,7 @@ calcxx_sources = \
72
 @ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@nodist_examples_c___calc___calc___SOURCES = $(calcxx_sources)
73
 @ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@examples_c___calc___calc___CPPFLAGS = -I$(top_srcdir)/examples/c++/calc++ -I$(top_builddir)/examples/c++/calc++
74
 @ENABLE_CXX_TRUE@@FLEX_CXX_WORKS_TRUE@examples_c___calc___calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
75
-calcxxdir = $(docdir)/examples/c++/calc++
76
+calcxxdir = $(datarootdir)/examples/bison/c++/calc++
77
 calcxx_DATA = $(calcxx_extracted)
78
 dist_calcxx_DATA = examples/c++/calc++/README.md examples/c++/calc++/Makefile
79
 cxx_DATA = $(simple_extracted)
80
@@ -3223,13 +3223,13 @@ simple_sources = $(simple_extracted)
81
 @ENABLE_CXX11_TRUE@examples_c___variant_11_CXXFLAGS = $(CXX11_CXXFLAGS) $(WARN_CXXFLAGS_TEST)
82
 @ENABLE_CXX11_TRUE@examples_c___variant_11_CPPFLAGS = -I$(top_builddir)
83
 dist_cxx_DATA = examples/c++/README.md examples/c++/Makefile examples/c++/variant.yy examples/c++/variant-11.yy
84
-ddir = $(docdir)/examples/d
85
+ddir = $(datarootdir)/examples/bison/d
86
 dist_d_DATA = examples/d/calc.y examples/d/Makefile examples/d/README.md
87
-javadir = $(docdir)/examples/java
88
+javadir = $(datarootdir)/examples/bison/java
89
 dist_java_DATA = examples/java/README.md
90
-java_calcdir = $(docdir)/examples/java/calc
91
+java_calcdir = $(datarootdir)/examples/bison/java/calc
92
 dist_java_calc_DATA = examples/java/calc/Calc.y examples/java/calc/Makefile
93
-java_simpledir = $(docdir)/examples/java/simple
94
+java_simpledir = $(datarootdir)/examples/bison/java/simple
95
 dist_java_simple_DATA = examples/java/simple/Calc.y examples/java/simple/Makefile
96
 
97
 # Non-gnulib sources in Bison's internal library.
(-)b/devel/bison/pkg-plist (-4 / +8 lines)
Lines 5-11 share/aclocal/bison-i18n.m4 Link Here
5
%%DATADIR%%/bison-default.css
5
%%DATADIR%%/bison-default.css
6
%%DATADIR%%/m4sugar/foreach.m4
6
%%DATADIR%%/m4sugar/foreach.m4
7
%%DATADIR%%/m4sugar/m4sugar.m4
7
%%DATADIR%%/m4sugar/m4sugar.m4
8
%%DATADIR%%/skeletons/README-D.txt
9
%%DATADIR%%/skeletons/bison.m4
8
%%DATADIR%%/skeletons/bison.m4
10
%%DATADIR%%/skeletons/c++-skel.m4
9
%%DATADIR%%/skeletons/c++-skel.m4
11
%%DATADIR%%/skeletons/c++.m4
10
%%DATADIR%%/skeletons/c++.m4
Lines 16-21 share/aclocal/bison-i18n.m4 Link Here
16
%%DATADIR%%/skeletons/d.m4
15
%%DATADIR%%/skeletons/d.m4
17
%%DATADIR%%/skeletons/glr.c
16
%%DATADIR%%/skeletons/glr.c
18
%%DATADIR%%/skeletons/glr.cc
17
%%DATADIR%%/skeletons/glr.cc
18
%%DATADIR%%/skeletons/glr2.cc
19
%%DATADIR%%/skeletons/java-skel.m4
19
%%DATADIR%%/skeletons/java-skel.m4
20
%%DATADIR%%/skeletons/java.m4
20
%%DATADIR%%/skeletons/java.m4
21
%%DATADIR%%/skeletons/lalr1.cc
21
%%DATADIR%%/skeletons/lalr1.cc
Lines 56-61 share/aclocal/bison-i18n.m4 Link Here
56
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/Makefile
56
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/Makefile
57
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/README.md
57
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/README.md
58
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/calc.y
58
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/calc/calc.y
59
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/Makefile
60
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/README.md
61
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/glr/c++-types.y
59
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/Makefile
62
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/Makefile
60
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/README.md
63
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/README.md
61
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/parse.y
64
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/lexcalc/parse.y
Lines 72-80 share/aclocal/bison-i18n.m4 Link Here
72
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/reccalc/scan.l
75
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/reccalc/scan.l
73
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/Makefile
76
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/Makefile
74
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/rpcalc.y
77
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/c/rpcalc/rpcalc.y
75
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/Makefile
76
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/README.md
78
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/README.md
77
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc.y
79
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc/Makefile
80
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/calc/calc.y
81
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/simple/Makefile
82
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/d/simple/calc.y
78
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.md
83
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/README.md
79
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Calc.y
84
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Calc.y
80
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Makefile
85
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/java/calc/Makefile
81
- 

Return to bug 259577