diff options
| -rw-r--r-- | devel/bison/Makefile | 6 | ||||
| -rw-r--r-- | devel/bison/PLIST | 4 | ||||
| -rw-r--r-- | devel/bison/distinfo | 11 | ||||
| -rw-r--r-- | devel/bison/patches/patch-Makefile.in | 26 | ||||
| -rw-r--r-- | devel/bison/patches/patch-doc_Makefile.in | 15 | ||||
| -rw-r--r-- | devel/bison/patches/patch-src_Makefile.in | 19 |
6 files changed, 37 insertions, 44 deletions
diff --git a/devel/bison/Makefile b/devel/bison/Makefile index 4c4651b278b..a955240433c 100644 --- a/devel/bison/Makefile +++ b/devel/bison/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.90 2013/04/15 19:19:09 adam Exp $ +# $NetBSD: Makefile,v 1.91 2013/07/28 12:43:50 wiz Exp $ -DISTNAME= bison-2.7.1 +DISTNAME= bison-3.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=bison/} EXTRACT_SUFX= .tar.xz @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes -USE_TOOLS+= grep gm4:run msgfmt flex +USE_TOOLS+= grep gm4:run msgfmt flex perl:build GNU_CONFIGURE= yes CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes CONFIGURE_ENV+= ac_cv_prog_M4=${TOOLS_PATH.gm4} diff --git a/devel/bison/PLIST b/devel/bison/PLIST index c5876ec1621..e5ec9727a27 100644 --- a/devel/bison/PLIST +++ b/devel/bison/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2012/11/03 01:02:23 wiz Exp $ +@comment $NetBSD: PLIST,v 1.26 2013/07/28 12:43:50 wiz Exp $ bin/bison info/bison.info lib/liby.a @@ -21,6 +21,7 @@ share/bison/location.cc share/bison/m4sugar/foreach.m4 share/bison/m4sugar/m4sugar.m4 share/bison/stack.hh +share/bison/variant.hh share/bison/xslt/bison.xsl share/bison/xslt/xml2dot.xsl share/bison/xslt/xml2text.xsl @@ -49,6 +50,7 @@ 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/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 diff --git a/devel/bison/distinfo b/devel/bison/distinfo index 61ebffaf5ac..74edbbb793b 100644 --- a/devel/bison/distinfo +++ b/devel/bison/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.36 2013/04/15 19:19:09 adam Exp $ +$NetBSD: distinfo,v 1.37 2013/07/28 12:43:50 wiz Exp $ -SHA1 (bison-2.7.1.tar.xz) = 00ab1b32d864622077c311e4f5420d4e2931fdc8 -RMD160 (bison-2.7.1.tar.xz) = 933257e61c1098160d4fd71063f340b2ee304671 -Size (bison-2.7.1.tar.xz) = 1781068 bytes -SHA1 (patch-doc_Makefile.in) = dc3dd7ee66dfe5995abd3a34973cbebdb7fed7fb +SHA1 (bison-3.0.tar.xz) = 5e32be3773522cf89163a4beb622eeeb4ace90dc +RMD160 (bison-3.0.tar.xz) = 6b68dfec7e83ab481f3e9d315f779f462dfc3823 +Size (bison-3.0.tar.xz) = 1913532 bytes +SHA1 (patch-Makefile.in) = e472c53696e55f40711d22b2befbb91fba1f349c SHA1 (patch-lib_isnan.c) = c5d2603447064c95e8bbc75a24c09366b752bad6 -SHA1 (patch-src_Makefile.in) = 6baa8ff8b8f4f0aa9c8efee60e172584c68eac7c diff --git a/devel/bison/patches/patch-Makefile.in b/devel/bison/patches/patch-Makefile.in new file mode 100644 index 00000000000..5b2c334c6a6 --- /dev/null +++ b/devel/bison/patches/patch-Makefile.in @@ -0,0 +1,26 @@ +$NetBSD: patch-Makefile.in,v 1.1 2013/07/28 12:43:50 wiz Exp $ + +Do not install yacc and its manpage. + +--- Makefile.in.orig 2013-07-25 15:56:24.000000000 +0000 ++++ Makefile.in +@@ -2304,7 +2304,7 @@ dist_man_MANS = $(top_srcdir)/doc/bison. + remove_time_stamp = \ + sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/' + +-nodist_man_MANS = doc/yacc.1 ++nodist_man_MANS = + FIGS_DOT = \ + doc/figs/example.dot \ + doc/figs/example-reduce.dot doc/figs/example-shift.dot +@@ -2536,8 +2536,8 @@ EXTRA_src_bison_SOURCES = \ + src/scan-gram.l \ + src/scan-skel.l + +-bin_SCRIPTS = $(YACC_SCRIPT) +-EXTRA_SCRIPTS = src/yacc ++bin_SCRIPTS = ++EXTRA_SCRIPTS = + TESTSUITE_AT = \ + tests/testsuite.at \ + \ diff --git a/devel/bison/patches/patch-doc_Makefile.in b/devel/bison/patches/patch-doc_Makefile.in deleted file mode 100644 index c90d1ac2361..00000000000 --- a/devel/bison/patches/patch-doc_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-doc_Makefile.in,v 1.2 2012/12/16 10:46:17 wiz Exp $ - -Do not install yacc(1). - ---- doc/Makefile.in.orig 2012-12-12 15:08:52.000000000 +0000 -+++ doc/Makefile.in -@@ -1429,7 +1429,7 @@ remove_time_stamp = \ - MOSTLYCLEANFILES = $(srcdir)/*.t - SUFFIXES = .x .1 .dot .eps .pdf .png - PREPATH = $(top_builddir)/src --nodist_man_MANS = yacc.1 -+nodist_man_MANS = - FIGS_DOT = figs/example.dot figs/example-reduce.dot figs/example-shift.dot - DOXYGEN = doxygen - edit = sed -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ diff --git a/devel/bison/patches/patch-src_Makefile.in b/devel/bison/patches/patch-src_Makefile.in deleted file mode 100644 index b774a22cd15..00000000000 --- a/devel/bison/patches/patch-src_Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -$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. |