Index: head/devel/bisoncpp/Makefile =================================================================== --- head/devel/bisoncpp/Makefile (revision 388852) +++ head/devel/bisoncpp/Makefile (revision 388853) @@ -1,68 +1,68 @@ # $FreeBSD$ PORTNAME= bisoncpp -PORTVERSION= 4.09.02 +PORTVERSION= 4.10.01 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION} DISTNAME= bisonc++_${PORTVERSION}.orig MAINTAINER= bofh@FreeBSD.org COMMENT= LALR(1) parser generator that generates C++ classes LICENSE= GPLv3 BUILD_DEPENDS= icmake:${PORTSDIR}/devel/icmake \ yodl>=3.0:${PORTSDIR}/textproc/yodl \ libbobcat>=3.18:${PORTSDIR}/devel/libbobcat DOCSDIR= ${PREFIX}/share/doc/bisonc++ PORTDOCS= * WRKSRC= ${WRKDIR}/bisonc++-${PORTVERSION} -USE_GCC= yes +USE_GCC= 4.9+ USES= shebangfix SHEBANG_LANG= icmake icmake_OLD_CMD= /usr/bin/icmake icmake_CMD= ${LOCALBASE}/bin/icmake SHEBANG_FILES= build \ documentation/examples/bison++Example.NEW/make \ documentation/man/calculator/build \ documentation/manual/examples/calc/build \ documentation/manual/examples/errorcalc/build \ documentation/manual/examples/mfcalc/build \ documentation/manual/examples/rpn/build \ documentation/manual/grammar/poly/build \ documentation/regression/run \ parser/driver/build \ scanner/driver/build post-patch: @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/INSTALL.im @${REINPLACE_CMD} 's|"g++|"${CXX}|' \ ${WRKSRC}/INSTALL.im \ ${WRKSRC}/scanner/driver/build \ ${WRKSRC}/parser/driver/build @${REINPLACE_CMD} 's|"gcc|"${CC}|' \ ${WRKSRC}/icmake/special @${REINPLACE_CMD} 's|"cp -d |"cp -Pp | ; \ s|"cp -r |"cp -R | ; \ s|-doc|/doc|' \ ${WRKSRC}/icmake/install do-build: @cd ${WRKSRC} && ./build program strip @cd ${WRKSRC} && ./build man @cd ${WRKSRC} && ./build manual do-install: cd ${WRKSRC} && ./build install program ${STAGEDIR} cd ${WRKSRC} && ./build install man ${STAGEDIR} cd ${WRKSRC} && ./build install manual ${STAGEDIR} cd ${WRKSRC} && ./build install skel ${STAGEDIR} .include Index: head/devel/bisoncpp/distinfo =================================================================== --- head/devel/bisoncpp/distinfo (revision 388852) +++ head/devel/bisoncpp/distinfo (revision 388853) @@ -1,2 +1,2 @@ -SHA256 (bisonc++_4.09.02.orig.tar.gz) = b51f3ec125c6405530d82c403a58ec3c0c0a55242fb93ed6f4177aef59a2b380 -SIZE (bisonc++_4.09.02.orig.tar.gz) = 654692 +SHA256 (bisonc++_4.10.01.orig.tar.gz) = d03b1c3982f7cff9663382cb6933ccc5aa8ce35a7ccbd6f76769aa261777bf0b +SIZE (bisonc++_4.10.01.orig.tar.gz) = 652569 Index: head/devel/bisoncpp/files/patch-INSTALL.im =================================================================== --- head/devel/bisoncpp/files/patch-INSTALL.im (revision 388852) +++ head/devel/bisoncpp/files/patch-INSTALL.im (revision 388853) @@ -1,36 +1,36 @@ ---- INSTALL.im.orig 2013-06-21 11:16:33.000000000 +0200 -+++ INSTALL.im 2013-11-27 22:15:51.000000000 +0100 +--- INSTALL.im.orig 2015-04-28 13:26:33 UTC ++++ INSTALL.im @@ -15,7 +15,7 @@ #define LDFLAGS "" // flags passed to the linker -#define SKEL "/usr/share/bisonc++" +#define SKEL "%%PREFIX%%/share/"${PROGRAM} // the directory where the skeleton files are installed // Recompile options/data.cc if the skeleton location changes @@ -23,19 +23,19 @@ // ========================================================================= // The following locations are overruled by `build' arguments -#define BINARY "/usr/bin/"${PROGRAM} +#define BINARY "%%PREFIX%%/bin/"${PROGRAM} // the full path of the final program -#define MAN "/usr/share/man/man1" +#define MAN "%%PREFIX%%/man/man1" // the directory whre the manual page is stored -#define MANUAL "/usr/share/doc/"${PROGRAM}"-doc/manual" +#define MANUAL "%%PREFIX%%/share/doc/"${PROGRAM}"/manual" // the directory whre the manual page is stored -#define STD "/usr/share/doc/"${PROGRAM} +#define STD "%%PREFIX%%/share/doc/"${PROGRAM} // the directory where the standard documentation is stored -#define EXTRA "/usr/share/doc/"${PROGRAM}"-doc" +#define EXTRA "%%PREFIX%%/share/doc/"${PROGRAM} // the directory where the extra documentation is stored Index: head/devel/bisoncpp/files/patch-block__atindex.cc =================================================================== --- head/devel/bisoncpp/files/patch-block__atindex.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-block__atindex.cc (revision 388853) @@ -1,11 +1,11 @@ ---- ./block/atindex.cc.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./block/atindex.cc 2013-11-27 18:55:51.000000000 +0100 -@@ -6,7 +6,7 @@ +--- block/atindex.cc.orig 2013-06-23 18:13:49 UTC ++++ block/atindex.cc +@@ -6,7 +6,7 @@ void Block::atIndex(size_t lineNr, strin d_atDollar.push_back( AtDollar( AtDollar::AT, length(), lineNr, - text, stol(text.substr(1)), false + text, A2x(text.substr(1)), false ) ); append(text); Index: head/devel/bisoncpp/files/patch-block__block.ih =================================================================== --- head/devel/bisoncpp/files/patch-block__block.ih (revision 388852) +++ head/devel/bisoncpp/files/patch-block__block.ih (revision 388853) @@ -1,12 +1,12 @@ ---- ./block/block.ih.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./block/block.ih 2013-11-27 18:54:50.000000000 +0100 +--- block/block.ih.orig 2013-06-23 18:13:49 UTC ++++ block/block.ih @@ -5,6 +5,8 @@ #include #include -using namespace std; +#include +using namespace std; +using namespace FBB; Index: head/devel/bisoncpp/files/patch-block__dollarindex.cc =================================================================== --- head/devel/bisoncpp/files/patch-block__dollarindex.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-block__dollarindex.cc (revision 388853) @@ -1,11 +1,11 @@ ---- ./block/dollarindex.cc.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./block/dollarindex.cc 2013-11-27 18:55:17.000000000 +0100 -@@ -6,7 +6,7 @@ +--- block/dollarindex.cc.orig 2013-06-23 18:13:49 UTC ++++ block/dollarindex.cc +@@ -6,7 +6,7 @@ void Block::dollarIndex(size_t lineNr, s { d_atDollar.push_back( AtDollar(AtDollar::DOLLAR, length(), lineNr, - text, stol(text.substr(1)), member) + text, A2x(text.substr(1)), member) ); append(text); } Index: head/devel/bisoncpp/files/patch-block__idindex.cc =================================================================== --- head/devel/bisoncpp/files/patch-block__idindex.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-block__idindex.cc (revision 388853) @@ -1,11 +1,11 @@ ---- ./block/idindex.cc.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./block/idindex.cc 2013-11-27 18:54:04.000000000 +0100 -@@ -8,7 +8,7 @@ +--- block/idindex.cc.orig 2013-06-23 18:13:49 UTC ++++ block/idindex.cc +@@ -8,7 +8,7 @@ void Block::IDindex(size_t lineNr, strin d_atDollar.push_back( AtDollar( AtDollar::DOLLAR, length(), lineNr, - text, text.substr(begin, end - begin), stol(text.substr(end + 1)) + text, text.substr(begin, end - begin), A2x(text.substr(end + 1)) ) ); Index: head/devel/bisoncpp/files/patch-build =================================================================== --- head/devel/bisoncpp/files/patch-build (revision 388852) +++ head/devel/bisoncpp/files/patch-build (revision 388853) @@ -1,13 +1,13 @@ ---- ./build.orig 2013-11-27 18:04:34.000000000 +0100 -+++ ./build 2013-11-27 18:04:34.000000000 +0100 -@@ -40,7 +40,10 @@ +--- build.orig 2015-05-25 15:47:08 UTC ++++ build +@@ -40,7 +40,10 @@ void main(int argc, list argv) manpage(); if (option == "manual") + { + manhtmlpage(); manual(); + } if (option == "library") { Index: head/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo =================================================================== --- head/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo (revision 388852) +++ head/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo (revision 388853) @@ -1,12 +1,12 @@ ---- documentation/manual/conditions/gpl.yo.orig 2007-03-22 21:29:15.000000000 +0100 -+++ documentation/manual/conditions/gpl.yo 2009-03-05 16:07:39.000000000 +0100 +--- documentation/manual/conditions/gpl.yo.orig 2012-02-08 19:53:51 UTC ++++ documentation/manual/conditions/gpl.yo @@ -1,8 +1,2 @@ The text of the em(GNU General Public License) (GPL) is frequently found in -files named tt(COPYING). On em(Debian) systems the GPL may be found in the -file tt(/usr/share/common-licenses/GPL). - -The GPL is shown below: - -verbinclude(/usr/share/common-licenses/GPL) - +files named tt(COPYING). Index: head/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo =================================================================== --- head/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo (revision 388852) +++ head/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo (revision 388853) @@ -1,11 +1,11 @@ ---- documentation/manual/invoking/options.yo.orig 2012-04-29 13:59:49.000000000 +0200 -+++ documentation/manual/invoking/options.yo 2012-12-02 13:00:49.000000000 +0100 -@@ -179,7 +179,7 @@ +--- documentation/manual/invoking/options.yo.orig 2015-04-28 13:26:33 UTC ++++ documentation/manual/invoking/options.yo +@@ -235,7 +235,7 @@ END) it() loption(own-tokens) (soption(T))nl() The tokens returned as well as the text matched when bic() reads - its input files(s) are shown when this option is used. + its input file(s) are shown when this option is used. This option does em(not) result in the generated parsing function displaying returned tokens and matched text. If that is what you Index: head/devel/bisoncpp/files/patch-icmake-install =================================================================== --- head/devel/bisoncpp/files/patch-icmake-install (revision 388852) +++ head/devel/bisoncpp/files/patch-icmake-install (revision 388853) @@ -1,91 +1,91 @@ ---- icmake/install.orig 2013-06-21 11:16:34.000000000 +0200 -+++ icmake/install 2013-11-27 22:05:08.000000000 +0100 -@@ -3,7 +3,6 @@ +--- icmake/install.orig 2013-06-21 09:16:34 UTC ++++ icmake/install +@@ -3,7 +3,6 @@ string setWhere(string where, string def if (where == "") where = defaultWhere; - md(where); return where; } -@@ -13,22 +12,15 @@ +@@ -13,22 +12,15 @@ void install(string what, string where) if (what == "program") { - if (where == "") - where = BINARY; - - path = get_path(where); - if (path != "") - md(path); - + where = setWhere(where + BINARY, BINARY); printf(" INSTALLING the executable `", where, "'\n"); - run("icmbuild install program " + where); + run("cp tmp/bin/* " + where); exit(0); } if (what == "skel") { - where = setWhere(where, SKEL); - + where = setWhere(where + SKEL, SKEL); printf(" INSTALLING skeleton files at `" + where + "'\n"); md(where); run("cp skeletons/* " + where); -@@ -37,8 +29,7 @@ +@@ -37,8 +29,7 @@ void install(string what, string where) if (what == "man") { - where = setWhere(where, MAN); - + where = setWhere(where + MAN, MAN); printf(" INSTALLING the manual page at `", where, "'\n"); run("gzip -9 < tmp/man/" PROGRAM ".1 > " + where + "/" PROGRAM ".1.gz"); exit(0); -@@ -46,21 +37,18 @@ +@@ -46,21 +37,18 @@ void install(string what, string where) if (what == "manual") { - where = setWhere(where, MANUAL); - + where = setWhere(where + MANUAL, MANUAL); printf(" INSTALLING the manual at `", where, "'\n"); - run("cp -r tmp/manual " + where); - + md(where); + run("cp -r tmp/manual/* " + where); exit(0); } if (what == "std") { - where = setWhere(where, STD); - + where = setWhere(where + STD, STD); printf(" INSTALLING the changelog at `", where, "\n"); run("gzip -9 < changelog > " + where + "/changelog.gz"); - printf(" INSTALLING the html-manual page at `", where, "\n"); run("cp tmp/manhtml/" PROGRAM "man.html " + where); exit(0); -@@ -68,17 +56,14 @@ +@@ -68,17 +56,14 @@ void install(string what, string where) if (what == "extra") { - where = setWhere(where, EXTRA); - + where = setWhere(where + EXTRA, EXTRA); printf(" INSTALLING original bison's docs at `", where + "'\n"); md(where + "/bison-docs"); run("cp -r documentation/html " "documentation/bison.ps.org " + where + "/bison-docs"); - printf(" INSTALLING examples at `", where + "'\n"); run("cp -r documentation/examples " + where); run("cp -r documentation/man/calculator " + where + "/examples"); - printf(" INSTALLING regression tests at `", where + "'\n"); run("cp -r documentation/regression " + where); exit(0); Index: head/devel/bisoncpp/files/patch-icmake-manpage =================================================================== --- head/devel/bisoncpp/files/patch-icmake-manpage (revision 388852) +++ head/devel/bisoncpp/files/patch-icmake-manpage (revision 388853) @@ -1,35 +1,35 @@ ---- icmake/manpage.orig 2013-06-21 11:16:34.000000000 +0200 -+++ icmake/manpage 2013-11-27 17:42:34.000000000 +0100 +--- icmake/manpage.orig 2013-06-21 09:16:34 UTC ++++ icmake/manpage @@ -3,14 +3,29 @@ void manpage() { - md("tmp/man tmp/manhtml"); + md("tmp/man"); chdir("documentation/man"); if (PROGRAM ".yo" younger MANPAGE || "release.yo" younger MANPAGE) { - run("yodl2man -o " MANPAGE " " PROGRAM); - run("yodl2html -o " MANHTML " " PROGRAM); + run("yodl2man -l3 -o " MANPAGE " " PROGRAM); } exit(0); } + +void manhtmlpage() +{ + md("tmp/manhtml"); + + special(); + + chdir("documentation/man"); + + if (PROGRAM ".yo" younger MANHTML || "release.yo" younger MANHTML) + { + run("yodl2html -l3 -o " MANHTML " " PROGRAM); + } + + chdir("../.."); +} Index: head/devel/bisoncpp/files/patch-options__options.ih =================================================================== --- head/devel/bisoncpp/files/patch-options__options.ih (revision 388852) +++ head/devel/bisoncpp/files/patch-options__options.ih (revision 388853) @@ -1,10 +1,10 @@ ---- ./options/options.ih.orig 2013-06-21 11:16:34.000000000 +0200 -+++ ./options/options.ih 2013-11-27 18:56:37.000000000 +0100 +--- options/options.ih.orig 2013-06-21 09:16:34 UTC ++++ options/options.ih @@ -4,6 +4,7 @@ #include #include #include +#include using namespace std; using namespace FBB; Index: head/devel/bisoncpp/files/patch-options__setbasicstrings.cc =================================================================== --- head/devel/bisoncpp/files/patch-options__setbasicstrings.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-options__setbasicstrings.cc (revision 388853) @@ -1,11 +1,11 @@ ---- ./options/setbasicstrings.cc.orig 2013-06-24 15:10:12.000000000 +0200 -+++ ./options/setbasicstrings.cc 2013-11-27 18:56:48.000000000 +0100 -@@ -35,7 +35,7 @@ +--- options/setbasicstrings.cc.orig 2014-02-17 12:30:08 UTC ++++ options/setbasicstrings.cc +@@ -34,7 +34,7 @@ void Options::setBasicStrings() string nTokens; if (d_arg.option(&nTokens, "required-tokens")) - d_requiredTokens = stoul(nTokens); + d_requiredTokens = A2x(nTokens); d_arg.option(&d_genericFilename, 'f'); if (d_genericFilename.empty()) Index: head/devel/bisoncpp/files/patch-scanner__lex.cc =================================================================== --- head/devel/bisoncpp/files/patch-scanner__lex.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-scanner__lex.cc (revision 388853) @@ -1,11 +1,11 @@ ---- scanner/lex.cc.orig 2014-04-04 14:46:17.624123806 +0600 -+++ scanner/lex.cc 2014-04-04 14:46:39.301107135 +0600 -@@ -2702,7 +2702,7 @@ +--- scanner/lex.cc.orig 2015-05-17 14:35:38 UTC ++++ scanner/lex.cc +@@ -2698,7 +2698,7 @@ try { - #line 193 "lexer" + #line 194 "lexer" { - d_number = stoul(d_matched); + d_number = A2x(d_matched); return Parser::NUMBER; } } Index: head/devel/bisoncpp/files/patch-scanner__scanner.ih =================================================================== --- head/devel/bisoncpp/files/patch-scanner__scanner.ih (revision 388852) +++ head/devel/bisoncpp/files/patch-scanner__scanner.ih (revision 388853) @@ -1,10 +1,10 @@ ---- ./scanner/scanner.ih.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./scanner/scanner.ih 2013-11-27 19:03:53.000000000 +0100 +--- scanner/scanner.ih.orig 2013-06-23 18:13:49 UTC ++++ scanner/scanner.ih @@ -14,6 +14,7 @@ #include #include #include +#include #include "../parser/parserbase.h" #include "../options/options.h" Index: head/devel/bisoncpp/files/patch-scanner__scanner1.cc =================================================================== --- head/devel/bisoncpp/files/patch-scanner__scanner1.cc (revision 388852) +++ head/devel/bisoncpp/files/patch-scanner__scanner1.cc (revision 388853) @@ -1,11 +1,11 @@ ---- ./scanner/scanner1.cc.orig 2013-06-23 20:13:49.000000000 +0200 -+++ ./scanner/scanner1.cc 2013-11-27 19:03:33.000000000 +0100 -@@ -15,7 +15,7 @@ +--- scanner/scanner1.cc.orig 2013-06-23 18:13:49 UTC ++++ scanner/scanner1.cc +@@ -15,7 +15,7 @@ Scanner::Scanner(std::string const &infi string value; if (arg.option(&value, "max-inclusion-depth")) - d_maxDepth = stoul(value); + d_maxDepth = A2x(value); else d_maxDepth = 10; }