cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to bison-3.0.4

Browse Source 
Alas this switches bison from using m4 from base to GNU m4.  Work is
being done to switch back.

Support from many, input from sthen@ and nigel@, ok sthen@.  Bulk build
by ajacoutot@, regress tests ran on i386, powerpc (thx sthen@), amd64
and sparc64.
This commit is contained in:
jca 2015-11-15 11:53:30 +00:00
parent 8b5d0b5134
commit 3578ddf292
7 changed files with 94 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devel/bison/Makefile
View File

@ -1,23 +1,33 @@
# $OpenBSD: Makefile,v 1.51 2015/05/19 09:54:53 kettenis Exp $
# $OpenBSD: Makefile,v 1.52 2015/11/15 11:53:30 jca Exp $
COMMENT= GNU parser generator
DISTNAME= bison-2.3
REVISION= 2
DISTNAME= bison-3.0.4
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
HOMEPAGE= https://www.gnu.org/software/bison/
# GPLv2+
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c
MODULES= devel/gettext
BUILD_DEPENDS= devel/m4
BUILD_DEPENDS= devel/help2man \
devel/m4
RUN_DEPENDS= devel/m4
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-yacc
# Set bison to use "m4 -g" instead of "m4 --gnu" to permit use with m4
# from the base OS by setting M4=/usr/bin/m4 in the environment. This is
# for development purposes; bison currently uses GNU regular expressions
# which are not compatible with base m4.
CONFIGURE_ENV+= ac_cv_prog_gnu_m4_gnu="-g"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
.if defined(M4)
TEST_ENV= M4="${M4}"
.endif
.include <bsd.port.mk>

4
devel/bison/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
SIZE (bison-2.3.tar.gz) = 1386694
SHA256 (bison-3.0.4.tar.gz) = tn/S2q56ZLW6hixmwHwa3bnmsbBcXyBJOSz9iiFylS4=
SIZE (bison-3.0.4.tar.gz) = 3354179

16
devel/bison/patches/patch-configure
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-configure,v 1.3 2008/07/08 00:24:17 brad Exp $
--- configure.orig Mon Jun 5 03:32:01 2006
+++ configure Sun Jun 29 22:09:16 2008
@@ -16768,10 +16768,10 @@ s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
s,@INTL_MACOSX_LIBS@,$INTL_MACOSX_LIBS,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@UNISTD_H@,$UNISTD_H,;t t

8
devel/bison/patches/patch-data_m4sugar_m4sugar_m4
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.2 2008/07/08 00:24:17 brad Exp $
--- data/m4sugar/m4sugar.m4.orig Mon Nov 14 03:13:07 2005
+++ data/m4sugar/m4sugar.m4 Sun Jun 29 22:09:16 2008
@@ -55,13 +55,6 @@ divert(-1)#
$OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.3 2015/11/15 11:53:30 jca Exp $
--- data/m4sugar/m4sugar.m4.orig Fri Aug 2 17:03:17 2013
+++ data/m4sugar/m4sugar.m4 Fri Nov 6 20:39:48 2015
@@ -31,13 +31,6 @@ divert(-1)#
changequote()
changequote([, ])

46
devel/bison/patches/patch-data_yacc_c
View File

