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: 08-Feb-2004 19:29:32
Branch: HEAD Handle: 2004020818293002
Modified files:
openpkg-src/flex flex.patch flex.spec
openpkg-web news.txt
Log:
include generated scan.c and make sure it is not regenerated -- this
should fix building under Solaris, too.
Summary:
Revision Changes Path
1.8 +57 -13 openpkg-src/flex/flex.patch
1.66 +2 -1 openpkg-src/flex/flex.spec
1.8486 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 flex.patch
--- openpkg-src/flex/flex.patch 7 Feb 2004 12:25:48 -0000 1.7
+++ openpkg-src/flex/flex.patch 8 Feb 2004 18:29:32 -0000 1.8
@@ -234,19 +234,6 @@
}
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
@@ -310,3 +297,60 @@
th->th_flags = 0;
th->th_version = copy_string (version_str);
th->th_name = copy_string (name);
+Index: scan.c
+--- scan.c.orig 2003-04-01 18:33:17.000000000 +0200
++++ scan.c 2004-02-08 19:25:53.000000000 +0100
+@@ -1,5 +1,6 @@
++#line 2 "scan.c"
+
+-#line 3 "scan.c"
++#line 4 "scan.c"
+
+ #define YY_INT_ALIGNED short int
+
+@@ -1596,7 +1597,7 @@
+
+
+
+-#line 1600 "scan.c"
++#line 1601 "scan.c"
+
+ #define INITIAL 0
+ #define SECT2 1
+@@ -1623,7 +1624,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 *
+@@ -1786,7 +1789,7 @@
+ Char nmdef[MAXLINE];
+
+
+-#line 1790 "scan.c"
++#line 1793 "scan.c"
+
+ if ( (yy_init) )
+ {
+@@ -2388,7 +2391,7 @@
+ case 77:
+ YY_RULE_SETUP
+ #line 353 "scan.l"
+-ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense);
++ACTION_M4_IFDEF("M4""_YY_NO_UNISTD_H", ! option_sense);
+ YY_BREAK
+ case 78:
+ YY_RULE_SETUP
+@@ -3339,7 +3342,7 @@
+ #line 821 "scan.l"
+ YY_FATAL_ERROR( "flex scanner jammed" );
+ YY_BREAK
+-#line 3343 "scan.c"
++#line 3346 "scan.c"
+ case YY_STATE_EOF(INITIAL):
+ case YY_STATE_EOF(SECT2):
+ case YY_STATE_EOF(CODEBLOCK):
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.spec
============================================================================
$ cvs diff -u -r1.65 -r1.66 flex.spec
--- openpkg-src/flex/flex.spec 7 Feb 2004 12:25:48 -0000 1.65
+++ openpkg-src/flex/flex.spec 8 Feb 2004 18:29:32 -0000 1.66
@@ -39,7 +39,7 @@
Group: Language
License: BSD
Version: %{V_release}
-Release: 20040207
+Release: 20040208
# package options
%option with_beta yes
@@ -85,6 +85,7 @@
%setup -q -T -D -a 1
( cd flex-%{V_beta}
%patch -p0
+ sleep 1; touch scan.c
) || exit $?
%endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.8485 -r1.8486 news.txt
--- openpkg-web/news.txt 8 Feb 2004 15:39:25 -0000 1.8485
+++ openpkg-web/news.txt 8 Feb 2004 18:29:30 -0000 1.8486
@@ -1,3 +1,4 @@
+08-Feb-2004: Upgraded package: P<flex-2.5.4a-20040208>
08-Feb-2004: Upgraded package: P<mkisofs-2.0.3-20040208>
08-Feb-2004: Upgraded package: P<sasl-2.1.17-20040208>
08-Feb-2004: Upgraded package: P<openpkg-20040208-20040208>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
