Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25800/stable/main/finkinfo/devel
Modified Files: flex-devel.info flex-devel.patch Log Message: flex-devel 2.5.35 to stable Index: flex-devel.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/flex-devel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- flex-devel.patch 20 Jan 2006 20:12:52 -0000 1.1 +++ flex-devel.patch 10 May 2010 15:38:11 -0000 1.2 @@ -1,249 +1,337 @@ -diff -uNr flex-2.5.31/filter.c flex-2.5.31-new/filter.c ---- flex-2.5.31/filter.c Tue Mar 25 11:39:08 2003 -+++ flex-2.5.31-new/filter.c Tue Nov 18 15:24:12 2003 -@@ -157,11 +157,15 @@ - if (chain->filter_func) { - int r; +diff -Nurd flex-2.5.35/doc/stamp-vti flex-2.5.35-new/doc/stamp-vti +--- flex-2.5.35/doc/stamp-vti 2008-02-26 16:34:27.000000000 -0500 ++++ flex-2.5.35-new/doc/stamp-vti 2009-04-29 10:27:25.000000000 -0400 +@@ -1,4 +1,4 @@ +...@set UPDATED 10 September 2007 +...@set UPDATED-MONTH September 2007 +...@set UPDATED 1 June 2008 +...@set UPDATED-MONTH June 2008 + @set EDITION 2.5.35 + @set VERSION 2.5.35 +diff -Nurd flex-2.5.35/doc/version.texi flex-2.5.35-new/doc/version.texi +--- flex-2.5.35/doc/version.texi 2008-02-26 16:34:27.000000000 -0500 ++++ flex-2.5.35-new/doc/version.texi 2009-04-29 10:27:25.000000000 -0400 +@@ -1,4 +1,4 @@ +...@set UPDATED 10 September 2007 +...@set UPDATED-MONTH September 2007 +...@set UPDATED 1 June 2008 +...@set UPDATED-MONTH June 2008 + @set EDITION 2.5.35 + @set VERSION 2.5.35 +diff -Nurd flex-2.5.35/flex.skl flex-2.5.35-new/flex.skl +--- flex-2.5.35/flex.skl 2008-02-09 13:54:56.000000000 -0500 ++++ flex-2.5.35-new/flex.skl 2009-04-29 10:27:25.000000000 -0400 +@@ -218,6 +218,7 @@ + #include <iostream> + #include <errno.h> + #include <cstdlib> ++#include <cstdio> + #include <cstring> + /* end standard C++ headers. */ + %endif +@@ -443,7 +444,15 @@ -- /* setup streams again */ -+ /* setup streams again -- Removed. POSIX states that children inherit -+ open streams in the parent. Also, ANSI C99 states that the stdin -+ and stdout macors need not be modified lvalues; so this code is -+ broken in the first place. - if ((stdin = fdopen (0, "r")) == NULL) - flexfatal (_("fdopen(0) failed")); - if ((stdout = fdopen (1, "w")) == NULL) - flexfatal (_("fdopen(1) failed")); -+ */ + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k. ++ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. ++ * Ditto for the __ia64__ case accordingly. ++ */ ++#define YY_BUF_SIZE 32768 ++#else + #define YY_BUF_SIZE 16384 ++#endif /* __ia64__ */ + #endif - if ((r = chain->filter_func (chain)) == -1) - flexfatal (_("filter_func failed")); -@@ -181,9 +185,11 @@ - if (dup2 (pipes[1], 1) == -1) - flexfatal (_("dup2(pipes[1],1)")); - close (pipes[1]); -+ /* This is not legal; stfout does not need to be a modifiable -+ lvalue - if ((stdout = fdopen (1, "w")) == NULL) - flexfatal (_("fdopen(1) failed")); -- -+ */ - return true; - } + m4_ifdef( [[M4_YY_NOT_IN_HEADER]], +@@ -1063,7 +1072,12 @@ -diff -uNr flex-2.5.31/flex.skl flex-2.5.31-new/flex.skl ---- flex-2.5.31/flex.skl Mon Mar 31 20:51:38 2003 -+++ flex-2.5.31-new/flex.skl Tue Nov 18 15:24:12 2003 -@@ -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 @@ + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k */ ++#define YY_READ_BUF_SIZE 16384 ++#else + #define YY_READ_BUF_SIZE 8192 ++#endif /* __ia64__ */ + #endif - 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> + m4_ifdef( [[M4_YY_NOT_IN_HEADER]], +@@ -1074,7 +1088,7 @@ + /* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +-#define ECHO fwrite( yytext, yyleng, 1, yyout ) ++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) %endif -+#endif - ]]) + %if-c++-only C++ definition + #define ECHO LexerOutput( yytext, yyleng ) +@@ -2348,8 +2362,8 @@ + %if-c-only + /** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. +- * @param bytes the byte buffer to scan +- * @param len the number of bytes in the buffer pointed to by @a bytes. ++ * @param yybytes the byte buffer to scan ++ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * M4_YY_DOC_PARAM + * @return the newly allocated buffer state object. + */ +diff -Nurd flex-2.5.35/flexint.h flex-2.5.35-new/flexint.h +--- flex-2.5.35/flexint.h 2006-03-20 21:17:56.000000000 -0500 ++++ flex-2.5.35-new/flexint.h 2009-04-29 10:27:25.000000000 -0400 +@@ -28,7 +28,6 @@ + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; +-#endif /* ! C99 */ - #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. + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -59,5 +58,6 @@ + #define UINT32_MAX (4294967295U) + #endif -- 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)]]) - ]]) ++#endif /* ! C99 */ -@@ -1134,9 +1136,9 @@ - [[ - m4_dnl Locations are used. yylex should also accept the ylloc parameter. + #endif /* ! FLEXINT_H */ +diff -Nurd flex-2.5.35/gen.c flex-2.5.35-new/gen.c +--- flex-2.5.35/gen.c 2007-05-31 02:21:57.000000000 -0400 ++++ flex-2.5.35-new/gen.c 2009-04-29 10:27:25.000000000 -0400 +@@ -1890,7 +1890,7 @@ + outn ("\tif ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \\"); + outn ("\t\t{ \\"); + outn ("\t\tint c = '*'; \\"); +- outn ("\t\tint n; \\"); ++ outn ("\t\tsize_t n; \\"); + outn ("\t\tfor ( n = 0; n < max_size && \\"); + outn ("\t\t\t (c = getc( yyin )) != EOF && c != '\\n'; ++n ) \\"); + outn ("\t\t\tbuf[n] = (char) c; \\"); +diff -Nurd flex-2.5.35/scan.c flex-2.5.35-new/scan.c +--- flex-2.5.35/scan.c 2008-02-26 16:34:23.000000000 -0500 ++++ flex-2.5.35-new/scan.c 2009-04-29 10:27:25.000000000 -0400 +@@ -1,5 +1,6 @@ ++#line 2 "scan.c" -- 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)]]) - ]]) +-#line 3 "scan.c" ++#line 4 "scan.c" -@@ -2251,11 +2253,11 @@ - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ --YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str) -+YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str) - { - m4_dnl M4_YY_DECL_GUTS_VAR(); + #define YY_INT_ALIGNED short int -- return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG); -+ return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG); - } - %endif - ]]) -diff -uNr flex-2.5.31/gen.c flex-2.5.31-new/gen.c ---- flex-2.5.31/gen.c Sun Mar 30 14:58:44 2003 -+++ flex-2.5.31-new/gen.c Tue Nov 18 15:24:12 2003 -@@ -1808,21 +1808,20 @@ - } +@@ -53,7 +54,6 @@ + typedef unsigned char flex_uint8_t; + typedef unsigned short int flex_uint16_t; + typedef unsigned int flex_uint32_t; +-#endif /* ! C99 */ - if (yymore_used) { -- if (!C_plus_plus) { -- if (yytext_is_array) { -- if (!reentrant){ -- indent_puts ("static int yy_more_offset = 0;"); -- }else{ -- indent_puts ("static int yy_prev_more_offset = 0;"); -- } -- } -- else if (!reentrant) { -- indent_puts -- ("static int yy_more_flag = 0;"); -- indent_puts -- ("static int yy_more_len = 0;"); -- } -- } -+ if (!C_plus_plus) { -+ if (yytext_is_array) { -+ if (!reentrant){ -+ indent_puts ("static int yy_more_offset = 0;"); -+ indent_puts ("static int yy_prev_more_offset = 0;"); -+ } -+ } -+ else if (!reentrant) { -+ indent_puts -+ ("static int yy_more_flag = 0;"); -+ indent_puts -+ ("static int yy_more_len = 0;"); -+ } -+ } + /* Limits of integral types. */ + #ifndef INT8_MIN +@@ -84,6 +84,8 @@ + #define UINT32_MAX (4294967295U) + #endif - if (yytext_is_array) { - indent_puts -diff -uNr flex-2.5.31/main.c flex-2.5.31-new/main.c ---- flex-2.5.31/main.c Mon Mar 31 20:51:38 2003 -+++ flex-2.5.31-new/main.c Tue Nov 18 15:24:12 2003 -@@ -199,6 +199,7 @@ - { - #if ENABLE_NLS - setlocale (LC_MESSAGES, ""); -+ setlocale (LC_CTYPE, ""); - textdomain (PACKAGE); - bindtextdomain (PACKAGE, LOCALEDIR); ++#endif /* ! C99 */ ++ + #endif /* ! FLEXINT_H */ + + #ifdef __cplusplus +@@ -140,7 +142,15 @@ + + /* Size of default input buffer. */ + #ifndef YY_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k. ++ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. ++ * Ditto for the __ia64__ case accordingly. ++ */ ++#define YY_BUF_SIZE 32768 ++#else + #define YY_BUF_SIZE 16384 ++#endif /* __ia64__ */ #endif -@@ -1594,7 +1595,6 @@ - outn ("#endif"); - outn ("#else"); - outn (yy_stdinit); -- outn ("#endif"); - outn ("#endif"); - } -diff -uNr flex-2.5.31/scan.c flex-2.5.31-new/scan.c ---- flex-2.5.31/scan.c Tue Apr 1 11:33:17 2003 -+++ flex-2.5.31-new/scan.c Tue Nov 18 15:24:12 2003 -@@ -1619,11 +1619,13 @@ - #define LINEDIR 18 - #define CODEBLOCK_MATCH_BRACE 19 + /* The state buf must be large enough to hold one state per character in the main buffer. +@@ -2085,7 +2095,12 @@ + + /* Amount of stuff to slurp up with each read. */ + #ifndef YY_READ_BUF_SIZE ++#ifdef __ia64__ ++/* On IA-64, the buffer size is 16k, not 8k */ ++#define YY_READ_BUF_SIZE 16384 ++#else + #define YY_READ_BUF_SIZE 8192 ++#endif /* __ia64__ */ + #endif -+#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. + /* Copy whatever the last rule matched to the standard output. */ +@@ -2093,7 +2108,7 @@ + /* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). */ - #include <unistd.h> -+#endif +-#define ECHO fwrite( yytext, yyleng, 1, yyout ) ++#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) + #endif - #ifndef YY_EXTRA_TYPE - #define YY_EXTRA_TYPE void * -diff -uNr flex-2.5.31/skel.c flex-2.5.31-new/skel.c ---- flex-2.5.31/skel.c Tue Apr 1 11:33:08 2003 -+++ flex-2.5.31-new/skel.c Tue Nov 18 15:24:12 2003 -@@ -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;", -@@ -783,6 +783,7 @@ + /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, +@@ -2104,7 +2119,7 @@ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ + { \ + int c = '*'; \ +- int n; \ ++ size_t n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ +@@ -4847,8 +4862,8 @@ + + /** Setup the input buffer state to scan the given bytes. The next call to yylex() will + * scan from a @e copy of @a bytes. +- * @param bytes the byte buffer to scan +- * @param len the number of bytes in the buffer pointed to by @a bytes. ++ * @param yybytes the byte buffer to scan ++ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +diff -Nurd flex-2.5.35/skel.c flex-2.5.35-new/skel.c +--- flex-2.5.35/skel.c 2008-02-26 16:34:19.000000000 -0500 ++++ flex-2.5.35-new/skel.c 2009-04-29 10:27:25.000000000 -0400 +@@ -244,7 +244,6 @@ + "typedef unsigned char flex_uint8_t; ", + "typedef unsigned short int flex_uint16_t;", + "typedef unsigned int flex_uint32_t;", +- "#endif /* ! C99 */", "", - "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.", -@@ -793,6 +794,7 @@ - "%if-c++-only", - "#include <unistd.h>", + "/* Limits of integral types. */", + "#ifndef INT8_MIN", +@@ -275,6 +274,7 @@ + "#define UINT32_MAX (4294967295U)", + "#endif", + "", ++ "#endif /* ! C99 */", + "", + "#endif /* ! FLEXINT_H */", + "", +@@ -285,6 +285,7 @@ + "#include <iostream> ", + "#include <errno.h>", + "#include <cstdlib>", ++ "#include <cstdio>", + "#include <cstring>", + "/* end standard C++ headers. */", "%endif", -+ "#endif", - "]])", +@@ -510,7 +511,15 @@ "", - "#ifndef YY_EXTRA_TYPE", -@@ -2454,11 +2456,11 @@ - " * @note If you want to scan bytes that may contain NUL values, then use", - " * yy_scan_bytes() instead.", - " */", -- "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)", -+ "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)", - "{", - " m4_dnl M4_YY_DECL_GUTS_VAR();", + "/* Size of default input buffer. */", + "#ifndef YY_BUF_SIZE", ++ "#ifdef __ia64__", ++ "/* On IA-64, the buffer size is 16k, not 8k.", ++ " * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.", ++ " * Ditto for the __ia64__ case accordingly.", ++ " */", ++ "#define YY_BUF_SIZE 32768", ++ "#else", + "#define YY_BUF_SIZE 16384", ++ "#endif /* __ia64__ */", + "#endif", "", -- " return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);", -+ " return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);", - "}", + "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],", +@@ -1130,7 +1139,12 @@ + "", + "/* Amount of stuff to slurp up with each read. */", + "#ifndef YY_READ_BUF_SIZE", ++ "#ifdef __ia64__", ++ "/* On IA-64, the buffer size is 16k, not 8k */", ++ "#define YY_READ_BUF_SIZE 16384", ++ "#else", + "#define YY_READ_BUF_SIZE 8192", ++ "#endif /* __ia64__ */", + "#endif", + "", + "m4_ifdef( [[M4_YY_NOT_IN_HEADER]],", +@@ -1141,7 +1155,7 @@ + "/* This used to be an fputs(), but since the string might contain NUL's,", + " * we now use fwrite().", + " */", +- "#define ECHO fwrite( yytext, yyleng, 1, yyout )", ++ "#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)", "%endif", - "]])", + "%if-c++-only C++ definition", + "#define ECHO LexerOutput( yytext, yyleng )", +@@ -2559,8 +2573,8 @@ + "%if-c-only", + "/** Setup the input buffer state to scan the given bytes. The next call to yylex() will", + " * scan from a @e copy of @a bytes.", +- " * @param bytes the byte buffer to scan", +- " * @param len the number of bytes in the buffer pointed to by @a bytes.", ++ " * @param yybytes the byte buffer to scan", ++ " * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.", + " * M4_YY_DOC_PARAM", + " * @return the newly allocated buffer state object.", + " */", +diff -Nurd flex-2.5.35/tests/test-bison-nr/Makefile.in flex-2.5.35-new/tests/test-bison-nr/Makefile.in +--- flex-2.5.35/tests/test-bison-nr/Makefile.in 2008-02-26 16:34:05.000000000 -0500 ++++ flex-2.5.35-new/tests/test-bison-nr/Makefile.in 2009-04-29 10:31:03.000000000 -0400 +@@ -343,7 +343,7 @@ + uninstall-info-am + + +-scanner.c: $(srcdir)/scanner.l ++scanner.c scanner.h: $(srcdir)/scanner.l + $(FLEX) $< + + parser.c: $(srcdir)/parser.y +@@ -359,7 +359,8 @@ + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< + + parser.h: parser.c +-scanner.c main.o: parser.h ++scanner.o: parser.h ++main.o: parser.h scanner.h + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Nurd flex-2.5.35/tests/test-bison-yylloc/Makefile.in flex-2.5.35-new/tests/test-bison-yylloc/Makefile.in +--- flex-2.5.35/tests/test-bison-yylloc/Makefile.in 2008-02-26 16:34:06.000000000 -0500 ++++ flex-2.5.35-new/tests/test-bison-yylloc/Makefile.in 2009-04-29 10:31:41.000000000 -0400 +@@ -343,7 +343,7 @@ + uninstall-info-am + + +-scanner.c: $(srcdir)/scanner.l ++scanner.c scanner.h: $(srcdir)/scanner.l + $(FLEX) $< + + parser.c: $(srcdir)/parser.y +@@ -359,7 +359,8 @@ + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< + + parser.h: parser.c +-scanner.c main.o: parser.h ++scanner.o: parser.h ++main.o: parser.h scanner.h + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -Nurd flex-2.5.35/tests/test-bison-yylval/Makefile.in flex-2.5.35-new/tests/test-bison-yylval/Makefile.in +--- flex-2.5.35/tests/test-bison-yylval/Makefile.in 2008-02-26 16:34:06.000000000 -0500 ++++ flex-2.5.35-new/tests/test-bison-yylval/Makefile.in 2009-04-29 10:32:00.000000000 -0400 +@@ -343,7 +343,7 @@ + uninstall-info-am + + +-scanner.c: $(srcdir)/scanner.l ++scanner.c scanner.h: $(srcdir)/scanner.l + $(FLEX) $< + + parser.c: $(srcdir)/parser.y +@@ -359,7 +359,7 @@ + $(CC) -c -o $@ $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) $< + + parser.h: parser.c +-main.o: parser.h ++main.o: parser.h scanner.h + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Index: flex-devel.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/flex-devel.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- flex-devel.info 23 Mar 2009 07:38:29 -0000 1.2 +++ flex-devel.info 10 May 2010 15:38:04 -0000 1.3 @@ -1,23 +1,31 @@ Package: flex-devel -Version: 2.5.31 +Version: 2.5.35 Revision: 2 -BuildDepends: help2man, fink (>= 0.24.12) -Source: mirror:sourceforge:lex/flex-%v.tar.bz2 +BuildDepends: fink (>= 0.28.0-1), help2man + +Source: mirror:sourceforge:flex/flex-%v.tar.bz2 +Source-MD5: 10714e50cea54dc7a227e3eddcd44d57 PatchFile: %n.patch -PatchFile-MD5: 9866a0f8dce1b4d92992b99fd6189f06 +PatchFile-MD5: 8f9cf336bd558b8b38616275f8164ec7 + NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 -DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS ONEWS README* RoadMap THANKS TODO + CompileScript: << +#!/bin/sh -ex + + export lt_cv_sys_max_cmd_len=65536 ./configure --prefix=%p/lib/flex make << InstallScript: << - make install DESTDIR=%d + make -j1 install DESTDIR=%d rm -rf %i/lib/flex/man %i/lib/flex/share %i/lib/flex/info << -# -Description: Fast lexical analyser generator (development version) + +Description: Fast lexical analyser generator +DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS ONEWS README* THANKS TODO + DescDetail: << Flex is a tool for generating programs that require pattern-matching on text. It is usually used together with yacc/bison to automatically @@ -42,6 +50,5 @@ << License: BSD -Homepage: http://lex.sourceforge.net/ -Maintainer: Benjamin Reed <ran...@befunk.com> -Source-MD5: 363dcc4afc917dc51306eb9d3de0152f +Homepage: http://flex.sourceforge.net/ +Maintainer: Benjamin Reed <flex-de...@fink.racoonfink.com> ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs