diff options
| author | wiz <wiz@pkgsrc.org> | 2013-08-27 18:43:31 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2013-08-27 18:43:31 +0000 |
| commit | 114ddf400de4fe4d6c773e4662ab56595aabd8c0 (patch) | |
| tree | 947af2dfbfb77f618dae804577a57ee1a430cfd9 /print/bww2tex | |
| parent | 12b0a6aec7859908704b0f39910597754362eb87 (diff) | |
| download | pkgsrc-114ddf400de4fe4d6c773e4662ab56595aabd8c0.tar.gz | |
Fix grammar for bison-3.0.
Diffstat (limited to 'print/bww2tex')
| -rw-r--r-- | print/bww2tex/distinfo | 4 | ||||
| -rw-r--r-- | print/bww2tex/patches/patch-aa | 40 |
2 files changed, 38 insertions, 6 deletions
diff --git a/print/bww2tex/distinfo b/print/bww2tex/distinfo index 4eec4eb8519..6bc81d92dcd 100644 --- a/print/bww2tex/distinfo +++ b/print/bww2tex/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 12:51:41 agc Exp $ +$NetBSD: distinfo,v 1.3 2013/08/27 18:43:31 wiz Exp $ SHA1 (bww2tex200.tar.gz) = 5ff680d5b5d01ec09c3b8631975b3ed972a50035 RMD160 (bww2tex200.tar.gz) = 03936d899d7b4570376c6b67511e5fec35bd5b1c Size (bww2tex200.tar.gz) = 274364 bytes -SHA1 (patch-aa) = 494da8b380d292dc09569d382dd0fd0a8f135542 +SHA1 (patch-aa) = f2feb22dd5fad84f6e13f6776884ab99572d190c SHA1 (patch-ab) = d921a372d3a61642ec92115b112359f776c6b9c2 diff --git a/print/bww2tex/patches/patch-aa b/print/bww2tex/patches/patch-aa index 58c37e6613a..ffeafb92119 100644 --- a/print/bww2tex/patches/patch-aa +++ b/print/bww2tex/patches/patch-aa @@ -1,8 +1,40 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/01/23 18:16:41 fredb Exp $ +$NetBSD: patch-aa,v 1.2 2013/08/27 18:43:31 wiz Exp $ ---- grammar.y.orig Sun Jan 19 16:02:42 2003 -+++ grammar.y Sun Jan 19 16:02:59 2003 -@@ -697,18 +697,15 @@ +First two chunks: bison-3.0 compat. +last chunk: support --help and -h. + +--- grammar.y.orig 2002-06-03 20:38:03.000000000 +0000 ++++ grammar.y +@@ -105,7 +105,7 @@ bline: bline ebarc { strcat($1,"\\notes" + printf("%s", strcat($1,$2)); free($1); free($2); + $$=malloc(MAXLEN); strcpy($$,reprmorceau); + } +-bline: bbline { $$ = $1 ++bline: bbline { $$ = $1; + } + | bline ebar ebarc { strcat($1,"\\notes"); + if(tiearmed) { tiearmed=0; strcat($1,"\\tten0"); } +@@ -560,8 +560,8 @@ emb: EMBP { $$ = $1; } + tiebeat: TIEBEAT { $$ = $1; } + | TIE BEAT { $$ = $1; } + | BEAT TIE { $$ = $2; } +- | tiebeat BEAT { $$ = $1 } +- | BEAT tiebeat { $$ = $2 } ++ | tiebeat BEAT { $$ = $1; } ++ | BEAT tiebeat { $$ = $2; } + ; + bar: BAR { $$ = (char *) malloc(MAXLEN); strcpy($$,$1); } + | BEAT bar { $$ = $2; } +@@ -605,7 +605,7 @@ tiebeat: TIEBEAT { $$ = $1; } + tline: COMMENT { $$= (char *) malloc(MAXLEN); + strcat(strcpy($$,"%"),$1); free($1); + } +- | FORMAT { $$ = $1 } ++ | FORMAT { $$ = $1; } + | text { $$ = (char *) malloc(MAXLEN); + if( ntext != 4 || strlen($1) > 0) + { if (ntext == 1) {strcat(strcat(strcpy($$,"\\line{\\moyen "),$1)," \\hss}\n"); free($1);} +@@ -697,18 +697,15 @@ int main (int argc, char **argv) if (argc > 1) /* if a file was named, open it for reading*/ { |