Index: head/cad/verilator/files/patch-src-verilog.y =================================================================== --- head/cad/verilator/files/patch-src-verilog.y (revision 562664) +++ head/cad/verilator/files/patch-src-verilog.y (revision 562665) @@ -1,18 +1,10 @@ ---- src/verilog.y.orig 2020-07-11 01:58:03 UTC +--- src/verilog.y.orig 2020-08-14 11:38:09 UTC +++ src/verilog.y -@@ -17,6 +17,7 @@ - //************************************************************************* - // clang-format off - -+%define parse.error verbose - %{ - #ifdef NEVER_JUST_FOR_CLANG_FORMAT - } -@@ -31,7 +32,6 @@ +@@ -31,7 +31,6 @@ #include #include -#define YYERROR_VERBOSE 1 // For prior to Bison 3.6 #define YYINITDEPTH 10000 // Older bisons ignore YYMAXDEPTH #define YYMAXDEPTH 10000 Index: head/editors/xcoral/files/patch-Makefile =================================================================== --- head/editors/xcoral/files/patch-Makefile (nonexistent) +++ head/editors/xcoral/files/patch-Makefile (revision 562665) @@ -0,0 +1,10 @@ +--- Makefile.orig 2008-04-21 19:51:52 UTC ++++ Makefile +@@ -113,7 +113,6 @@ lint: $(SRCS) + BR_Parser.c BR_Parser.h: BR_Parser.y + $(BISON) -d -t -p BR_yy BR_Parser.y + mv BR_Parser.tab.c BR_Parser.c +- mv BR_Parser.tab.h BR_Parser.h + + BR_Lexer.c: BR_Lexer.l BR_Parser.h + $(FLEX) -8 -PBR_yy -oBR_Lexer.c BR_Lexer.l Property changes on: head/editors/xcoral/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/vultures-eye/files/patch-..-vulture-GNUmakefile =================================================================== --- head/games/vultures-eye/files/patch-..-vulture-GNUmakefile (nonexistent) +++ head/games/vultures-eye/files/patch-..-vulture-GNUmakefile (revision 562665) @@ -0,0 +1,13 @@ +--- ../vulture/GNUmakefile.orig 2011-04-04 18:23:51 UTC ++++ ../vulture/GNUmakefile +@@ -77,9 +77,7 @@ $(OUTPUT_OBJ): $(VOBJ) + $(BUILDDIR)/vulture_tileconfig.parser.cpp $(BUILDDIR)/vulture_tileconfig.parser.h: vulture_tileconfig.parser.y + @echo generating parser + @mkdir -p $(BUILDDIR)/winclass +- @bison -d vulture_tileconfig.parser.y -o $(BUILDDIR)/vulture_tileconfig.parser.tmp.cpp +- @mv $(BUILDDIR)/vulture_tileconfig.parser.tmp.cpp $(BUILDDIR)/vulture_tileconfig.parser.cpp +- @mv $(BUILDDIR)/vulture_tileconfig.parser.tmp.hpp $(BUILDDIR)/vulture_tileconfig.parser.h ++ @bison -d vulture_tileconfig.parser.y -o $(BUILDDIR)/vulture_tileconfig.parser.cpp + + $(BUILDDIR)/vulture_tileconfig.lexer.cpp: vulture_tileconfig.lexer.l + @echo generating lexer Property changes on: head/games/vultures-eye/files/patch-..-vulture-GNUmakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l =================================================================== --- head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l (nonexistent) +++ head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l (revision 562665) @@ -0,0 +1,11 @@ +--- ../vulture/vulture_tileconfig.lexer.l.orig 2011-04-05 02:23:52.000000000 +0800 ++++ ../vulture/vulture_tileconfig.lexer.l 2020-10-01 21:55:27.849177000 +0800 +@@ -7,7 +7,7 @@ + #include "vulture_types.h" + #include "vulture_tile.h" + #include "vulture_tileconfig.h" +-#include "vulture_tileconfig.parser.h" ++#include "vulture_tileconfig.parser.hpp" + + #define YY_SKIP_YYWRAP + extern int yywrap(); Property changes on: head/games/vultures-eye/files/patch-..-vulture-vulture_tileconfig.lexer.l ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/ptoc/files/patch-main.cxx =================================================================== --- head/lang/ptoc/files/patch-main.cxx (revision 562664) +++ head/lang/ptoc/files/patch-main.cxx (revision 562665) @@ -1,13 +1,13 @@ ---- main.cxx.orig Thu Sep 23 23:35:38 1999 -+++ main.cxx Sat Oct 21 04:11:00 2000 -@@ -326,8 +326,8 @@ +--- main.cxx.orig 2002-10-24 15:38:50 UTC ++++ main.cxx +@@ -345,8 +345,8 @@ int main(int argc, char* argv[]) compile_system_library = TRUE; #ifdef PREFIX token::input(turbo_pascal - ? PREFIX "/share/ptoc/tptoc.pas" - : PREFIX "/share/ptoc/ptoc.pas")); + ? (char *) PREFIX "/share/ptoc/tptoc.pas" + : (char *) PREFIX "/share/ptoc/ptoc.pas"); #else token::input(dprintf("%s%s", prog_path, turbo_pascal ? "tptoc.pas" : "ptoc.pas")); Index: head/lang/ptoc/files/patch-makefile.bsd =================================================================== --- head/lang/ptoc/files/patch-makefile.bsd (revision 562664) +++ head/lang/ptoc/files/patch-makefile.bsd (revision 562665) @@ -1,47 +1,55 @@ ---- makefile.bsd.orig 1998-11-06 21:10:50.000000000 -0500 -+++ makefile.bsd 2018-05-14 12:46:15.288108000 -0400 -@@ -10,21 +10,21 @@ +--- makefile.bsd.orig 1998-11-07 02:10:50 UTC ++++ makefile.bsd +@@ -10,21 +10,21 @@ default : all # # C/C++ compiler # -CC?= gcc -CXX?= g++ +CC?= cc +CXX?= c++ # # C/C++ flags # -CFLAGS?= -O5 -g -Wall -c -CXXFLAGS?= -O5 -g -Wall -c +CFLAGS?= -Wall -c +CXXFLAGS= -Wall -c -std=c++98 #CFLAGS= -fno-exceptions -O5 -g -Wall -c #CXXFLAGS= -fno-exceptions -O5 -g -Wall -c # # X Window System directory # -X11BASE?= /usr/X11R6 +X11BASE?= /usr/local # # Local packages directory -@@ -94,7 +94,7 @@ +@@ -94,7 +94,7 @@ LIB_OBJS = $(LIB_SRCS:.c=.o) $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $< .c.o : - $(CC) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $< + $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -o $@ -c $< # # Custom targets. -@@ -131,7 +131,7 @@ +@@ -106,7 +106,6 @@ $(OBJS) : $(INCS) + parser.cxx parser.h : parser.y + $(YACC) parser.y + mv parser.tab.c parser.cxx +- mv parser.tab.h parser.h + + lex.cxx : lex.l + $(LEX) lex.l +@@ -131,7 +130,7 @@ ptoc : $(OBJS) $(LD) $(LDFLAGS) -o $@ $(OBJS) libXbgi.a: - (cd Xbgi; make) + (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(LOCALBASE)") all : $(BINS) $(LIBS) Index: head/lang/ptoc/files/patch-parser.y =================================================================== --- head/lang/ptoc/files/patch-parser.y (revision 562664) +++ head/lang/ptoc/files/patch-parser.y (revision 562665) @@ -1,491 +1,493 @@ ---- parser.y.orig 2010-05-20 18:31:37.000000000 +0400 -+++ parser.y 2010-05-20 18:38:46.000000000 +0400 +--- parser.y.orig 2008-03-04 11:25:16 UTC ++++ parser.y @@ -1,4 +1,4 @@ -%{ +%code requires { #include #include @@ -9,6 +9,10 @@ #include "trnod.h" #include "util.h" +} + +%code provides { + static int zzcnv_table[] = { #define DEF_TOKEN(mnem, cat, cls, yacc) yacc, #include "token.dpp" -@@ -21,7 +25,7 @@ +@@ -21,7 +25,7 @@ void zzerror(char* text) error(curr_token, "syntax error: %s", text); } -%} +} %union { -@@ -281,23 +285,27 @@ +@@ -281,24 +285,28 @@ input_file { $2->attrib(ctx_program); $2->translate(ctx_program); } +; input_file: program | module | unit + ; program: block '.' { $$ = new program_node(NULL, NULL, NULL, NULL, $1, $2); } | PROGRAM IDENT prog_param_list ';' block '.' { $$ = new program_node($1, $2, $3, $4, $5, $6); } +; progend: { $$ = NULL; } | '.' +; module: decl_part_list { $$ = new module_node(NULL, NULL, NULL, NULL, $1, NULL); } | PROGRAM IDENT prog_param_list ';' decl_part_list progend { $$ = new module_node($1, $2, $3, $4, $5, $6); } -- +; +- /* Turbo Pascal specific */ -@@ -309,38 +317,46 @@ + unit: UNIT IDENT ';' INTERFACE unit_decl_list IMPLEMENTATION unit_def_list END '.' +@@ -309,38 +317,46 @@ unit: UNIT IDENT ';' INTERFACE unit_decl_list IMPLEMEN { $$ = new unit_node(NULL, NULL, NULL, $1, $2, $3, $4, NULL, $5, $6); } | INTERFACE unit_decl_list IMPLEMENTATION unit_def_list compoundst '.' { $$ = new unit_node(NULL, NULL, NULL, $1, $2, $3, $4, $5, NULL, $6); } + ; unit_def_list: decl_part_list -- + ; +- prog_param_list: { $$ = NULL; } | '(' ident_list ')' { $$ = new import_list_node($1, $2, $3); } + ; ident_list: IDENT ',' ident_list { $$ = new token_list($1, $3); } | IDENT { $$ = new token_list($1); } + ; block: decl_part_list compoundst { $$ = new block_node($1, $2); } +; decl_part_list: { $$ = NULL; } | decl_part decl_part_list { $1->next = $2; $$ = $1; } +; decl_part: label_decl_part | const_def_part | type_def_part | var_decl_part | proc_def | proc_fwd_decl | unit_spec +; unit_spec: UNIT IDENT ';' INTERFACE unit_decl_list UNIT_END { $$ = new unit_spec_node($1, $2, $3, $4, $5); } | INTERFACE unit_decl_list UNIT_END { $$ = new unit_spec_node(NULL, NULL, NULL, $1, $2); } - +; unit_decl_list: { $$ = NULL; } | unit_decl unit_decl_list { $1->next = $2; $$ = $1; } +; unit_decl: label_decl_part | const_def_part | type_def_part | var_decl_part | proc_spec | proc_fwd_decl | unit_spec +; /* //============================================================================= -@@ -397,15 +413,20 @@ +@@ -397,15 +413,20 @@ statement: { $$ = new empty_node(curr_token->prev_rele | ICONST ':' statement { $$ = new label_node($1, $2, $3); } | IDENT ':' statement { $$ = new label_node($1, $2, $3); } | compoundst { $$ = $1; } +; compoundst: BEGIN sequence END { $$ = new compound_node($1, $2, $3); } +; sequence: statement | statement ';' sequence { $1->next = $3; $$ = $1; } +; actual_params: { $$ = NULL; } | expr_group { $$ = $1; } +; write_params: { $$ = NULL; } | '(' write_list ')' { $$ = new write_list_node($1, $2, $3); } +; case_list: case_items | case_items otherwise sequence -@@ -419,20 +440,26 @@ +@@ -419,20 +440,26 @@ case_list: case_items $$ = new case_node(NULL, $2, $3); } } +; otherwise: OTHERWISE | ELSE /* Turbo Pascal */ +; case_items: { $$ = NULL; } | case_item | case_item ';' case_items { $1->next = $3; $$ = $1; } +; case_item: case_elem_list ':' statement { $$ = new case_node($1, $2, $3); } +; case_elem_list: case_elem | case_elem ',' case_elem_list { $1->next = $3; $$ = $1; } +; case_elem: expr { $$ = $1; } | expr DOTS expr { $$ = new case_range_node($1, $2, $3); } +; /* //============================================================================= -@@ -481,6 +508,7 @@ +@@ -481,6 +508,7 @@ expr: simple_expr | expr OR expr { $$ = new op_node(tn_or, $1, $2, $3); } | expr XOR expr { $$ = new op_node(tn_xor, $1, $2, $3); } + | expr GT expr { $$ = new op_node(tn_gt, $1, $2, $3); } | expr LT expr { $$ = new op_node(tn_lt, $1, $2, $3); } | expr LE expr { $$ = new op_node(tn_le, $1, $2, $3); } -@@ -488,6 +516,7 @@ +@@ -488,6 +516,7 @@ expr: simple_expr | expr EQ expr { $$ = new op_node(tn_eq, $1, $2, $3); } | expr NE expr { $$ = new op_node(tn_ne, $1, $2, $3); } | expr IN expr { $$ = new op_node(tn_in, $1, $2, $3); } +; simple_expr: primary | PLUS simple_expr %prec UPLUS { -@@ -498,6 +527,7 @@ +@@ -498,6 +527,7 @@ simple_expr: primary { $$ = new op_node(tn_not, NULL, $1, $2); } | '@' primary { $$ = new address_node($1, $2); } | AND primary %prec ADDRESS { $$ = new address_node($1, $2); } +; primary: constant | '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); } -@@ -506,6 +536,7 @@ +@@ -506,6 +536,7 @@ primary: constant | primary '^' { $$ = new deref_expr_node($1, $2); } | primary '[' expr_list ']' { $$ = new idx_expr_node($1, $2, $3, $4); } | LOOPHOLE '(' type ',' expr ')' { $$ = new loophole_node($1, $2, $3, $4, $5, $6); } +; constant: record_constant | ICONST { $$ = new integer_node($1); } -@@ -513,41 +544,49 @@ +@@ -513,42 +544,50 @@ constant: record_constant | SCONST { $$ = new string_node($1); } | '[' set_elem_list ']' { $$ = new set_node($1, $2, $3); } | IDENT { $$ = new atom_expr_node($1); } +; set_elem_list: { $$ = NULL; } | set_elem | set_elem ',' set_elem_list { $1->next = $3; $$ = $1; } +; set_elem: expr { $$ = new set_elem_node($1); } | expr DOTS expr { $$ = new set_range_node($1, $2, $3); } +; expr_list: expr | expr ',' expr_list { $1->next = $3; $$ = $1; } +; act_param_list: act_param | act_param ',' act_param_list { $1->next = $3; $$ = $1; } +; act_param: expr | { $$ = new skipped_node(curr_token->prev_relevant()); } -- +; +- record_constant: '(' field_init_list ')' { $$ = new record_constant_node($1, $2, $3); } +; field_init_list: field_init_item { $$ = $1; } | field_init_item ';' field_init_list { $1->next = $3; $$ = $1; } +; field_init_item: IDENT ':' expr { $$ = new field_init_node($1, $2, $3); } -- +; - expr_group: '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); } - + expr_group: '(' expr_list ')' { $$ = new expr_group_node($1, $2, $3); } +; +- write_list: write_param | write_param ',' write_list { $1->next = $3; $$ = $1; } +; write_param: expr { $$ = new write_param_node($1); } | expr ':' expr { $$ = new write_param_node($1, $2, $3); } | expr ':' expr ':' expr { $$ = new write_param_node($1, $2, $3, $4, $5); } -- +; +- /* //============================================================================= -@@ -590,31 +629,40 @@ + // Declaration syntax: +@@ -590,31 +629,40 @@ write_param: expr { $$ = new write_param_node($1); } label_decl_part: LABEL label_list ';' { $$ = new label_decl_part_node($1, $2, $3); } +; label_list: ICONST { $$ = new token_list($1); } | ICONST ',' label_list { $$ = new token_list($1, $3); } | IDENT { $$ = new token_list($1); } | IDENT ',' label_list { $$ = new token_list($1, $3); } +; const_def_part: CONST const_def_list { $$ = new const_def_part_node($1, $2); } +; const_def_list: { $$ = NULL; } | const_def ';' const_def_list { $1->next = $3; $$ = $1; } +; const_def: IDENT EQ expr { $$ = new const_def_node($1, $2, $3); } | IDENT ':' const_type EQ expr { $$ = new typed_const_def_node($1, $2, $3, $4, $5); } +; type_def_part: TYPE type_def_list { $$ = new type_def_part_node($1, $2); } +; type_def_list: { $$ = NULL; } | type_def ';' type_def_list { $1->next = $3; $$ = $1; } +; type_def: IDENT EQ type { $$ = new type_def_node($1, $2, $3); } +; var_decl_part: VAR var_decl_list { $$ = new var_decl_part_node($1, $2); } +; var_decl_list: { $$ = NULL; } | var_decl -@@ -630,29 +678,33 @@ +@@ -630,29 +678,33 @@ var_decl_list: { $$ = NULL; } $1->next = $5; $$ = $1; } | var_decl ';' var_decl_list { $1->next = $3; $$ = $1; } +; var_decl: ident_list ':' type { $$ = new var_decl_node($1, $2, $3); } | IDENT ORIGIN expr ':' simple_type { $$ = (var_decl_node*)new var_origin_decl_node($1, $2, $3, $4, $5); } +; proc_decl: PROCEDURE IDENT formal_params { $$ = new proc_decl_node($1, $2, $3); } | FUNCTION IDENT formal_params ':' type { $$ = new proc_decl_node($1, $2, $3, $4, $5); } - +; proc_fwd_decl: PROCEDURE IDENT formal_params ';' qualifiers ';' { $$ = new proc_fwd_decl_node($1, $2, $3, NULL, NULL, $4, $5, $6); } | FUNCTION IDENT formal_params ':' type ';' qualifiers ';' { $$ = new proc_fwd_decl_node($1, $2, $3, $4, $5, $6, $7, $8); } +; proc_spec: PROCEDURE IDENT formal_params ';' { $$ = new proc_fwd_decl_node($1, $2, $3, NULL, NULL, $4); } | FUNCTION IDENT formal_params ':' type ';' { $$ = new proc_fwd_decl_node($1, $2, $3, $4, $5, $6); } +; proc_def: PROCEDURE IDENT formal_params ';' block ';' -@@ -671,135 +723,166 @@ +@@ -671,135 +723,166 @@ proc_def: { $$ = new proc_def_node($1, NULL, NULL, $2, $3, $4, $5, $6, $7, $8, $9, $10); } | FUNCTION IDENT ';' FAR ';' block ';' { $$ = new proc_def_node($1, NULL, NULL, $2, NULL, NULL, NULL, $3, $4, $5, $6, $7); } +; qualifiers: IDENT qualifiers { $$ = new token_list($1, $2); } | SCOPE qualifiers { $$ = new token_list($1, $2); } | IDENT { $$ = new token_list($1); } | SCOPE { $$ = new token_list($1); } -- +; +- formal_params: { $$ = NULL; } | '(' formal_param_list ')' { $$ = new param_list_node($1, $2, $3); } +; formal_param_list: formal_param | formal_param ';' formal_param_list { $1->next = $3; $$ = $1; } +; formal_param: VAR param_decl { $$ = new var_decl_part_node($1, $2); } | param_decl { $$ = $1; } | proc_decl +; param_decl: ident_list ':' param_type { $$ = new var_decl_node($1, $2, $3); } | ident_list { $$ = new var_decl_node($1, NULL, NULL); } +; param_type: simple_type | conformant_array_type -- -- +; +- +- /* Types definition */ type: simple_type | array_type | record_type | object_type | set_type | file_type | pointer_type | enum_type | range_type | string_type | fptr_type +; const_type: simple_type | const_array_type | record_type | const_set_type | string_type +; fptr_type: FUNCTION formal_params ':' type { $$ = new fptr_tpd_node($1, $2, $3, $4); } | PROCEDURE formal_params { $$ = new fptr_tpd_node($1, $2); } +; string_type: STRING '[' expr ']' { $$ = new varying_tpd_node($1, $2, $3, $4); } +; simple_type: IDENT { $$ = new simple_tpd_node($1); } | STRING { $$ = new string_tpd_node($1); } +; array_type: packed ARRAY '[' indices ']' OF type { $$ = new array_tpd_node($1, $2, $3, $4, $5, $6, $7); } +; const_array_type: packed ARRAY '[' indices ']' OF const_type { $$ = new array_tpd_node($1, $2, $3, $4, $5, $6, $7); } +; conformant_array_type: packed ARRAY '[' conformant_indices ']' OF simple_type { $$ = new array_tpd_node($1, $2, $3, $4, $5, $6, $7); } | packed ARRAY '[' conformant_indices ']' OF conformant_array_type { $$ = new array_tpd_node($1, $2, $3, $4, $5, $6, $7); } +; enum_type: '(' ident_list ')' { $$ = new enum_tpd_node($1, $2, $3); } +; range_type: expr DOTS expr { $$ = new range_tpd_node($1, $2, $3); } +; pointer_type: '^' type { $$ = new ptr_tpd_node($1, $2); } +; set_type: packed SET OF type { $$ = new set_tpd_node($1, $2, $3, $4); } +; const_set_type: packed SET OF const_type { $$ = new set_tpd_node($1, $2, $3, $4); } +; record_type: packed RECORD field_list END { $$ = new record_tpd_node($1, $2, $3, $4); } +; object_type: OBJECT object_components END { $$ = new object_tpd_node($1, NULL, NULL, NULL, $2, $3); } | OBJECT '(' IDENT ')' object_components END { $$ = new object_tpd_node($1, $2, $3, $4, $5, $6); } +; object_components: object_fields object_methods { $1->next = $2; $$ = $1; } | object_methods | object_fields +; object_fields: field_decl_list { $$ = new var_decl_part_node(NULL, $1); } +; field_decl_list: var_decl | var_decl ';' { $$ = $1; } | var_decl ';' field_decl_list { $1->next = $3; $$ = $1; } +; object_methods: proc_fwd_decl | proc_spec | proc_fwd_decl object_methods { $1->next = $2; $$ = $1; } | proc_spec object_methods { $1->next = $2; $$ = $1; } - -- +; +- file_type: packed FIL OF type { $$ = new file_tpd_node($1, $2, $3, $4); } +; -packed: { $$ = NULL; } | PACKED +packed: { $$ = NULL; } | PACKED +; conformant_indices: conformant_index | conformant_index ';' conformant_indices { $1->next = $3; $$ = $1; } +; conformant_index: IDENT DOTS IDENT ':' type { $$ = new conformant_index_node($1, $2, $3, $4, $5); } +; indices: index_spec | index_spec ',' indices { $1->next = $3; $$ = $1; } +; index_spec: simple_type { $$ = new type_index_node($1); } | expr DOTS expr { $$ = new range_index_node($1, $2, $3); } -- +; +- field_list: fixed_part variant_part { $$ = new field_list_node($1, $2); } | fixed_part { $$ = new field_list_node($1); } +; fixed_part: var_decl_list +; variant_part: CASE selector OF variant_list { $$ = new variant_part_node($1, $2, $3, $4); } +; selector: IDENT ':' type { $$ = new selector_node($1, $2, $3); } | type { $$ = new selector_node(NULL, NULL, $1); } -- +; +- variant_list: variant | variant ';' { $$ = $1; } | variant ';' variant_list { $1->next = $3; $$ = $1; } +; variant: expr_list ':' '(' field_list ')' { $$ = new variant_node($1, $2, $3, $4, $5); } +; %% Index: head/lang/ptoc/files/patch-tpexpr.cxx =================================================================== --- head/lang/ptoc/files/patch-tpexpr.cxx (revision 562664) +++ head/lang/ptoc/files/patch-tpexpr.cxx (revision 562665) @@ -1,11 +1,11 @@ ---- tpexpr.cxx.old Sat Feb 12 17:24:29 2000 -+++ tpexpr.cxx Sat Feb 12 17:24:41 2000 -@@ -170,7 +170,7 @@ +--- tpexpr.cxx.orig 2001-04-04 15:56:02 UTC ++++ tpexpr.cxx +@@ -170,7 +170,7 @@ void array_tp::insert_dimensions(expr_node* e, array_t if (!e->is_parameter() && (base == 0 || base == 1)) { t->prepend(dprintf("items(%.*s", n, "****************")); t->copy(e->f_tkn, e->l_tkn); - t->prepend(base == 0 ? ")-1" : ")"); + t->prepend(base == 0 ? (char *) ")-1" : (char *) ")"); } else { if (high == NULL) { assert(high_expr != NULL); Index: head/lang/ptoc/files/patch-trnod.cxx =================================================================== --- head/lang/ptoc/files/patch-trnod.cxx (revision 562664) +++ head/lang/ptoc/files/patch-trnod.cxx (revision 562665) @@ -1,246 +1,246 @@ ---- trnod.cxx.orig Sat Oct 21 04:24:34 2000 -+++ trnod.cxx Sat Oct 21 04:45:38 2000 -@@ -460,7 +460,7 @@ +--- trnod.cxx.orig 2008-06-05 08:43:52 UTC ++++ trnod.cxx +@@ -468,7 +468,7 @@ void read_node::translate(int) if (language_c) { if (params) { char const* format = ""; - char const* newln = (t_read->tag == TKN_READLN) ? "\\n" : ""; + char const* newln = (t_read->tag == TKN_READLN) ? (char *) "\\n" : ""; expr_node *prm = params->expr; l_tkn = params->rpar; -@@ -618,7 +618,7 @@ +@@ -626,7 +626,7 @@ void write_node::translate(int) write_param_node *prm = params->vals; l_tkn = params->rpar; - char const* newln = (t_write->tag == TKN_WRITELN) ? "\\n" : ""; + char const* newln = (t_write->tag == TKN_WRITELN) ? (char *) "\\n" : ""; write_format = NULL; if (prm->type->tag == tp_file) { prm->translate(ctx_value); -@@ -1000,7 +1000,7 @@ +@@ -1008,7 +1008,7 @@ void for_node::translate(int ctx) from->translate(ctx_value); from->l_tkn->append(";"); t_to->set_trans(t_ident->out_text); - t_to->append(t_to->name->tag == TKN_TO ? " <=" : " >="); + t_to->append(t_to->name->tag == TKN_TO ? (char *) " <=" : (char *) " >="); till->translate(ctx_value); till->l_tkn->append(";"); if (t_to->name->tag == TKN_TO) { -@@ -1069,11 +1069,11 @@ +@@ -1077,11 +1077,11 @@ void repeat_node::translate(int ctx) bool body_is_block = body != NULL && body->is_compound() && body->next == NULL; - t_repeat->set_trans(body_is_block ? "do" : "do {"); + t_repeat->set_trans(body_is_block ? (char *) "do" : (char *) "do {"); for (stmt_node *stmt = body; stmt != NULL; stmt = stmt->next) { stmt->translate(ctx); } - t_until->set_trans(body_is_block ? "while" : "} while"); + t_until->set_trans(body_is_block ? (char *) "while" : (char *) "} while"); expr->translate(ctx_condition); f_tkn = t_repeat; l_tkn = expr->l_tkn; -@@ -1264,7 +1264,7 @@ +@@ -1272,7 +1272,7 @@ void atom_expr_node::translate(int ctx) } else if (var->type->tag == tp_proc) { if (turbo_pascal && tkn->name->tag == TKN_HALT) { - tkn->set_trans(ctx == ctx_apply ? "exit" : "exit(0)"); + tkn->set_trans(ctx == ctx_apply ? (char *) "exit" : (char *) "exit(0)"); return; } proc_tp* prc = (proc_tp*)var->type->get_typedef(); -@@ -1286,8 +1286,8 @@ +@@ -1294,8 +1294,8 @@ void atom_expr_node::translate(int ctx) if (prm->var->type->tag == tp_file || prm->var->type->tag == tp_text) { - t = t->append(strcmp(var->in_name->text, "page") - ? "input" : "output"); + t = t->append(strcmp(var->in_name->text, (char *) "page") + ? (char *) "input" : (char *) "output"); } else { t = t->append("0"); } -@@ -1334,7 +1334,7 @@ +@@ -1342,7 +1342,7 @@ void atom_expr_node::translate(int ctx) if (with != NULL) { f_tkn = tkn->prepend(language_c && with->tag == symbol::s_ref - ? "->" : ".") + ? (char *) "->" : (char *) ".") ->prepend(with->out_name->text); } -@@ -1750,7 +1750,7 @@ +@@ -1764,7 +1764,7 @@ void set_node::translate(int) t_lbr->set_trans("set::of("); } } - t_rbr->set_trans(items ? ", eos)" : "eos)"); + t_rbr->set_trans(items ? (char *) ", eos)" : (char *) "eos)"); } idx_expr_node::idx_expr_node(expr_node* arr, token* t_lbr, expr_node* indices, -@@ -2181,7 +2181,7 @@ +@@ -2196,7 +2196,7 @@ void op_node::translate(int) case tn_and: op->set_trans(((left->type && left->type->tag != tp_bool) || (right->type && right->type->tag != tp_bool) || nological) - ? "&" : "&&"); + ? (char *) "&" : (char *) "&&"); if (parent_tag != tn_group && parent_tag != tn_and) { f_tkn = left->f_tkn->prepend("("); l_tkn = right->l_tkn->append(")"); -@@ -2201,12 +2201,12 @@ +@@ -2216,12 +2216,12 @@ void op_node::translate(int) if (parent_tag != tn_group) { f_tkn = left->f_tkn->prepend(left->type && left->type->get_typedef() == &longint_type - ? "((unsigned long)" : "((cardinal)"); + ? (char *) "((unsigned long)" : (char *) "((cardinal)"); l_tkn = right->l_tkn->append(")"); } else { f_tkn = left->f_tkn->prepend(left->type && left->type->get_typedef() == &longint_type - ? "(unsigned long)" : "(cardinal)"); + ? (char *) "(unsigned long)" : (char *) "(cardinal)"); } op->set_trans(">>"); break; -@@ -2224,14 +2224,14 @@ +@@ -2239,14 +2239,14 @@ void op_node::translate(int) } op->set_trans(((left->type && left->type->tag != tp_bool) || (right->type && right->type->tag != tp_bool) || - nological) ? "|" : "||"); + nological) ? (char *) "|" : (char *) "||"); break; case tn_in: token::disable(left->l_tkn->next, right->f_tkn->prev); if (language_c) { f_tkn = left->f_tkn->prepend( short_set && ((set_tp*)right->type)->is_short_set() - ? "INSET(" : "inset("); + ? (char *) "INSET(" : (char *) "inset("); left->l_tkn->append(", "); l_tkn = right->l_tkn->append(")"); } else { -@@ -2253,14 +2253,14 @@ +@@ -2268,14 +2268,14 @@ void op_node::translate(int) if (language_c) { if (short_set && ((set_tp*)type)->is_short_set()) { f_tkn = left->f_tkn->prepend(tag == tn_add - ? "JOIN(" : tag == tn_sub - ? "DIFFERENCE(" - : "INTERSECT("); + ? (char *) "JOIN(" : tag == tn_sub + ? (char *) "DIFFERENCE(" + : (char *) "INTERSECT("); } else { f_tkn = left->f_tkn->prepend(tag == tn_add - ? "join(" : tag == tn_sub - ? "difference(" - : "intersect("); + ? (char *) "join(" : tag == tn_sub + ? (char *) "difference(" + : (char *) "intersect("); } l_tkn = right->l_tkn->append(")"); token::disable(left->l_tkn->next, right->f_tkn->prev); -@@ -2298,9 +2298,9 @@ +@@ -2313,9 +2313,9 @@ void op_node::translate(int) } else if (ltype->tag == tp_enum || rtype->size <= ltype->size) { - right->f_tkn->prepend(rtype->size == 1 ? "(unsigned char)": - rtype->size == 2 ? "(unsigned short)" - : "(unsigned)"); + right->f_tkn->prepend(rtype->size == 1 ? (char *) "(unsigned char)": + rtype->size == 2 ? (char *) "(unsigned short)" + : (char *) "(unsigned)"); } } else if (((rtype->tag == tp_range && rtype->min_value >= 0) || rtype->tag == tp_enum) && -@@ -2313,9 +2313,9 @@ +@@ -2328,9 +2328,9 @@ void op_node::translate(int) else if (rtype->tag == tp_enum || ltype->size <= rtype->size) { f_tkn = left->f_tkn->prepend( - ltype->size == 1 ? "(unsigned char)": - ltype->size == 2 ? "(unsigned short)" - : "(unsigned)"); + ltype->size == 1 ? (char *) "(unsigned char)": + ltype->size == 2 ? (char *) "(unsigned short)" + : (char *) "(unsigned)"); } } } -@@ -2439,7 +2439,7 @@ +@@ -2454,7 +2454,7 @@ void op_node::translate(int) op->set_trans(CMP_OP(tag)); break; case tn_not: - op->set_trans(right->type && right->type->tag == tp_bool ? "!" : "~"); + op->set_trans(right->type && right->type->tag == tp_bool ? (char *) "!" : (char *) "~"); break; } if ((unsigned(tag - tn_add) <= tn_div - tn_add) && type && type->tag == tp_longint) -@@ -3406,7 +3406,7 @@ +@@ -3440,7 +3440,7 @@ void const_def_node::translate(int) } } } else { - f_tkn = ident->prepend(language_c ? "static const " : "const "); + f_tkn = ident->prepend(language_c ? (char *) "static const " : (char *) "const "); enumeration = NULL; if (constant->type->tag == tp_string) { ident->prepend("char "); -@@ -3749,16 +3749,16 @@ +@@ -3783,16 +3783,16 @@ void var_decl_node::translate(int ctx) t = tkn->ident->copy(eltd->f_tkn, eltd->l_tkn); if (tp->tag == tp_dynarray) { tkn->ident->prepend(ctx == ctx_varpar - ? "* " : " const* "); + ? (char *) "* " : (char *) " const* "); } else { tkn->ident->prepend(ctx == ctx_varpar - ? " " : " const "); + ? (char *) " " : (char *) " const "); tkn->ident->next->copy(tpd->f_tkn, tpd->l_tkn); } } else { t = tkn->ident->prepend(ctx == ctx_varpar - ? tp->tag == tp_array || tp->tag == tp_string ? " " : "* " - : tp->tag == tp_array ? " const " : " ")-> + ? tp->tag == tp_array || tp->tag == tp_string ? (char *) " " : (char *) "* " + : tp->tag == tp_array ? (char *) " const " : (char *) " ")-> copy(tpd->f_tkn, tpd->l_tkn); } } else { -@@ -3823,7 +3823,7 @@ +@@ -3857,7 +3857,7 @@ void var_decl_node::translate(int ctx) // initialize file structure tkn->ident->append( (tp->tag == tp_file || tp->tag == tp_text) - ? " = VOID_FILE" : " = {0}"); + ? (char *) " = VOID_FILE" : (char *) " = {0}"); } if (tkn->var->flags & symbol::f_static) { is_static = TRUE; -@@ -3854,8 +3854,8 @@ +@@ -3888,8 +3888,8 @@ void var_decl_node::translate(int ctx) { f_tkn = f_tkn->prepend("EXTERN "); } else if (scope != NULL) { - f_tkn = f_tkn->prepend(scope->tag == TKN_EXTERNAL ? "extern " : - scope->tag == TKN_STATIC ? "static " : ""); + f_tkn = f_tkn->prepend(scope->tag == TKN_EXTERNAL ? (char *) "extern " : + scope->tag == TKN_STATIC ? (char *) "static " : (char *) ""); } force_semicolon(); if (is_static) { -@@ -4215,7 +4215,7 @@ +@@ -4249,7 +4249,7 @@ void proc_fwd_decl_node::translate(int) if (qualifiers) { if (is_external) { f_tkn = f_tkn->prepend(type->is_extern_c && !language_c - ? "extern \"C\" " : "extern "); + ? (char *) "extern \"C\" " : (char *) "extern "); } else if (is_static) { f_tkn = f_tkn->prepend("static "); } else if (is_virtual) { -@@ -4832,7 +4832,7 @@ +@@ -4875,7 +4875,7 @@ void array_tpd_node::translate(int ctx) t_array->set_trans("conf_matrix"); } else { t_array->set_trans(indices->next == NULL - ? "conf_array" : "conf_matrix"); + ? (char *) "conf_array" : (char *) "conf_matrix"); } token::disable(t_array->next, eltd->f_tkn->prev); eltd->f_tkn->prepend("<"); Index: head/math/cvc3/files/patch-src-parser-Makefile =================================================================== --- head/math/cvc3/files/patch-src-parser-Makefile (nonexistent) +++ head/math/cvc3/files/patch-src-parser-Makefile (revision 562665) @@ -0,0 +1,35 @@ +--- src/parser/Makefile.orig 2010-06-16 17:55:52 UTC ++++ src/parser/Makefile +@@ -38,7 +38,7 @@ parsePL_defs.h: parsePL.cpp + parsePL.cpp: PL.y + $(YACC) $(YFLAGS) -o parsePL.cpp -p PL --debug -v PL.y + @if [ -f parsePL.cpp.h ]; then mv parsePL.cpp.h parsePL.hpp; fi +- @mv parsePL.hpp parsePL_defs.h ++ @cp parsePL.hpp parsePL_defs.h + + lexLisp.cpp: Lisp.lex parseLisp_defs.h + $(LEX) $(LFLAGS) -I -PLisp -olexLisp.cpp Lisp.lex +@@ -48,7 +48,7 @@ parseLisp_defs.h: parseLisp.cpp + parseLisp.cpp: Lisp.y + $(YACC) $(YFLAGS) -o parseLisp.cpp -p Lisp --debug -v Lisp.y + @if [ -f parseLisp.cpp.h ]; then mv parseLisp.cpp.h parseLisp.hpp; fi +- @mv parseLisp.hpp parseLisp_defs.h ++ @cp parseLisp.hpp parseLisp_defs.h + + lexsmtlib.cpp: smtlib.lex parsesmtlib_defs.h + $(LEX) $(LFLAGS) -I -Psmtlib -olexsmtlib.cpp smtlib.lex +@@ -58,7 +58,7 @@ parsesmtlib_defs.h: parsesmtlib.cpp + parsesmtlib.cpp: smtlib.y + $(YACC) $(YFLAGS) -o parsesmtlib.cpp -p smtlib --debug -v smtlib.y + @if [ -f parsesmtlib.cpp.h ]; then mv parsesmtlib.cpp.h parsesmtlib.hpp; fi +- @mv parsesmtlib.hpp parsesmtlib_defs.h ++ @cp parsesmtlib.hpp parsesmtlib_defs.h + + lexsmtlib2.cpp: smtlib2.lex parsesmtlib2_defs.h + $(LEX) $(LFLAGS) -I -Psmtlib2 -olexsmtlib2.cpp smtlib2.lex +@@ -68,4 +68,4 @@ parsesmtlib2_defs.h: parsesmtlib2.cpp + parsesmtlib2.cpp: smtlib2.y + $(YACC) $(YFLAGS) -o parsesmtlib2.cpp -p smtlib2 --debug -v smtlib2.y + @if [ -f parsesmtlib2.cpp.h ]; then mv parsesmtlib2.cpp.h parsesmtlib2.hpp; fi +- @mv parsesmtlib2.hpp parsesmtlib2_defs.h ++ @cp parsesmtlib2.hpp parsesmtlib2_defs.h Property changes on: head/math/cvc3/files/patch-src-parser-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/olsrd/files/patch-src-cfgparser-local.mk =================================================================== --- head/net/olsrd/files/patch-src-cfgparser-local.mk (nonexistent) +++ head/net/olsrd/files/patch-src-cfgparser-local.mk (revision 562665) @@ -0,0 +1,18 @@ +--- src/cfgparser/local.mk.orig 2019-08-11 08:09:47 UTC ++++ src/cfgparser/local.mk +@@ -74,12 +74,9 @@ $(C)oparse.c: $(C)oparse.y $(C)olsrd_conf.h $(C)Makefi + ifeq ($(VERBOSE),0) + @echo "[BISON] $@" + endif +- $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" +- $(MAKECMDPREFIX)sed -e 's/register //' \ +- -e '/^#line/s/$(call quote,$@-tmp)/$(call quote,$@)/' \ +- < "$@-tmp" >"$@" +- $(MAKECMDPREFIX)mv "$(subst .c,.h,$@-tmp)" "$(subst .c,.h,$@)" +- $(MAKECMDPREFIX)$(RM) "$@-tmp" "$(subst .c,.h,$@-tmp)" ++ $(MAKECMDPREFIX)$(BISON) -d -o "$@" "$<" ++ $(MAKECMDPREFIX)sed -e 's/register //' < "$@" >"$@.o" ++ $(MAKECMDPREFIX)mv "$@.o" "$@" + + $(C)oparse.o: CFLAGS := $(filter-out -Wunreachable-code,$(CFLAGS)) + Property changes on: head/net/olsrd/files/patch-src-cfgparser-local.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y =================================================================== --- head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y (nonexistent) +++ head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y (revision 562665) @@ -0,0 +1,11 @@ +--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y.orig 2020-03-04 17:16:37 UTC ++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.y +@@ -68,7 +68,7 @@ struct Context + } // namespace + %} + +-%pure-parser ++%define api.pure + %name-prefix "pp" + %parse-param {Context *context} + %lex-param {Context *context} Property changes on: head/www/qt5-webkit/files/patch-Source_ThirdParty_ANGLE_src_compiler_preprocessor_ExpressionParser.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in (nonexistent) +++ head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in (revision 562665) @@ -0,0 +1,11 @@ +--- Source/WebCore/css/CSSGrammar.y.in.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/css/CSSGrammar.y.in +@@ -21,7 +21,7 @@ + * + */ + +-%pure-parser ++%define api.pure + + %parse-param { CSSParser* parser } + %lex-param { CSSParser* parser } Property changes on: head/www/qt5-webkit/files/patch-Source_WebCore_css_CSSGrammar.y.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl (nonexistent) +++ head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl (revision 562665) @@ -0,0 +1,31 @@ +Obtained from: https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31 + +--- Source/WebCore/css/makegrammar.pl.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/css/makegrammar.pl +@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { + } + + my $fileBase = File::Spec->join($outputDir, $filename); +-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); ++my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); + push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. + system(@bisonCommand) == 0 or die; +- +-open HEADER, ">$fileBase.h" or die; +-print HEADER << "EOF"; +-#ifndef CSSGRAMMAR_H +-#define CSSGRAMMAR_H +-EOF +- +-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; +-while () { +- print HEADER; +-} +-close HPP; +- +-print HEADER "#endif\n"; +-close HEADER; +- +-unlink("$fileBase.cpp.h"); +-unlink("$fileBase.hpp"); +- Property changes on: head/www/qt5-webkit/files/patch-Source_WebCore_css_makegrammar.pl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y (nonexistent) +++ head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y (revision 562665) @@ -0,0 +1,11 @@ +--- Source/WebCore/xml/XPathGrammar.y.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/xml/XPathGrammar.y +@@ -47,7 +47,7 @@ using namespace XPath; + + %} + +-%pure-parser ++%define api.pure + %lex-param { parser } + %parse-param { Parser& parser } + Property changes on: head/www/qt5-webkit/files/patch-Source_WebCore_xml_XPathGrammar.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-clocks/buici-clock/files/patch-xo_Makefile.in =================================================================== --- head/x11-clocks/buici-clock/files/patch-xo_Makefile.in (revision 562664) +++ head/x11-clocks/buici-clock/files/patch-xo_Makefile.in (revision 562665) @@ -1,13 +1,21 @@ --- xo/Makefile.in.orig 2012-12-29 18:51:57 UTC +++ xo/Makefile.in @@ -60,8 +60,8 @@ CXXFLAGS=@CXXFLAGS@ #CXXFLAGS=-${CXXFLAGS} -O #CXXFLAGS=-${CXXFLAGS} -O2 #CXXFLAGS=-${CXXFLAGS} -fomit-frame-pointer -CXXFLAGS_=-g @CFLAGS_W@@X_CFLAGS@ -LFLAGS=-g @LDFLAGS@@X_LIBS@@LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ +CXXFLAGS+= @CFLAGS_W@@X_CFLAGS@ +LFLAGS= @LDFLAGS@@X_LIBS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ FLEX=@LEX@ YACC=@YACC@ +@@ -104,7 +104,6 @@ $(O_D)%.o: %.s + + %.cxx: %.y + $(YACC) -d -o $@ $< +- mv $(basename $@).hxx $(basename $@).h + + %.i: %.cxx + $(CC) -c $(CXXFLAGS) $(CXXFLAGS_) -E -o $(notdir $@) $< Index: head/x11-clocks/buici-clock/files/patch-xo_res.cxx =================================================================== --- head/x11-clocks/buici-clock/files/patch-xo_res.cxx (nonexistent) +++ head/x11-clocks/buici-clock/files/patch-xo_res.cxx (revision 562665) @@ -0,0 +1,11 @@ +--- xo/res.cxx.orig 2012-12-29 18:51:57 UTC ++++ xo/res.cxx +@@ -43,7 +43,7 @@ + + #define IS_PARSER + #include "lres.h" +-#include "res_y.h" ++#include "res_y.hxx" + + #define LONG_PRIME_MAX (LONG_MAX/10) + #define LONG_PRIME_MAX_REM (LONG_MAX - LONG_PRIME_MAX*10) Property changes on: head/x11-clocks/buici-clock/files/patch-xo_res.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-clocks/buici-clock/files/patch-xo_res__l.l =================================================================== --- head/x11-clocks/buici-clock/files/patch-xo_res__l.l (nonexistent) +++ head/x11-clocks/buici-clock/files/patch-xo_res__l.l (revision 562665) @@ -0,0 +1,11 @@ +--- xo/res_l.l.orig 2012-12-29 18:51:57 UTC ++++ xo/res_l.l +@@ -33,7 +33,7 @@ + #include "standard.h" + #define IS_PARSER + #include "lres.h" +-#include "res_y.h" ++#include "res_y.hxx" + #include + + #if defined (__cplusplus) Property changes on: head/x11-clocks/buici-clock/files/patch-xo_res__l.l ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property