OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 16:36:33
Branch: HEAD Handle: 2007122215363200
Modified files:
openpkg-src/rdist rdist.patch rdist.spec
Log:
fix parser specification to pass through latest Bison and this way
avoid requirement to bison-old
Summary:
Revision Changes Path
1.2 +143 -0 openpkg-src/rdist/rdist.patch
1.32 +2 -2 openpkg-src/rdist/rdist.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 rdist.patch
--- openpkg-src/rdist/rdist.patch 10 Oct 2003 19:06:44 -0000 1.1
+++ openpkg-src/rdist/rdist.patch 22 Dec 2007 15:36:32 -0000 1.2
@@ -112,3 +112,146 @@
extern void sighandler();
extern void waitup();
struct namelist *expand();
+Index: src/gram.y
+--- src/gram.y.orig 2001-10-22 22:32:34 +0200
++++ src/gram.y 2007-12-22 16:33:40 +0100
+@@ -116,10 +116,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
+
+ %%
+
+@@ -127,19 +127,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
+@@ -159,10 +159,10 @@
+ }
+ ;
+
+-nlist: NAME = {
++nlist: NAME {
+ $$ = makenl($1);
+ }
+- | '(' names ')' = {
++ | '(' names ')' {
+ $$ = $2;
+ }
+ ;
+@@ -170,7 +170,7 @@
+ names: /* VOID */ {
+ $$ = last_n = NULL;
+ }
+- | names NAME = {
++ | names NAME {
+ if (last_n == NULL)
+ $$ = last_n = makenl($2);
+ else {
+@@ -184,7 +184,7 @@
+ cmdlist: /* VOID */ {
+ $$ = last_sc = NULL;
+ }
+- | cmdlist cmd = {
++ | cmdlist cmd {
+ if (last_sc == NULL)
+ $$ = last_sc = $2;
+ else {
+@@ -195,7 +195,7 @@
+ }
+ ;
+
+-cmd: INSTALL options opt_namelist ';' = {
++cmd: INSTALL options opt_namelist ';' {
+ register struct namelist *nl;
+
+ $1->sc_options = $2 | options;
+@@ -211,17 +211,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;
+ #if defined(HAVE_POSIX_REGEX)
+ #define ERRMSGSIZE 1000
+@@ -251,13 +251,13 @@
+ $$ = $1;
+ #endif /* !HAVE_POSIX_REGEX */
+ }
+- | 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;
+@@ -265,18 +265,18 @@
+ }
+ ;
+
+-options: /* VOID */ = {
++options: /* VOID */ {
+ $$ = 0;
+ }
+- | options OPTION = {
++ | options OPTION {
+ $$ |= $2;
+ }
+ ;
+
+-opt_namelist: /* VOID */ = {
++opt_namelist: /* VOID */ {
+ $$ = NULL;
+ }
+- | namelist = {
++ | namelist {
+ $$ = $1;
+ }
+ ;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rdist/rdist.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 rdist.spec
--- openpkg-src/rdist/rdist.spec 27 Oct 2007 11:59:53 -0000 1.31
+++ openpkg-src/rdist/rdist.spec 22 Dec 2007 15:36:32 -0000 1.32
@@ -38,7 +38,7 @@
Group: Filesystem
License: BSD
Version: %{V_opkg}
-Release: 20071027
+Release: 20071222
# package options
%option with_fsl yes
@@ -82,7 +82,7 @@
CFLAGS="%{l_cflags -O}" \
LDFLAGS="%{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
- YACC="bison-old -y" \
+ YACC="bison -y" \
./configure \
--prefix=%{l_prefix}
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
