Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/flex Merge conflicts
details: https://anonhg.NetBSD.org/src/rev/431938b9db79
branches: trunk
changeset: 820175:431938b9db79
user: christos <christos%NetBSD.org@localhost>
date: Mon Jan 02 17:45:26 2017 +0000
description:
Merge conflicts
diffstat:
external/bsd/flex/Makefile.inc | 5 +-
external/bsd/flex/bin/Makefile | 6 +-
external/bsd/flex/dist/INSTALL | 370 -
external/bsd/flex/dist/README | 113 -
external/bsd/flex/dist/TODO | 66 -
external/bsd/flex/dist/doc/Makefile | 845 -
external/bsd/flex/dist/doc/flex.pdf | Bin
external/bsd/flex/dist/doc/mdate-sh | 225 -
external/bsd/flex/dist/doc/texinfo.tex | 9977 ----------
external/bsd/flex/dist/examples/Makefile | 645 -
external/bsd/flex/dist/examples/fastwc/Makefile | 446 -
external/bsd/flex/dist/examples/manual/Makefile | 473 -
external/bsd/flex/dist/lib/.deps/lib.Plo | 1 -
external/bsd/flex/dist/lib/.deps/malloc.Po | 1 -
external/bsd/flex/dist/lib/.deps/realloc.Po | 1 -
external/bsd/flex/dist/lib/Makefile | 536 -
external/bsd/flex/dist/lib/lib.c | 7 -
external/bsd/flex/dist/po/Makefile | 550 -
external/bsd/flex/dist/po/Makefile.in | 444 -
external/bsd/flex/dist/po/POTFILES | 18 -
external/bsd/flex/dist/src/FlexLexer.h | 233 +-
external/bsd/flex/dist/src/buf.c | 93 +-
external/bsd/flex/dist/src/ccl.c | 17 +-
external/bsd/flex/dist/src/dfa.c | 74 +-
external/bsd/flex/dist/src/ecs.c | 21 +-
external/bsd/flex/dist/src/filter.c | 41 +-
external/bsd/flex/dist/src/flex.skl | 507 +-
external/bsd/flex/dist/src/flexdef.h | 399 +-
external/bsd/flex/dist/src/gen.c | 344 +-
external/bsd/flex/dist/src/initparse.c | 177 +-
external/bsd/flex/dist/src/initparse.h | 14 +-
external/bsd/flex/dist/src/initscan.c | 3888 ++-
external/bsd/flex/dist/src/libmain.c | 8 +-
external/bsd/flex/dist/src/main.c | 179 +-
external/bsd/flex/dist/src/misc.c | 272 +-
external/bsd/flex/dist/src/nfa.c | 61 +-
external/bsd/flex/dist/src/options.c | 11 +-
external/bsd/flex/dist/src/options.h | 7 +-
external/bsd/flex/dist/src/parse.y | 74 +-
external/bsd/flex/dist/src/regex.c | 22 +-
external/bsd/flex/dist/src/scan.l | 355 +-
external/bsd/flex/dist/src/scanflags.c | 13 +-
external/bsd/flex/dist/src/scanopt.c | 148 +-
external/bsd/flex/dist/src/scanopt.h | 21 +-
external/bsd/flex/dist/src/sym.c | 73 +-
external/bsd/flex/dist/src/tables.c | 70 +-
external/bsd/flex/dist/src/tables.h | 4 +-
external/bsd/flex/dist/src/tblcmp.c | 66 +-
external/bsd/flex/dist/src/yylex.c | 20 +-
external/bsd/flex/dist/tests/Makefile | 766 -
external/bsd/flex/dist/tests/TEMPLATE/Makefile | 463 -
external/bsd/flex/dist/tests/TEMPLATE/Makefile.am | 50 -
external/bsd/flex/dist/tests/TEMPLATE/Makefile.in | 463 -
external/bsd/flex/dist/tests/TEMPLATE/parser.y | 61 -
external/bsd/flex/dist/tests/TEMPLATE/scanner.l | 54 -
external/bsd/flex/dist/tests/TEMPLATE/test.input | 2 -
external/bsd/flex/dist/tests/create-test | 33 -
external/bsd/flex/dist/tests/noansi_nr.l | 67 -
external/bsd/flex/dist/tests/noansi_nr.txt | 5 -
external/bsd/flex/dist/tests/noansi_r.l | 69 -
external/bsd/flex/dist/tests/noansi_r.txt | 4 -
external/bsd/flex/dist/tests/test-alloc-extra/Makefile | 463 -
external/bsd/flex/dist/tests/test-alloc-extra/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-alloc-extra/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-alloc-extra/scanner.l | 123 -
external/bsd/flex/dist/tests/test-alloc-extra/test.input | 795 -
external/bsd/flex/dist/tests/test-array-nr/Makefile | 462 -
external/bsd/flex/dist/tests/test-array-nr/Makefile.am | 48 -
external/bsd/flex/dist/tests/test-array-nr/Makefile.in | 462 -
external/bsd/flex/dist/tests/test-array-nr/scanner.l | 55 -
external/bsd/flex/dist/tests/test-array-nr/test.input | 2 -
external/bsd/flex/dist/tests/test-array-r/Makefile | 459 -
external/bsd/flex/dist/tests/test-array-r/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-array-r/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-array-r/scanner.l | 62 -
external/bsd/flex/dist/tests/test-array-r/test.input | 2 -
external/bsd/flex/dist/tests/test-basic-nr/Makefile | 462 -
external/bsd/flex/dist/tests/test-basic-nr/Makefile.am | 48 -
external/bsd/flex/dist/tests/test-basic-nr/Makefile.in | 462 -
external/bsd/flex/dist/tests/test-basic-nr/scanner.l | 66 -
external/bsd/flex/dist/tests/test-basic-nr/test.input | 5 -
external/bsd/flex/dist/tests/test-basic-r/Makefile | 462 -
external/bsd/flex/dist/tests/test-basic-r/Makefile.am | 48 -
external/bsd/flex/dist/tests/test-basic-r/Makefile.in | 462 -
external/bsd/flex/dist/tests/test-basic-r/scanner.l | 68 -
external/bsd/flex/dist/tests/test-basic-r/test.input | 4 -
external/bsd/flex/dist/tests/test-bison-nr/Makefile | 466 -
external/bsd/flex/dist/tests/test-bison-nr/Makefile.am | 55 -
external/bsd/flex/dist/tests/test-bison-nr/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-bison-nr/main.c | 39 -
external/bsd/flex/dist/tests/test-bison-nr/parser.y | 96 -
external/bsd/flex/dist/tests/test-bison-nr/scanner.l | 62 -
external/bsd/flex/dist/tests/test-bison-nr/test.input | 4 -
external/bsd/flex/dist/tests/test-bison-yylloc/Makefile | 466 -
external/bsd/flex/dist/tests/test-bison-yylloc/Makefile.am | 55 -
external/bsd/flex/dist/tests/test-bison-yylloc/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-bison-yylloc/main.c | 40 -
external/bsd/flex/dist/tests/test-bison-yylloc/parser.y | 96 -
external/bsd/flex/dist/tests/test-bison-yylloc/scanner.l | 65 -
external/bsd/flex/dist/tests/test-bison-yylloc/test.input | 4 -
external/bsd/flex/dist/tests/test-bison-yylval/Makefile | 466 -
external/bsd/flex/dist/tests/test-bison-yylval/Makefile.am | 55 -
external/bsd/flex/dist/tests/test-bison-yylval/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-bison-yylval/main.c | 39 -
external/bsd/flex/dist/tests/test-bison-yylval/parser.y | 80 -
external/bsd/flex/dist/tests/test-bison-yylval/scanner.l | 81 -
external/bsd/flex/dist/tests/test-bison-yylval/test.input | 5 -
external/bsd/flex/dist/tests/test-c++-basic/Makefile | 459 -
external/bsd/flex/dist/tests/test-c++-basic/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-c++-basic/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-c++-basic/scanner.l | 51 -
external/bsd/flex/dist/tests/test-c++-basic/test.input | 2 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile | 466 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile.am | 53 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/main.cpp | 56 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/scanner-1.l | 44 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/scanner-2.l | 48 -
external/bsd/flex/dist/tests/test-c++-multiple-scanners/test.input | 1 -
external/bsd/flex/dist/tests/test-c++-yywrap/Makefile | 459 -
external/bsd/flex/dist/tests/test-c++-yywrap/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-c++-yywrap/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-c++-yywrap/scanner.l | 70 -
external/bsd/flex/dist/tests/test-c++-yywrap/test.input | 2 -
external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile | 459 -
external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-c-cpp-nr/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-c-cpp-nr/scanner.l | 57 -
external/bsd/flex/dist/tests/test-c-cpp-nr/test.input | 2 -
external/bsd/flex/dist/tests/test-c-cpp-r/Makefile | 459 -
external/bsd/flex/dist/tests/test-c-cpp-r/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-c-cpp-r/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-c-cpp-r/scanner.l | 61 -
external/bsd/flex/dist/tests/test-c-cpp-r/test.input | 2 -
external/bsd/flex/dist/tests/test-ccl/Makefile | 457 -
external/bsd/flex/dist/tests/test-ccl/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-ccl/Makefile.in | 457 -
external/bsd/flex/dist/tests/test-ccl/scanner.l | 95 -
external/bsd/flex/dist/tests/test-ccl/test.input | 27 -
external/bsd/flex/dist/tests/test-concatenated-options/Makefile | 449 -
external/bsd/flex/dist/tests/test-concatenated-options/Makefile.am | 33 -
external/bsd/flex/dist/tests/test-concatenated-options/Makefile.in | 449 -
external/bsd/flex/dist/tests/test-debug-nr/Makefile | 458 -
external/bsd/flex/dist/tests/test-debug-nr/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-debug-nr/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-debug-nr/scanner.l | 52 -
external/bsd/flex/dist/tests/test-debug-nr/test.input | 2 -
external/bsd/flex/dist/tests/test-debug-r/Makefile | 458 -
external/bsd/flex/dist/tests/test-debug-r/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-debug-r/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-debug-r/scanner.l | 59 -
external/bsd/flex/dist/tests/test-debug-r/test.input | 2 -
external/bsd/flex/dist/tests/test-extended/Makefile | 457 -
external/bsd/flex/dist/tests/test-extended/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-extended/Makefile.in | 457 -
external/bsd/flex/dist/tests/test-extended/scanner.l | 73 -
external/bsd/flex/dist/tests/test-extended/test.input | 2 -
external/bsd/flex/dist/tests/test-header-nr/Makefile | 465 -
external/bsd/flex/dist/tests/test-header-nr/Makefile.am | 53 -
external/bsd/flex/dist/tests/test-header-nr/Makefile.in | 465 -
external/bsd/flex/dist/tests/test-header-nr/main.c | 37 -
external/bsd/flex/dist/tests/test-header-nr/scanner.l | 42 -
external/bsd/flex/dist/tests/test-header-nr/test.input | 3 -
external/bsd/flex/dist/tests/test-header-r/Makefile | 466 -
external/bsd/flex/dist/tests/test-header-r/Makefile.am | 54 -
external/bsd/flex/dist/tests/test-header-r/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-header-r/main.c | 63 -
external/bsd/flex/dist/tests/test-header-r/scanner.l | 46 -
external/bsd/flex/dist/tests/test-header-r/test.input | 3 -
external/bsd/flex/dist/tests/test-include-by-buffer/Makefile | 463 -
external/bsd/flex/dist/tests/test-include-by-buffer/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-include-by-buffer/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-include-by-buffer/scanner.l | 102 -
external/bsd/flex/dist/tests/test-include-by-buffer/test-1.input | 3 -
external/bsd/flex/dist/tests/test-include-by-buffer/test-2.input | 3 -
external/bsd/flex/dist/tests/test-include-by-buffer/test-3.input | 2 -
external/bsd/flex/dist/tests/test-include-by-push/Makefile | 463 -
external/bsd/flex/dist/tests/test-include-by-push/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-include-by-push/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-include-by-push/scanner.l | 92 -
external/bsd/flex/dist/tests/test-include-by-push/test-1.input | 3 -
external/bsd/flex/dist/tests/test-include-by-push/test-2.input | 3 -
external/bsd/flex/dist/tests/test-include-by-push/test-3.input | 2 -
external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile | 463 -
external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-include-by-reentrant/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-include-by-reentrant/scanner.l | 101 -
external/bsd/flex/dist/tests/test-include-by-reentrant/test-1.input | 3 -
external/bsd/flex/dist/tests/test-include-by-reentrant/test-2.input | 3 -
external/bsd/flex/dist/tests/test-include-by-reentrant/test-3.input | 2 -
external/bsd/flex/dist/tests/test-linedir-r/Makefile | 468 -
external/bsd/flex/dist/tests/test-linedir-r/Makefile.am | 56 -
external/bsd/flex/dist/tests/test-linedir-r/Makefile.in | 468 -
external/bsd/flex/dist/tests/test-linedir-r/check-lines.awk | 7 -
external/bsd/flex/dist/tests/test-linedir-r/main.c | 58 -
external/bsd/flex/dist/tests/test-linedir-r/scanner.l | 45 -
external/bsd/flex/dist/tests/test-linedir-r/test.input | 3 -
external/bsd/flex/dist/tests/test-lineno-nr/Makefile | 458 -
external/bsd/flex/dist/tests/test-lineno-nr/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-lineno-nr/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-lineno-nr/scanner.l | 94 -
external/bsd/flex/dist/tests/test-lineno-nr/test.input | 19 -
external/bsd/flex/dist/tests/test-lineno-r/Makefile | 458 -
external/bsd/flex/dist/tests/test-lineno-r/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-lineno-r/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-lineno-r/scanner.l | 97 -
external/bsd/flex/dist/tests/test-lineno-r/test.input | 19 -
external/bsd/flex/dist/tests/test-lineno-trailing/Makefile | 458 -
external/bsd/flex/dist/tests/test-lineno-trailing/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-lineno-trailing/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-lineno-trailing/scanner.l | 87 -
external/bsd/flex/dist/tests/test-lineno-trailing/test.input | 13 -
external/bsd/flex/dist/tests/test-mem-nr/Makefile | 458 -
external/bsd/flex/dist/tests/test-mem-nr/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-mem-nr/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-mem-nr/scanner.l | 179 -
external/bsd/flex/dist/tests/test-mem-nr/test.input | 25 -
external/bsd/flex/dist/tests/test-mem-r/Makefile | 458 -
external/bsd/flex/dist/tests/test-mem-r/Makefile.am | 44 -
external/bsd/flex/dist/tests/test-mem-r/Makefile.in | 458 -
external/bsd/flex/dist/tests/test-mem-r/scanner.l | 181 -
external/bsd/flex/dist/tests/test-mem-r/test.input | 25 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile | 466 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile.am | 54 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/main.c | 51 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/scanner-1.l | 50 -
external/bsd/flex/dist/tests/test-multiple-scanners-nr/scanner-2.l | 49 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile | 469 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile.am | 56 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/Makefile.in | 469 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/main.c | 85 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/scanner-1.l | 51 -
external/bsd/flex/dist/tests/test-multiple-scanners-r/scanner-2.l | 50 -
external/bsd/flex/dist/tests/test-noansi-nr/Makefile | 462 -
external/bsd/flex/dist/tests/test-noansi-nr/Makefile.am | 48 -
external/bsd/flex/dist/tests/test-noansi-nr/Makefile.in | 462 -
external/bsd/flex/dist/tests/test-noansi-nr/scanner.l | 67 -
external/bsd/flex/dist/tests/test-noansi-nr/test.input | 5 -
external/bsd/flex/dist/tests/test-noansi-r/Makefile | 462 -
external/bsd/flex/dist/tests/test-noansi-r/Makefile.am | 48 -
external/bsd/flex/dist/tests/test-noansi-r/Makefile.in | 462 -
external/bsd/flex/dist/tests/test-noansi-r/scanner.l | 69 -
external/bsd/flex/dist/tests/test-noansi-r/test.input | 4 -
external/bsd/flex/dist/tests/test-posix/Makefile | 459 -
external/bsd/flex/dist/tests/test-posix/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-posix/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-posix/scanner.l | 79 -
external/bsd/flex/dist/tests/test-posixly-correct/Makefile | 459 -
external/bsd/flex/dist/tests/test-posixly-correct/Makefile.am | 45 -
external/bsd/flex/dist/tests/test-posixly-correct/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-posixly-correct/scanner.l | 79 -
external/bsd/flex/dist/tests/test-prefix-nr/Makefile | 463 -
external/bsd/flex/dist/tests/test-prefix-nr/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-prefix-nr/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-prefix-nr/README | 2 -
external/bsd/flex/dist/tests/test-prefix-nr/scanner.l | 75 -
external/bsd/flex/dist/tests/test-prefix-nr/test.input | 1 -
external/bsd/flex/dist/tests/test-prefix-r/Makefile | 463 -
external/bsd/flex/dist/tests/test-prefix-r/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-prefix-r/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-prefix-r/README | 2 -
external/bsd/flex/dist/tests/test-prefix-r/scanner.l | 83 -
external/bsd/flex/dist/tests/test-prefix-r/test.input | 1 -
external/bsd/flex/dist/tests/test-pthread/Makefile | 459 -
external/bsd/flex/dist/tests/test-pthread/Makefile.am | 46 -
external/bsd/flex/dist/tests/test-pthread/Makefile.in | 459 -
external/bsd/flex/dist/tests/test-pthread/scanner.l | 204 -
external/bsd/flex/dist/tests/test-pthread/test-1.input | 847 -
external/bsd/flex/dist/tests/test-pthread/test-2.input | 847 -
external/bsd/flex/dist/tests/test-pthread/test-3.input | 847 -
external/bsd/flex/dist/tests/test-pthread/test-4.input | 847 -
external/bsd/flex/dist/tests/test-pthread/test-5.input | 847 -
external/bsd/flex/dist/tests/test-quotes/Makefile | 460 -
external/bsd/flex/dist/tests/test-quotes/Makefile.am | 47 -
external/bsd/flex/dist/tests/test-quotes/Makefile.in | 460 -
external/bsd/flex/dist/tests/test-quotes/scanner.l | 101 -
external/bsd/flex/dist/tests/test-quotes/test.input | 2 -
external/bsd/flex/dist/tests/test-reject/Makefile | 493 -
external/bsd/flex/dist/tests/test-reject/Makefile.am | 80 -
external/bsd/flex/dist/tests/test-reject/Makefile.in | 493 -
external/bsd/flex/dist/tests/test-reject/scanner.l | 80 -
external/bsd/flex/dist/tests/test-reject/test.input | 2 -
external/bsd/flex/dist/tests/test-rescan-nr/Makefile | 460 -
external/bsd/flex/dist/tests/test-rescan-nr/Makefile.am | 47 -
external/bsd/flex/dist/tests/test-rescan-nr/Makefile.in | 460 -
external/bsd/flex/dist/tests/test-rescan-nr/scanner.l | 70 -
external/bsd/flex/dist/tests/test-rescan-nr/test.input | 2 -
external/bsd/flex/dist/tests/test-rescan-r/Makefile | 460 -
external/bsd/flex/dist/tests/test-rescan-r/Makefile.am | 47 -
external/bsd/flex/dist/tests/test-rescan-r/Makefile.in | 460 -
external/bsd/flex/dist/tests/test-rescan-r/scanner.l | 95 -
external/bsd/flex/dist/tests/test-rescan-r/test.input | 2 -
external/bsd/flex/dist/tests/test-string-nr/Makefile | 460 -
external/bsd/flex/dist/tests/test-string-nr/Makefile.am | 46 -
external/bsd/flex/dist/tests/test-string-nr/Makefile.in | 460 -
external/bsd/flex/dist/tests/test-string-nr/scanner.l | 96 -
external/bsd/flex/dist/tests/test-string-r/Makefile | 460 -
external/bsd/flex/dist/tests/test-string-r/Makefile.am | 46 -
external/bsd/flex/dist/tests/test-string-r/Makefile.in | 460 -
external/bsd/flex/dist/tests/test-string-r/scanner.l | 103 -
external/bsd/flex/dist/tests/test-table-opts/Makefile | 548 -
external/bsd/flex/dist/tests/test-table-opts/Makefile.am | 132 -
external/bsd/flex/dist/tests/test-table-opts/Makefile.in | 548 -
external/bsd/flex/dist/tests/test-table-opts/scanner.l | 82 -
external/bsd/flex/dist/tests/test-table-opts/test.input | 2 -
external/bsd/flex/dist/tests/test-top/Makefile | 466 -
external/bsd/flex/dist/tests/test-top/Makefile.am | 54 -
external/bsd/flex/dist/tests/test-top/Makefile.in | 466 -
external/bsd/flex/dist/tests/test-top/main.c | 63 -
external/bsd/flex/dist/tests/test-top/scanner.l | 53 -
external/bsd/flex/dist/tests/test-top/test.input | 3 -
external/bsd/flex/dist/tests/test-yyextra/Makefile | 463 -
external/bsd/flex/dist/tests/test-yyextra/Makefile.am | 49 -
external/bsd/flex/dist/tests/test-yyextra/Makefile.in | 463 -
external/bsd/flex/dist/tests/test-yyextra/scanner.l | 121 -
external/bsd/flex/dist/tests/test-yyextra/test.input | 795 -
external/bsd/flex/include/config.h | 25 +-
318 files changed, 3633 insertions(+), 77110 deletions(-)
diffs (truncated from 88223 to 300 lines):
diff -r dbe539092717 -r 431938b9db79 external/bsd/flex/Makefile.inc
--- a/external/bsd/flex/Makefile.inc Mon Jan 02 16:32:38 2017 +0000
+++ b/external/bsd/flex/Makefile.inc Mon Jan 02 17:45:26 2017 +0000
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.3 2016/01/09 17:38:56 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/01/02 17:45:26 christos Exp $
WARNS?= 1
.include <bsd.own.mk>
-VERSION=2.6.0
BINDIR?= /usr/bin
IDIST= ${NETBSDSRCDIR}/external/bsd/flex/dist/src
+VERSION != ${TOOL_SED} -ne "s/PACKAGE_VERSION='\(.*\)'/\1/p" \
+ ${IDIST}/../configure
CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../include -I${IDIST} \
-DLOCALEDIR=\"/usr/share/locale\"
diff -r dbe539092717 -r 431938b9db79 external/bsd/flex/bin/Makefile
--- a/external/bsd/flex/bin/Makefile Mon Jan 02 16:32:38 2017 +0000
+++ b/external/bsd/flex/bin/Makefile Mon Jan 02 17:45:26 2017 +0000
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.9 2011/03/08 19:25:32 plunky Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/02 17:45:26 christos Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -12,8 +12,10 @@
#
# To bootstrap lex, cp initscan.c to scan.c and run make.
+.include <bsd.init.mk>
+
PROG= lex
-CPPFLAGS+=-I. -I${.CURDIR}
+CPPFLAGS+=-I. -I${.CURDIR} -DVERSION=\"${VERSION}\"
SRCS= \
buf.c \
ccl.c \
diff -r dbe539092717 -r 431938b9db79 external/bsd/flex/dist/INSTALL
--- a/external/bsd/flex/dist/INSTALL Mon Jan 02 16:32:38 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
-Inc.
-
- Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved. This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==================
-
- Briefly, the shell command `./configure && make && make install'
-should configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package. Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below. The lack of an optional feature in a given package is not
-necessarily a bug. More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
- documentation. When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
- 5. Optionally, type `make installcheck' to repeat any self-tests, but
- this time using the binaries in their final installed location.
- This target does not install anything. Running this target as a
- regular user, particularly if the prior `make install' required
- root privileges, verifies that the installation completed
- correctly.
-
- 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 7. Often, you can also type `make uninstall' to remove the installed
- files again. In practice, not all packages have tested that
- uninstallation works correctly, even though it is required by the
- GNU Coding Standards.
-
- 8. Some packages, particularly those that use Automake, provide `make
- distcheck', which can by used by developers to test that all other
- targets like `make install' and `make uninstall' work correctly.
- This target is generally not run by end users.
-
-Compilers and Options
-=====================
-
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
- You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'. This
-is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
-
-Installation Names
-==================
-
- By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute file name.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them. In general, the
-default for these options is expressed in terms of `${prefix}', so that
-specifying just `--prefix' will affect all of the other directory
-specifications that were not explicitly provided.
-
- The most portable way to affect installation locations is to pass the
-correct locations to `configure'; however, many packages provide one or
-both of the following shortcuts of passing variable assignments to the
-`make install' command line to change installation locations without
-having to reconfigure or recompile.
-
- The first method involves providing an override variable for each
-affected directory. For example, `make install
-prefix=/alternate/directory' will choose an alternate location for all
-directory configuration variables that were expressed in terms of
-`${prefix}'. Any directories that were specified during `configure',
-but not in terms of `${prefix}', must each be overridden at install
-time for the entire installation to be relocated. The approach of
-makefile variable overrides for each directory variable is required by
-the GNU Coding Standards, and ideally causes no recompilation.
-However, some platforms have known limitations with the semantics of
-shared libraries that end up requiring recompilation when using this
-method, particularly noticeable in packages that use GNU Libtool.
-
- The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/alternate/directory' will prepend
-`/alternate/directory' before all installation names. The approach of
-`DESTDIR' overrides is not required by the GNU Coding Standards, and
-does not work on platforms that have drive letters. On the other hand,
-it does better at avoiding recompilation issues, and works well even
-when some directory options were not specified in terms of `${prefix}'
-at `configure' time.
-
-Optional Features
-=================
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
- Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
- Some packages offer the ability to configure how verbose the
-execution of `make' will be. For these packages, running `./configure
---enable-silent-rules' sets the default to minimal output, which can be
-overridden with `make V=1'; while running `./configure
---disable-silent-rules' sets the default to verbose, which can be
-overridden with `make V=0'.
-
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- HP-UX `make' updates targets which have the same time stamps as
-their prerequisites, which makes it generally unusable when shipped
-generated files such as `configure' are involved. Use GNU `make'
-instead.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
-directory contains several dysfunctional programs; working variants of
-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
-in your `PATH', put it _after_ `/usr/bin'.
-
- On Haiku, software installed for all users goes in `/boot/common',
-not `/usr/local'. It is recommended to use the following options:
-
- ./configure --prefix=/boot/common
-
Home |
Main Index |
Thread Index |
Old Index