Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3127
Modified Files: rdist.info rdist.patch Log Message: Apply a patch suggested by Greg Minshall. Thanks. Index: rdist.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/rdist.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rdist.info 27 Jan 2009 07:41:23 -0000 1.2 +++ rdist.info 27 Mar 2009 13:25:42 -0000 1.3 @@ -1,6 +1,6 @@ Package: rdist Version: 6.1.5 -Revision: 1 +Revision: 2 Description: Remote file distribution program License: BSD Maintainer: Todai Fink Team <f...@sodan.ecc.u-tokyo.ac.jp> @@ -13,7 +13,7 @@ BuildDepends: fink (>= 0.24.12) PatchFile: %n.patch -PatchFile-MD5: 90bf109504bd29eee8deede478c032f9 +PatchFile-MD5: 4da2aa537d3e6f663d6bae2f1a17cc07 PatchScript: << %{default_script} patch -p1 < ../%n-%v-darwin.patch @@ -27,8 +27,8 @@ /usr/bin/install -d -m 755 %i/share/man/man1 /usr/bin/install -d -m 755 %i/share/man/man8 -/usr/bin/make install PREFIX=%i -/usr/bin/make install.man PREFIX=%i +/usr/bin/make install PREFIX=%i BIN_OWNER="`/usr/bin/whoami`" IN_ARGS="-c" +/usr/bin/make install.man PREFIX=%i INSTALL_ARGS="-c -m 444" /usr/bin/install -m 755 support/*.pl %i/share/%n << DocFiles: ChangeLog Copyright README README.darwin Index: rdist.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/rdist.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- rdist.patch 20 Jan 2006 20:28:28 -0000 1.1 +++ rdist.patch 27 Mar 2009 13:25:42 -0000 1.2 @@ -16,3 +16,146 @@ # # $Id$ # +diff -Naur rdist-6.1.5/src/gram.yrdist-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 <optval> OPTION, options +-%type <string> NAME, STRING +-%type <subcmd> INSTALL, NOTIFY, EXCEPT, PATTERN, SPECIAL, CMDSPECIAL, cmdlist, cmd +-%type <namel> namelist, names, opt_namelist nlist ++%type <optval> OPTION options ++%type <string> NAME STRING ++%type <subcmd> INSTALL NOTIFY EXCEPT PATTERN SPECIAL CMDSPECIAL cmdlist cmd ++%type <namel> 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; + } + ; ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs