diff options
Diffstat (limited to 'devel/bisoncpp/files')
-rw-r--r-- | devel/bisoncpp/files/patch-INSTALL.im | 36 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-block__atindex.cc | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-block__block.ih | 12 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-block__dollarindex.cc | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-block__idindex.cc | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-build | 13 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo | 12 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-icmake-install | 91 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-icmake-manpage | 35 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-options__options.ih | 10 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-options__setbasicstrings.cc | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-scanner__lex.cc | 11 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-scanner__scanner.ih | 10 | ||||
-rw-r--r-- | devel/bisoncpp/files/patch-scanner__scanner1.cc | 11 |
15 files changed, 0 insertions, 296 deletions
diff --git a/devel/bisoncpp/files/patch-INSTALL.im b/devel/bisoncpp/files/patch-INSTALL.im deleted file mode 100644 index da9da2af455b..000000000000 --- a/devel/bisoncpp/files/patch-INSTALL.im +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 - - diff --git a/devel/bisoncpp/files/patch-block__atindex.cc b/devel/bisoncpp/files/patch-block__atindex.cc deleted file mode 100644 index ada84c34c3b6..000000000000 --- a/devel/bisoncpp/files/patch-block__atindex.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); diff --git a/devel/bisoncpp/files/patch-block__block.ih b/devel/bisoncpp/files/patch-block__block.ih deleted file mode 100644 index 44ae3d32c687..000000000000 --- a/devel/bisoncpp/files/patch-block__block.ih +++ /dev/null @@ -1,12 +0,0 @@ ---- block/block.ih.orig 2013-06-23 18:13:49 UTC -+++ block/block.ih -@@ -5,6 +5,8 @@ - #include <iterator> - #include <limits> - --using namespace std; -+#include <bobcat/a2x> - -+using namespace std; -+using namespace FBB; - diff --git a/devel/bisoncpp/files/patch-block__dollarindex.cc b/devel/bisoncpp/files/patch-block__dollarindex.cc deleted file mode 100644 index 8da87784e644..000000000000 --- a/devel/bisoncpp/files/patch-block__dollarindex.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); - } diff --git a/devel/bisoncpp/files/patch-block__idindex.cc b/devel/bisoncpp/files/patch-block__idindex.cc deleted file mode 100644 index 6053994cd8e6..000000000000 --- a/devel/bisoncpp/files/patch-block__idindex.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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)) - ) - ); - diff --git a/devel/bisoncpp/files/patch-build b/devel/bisoncpp/files/patch-build deleted file mode 100644 index e3abd5377864..000000000000 --- a/devel/bisoncpp/files/patch-build +++ /dev/null @@ -1,13 +0,0 @@ ---- 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") - { diff --git a/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo b/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo deleted file mode 100644 index 3ec1b7132a29..000000000000 --- a/devel/bisoncpp/files/patch-documentation-manual-conditions-gpl.yo +++ /dev/null @@ -1,12 +0,0 @@ ---- 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). diff --git a/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo b/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo deleted file mode 100644 index 20578380e0f2..000000000000 --- a/devel/bisoncpp/files/patch-documentation-manual-invoking-options.yo +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/devel/bisoncpp/files/patch-icmake-install b/devel/bisoncpp/files/patch-icmake-install deleted file mode 100644 index 4f9ab11fe265..000000000000 --- a/devel/bisoncpp/files/patch-icmake-install +++ /dev/null @@ -1,91 +0,0 @@ ---- 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 @@ 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 @@ 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 @@ 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 @@ 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); diff --git a/devel/bisoncpp/files/patch-icmake-manpage b/devel/bisoncpp/files/patch-icmake-manpage deleted file mode 100644 index 77bf277ef6a0..000000000000 --- a/devel/bisoncpp/files/patch-icmake-manpage +++ /dev/null @@ -1,35 +0,0 @@ ---- 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("../.."); -+} diff --git a/devel/bisoncpp/files/patch-options__options.ih b/devel/bisoncpp/files/patch-options__options.ih deleted file mode 100644 index 10ca2e47d667..000000000000 --- a/devel/bisoncpp/files/patch-options__options.ih +++ /dev/null @@ -1,10 +0,0 @@ ---- options/options.ih.orig 2013-06-21 09:16:34 UTC -+++ options/options.ih -@@ -4,6 +4,7 @@ - #include <bobcat/arg> - #include <bobcat/string> - #include <bobcat/mstream> -+#include <bobcat/a2x> - - using namespace std; - using namespace FBB; diff --git a/devel/bisoncpp/files/patch-options__setbasicstrings.cc b/devel/bisoncpp/files/patch-options__setbasicstrings.cc deleted file mode 100644 index eba8b7f7a014..000000000000 --- a/devel/bisoncpp/files/patch-options__setbasicstrings.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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()) diff --git a/devel/bisoncpp/files/patch-scanner__lex.cc b/devel/bisoncpp/files/patch-scanner__lex.cc deleted file mode 100644 index 1374957ee507..000000000000 --- a/devel/bisoncpp/files/patch-scanner__lex.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- scanner/lex.cc.orig 2015-05-17 14:35:38 UTC -+++ scanner/lex.cc -@@ -2698,7 +2698,7 @@ try - { - #line 194 "lexer" - { -- d_number = stoul(d_matched); -+ d_number = A2x(d_matched); - return Parser::NUMBER; - } - } diff --git a/devel/bisoncpp/files/patch-scanner__scanner.ih b/devel/bisoncpp/files/patch-scanner__scanner.ih deleted file mode 100644 index 9b41544192c6..000000000000 --- a/devel/bisoncpp/files/patch-scanner__scanner.ih +++ /dev/null @@ -1,10 +0,0 @@ ---- scanner/scanner.ih.orig 2013-06-23 18:13:49 UTC -+++ scanner/scanner.ih -@@ -14,6 +14,7 @@ - #include <bobcat/arg> - #include <bobcat/mstream> - #include <bobcat/string> -+#include <bobcat/a2x> - - #include "../parser/parserbase.h" - #include "../options/options.h" diff --git a/devel/bisoncpp/files/patch-scanner__scanner1.cc b/devel/bisoncpp/files/patch-scanner__scanner1.cc deleted file mode 100644 index 362eda1f68b8..000000000000 --- a/devel/bisoncpp/files/patch-scanner__scanner1.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- 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; - } |