@ -1,46 +0,0 @@
$OpenBSD: patch-data_yacc_c,v 1.1 2015/05/19 09:54:53 kettenis Exp $
--- data/yacc.c.orig Mon May 18 18:07:15 2015
+++ data/yacc.c Mon May 18 18:08:26 2015
@@ -307,10 +307,10 @@ typedef short int yytype_int16;
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && ]b4_c_modern[
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && ]b4_c_modern[
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -333,23 +333,23 @@ typedef short int yytype_int16;
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && ]b4_c_modern[
+# if ! defined malloc && ! defined EXIT_SUCCESS && ]b4_c_modern[
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && ]b4_c_modern[
+# if ! defined free && ! defined EXIT_SUCCESS && ]b4_c_modern[
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
# endif

50
devel/bison/patches/patch-src_output_c
View File

@ -1,50 +0,0 @@
$OpenBSD: patch-src_output_c,v 1.5 2012/04/14 12:22:25 espie Exp $
--- src/output.c.orig Sun May 14 22:40:35 2006
+++ src/output.c Fri Apr 13 20:38:39 2012
@@ -501,7 +501,8 @@ output_skeleton (void)
FILE *in;
FILE *out;
int filter_fd[2];
- char const *argv[6];
+ char const *argv[7];
+ int i;
pid_t pid;
/* Compute the names of the package data dir and skeleton file.
@@ -512,7 +513,7 @@ output_skeleton (void)
char *full_m4sugar;
char *full_skeleton;
char const *p;
- char const *m4 = (p = getenv ("M4")) ? p : M4;
+ char const *m4 = (p = getenv ("M4")) ? p : "/usr/bin/m4";
char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR;
size_t skeleton_size = strlen (skeleton) + 1;
size_t pkgdatadirlen = strlen (pkgdatadir);
@@ -534,12 +535,21 @@ output_skeleton (void)
fprintf (stderr, "running: %s %s - %s\n",
m4, full_m4sugar, full_skeleton);
- argv[0] = m4;
- argv[1] = full_m4sugar;
- argv[2] = "-";
- argv[3] = full_skeleton;
- argv[4] = trace_flag & trace_m4 ? "-dV" : NULL;
- argv[5] = NULL;
+ i = 0;
+ argv[i++] = m4;
+ p = strrchr(m4, '/');
+ if (p)
+ p++;
+ else
+ p = m4;
+ if (strcmp(p, "m4") == 0) {
+ argv[i++] = "-g";
+ }
+ argv[i++] = full_m4sugar;
+ argv[i++] = "-";
+ argv[i++] = full_skeleton;
+ argv[i++] = trace_flag & trace_m4 ? "-dV" : NULL;
+ argv[i++] = NULL;
init_subpipe ();
pid = create_subpipe (argv, filter_fd);

78
devel/bison/pkg/PLIST
View File

@ -1,39 +1,96 @@
@comment $OpenBSD: PLIST,v 1.9 2008/07/08 00:24:17 brad Exp $
@comment $OpenBSD: PLIST,v 1.10 2015/11/15 11:53:31 jca Exp $
@bin bin/bison
@info info/bison.info
@comment lib/charset.alias
@man man/man1/bison.1
share/aclocal/
share/aclocal/bison-i18n.m4
share/bison/
share/bison/README
share/bison/bison.m4
share/bison/c++-skel.m4
share/bison/c++.m4
share/bison/c-like.m4
share/bison/c-skel.m4
share/bison/c.m4
share/bison/glr.c
share/bison/glr.cc
share/bison/java-skel.m4
share/bison/java.m4
share/bison/lalr1.cc
share/bison/lalr1.java
share/bison/location.cc
share/bison/m4sugar/
share/bison/m4sugar/foreach.m4
share/bison/m4sugar/m4sugar.m4
share/bison/stack.hh
share/bison/variant.hh
share/bison/xslt/
share/bison/xslt/bison.xsl
share/bison/xslt/xml2dot.xsl
share/bison/xslt/xml2text.xsl
share/bison/xslt/xml2xhtml.xsl
share/bison/yacc.c
share/doc/bison/
share/doc/bison/AUTHORS
share/doc/bison/COPYING
share/doc/bison/NEWS
share/doc/bison/README
share/doc/bison/THANKS
share/doc/bison/TODO
share/doc/bison/examples/
share/doc/bison/examples/calc++/
share/doc/bison/examples/calc++/calc++-driver.cc
share/doc/bison/examples/calc++/calc++-driver.hh
share/doc/bison/examples/calc++/calc++-parser.yy
share/doc/bison/examples/calc++/calc++-scanner.ll
share/doc/bison/examples/calc++/calc++.cc
share/doc/bison/examples/mfcalc/
share/doc/bison/examples/mfcalc/calc.h
share/doc/bison/examples/mfcalc/mfcalc.y
share/doc/bison/examples/rpcalc/
share/doc/bison/examples/rpcalc/rpcalc.y
share/locale/ast/
share/locale/ast/LC_MESSAGES/
share/locale/ast/LC_MESSAGES/bison-runtime.mo
share/locale/da/LC_MESSAGES/bison-runtime.mo
share/locale/da/LC_MESSAGES/bison.mo
share/locale/de/LC_MESSAGES/bison-runtime.mo
share/locale/de/LC_MESSAGES/bison.mo
share/locale/el/LC_MESSAGES/bison-runtime.mo
share/locale/el/LC_MESSAGES/bison.mo
share/locale/eo/LC_MESSAGES/bison-runtime.mo
share/locale/eo/LC_MESSAGES/bison.mo
share/locale/es/LC_MESSAGES/bison-runtime.mo
share/locale/es/LC_MESSAGES/bison.mo
share/locale/et/LC_MESSAGES/bison-runtime.mo
share/locale/et/LC_MESSAGES/bison.mo
share/locale/fi/LC_MESSAGES/bison-runtime.mo
share/locale/fi/LC_MESSAGES/bison.mo
share/locale/fr/LC_MESSAGES/bison-runtime.mo
share/locale/fr/LC_MESSAGES/bison.mo
share/locale/ga/LC_MESSAGES/bison-runtime.mo
share/locale/ga/LC_MESSAGES/bison.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-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-runtime.mo
share/locale/it/LC_MESSAGES/bison.mo
share/locale/ja/LC_MESSAGES/bison-runtime.mo
share/locale/ja/LC_MESSAGES/bison.mo
share/locale/ky/
share/locale/ky/LC_MESSAGES/
share/locale/ky/LC_MESSAGES/bison-runtime.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/bison-runtime.mo
share/locale/lv/LC_MESSAGES/bison-runtime.mo
share/locale/ms/
share/locale/ms/LC_MESSAGES/
share/locale/ms/LC_MESSAGES/bison-runtime.mo
@ -44,21 +101,32 @@ share/locale/nl/LC_MESSAGES/bison-runtime.mo
share/locale/nl/LC_MESSAGES/bison.mo
share/locale/pl/LC_MESSAGES/bison-runtime.mo
share/locale/pl/LC_MESSAGES/bison.mo
share/locale/pt/LC_MESSAGES/bison-runtime.mo
share/locale/pt/LC_MESSAGES/bison.mo
share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
share/locale/pt_BR/LC_MESSAGES/bison.mo
share/locale/ro/LC_MESSAGES/bison-runtime.mo
share/locale/ro/LC_MESSAGES/bison.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-runtime.mo
share/locale/rw/LC_MESSAGES/bison.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-runtime.mo
share/locale/sr/LC_MESSAGES/bison.mo
share/locale/sv/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison.mo
share/locale/uk/LC_MESSAGES/bison-runtime.mo
share/locale/uk/LC_MESSAGES/bison.mo
share/locale/vi/LC_MESSAGES/bison-runtime.mo
share/locale/vi/LC_MESSAGES/bison.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-runtime.mo
share/locale/zh_TW/LC_MESSAGES/bison.mo