Christian Weisgerber:
> > > Hmm, why does bison.info get rebuilt anyway? GNU software ships
> > > with a pre-built .info file included. Maybe we can just disable
> > > the regeneration?
> >
> > I was unsuccessful in doing that, though I'm sure someone with more
> > automake knowledge could. Just touching the appropriate files
>
> I'll take a look...
bison.info incorporates bison.help, which is regenerated from the
newly built bison executable. We need to break that dependency.
That's simple enough that we can do it in Makefile.in. We can then
get rid of running the autotools suite.
Here's a diff against the tree that includes those changes:
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bison/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 5 Oct 2020 21:50:40 -0000 1.62
+++ Makefile 11 May 2021 18:20:14 -0000
@@ -2,8 +2,7 @@
COMMENT= GNU parser generator
-DISTNAME= bison-3.3.2
-REVISION= 2
+DISTNAME= bison-3.7.6
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
EXTRACT_SUFX= .tar.xz
@@ -15,17 +14,15 @@ PERMIT_PACKAGE= Yes
WANTLIB= c iconv intl m
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.16
-
LIB_DEPENDS= devel/gettext,-runtime
BUILD_DEPENDS= devel/gettext,-tools \
devel/help2man \
devel/m4
RUN_DEPENDS= devel/m4
-CONFIGURE_STYLE=autoreconf
-CONFIGURE_ARGS= --disable-yacc
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --disable-yacc --without-libtextstyle-prefix
+DEBUG_PACKAGES= ${BUILD_PACKAGES}
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bison/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 14 May 2019 16:28:23 -0000 1.13
+++ distinfo 11 May 2021 18:20:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (bison-3.3.2.tar.xz) = A57kW2HZXlAD5+g3b5CAABtAZv81e94nG3+qzlO52AQ=
-SIZE (bison-3.3.2.tar.xz) = 2108612
+SHA256 (bison-3.7.6.tar.xz) = Z9aM4eIhkgUFJWQ/wKeiIpdXZoK+9qXFFEaQP1ru888=
+SIZE (bison-3.7.6.tar.xz) = 2627180
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 11 May 2021 18:20:14 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Break the "bison.help: bison" dependency to avoid rebuilding bison.info.
+
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -10432,7 +10432,7 @@ $(srcdir)/$(doc_bison).info.bak: $(srcdir)/$(doc_bison
+
+ doc/refcard.pdf: doc/refcard.tex
+ $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
+-@CROSS_COMPILING_FALSE@$(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
++@CROSS_COMPILING_FALSE@$(top_srcdir)/doc/bison.help: #src/bison$(EXEEXT)
+ @CROSS_COMPILING_FALSE@ $(AM_V_GEN)$(MKDIR_P) doc
+ @CROSS_COMPILING_FALSE@ $(AM_V_at) LC_ALL=C tests/bison --version
>doc/bison.help.tmp
+ @CROSS_COMPILING_FALSE@ $(AM_V_at) LC_ALL=C tests/bison --help | \
Index: patches/patch-doc_local_mk
===================================================================
RCS file: patches/patch-doc_local_mk
diff -N patches/patch-doc_local_mk
--- patches/patch-doc_local_mk 11 Jul 2020 23:42:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-doc_local_mk,v 1.1 2020/07/11 23:42:05 naddy Exp $
-
-Don't depend on the path of the bison executable.
-https://git.savannah.gnu.org/cgit/bison.git/commit/doc/local.mk?id=0782ed327401d1b59c059c89c8630d002260b4f7
-
-PARALLEL MAKE BUG
-Fix build race: Our make(1) treats $(top_srcdir)/doc/bison.help and
-doc/bison.help as distinct targets.
-
-Index: doc/local.mk
---- doc/local.mk.orig
-+++ doc/local.mk
-@@ -90,9 +90,11 @@ MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
- $(AM_V_GEN)LC_ALL=C src/bison$(EXEEXT) --version >doc/bison.help.tmp
- $(AM_V_at) LC_ALL=C src/bison$(EXEEXT) --help | \
-+## Avoid depending on the path to Bison.
-+ sed -e 's,^Usage: .*/bison \[OPTION\],Usage: bison [OPTION],g' \
- ## Avoid variations in the output depending on whether we are
- ## on a glibc system.
-- sed '/translation bugs/d' >>doc/bison.help.tmp
-+ -e '/translation bugs/d' >>doc/bison.help.tmp
- $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
- endif ! CROSS_COMPILING
-
-@@ -112,7 +114,7 @@ remove_time_stamp = \
-
- # Depend on configure to get version number changes.
- if ! CROSS_COMPILING
--MAN_DEPS = doc/bison.help doc/bison.x $(top_srcdir)/configure
-+MAN_DEPS = $(top_srcdir)/doc/bison.help doc/bison.x $(top_srcdir)/configure
- endif
-
- $(top_srcdir)/doc/bison.1: $(MAN_DEPS)
Index: patches/patch-lib_vasnprintf_c
===================================================================
RCS file: patches/patch-lib_vasnprintf_c
diff -N patches/patch-lib_vasnprintf_c
--- patches/patch-lib_vasnprintf_c 23 Oct 2020 21:34:05 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-lib_vasnprintf_c,v 1.2 2020/10/23 21:34:05 jca Exp $
-
-Don't use printf %n.
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/vasnprintf.c?id=b954346c6101860c7b462d1b286641d1307afd6c
-
-Index: lib/vasnprintf.c
---- lib/vasnprintf.c.orig
-+++ lib/vasnprintf.c
-@@ -4871,11 +4871,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
- #endif
- *fbp = dp->conversion;
- #if USE_SNPRINTF
--# if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \
-- && !defined __UCLIBC__) \
-- || (defined __APPLE__ && defined __MACH__) \
-- || defined __ANDROID__ \
-- || (defined _WIN32 && ! defined __CYGWIN__))
-+# if 0
- fbp[1] = '%';
- fbp[2] = 'n';
- fbp[3] = '\0';
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bison/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 14 May 2019 16:28:23 -0000 1.13
+++ pkg/PLIST 11 May 2021 18:20:14 -0000
@@ -6,7 +6,8 @@
share/aclocal/
share/aclocal/bison-i18n.m4
share/bison/
-share/bison/README
+share/bison/README.md
+share/bison/bison-default.css
share/bison/m4sugar/
share/bison/m4sugar/foreach.m4
share/bison/m4sugar/m4sugar.m4
@@ -29,6 +30,7 @@ share/bison/skeletons/lalr1.d
share/bison/skeletons/lalr1.java
share/bison/skeletons/location.cc
share/bison/skeletons/stack.hh
+share/bison/skeletons/traceon.m4
share/bison/skeletons/variant.hh
share/bison/skeletons/yacc.c
share/bison/xslt/
@@ -61,6 +63,14 @@ share/doc/bison/examples/c++/simple.yy
share/doc/bison/examples/c++/variant-11.yy
share/doc/bison/examples/c++/variant.yy
share/doc/bison/examples/c/README.md
+share/doc/bison/examples/c/bistromathic/
+share/doc/bison/examples/c/bistromathic/Makefile
+share/doc/bison/examples/c/bistromathic/README.md
+share/doc/bison/examples/c/bistromathic/parse.y
+share/doc/bison/examples/c/calc/
+share/doc/bison/examples/c/calc/Makefile
+share/doc/bison/examples/c/calc/README.md
+share/doc/bison/examples/c/calc/calc.y
share/doc/bison/examples/c/lexcalc/
share/doc/bison/examples/c/lexcalc/Makefile
share/doc/bison/examples/c/lexcalc/README.md
@@ -70,6 +80,15 @@ share/doc/bison/examples/c/mfcalc/
share/doc/bison/examples/c/mfcalc/Makefile
share/doc/bison/examples/c/mfcalc/calc.h
share/doc/bison/examples/c/mfcalc/mfcalc.y
+share/doc/bison/examples/c/pushcalc/
+share/doc/bison/examples/c/pushcalc/Makefile
+share/doc/bison/examples/c/pushcalc/README.md
+share/doc/bison/examples/c/pushcalc/calc.y
+share/doc/bison/examples/c/reccalc/
+share/doc/bison/examples/c/reccalc/Makefile
+share/doc/bison/examples/c/reccalc/README.md
+share/doc/bison/examples/c/reccalc/parse.y
+share/doc/bison/examples/c/reccalc/scan.l
share/doc/bison/examples/c/rpcalc/
share/doc/bison/examples/c/rpcalc/Makefile
share/doc/bison/examples/c/rpcalc/rpcalc.y
@@ -78,43 +97,71 @@ share/doc/bison/examples/d/Makefile
share/doc/bison/examples/d/README.md
share/doc/bison/examples/d/calc.y
share/doc/bison/examples/java/
-share/doc/bison/examples/java/Calc.y
-share/doc/bison/examples/java/Makefile
share/doc/bison/examples/java/README.md
+share/doc/bison/examples/java/calc/
+share/doc/bison/examples/java/calc/Calc.y
+share/doc/bison/examples/java/calc/Makefile
+share/doc/bison/examples/java/simple/
+share/doc/bison/examples/java/simple/Calc.y
+share/doc/bison/examples/java/simple/Makefile
+share/locale/af/
+share/locale/af/LC_MESSAGES/
+share/locale/af/LC_MESSAGES/bison-gnulib.mo
share/locale/ast/LC_MESSAGES/bison-runtime.mo
+share/locale/be/LC_MESSAGES/bison-gnulib.mo
+share/locale/bg/LC_MESSAGES/bison-gnulib.mo
+share/locale/bg/LC_MESSAGES/bison-runtime.mo
+share/locale/bg/LC_MESSAGES/bison.mo
+share/locale/ca/LC_MESSAGES/bison-gnulib.mo
share/locale/ca/LC_MESSAGES/bison-runtime.mo
share/locale/ca/LC_MESSAGES/bison.mo
+share/locale/cs/LC_MESSAGES/bison-gnulib.mo
+share/locale/da/LC_MESSAGES/bison-gnulib.mo
share/locale/da/LC_MESSAGES/bison-runtime.mo
share/locale/da/LC_MESSAGES/bison.mo
+share/locale/de/LC_MESSAGES/bison-gnulib.mo
share/locale/de/LC_MESSAGES/bison-runtime.mo
share/locale/de/LC_MESSAGES/bison.mo
+share/locale/el/LC_MESSAGES/bison-gnulib.mo
share/locale/el/LC_MESSAGES/bison-runtime.mo
share/locale/el/LC_MESSAGES/bison.mo
+share/locale/eo/LC_MESSAGES/bison-gnulib.mo
share/locale/eo/LC_MESSAGES/bison-runtime.mo
share/locale/eo/LC_MESSAGES/bison.mo
+share/locale/es/LC_MESSAGES/bison-gnulib.mo
share/locale/es/LC_MESSAGES/bison-runtime.mo
share/locale/es/LC_MESSAGES/bison.mo
+share/locale/et/LC_MESSAGES/bison-gnulib.mo
share/locale/et/LC_MESSAGES/bison-runtime.mo
share/locale/et/LC_MESSAGES/bison.mo
+share/locale/eu/LC_MESSAGES/bison-gnulib.mo
+share/locale/fi/LC_MESSAGES/bison-gnulib.mo
share/locale/fi/LC_MESSAGES/bison-runtime.mo
share/locale/fi/LC_MESSAGES/bison.mo
+share/locale/fr/LC_MESSAGES/bison-gnulib.mo
share/locale/fr/LC_MESSAGES/bison-runtime.mo
share/locale/fr/LC_MESSAGES/bison.mo
+share/locale/ga/LC_MESSAGES/bison-gnulib.mo
share/locale/ga/LC_MESSAGES/bison-runtime.mo
share/locale/ga/LC_MESSAGES/bison.mo
+share/locale/gl/LC_MESSAGES/bison-gnulib.mo
share/locale/gl/LC_MESSAGES/bison-runtime.mo
share/locale/hr/LC_MESSAGES/bison-runtime.mo
share/locale/hr/LC_MESSAGES/bison.mo
+share/locale/hu/LC_MESSAGES/bison-gnulib.mo
share/locale/hu/LC_MESSAGES/bison-runtime.mo
share/locale/ia/
share/locale/ia/LC_MESSAGES/
share/locale/ia/LC_MESSAGES/bison-runtime.mo
share/locale/id/LC_MESSAGES/bison-runtime.mo
share/locale/id/LC_MESSAGES/bison.mo
+share/locale/it/LC_MESSAGES/bison-gnulib.mo
share/locale/it/LC_MESSAGES/bison-runtime.mo
share/locale/it/LC_MESSAGES/bison.mo
+share/locale/ja/LC_MESSAGES/bison-gnulib.mo
share/locale/ja/LC_MESSAGES/bison-runtime.mo
share/locale/ja/LC_MESSAGES/bison.mo
+share/locale/ko/LC_MESSAGES/bison-gnulib.mo
share/locale/ky/
share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/bison-runtime.mo
@@ -124,40 +171,63 @@ share/locale/lt/LC_MESSAGES/bison-runtim
share/locale/lv/LC_MESSAGES/bison-runtime.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
+share/locale/ms/LC_MESSAGES/bison-gnulib.mo
share/locale/ms/LC_MESSAGES/bison-runtime.mo
share/locale/ms/LC_MESSAGES/bison.mo
+share/locale/nb/LC_MESSAGES/bison-gnulib.mo
share/locale/nb/LC_MESSAGES/bison-runtime.mo
share/locale/nb/LC_MESSAGES/bison.mo
+share/locale/nl/LC_MESSAGES/bison-gnulib.mo
share/locale/nl/LC_MESSAGES/bison-runtime.mo
share/locale/nl/LC_MESSAGES/bison.mo
+share/locale/pl/LC_MESSAGES/bison-gnulib.mo
share/locale/pl/LC_MESSAGES/bison-runtime.mo
share/locale/pl/LC_MESSAGES/bison.mo
+share/locale/pt/LC_MESSAGES/bison-gnulib.mo
share/locale/pt/LC_MESSAGES/bison-runtime.mo
share/locale/pt/LC_MESSAGES/bison.mo
+share/locale/pt_BR/LC_MESSAGES/bison-gnulib.mo
share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
share/locale/pt_BR/LC_MESSAGES/bison.mo
+share/locale/ro/LC_MESSAGES/bison-gnulib.mo
share/locale/ro/LC_MESSAGES/bison-runtime.mo
share/locale/ro/LC_MESSAGES/bison.mo
+share/locale/ru/LC_MESSAGES/bison-gnulib.mo
share/locale/ru/LC_MESSAGES/bison-runtime.mo
share/locale/ru/LC_MESSAGES/bison.mo
+share/locale/rw/
+share/locale/rw/LC_MESSAGES/
+share/locale/rw/LC_MESSAGES/bison-gnulib.mo
+share/locale/sk/LC_MESSAGES/bison-gnulib.mo
+share/locale/sl/LC_MESSAGES/bison-gnulib.mo
share/locale/sl/LC_MESSAGES/bison-runtime.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/bison-runtime.mo
+share/locale/sr/LC_MESSAGES/bison-gnulib.mo
share/locale/sr/LC_MESSAGES/bison-runtime.mo
share/locale/sr/LC_MESSAGES/bison.mo
+share/locale/sv/LC_MESSAGES/bison-gnulib.mo
share/locale/sv/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison.mo
+share/locale/ta/
+share/locale/ta/LC_MESSAGES/
+share/locale/ta/LC_MESSAGES/bison-runtime.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/bison-runtime.mo
+share/locale/tr/LC_MESSAGES/bison-gnulib.mo
share/locale/tr/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison.mo
+share/locale/uk/LC_MESSAGES/bison-gnulib.mo
share/locale/uk/LC_MESSAGES/bison-runtime.mo
share/locale/uk/LC_MESSAGES/bison.mo
+share/locale/vi/LC_MESSAGES/bison-gnulib.mo
share/locale/vi/LC_MESSAGES/bison-runtime.mo
share/locale/vi/LC_MESSAGES/bison.mo
+share/locale/zh_CN/LC_MESSAGES/bison-gnulib.mo
share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
share/locale/zh_CN/LC_MESSAGES/bison.mo
+share/locale/zh_TW/LC_MESSAGES/bison-gnulib.mo
share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
share/locale/zh_TW/LC_MESSAGES/bison.mo
--
Christian "naddy" Weisgerber [email protected]
