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: 29-Jul-2003 22:36:14
Branch: HEAD Handle: 2003072921361102
Modified files:
openpkg-src/flex flex.patch flex.spec
openpkg-web news.txt
Log:
do not build flex beta by default and remove C99 comments from its
code
Summary:
Revision Changes Path
1.6 +130 -0 openpkg-src/flex/flex.patch
1.59 +2 -2 openpkg-src/flex/flex.spec
1.5903 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 flex.patch
--- openpkg-src/flex/flex.patch 24 Jul 2003 08:32:11 -0000 1.5
+++ openpkg-src/flex/flex.patch 29 Jul 2003 20:36:13 -0000 1.6
@@ -37,3 +37,133 @@
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
+@@ -1142,7 +1142,6 @@
+ break;
+
+ case OPT_NO_UNISTD_H:
+- //buf_strdefine (&userdef_buf, "YY_NO_UNISTD_H", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_UNISTD_H",0);
+ break;
+
+@@ -1257,7 +1256,6 @@
+ break;
+
+ case OPT_STACK:
+- //buf_strdefine (&userdef_buf, "YY_STACK_USED", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_STACK_USED",0);
+ break;
+
+@@ -1314,87 +1312,66 @@
+ break;
+
+ case OPT_NO_YY_PUSH_STATE:
+- //buf_strdefine (&userdef_buf, "YY_NO_PUSH_STATE", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_PUSH_STATE",0);
+ break;
+ case OPT_NO_YY_POP_STATE:
+- //buf_strdefine (&userdef_buf, "YY_NO_POP_STATE", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_POP_STATE",0);
+ break;
+ case OPT_NO_YY_TOP_STATE:
+- //buf_strdefine (&userdef_buf, "YY_NO_TOP_STATE", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_TOP_STATE",0);
+ break;
+ case OPT_NO_UNPUT:
+- //buf_strdefine (&userdef_buf, "YY_NO_UNPUT", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_UNPUT",0);
+ break;
+ case OPT_NO_YY_SCAN_BUFFER:
+- //buf_strdefine (&userdef_buf, "YY_NO_SCAN_BUFFER", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SCAN_BUFFER",0);
+ break;
+ case OPT_NO_YY_SCAN_BYTES:
+- //buf_strdefine (&userdef_buf, "YY_NO_SCAN_BYTES", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SCAN_BYTES",0);
+ break;
+ case OPT_NO_YY_SCAN_STRING:
+- //buf_strdefine (&userdef_buf, "YY_NO_SCAN_STRING", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SCAN_STRING",0);
+ break;
+ case OPT_NO_YYGET_EXTRA:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_EXTRA", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_EXTRA",0);
+ break;
+ case OPT_NO_YYSET_EXTRA:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_EXTRA", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_EXTRA",0);
+ break;
+ case OPT_NO_YYGET_LENG:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_LENG", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_LENG",0);
+ break;
+ case OPT_NO_YYGET_TEXT:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_TEXT", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_TEXT",0);
+ break;
+ case OPT_NO_YYGET_LINENO:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_LINENO", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_LINENO",0);
+ break;
+ case OPT_NO_YYSET_LINENO:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_LINENO", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LINENO",0);
+ break;
+ case OPT_NO_YYGET_IN:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_IN", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_IN",0);
+ break;
+ case OPT_NO_YYSET_IN:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_IN", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_IN",0);
+ break;
+ case OPT_NO_YYGET_OUT:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_OUT", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_OUT",0);
+ break;
+ case OPT_NO_YYSET_OUT:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_OUT", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_OUT",0);
+ break;
+ case OPT_NO_YYGET_LVAL:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_LVAL", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_LVAL",0);
+ break;
+ case OPT_NO_YYSET_LVAL:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_LVAL", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LVAL",0);
+ break;
+ case OPT_NO_YYGET_LLOC:
+- //buf_strdefine (&userdef_buf, "YY_NO_GET_LLOC", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_GET_LLOC",0);
+ break;
+ case OPT_NO_YYSET_LLOC:
+- //buf_strdefine (&userdef_buf, "YY_NO_SET_LLOC", "1");
+ buf_m4_define( &m4defs_buf, "M4_YY_NO_SET_LLOC",0);
+ break;
+
+@@ -1547,7 +1524,6 @@
+
+ if (reject){
+ out_m4_define( "M4_YY_USES_REJECT", NULL);
+- //outn ("\n#define YY_USES_REJECT");
+ }
+
+ if (!do_yywrap) {
+--- tables.c.orig Wed Nov 27 15:43:24 2002
++++ tables.c Tue Jul 29 22:28:18 2003
+@@ -86,7 +86,7 @@
+ th->th_magic = YYTBL_MAGIC;
+ th->th_hsize = 14 + strlen (version_str) + 1 + strlen (name) + 1;
+ th->th_hsize += yypad64 (th->th_hsize);
+- th->th_ssize = 0; // Not known at this point.
++ th->th_ssize = 0;
+ th->th_flags = 0;
+ th->th_version = copy_string (version_str);
+ th->th_name = copy_string (name);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/flex/flex.spec
============================================================================
$ cvs diff -u -r1.58 -r1.59 flex.spec
--- openpkg-src/flex/flex.spec 24 Jul 2003 08:32:11 -0000 1.58
+++ openpkg-src/flex/flex.spec 29 Jul 2003 20:36:13 -0000 1.59
@@ -38,10 +38,10 @@
Group: Language
License: BSD
Version: %{V_release}
-Release: 20030724
+Release: 20030729
# package options
-%option with_beta yes
+%option with_beta no
# list of sources
Source0: ftp://ftp.gnu.org/non-gnu/flex/flex-%{V_release}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5902 -r1.5903 news.txt
--- openpkg-web/news.txt 29 Jul 2003 14:32:26 -0000 1.5902
+++ openpkg-web/news.txt 29 Jul 2003 20:36:11 -0000 1.5903
@@ -1,3 +1,4 @@
+29-Jul-2003: Upgraded package: P<flex-2.5.4a-20030729>
29-Jul-2003: Upgraded package: P<rsync-2.5.6-1.20030729>
29-Jul-2003: Upgraded package: P<apache-1.3.28-1.20030729>
29-Jul-2003: Upgraded package: P<rsync-2.5.6-20030729>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
