Update to bison 2.3.

ok jdixon@
This commit is contained in:
brad 2008-07-08 00:24:17 +00:00
parent 8d6bd7bd0a
commit af7a436428
6 changed files with 37 additions and 38 deletions

View File

@ -1,23 +1,22 @@
# $OpenBSD: Makefile,v 1.41 2007/09/16 02:52:57 merdely Exp $
# $OpenBSD: Makefile,v 1.42 2008/07/08 00:24:17 brad Exp $
COMMENT= GNU parser generator
DISTNAME= bison-2.1
PKGNAME= ${DISTNAME}p0
DISTNAME= bison-2.3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
HOMEPAGE= http://www.gnu.org/software/bison/
# GPL
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c
MODULES= devel/gettext
BUILD_DEPENDS= ::devel/m4
WANTLIB= c
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-yacc

View File

@ -1,5 +1,5 @@
MD5 (bison-2.1.tar.gz) = sUaNScE1euvNHebvEsvz6A==
RMD160 (bison-2.1.tar.gz) = XHfAd3IBu2pXAIfGZacZD5JKi1c=
SHA1 (bison-2.1.tar.gz) = sjaSPn1JCcb9iHOsh0MYM/pFBps=
SHA256 (bison-2.1.tar.gz) = 6YJRvbvFHsixGgyj765HPde5LiuBxcftIxZPkOQPjJY=
SIZE (bison-2.1.tar.gz) = 1316270
MD5 (bison-2.3.tar.gz) = IjJ+/dUIDisay25WCgS0Og==
RMD160 (bison-2.3.tar.gz) = TTPc/Q1LnSEVYIt6Je14hdm9gyI=
SHA1 (bison-2.3.tar.gz) = TfhMLFlxlGER/xmC+4MLPHjXxX4=
SHA256 (bison-2.3.tar.gz) = UveKpHYadM63/fdw81VN2EMIw7k8QlXjpcF1WOzaKT4=
SIZE (bison-2.3.tar.gz) = 1386694

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2005/10/30 18:07:35 naddy Exp $
--- configure.orig Thu Oct 27 20:27:44 2005
+++ configure Thu Oct 27 20:28:03 2005
@@ -15190,10 +15190,10 @@ s,@host_cpu@,$host_cpu,;t t
$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
@ -13,4 +13,4 @@ $OpenBSD: patch-configure,v 1.2 2005/10/30 18:07:35 naddy Exp $
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@BISON_LOCALEDIR@,$BISON_LOCALEDIR,;t t
s,@UNISTD_H@,$UNISTD_H,;t t

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-data_m4sugar_m4sugar_m4,v 1.1 2005/11/21 09:15:11 espie Exp $
--- data/m4sugar/m4sugar.m4.orig Sat Nov 19 16:05:49 2005
+++ data/m4sugar/m4sugar.m4 Sat Nov 19 16:06:24 2005
@@ -55,13 +55,6 @@ divert(-1)#
$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)#
changequote()
changequote([, ])

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_output_c,v 1.3 2005/11/21 09:15:11 espie Exp $
--- src/output.c.orig Sat Nov 19 16:01:00 2005
+++ src/output.c Sat Nov 19 16:04:17 2005
@@ -506,7 +506,8 @@ output_skeleton (void)
$OpenBSD: patch-src_output_c,v 1.4 2008/07/08 00:24:17 brad Exp $
--- src/output.c.orig Sun May 14 16:40:35 2006
+++ src/output.c Sun Jun 29 22:15:11 2008
@@ -501,7 +501,8 @@ output_skeleton (void)
FILE *in;
FILE *out;
int filter_fd[2];
@ -11,8 +11,8 @@ $OpenBSD: patch-src_output_c,v 1.3 2005/11/21 09:15:11 espie Exp $
pid_t pid;
/* Compute the names of the package data dir and skeleton file.
@@ -518,7 +519,7 @@ output_skeleton (void)
char *full_cm4;
@@ -512,7 +513,7 @@ output_skeleton (void)
char *full_m4sugar;
char *full_skeleton;
char const *p;
- char const *m4 = (p = getenv ("M4")) ? p : M4;
@ -20,25 +20,25 @@ $OpenBSD: patch-src_output_c,v 1.3 2005/11/21 09:15:11 espie Exp $
char const *pkgdatadir = (p = getenv ("BISON_PKGDATADIR")) ? p : PKGDATADIR;
size_t skeleton_size = strlen (skeleton) + 1;
size_t pkgdatadirlen = strlen (pkgdatadir);
@@ -542,12 +543,16 @@ output_skeleton (void)
fprintf (stderr, "running: %s %s - %s %s\n",
m4, full_m4sugar, full_cm4, full_skeleton);
@@ -534,12 +535,16 @@ 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_cm4;
- argv[4] = full_skeleton;
- argv[3] = full_skeleton;
- argv[4] = trace_flag & trace_m4 ? "-dV" : NULL;
- argv[5] = NULL;
+ i = 0;
+ argv[i++] = m4;
+ if (strcmp(m4, "/usr/bin/m4") == 0) {
+ argv[i++] = "-g";
+ argv[i++] = "-g";
+ }
+ argv[i++] = full_m4sugar;
+ argv[i++] = "-";
+ argv[i++] = full_cm4;
+ argv[i++] = full_skeleton;
+ argv[i++] = trace_flag & trace_m4 ? "-dV" : NULL;
+ argv[i++] = NULL;
init_subpipe ();

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.8 2005/10/30 18:07:35 naddy Exp $
bin/bison
@comment $OpenBSD: PLIST,v 1.9 2008/07/08 00:24:17 brad Exp $
@bin bin/bison
@info info/bison.info
@man man/man1/bison.1
share/aclocal/bison-i18n.m4
@ -8,7 +8,9 @@ share/bison/README
share/bison/c++.m4
share/bison/c.m4
share/bison/glr.c
share/bison/glr.cc
share/bison/lalr1.cc
share/bison/location.cc
share/bison/m4sugar/
share/bison/m4sugar/m4sugar.m4
share/bison/yacc.c
@ -22,8 +24,6 @@ share/locale/et/LC_MESSAGES/bison-runtime.mo
share/locale/et/LC_MESSAGES/bison.mo
share/locale/fr/LC_MESSAGES/bison-runtime.mo
share/locale/fr/LC_MESSAGES/bison.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/bison-runtime.mo
share/locale/ga/LC_MESSAGES/bison.mo
share/locale/hr/LC_MESSAGES/bison-runtime.mo
@ -54,11 +54,11 @@ 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/sv/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison.mo
share/locale/tr/LC_MESSAGES/bison-runtime.mo
share/locale/tr/LC_MESSAGES/bison.mo
share/locale/vi/
share/locale/vi/LC_MESSAGES/
share/locale/vi/LC_MESSAGES/bison-runtime.mo
share/locale/vi/LC_MESSAGES/bison.mo
share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo