summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/bison/Makefile7
-rw-r--r--devel/bison/PLIST6
-rw-r--r--devel/bison/distinfo12
-rw-r--r--devel/bison/patches/patch-aa19
-rw-r--r--devel/bison/patches/patch-lib_isnan.c23
-rw-r--r--devel/bison/patches/patch-src_Makefile.in19
6 files changed, 44 insertions, 42 deletions
diff --git a/devel/bison/Makefile b/devel/bison/Makefile
index 76153b01ccd..0115b4fd50f 100644
--- a/devel/bison/Makefile
+++ b/devel/bison/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.81 2012/01/19 13:32:05 tsutsui Exp $
+# $NetBSD: Makefile,v 1.82 2012/06/06 07:20:35 wiz Exp $
-DISTNAME= bison-2.5
-PKGREVISION= 3
+DISTNAME= bison-2.5.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=bison/}
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/bison/bison.html
diff --git a/devel/bison/PLIST b/devel/bison/PLIST
index aca07aa2bd3..450b2283aed 100644
--- a/devel/bison/PLIST
+++ b/devel/bison/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2011/08/06 17:15:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2012/06/06 07:20:35 wiz Exp $
bin/bison
info/bison.info
lib/liby.a
@@ -19,6 +19,7 @@ share/bison/lalr1.java
share/bison/location.cc
share/bison/m4sugar/foreach.m4
share/bison/m4sugar/m4sugar.m4
+share/bison/stack.hh
share/bison/xslt/bison.xsl
share/bison/xslt/xml2dot.xsl
share/bison/xslt/xml2text.xsl
@@ -32,6 +33,7 @@ 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
@@ -72,6 +74,7 @@ share/locale/ro/LC_MESSAGES/bison.mo
share/locale/ru/LC_MESSAGES/bison-runtime.mo
share/locale/ru/LC_MESSAGES/bison.mo
share/locale/sl/LC_MESSAGES/bison-runtime.mo
+share/locale/sr/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison-runtime.mo
share/locale/sv/LC_MESSAGES/bison.mo
share/locale/th/LC_MESSAGES/bison-runtime.mo
@@ -82,5 +85,6 @@ 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
diff --git a/devel/bison/distinfo b/devel/bison/distinfo
index b775d3d9df8..758558e264e 100644
--- a/devel/bison/distinfo
+++ b/devel/bison/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2012/04/07 15:14:04 schwarz Exp $
+$NetBSD: distinfo,v 1.30 2012/06/06 07:20:36 wiz Exp $
-SHA1 (bison-2.5.tar.bz2) = 907319624fe4f4c5f9e2c3e23601041ac636ae31
-RMD160 (bison-2.5.tar.bz2) = 9f90e477c9c397a8b136aa7bcee887767d94eea7
-Size (bison-2.5.tar.bz2) = 2030863 bytes
-SHA1 (patch-aa) = 7e83fa995e9406a67811b56fff2a25ef0feb06cf
+SHA1 (bison-2.5.1.tar.xz) = 4cd881033f4a66cf691462b0f2d8293aa712a781
+RMD160 (bison-2.5.1.tar.xz) = 45c2c6fa232bf9697e73653722d51759f284bbd4
+Size (bison-2.5.1.tar.xz) = 1608376 bytes
SHA1 (patch-doc_Makefile.in) = 11371a773019ada76396d36334abc6c8cac75ec6
-SHA1 (patch-lib_isnan.c) = 54b2cffb30a4aea827d7f9262e8e4e3efb8f1fe3
+SHA1 (patch-lib_isnan.c) = c5d2603447064c95e8bbc75a24c09366b752bad6
+SHA1 (patch-src_Makefile.in) = 6baa8ff8b8f4f0aa9c8efee60e172584c68eac7c
diff --git a/devel/bison/patches/patch-aa b/devel/bison/patches/patch-aa
deleted file mode 100644
index b1a6ee43f17..00000000000
--- a/devel/bison/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2011/08/06 17:15:43 wiz Exp $
-
-Do not create yacc executable.
-
---- src/Makefile.in.orig 2008-11-02 21:59:45.000000000 +0000
-+++ src/Makefile.in
-@@ -913,9 +913,9 @@ uninstall-am: uninstall-binPROGRAMS unin
-
-
- yacc:
-- echo '#! /bin/sh' >$@
-- echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
-- chmod a+x $@
-+# echo '#! /bin/sh' >$@
-+# echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
-+# chmod a+x $@
-
- echo:
- echo $(bison_SOURCES) $(noinst_HEADERS)
diff --git a/devel/bison/patches/patch-lib_isnan.c b/devel/bison/patches/patch-lib_isnan.c
index b8ce1d5ac47..d1c7cd6048e 100644
--- a/devel/bison/patches/patch-lib_isnan.c
+++ b/devel/bison/patches/patch-lib_isnan.c
@@ -1,14 +1,13 @@
-$NetBSD: patch-lib_isnan.c,v 1.2 2012/04/07 15:14:04 schwarz Exp $
+$NetBSD: patch-lib_isnan.c,v 1.3 2012/06/06 07:20:36 wiz Exp $
---- lib/isnan.c.orig 2011-04-16 21:08:41.000000000 +0200
-+++ lib/isnan.c 2012-04-06 16:16:04.995001524 +0200
-@@ -118,7 +118,8 @@
- /* Be careful to not do any floating-point operation on x, such as x == x,
+--- lib/isnan.c.orig 2012-03-30 07:18:32.000000000 +0000
++++ lib/isnan.c
+@@ -119,7 +119,7 @@ FUNC (DOUBLE x)
because x may be a signaling NaN. */
- # if defined __TINYC__ || defined __SUNPRO_C || defined __DECC \
-- || (defined __sgi && !defined __GNUC__) || defined __ICC
-+ || (defined __sgi && !defined __GNUC__) || defined __ICC \
-+ || defined __vax__
- /* The Sun C 5.0, Intel ICC 10.0, and Compaq (ex-DEC) 6.4 compilers don't
- recognize the initializers as constant expressions. The latter compiler
- also fails when constant-folding 0.0 / 0.0 even when constant-folding is
+ # if defined __SUNPRO_C || defined __ICC || defined _MSC_VER \
+ || defined __DECC || defined __TINYC__ \
+- || (defined __sgi && !defined __GNUC__)
++ || (defined __sgi && !defined __GNUC__) || defined __vax__
+ /* The Sun C 5.0, Intel ICC 10.0, Microsoft Visual C/C++ 9.0, Compaq (ex-DEC)
+ 6.4, and TinyCC compilers don't recognize the initializers as constant
+ expressions. The Compaq compiler also fails when constant-folding
diff --git a/devel/bison/patches/patch-src_Makefile.in b/devel/bison/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..b774a22cd15
--- /dev/null
+++ b/devel/bison/patches/patch-src_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2012/06/06 07:20:36 wiz Exp $
+
+Do not install a yacc executable.
+
+--- src/Makefile.in.orig 2012-06-06 07:16:43.000000000 +0000
++++ src/Makefile.in
+@@ -1899,9 +1899,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+
+ yacc:
+- $(AM_V_GEN)echo '#! /bin/sh' >$@
+- $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
+- $(AM_V_at)chmod a+x $@
++# $(AM_V_GEN)echo '#! /bin/sh' >$@
++# $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@
++# $(AM_V_at)chmod a+x $@
+
+ # The following rule is not designed to be portable,
+ # and relies on tools that not everyone has.