OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Feb-2004 13:25:49
Branch: HEAD Handle: 2004020712254602
Modified files:
openpkg-src/flex flex.patch flex.spec
openpkg-web news.txt
Log:
include all known patches for flex-beta and enable it by default to
see what the buildfarm says about it
Summary:
Revision Changes Path
1.7 +164 -21 openpkg-src/flex/flex.patch
1.65 +4 -5 openpkg-src/flex/flex.spec
1.8469 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 flex.patch
--- openpkg-src/flex/flex.patch 29 Jul 2003 20:36:13 -0000 1.6
+++ openpkg-src/flex/flex.patch 7 Feb 2004 12:25:48 -0000 1.7
@@ -1,16 +1,6 @@
-It is not portable to use "std{in,out}" as "lvalues" (for instance,
-building under Sun Solaris breaks here). The portable solution is to use
-freopen(3). Unfortunately, to achieve the same effect than fdopen(3) on
-"std{in,out}", one has to use "/dev/std{in,out}" (which in turn is not
-really portable, but at least more portable than using "std{in,out}"
-as "lvalues"). The only "we know it better" alternative would be to
-just replace the code with a fflush(3) on the streams and know that the
-stream has not recognized the changed underlying filedescriptor. But
-this again is not really portable, although also working for mostly all
-Unix platforms.
-
+Index: filter.c
--- filter.c.orig 2003-03-25 17:39:08.000000000 +0100
-+++ filter.c 2003-07-24 10:05:02.000000000 +0200
++++ filter.c 2004-02-07 13:21:59.000000000 +0100
@@ -158,10 +158,10 @@
int r;
@@ -37,13 +27,93 @@
return true;
}
-
-Our package does not rely on GCC (and cannot for dependency
-reasons), so we have to make sure that no C99 style comments
-are used inside the code.
-
---- main.c.orig Tue Apr 1 03:51:38 2003
-+++ main.c Tue Jul 29 22:27:40 2003
+Index: flex.skl
+--- flex.skl.orig 2003-04-01 03:51:38.000000000 +0200
++++ flex.skl 2004-02-07 13:21:59.000000000 +0100
+@@ -345,19 +345,19 @@
+ %# yyscan_t yyscanner;
+ %#
+ %# Generate traditional function defs
+- m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)
++ m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]]
+ M4_YY_DECL_LAST_ARG]])
+- m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)
+- $1 $2;
++ m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]]
++ $1 $2; [[\]]
+ M4_YY_DECL_LAST_ARG]])
+- m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)
+- $1 $2;
+- $3 $4;
++ m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]]
++ $1 $2; [[\]]
++ $3 $4; [[\]]
+ M4_YY_DECL_LAST_ARG]])
+- m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)
+- $1 $2;
+- $3 $4;
+- $5 $6;
++ m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]]
++ $1 $2; [[\]]
++ $3 $4; [[\]]
++ $5 $6; [[\]]
+ M4_YY_DECL_LAST_ARG]])
+ ]],
+ [[
+@@ -724,6 +724,7 @@
+
+ m4_ifdef( [[M4_YY_NO_UNISTD_H]],,
+ [[
++#ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+@@ -734,6 +735,7 @@
+ %if-c++-only
+ #include <unistd.h>
+ %endif
++#endif
+ ]])
+
+ #ifndef YY_EXTRA_TYPE
+@@ -1124,9 +1126,9 @@
+ m4_dnl The bison pure parser is used. Redefine yylex to
+ m4_dnl accept the lval parameter.
+
+- m4_define( [[M4_YY_LEX_PROTO]],
++ m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+ [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]])
+- m4_define( [[M4_YY_LEX_DECLARATION]],
++ m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+ [[YYFARGS1(YYSTYPE *,yylval_param)]])
+ ]])
+
+@@ -1134,9 +1136,9 @@
+ [[
+ m4_dnl Locations are used. yylex should also accept the ylloc parameter.
+
+- m4_define( [[M4_YY_LEX_PROTO]],
++ m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+ [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param
M4_YY_PROTO_LAST_ARG)]])
+- m4_define( [[M4_YY_LEX_DECLARATION]],
++ m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+ [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])
+ ]])
+
+Index: gen.c
+--- gen.c.orig 2003-03-30 21:58:44.000000000 +0200
++++ gen.c 2004-02-07 13:21:59.000000000 +0100
+@@ -1812,7 +1812,6 @@
+ if (yytext_is_array) {
+ if (!reentrant){
+ indent_puts ("static int yy_more_offset = 0;");
+- }else{
+ indent_puts ("static int yy_prev_more_offset = 0;");
+ }
+ }
+Index: main.c
+--- main.c.orig 2003-04-01 03:51:38.000000000 +0200
++++ main.c 2004-02-07 13:21:59.000000000 +0100
@@ -1142,7 +1142,6 @@
break;
@@ -156,8 +226,81 @@
}
if (!do_yywrap) {
---- tables.c.orig Wed Nov 27 15:43:24 2002
-+++ tables.c Tue Jul 29 22:28:18 2003
+@@ -1595,7 +1571,6 @@
+ outn ("#else");
+ outn (yy_stdinit);
+ outn ("#endif");
+- outn ("#endif");
+ }
+
+ else {
+Index: scan.c
+--- scan.c.orig 2003-04-01 18:33:17.000000000 +0200
++++ scan.c 2004-02-07 13:22:32.000000000 +0100
+@@ -1623,7 +1623,9 @@
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
++#ifndef YY_NO_UNISTD_H
+ #include <unistd.h>
++#endif
+
+ #ifndef YY_EXTRA_TYPE
+ #define YY_EXTRA_TYPE void *
+Index: scan.l
+--- scan.l.orig 2003-04-01 03:51:38.000000000 +0200
++++ scan.l 2004-02-07 13:21:59.000000000 +0100
+@@ -350,7 +350,7 @@
+ stack ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense );
+ stdinit do_stdinit = option_sense;
+ stdout use_stdout = option_sense;
+- unistd ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
++ unistd ACTION_M4_IFDEF("M4""_YY_NO_UNISTD_H", ! option_sense);
+ unput ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense);
+ verbose printstats = option_sense;
+ warn nowarn = ! option_sense;
+Index: skel.c
+--- skel.c.orig 2003-04-01 18:33:08.000000000 +0200
++++ skel.c 2004-02-07 13:23:16.000000000 +0100
+@@ -404,16 +404,16 @@
+ "%# yyscan_t yyscanner;",
+ "%#",
+ "%# Generate traditional function defs",
+- " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)",
++ " m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]",
+ " M4_YY_DECL_LAST_ARG]])",
+- " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)",
++ " m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]",
+ " $1 $2;",
+ " M4_YY_DECL_LAST_ARG]])",
+- " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)",
++ " m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]",
+ " $1 $2;",
+ " $3 $4;",
+ " M4_YY_DECL_LAST_ARG]])",
+- " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)",
++ " m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]",
+ " $1 $2;",
+ " $3 $4;",
+ " $5 $6;",
+@@ -787,12 +787,14 @@
+ " * down here because we want the user's section 1 to have been scanned first.",
+ " * The user has a chance to override it with an option.",
+ " */",
++ "#ifndef YY_NO_UNISTD_H",
+ "%if-c-only",
+ "#include <unistd.h>",
+ "%endif",
+ "%if-c++-only",
+ "#include <unistd.h>",
+ "%endif",
++ "#endif",
+ "]])",
+ "",
+ "#ifndef YY_EXTRA_TYPE",
+Index: tables.c
+--- tables.c.orig 2002-11-27 15:43:24.000000000 +0100
++++ tables.c 2004-02-07 13:21:59.000000000 +0100
@@ -86,7 +86,7 @@
th->th_magic = YYTBL_MAGIC;
th->th_hsize = 14 + strlen (version_str) + 1 + strlen (name) + 1;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.spec
============================================================================
$ cvs diff -u -r1.64 -r1.65 flex.spec
--- openpkg-src/flex/flex.spec 5 Feb 2004 22:30:59 -0000 1.64
+++ openpkg-src/flex/flex.spec 7 Feb 2004 12:25:48 -0000 1.65
@@ -39,10 +39,10 @@
Group: Language
License: BSD
Version: %{V_release}
-Release: 20040205
+Release: 20040207
# package options
-%option with_beta no
+%option with_beta yes
# list of sources
Source0: ftp://ftp.gnu.org/non-gnu/flex/flex-%{V_release}.tar.gz
@@ -69,13 +69,12 @@
%track
prog flex:release = {
- version = 2.5.4a
+ version = %{V_release}
url = ftp://ftp.gnu.org/non-gnu/flex/
regex = flex-(__VER__)\.tar\.gz
}
prog flex:beta = {
- comment = "see also http://astro.temple.edu/~john43/flex/";
- version = 2.5.31
+ version = %{V_beta}
url = http://prdownloads.sourceforge.net/lex/
regex = flex-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8468 -r1.8469 news.txt
--- openpkg-web/news.txt 7 Feb 2004 11:28:18 -0000 1.8468
+++ openpkg-web/news.txt 7 Feb 2004 12:25:46 -0000 1.8469
@@ -1,3 +1,4 @@
+07-Feb-2004: Upgraded package: P<flex-2.5.4a-20040207>
07-Feb-2004: Upgraded package: P<gmime-2.1.1-20040207>
07-Feb-2004: Upgraded package: P<perl-mail-20040207-20040207>
07-Feb-2004: Upgraded package: P<dhcpd-3.0.1rc13-20040207>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
