diff -Naur rdist-6.1.5/support/rdistcf.pl rdist-6.1.5.fink/support/rdistcf.pl --- rdist-6.1.5/support/rdistcf.pl Tue Feb 15 04:20:34 1994 +++ rdist-6.1.5.fink/support/rdistcf.pl Sat Aug 14 06:04:00 2004 @@ -1,4 +1,4 @@ -#! /usr/usc/bin/perl +#! /usr/bin/perl # # $Id: rdistcf.pl,v 6.6 1992/12/02 22:45:56 mcooper Exp $ # diff -Naur rdist-6.1.5/support/rdistvf.pl rdist-6.1.5.fink/support/rdistvf.pl --- rdist-6.1.5/support/rdistvf.pl Tue Feb 15 04:20:40 1994 +++ rdist-6.1.5.fink/support/rdistvf.pl Sat Aug 14 06:03:38 2004 @@ -1,4 +1,4 @@ -#!/usr/usc/bin/perl +#!/usr/bin/perl # # $Id: rdistvf.pl,v 1.5 1992/09/24 18:02:58 mcooper Exp $ # diff -Naur rdist-6.1.5/src/gram.y rdist-6.1.5.fink/src/gram.y --- rdist-6.1.5/src/gram.y 2009/03/05 19:03:38 1.1 +++ rdist-6.1.5.fink/src/gram.y 2009/03/05 19:47:43 1.3 @@ -90,10 +90,10 @@ struct namelist *namel; } -%type OPTION, options -%type NAME, STRING -%type INSTALL, NOTIFY, EXCEPT, PATTERN, SPECIAL, CMDSPECIAL, cmdlist, cmd -%type namelist, names, opt_namelist nlist +%type OPTION options +%type NAME STRING +%type INSTALL NOTIFY EXCEPT PATTERN SPECIAL CMDSPECIAL cmdlist cmd +%type namelist names opt_namelist nlist %% @@ -101,19 +101,19 @@ | file command ; -command: NAME '=' namelist = { +command: NAME '=' namelist { (void) lookup($1, INSERT, $3); } - | namelist ARROW namelist cmdlist = { + | namelist ARROW namelist cmdlist { insert((char *)NULL, $1, $3, $4); } - | NAME COLON namelist ARROW namelist cmdlist = { + | NAME COLON namelist ARROW namelist cmdlist { insert($1, $3, $5, $6); } - | namelist DCOLON NAME cmdlist = { + | namelist DCOLON NAME cmdlist { append((char *)NULL, $1, $3, $4); } - | NAME COLON namelist DCOLON NAME cmdlist = { + | NAME COLON namelist DCOLON NAME cmdlist { append($1, $3, $5, $6); } | error @@ -133,10 +133,10 @@ } ; -nlist: NAME = { +nlist: NAME { $$ = makenl($1); } - | '(' names ')' = { + | '(' names ')' { $$ = $2; } ; @@ -144,7 +144,7 @@ names: /* VOID */ { $$ = last_n = NULL; } - | names NAME = { + | names NAME { if (last_n == NULL) $$ = last_n = makenl($2); else { @@ -158,7 +158,7 @@ cmdlist: /* VOID */ { $$ = last_sc = NULL; } - | cmdlist cmd = { + | cmdlist cmd { if (last_sc == NULL) $$ = last_sc = $2; else { @@ -169,7 +169,7 @@ } ; -cmd: INSTALL options opt_namelist ';' = { +cmd: INSTALL options opt_namelist ';' { register struct namelist *nl; $1->sc_options = $2 | options; @@ -185,17 +185,17 @@ } $$ = $1; } - | NOTIFY namelist ';' = { + | NOTIFY namelist ';' { if ($2 != NULL) $1->sc_args = expand($2, E_VARS); $$ = $1; } - | EXCEPT namelist ';' = { + | EXCEPT namelist ';' { if ($2 != NULL) $1->sc_args = expand($2, E_ALL); $$ = $1; } - | PATTERN namelist ';' = { + | PATTERN namelist ';' { struct namelist *nl; char *cp, *re_comp(); @@ -205,13 +205,13 @@ $1->sc_args = expand($2, E_VARS); $$ = $1; } - | SPECIAL opt_namelist STRING ';' = { + | SPECIAL opt_namelist STRING ';' { if ($2 != NULL) $1->sc_args = expand($2, E_ALL); $1->sc_name = $3; $$ = $1; } - | CMDSPECIAL opt_namelist STRING ';' = { + | CMDSPECIAL opt_namelist STRING ';' { if ($2 != NULL) $1->sc_args = expand($2, E_ALL); $1->sc_name = $3; @@ -219,18 +219,18 @@ } ; -options: /* VOID */ = { +options: /* VOID */ { $$ = 0; } - | options OPTION = { + | options OPTION { $$ |= $2; } ; -opt_namelist: /* VOID */ = { +opt_namelist: /* VOID */ { $$ = NULL; } - | namelist = { + | namelist { $$ = $1; } ;