forked from jsonn/pkgsrc
-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
While here, send patches upstream. Changes: * version 2.6.0 released 2015-11-17 ** User Visible Changes *** C++ scanners now use references instead of pointers. See the manual for details. *** A number of compiler warnings were addressed, so flex generated scanners should be quieter under compiler warning scenarios. *** Allow error reporting routines to accept varying number of arguments *** Removed deprecated 'register' storage class specifier *** Changeed output formats from octal to hexadecimal *** check limits before using array index cclp; resolves sf-166 *** Suppress clang warning about empty @param paragraph; resolves sf#158 *** Fixed malloc/realloc replacement, resolves sf bug#151. *** Adjusted buffer sizes on ia64. *** various documentation and code clean up fixes: resolves sf bugs #167, #168, among other patches. ** Flex Internals *** flex is now organized into subdirectories. This keeps the tree neater at the top level and puts like things near each other and unlike things away from each other. *** The test suite has been reorganized and is now run with the parallel test suite harness from automake. *** Cleaned up the automake parts of the build system to better reflect what automake does on its own. Also added a call to libtoolize in autogen.sh because autoreconf gets confused without a prior run of libtoolize. *** po/Makefile now includes a rule to fetch the latest translations from the translation project. "make -f po/Makefile getpo" from the top level of the flex tree will fetch the files. *** New da translation from the translation project
- Loading branch information
wiz
committed
Jan 7, 2016
1 parent
cdf3ca4
commit 647b320
Showing
10 changed files
with
80 additions
and
131 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| $NetBSD: distinfo,v 1.20 2015/11/03 03:27:25 agc Exp $ | ||
| $NetBSD: distinfo,v 1.21 2016/01/07 12:05:30 wiz Exp $ | ||
|
|
||
| SHA1 (flex-2.5.39.tar.xz) = 415e82bb0dc9b1713fc4802a9db2274cd8d2909a | ||
| RMD160 (flex-2.5.39.tar.xz) = b5c9555d1fe48086d96475cf41ca800e8138514d | ||
| SHA512 (flex-2.5.39.tar.xz) = 488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec | ||
| Size (flex-2.5.39.tar.xz) = 1347436 bytes | ||
| SHA1 (patch-Makefile.am) = 7828c75f891db84b3be1719808b76542a24fdd74 | ||
| SHA1 (patch-ab) = 44497cff83005702dfcb36d490746e47757ae299 | ||
| SHA1 (patch-ad) = b7fe34269e4425a7b3871278bb6a2b1e754c9045 | ||
| SHA1 (patch-lib_Makefile.in) = b76d7083939a6e6efd865b45c37023de5058c6f6 | ||
| SHA1 (flex-2.6.0.tar.xz) = 684c927c9f1b170e9627338de12e99cf2c224b91 | ||
| RMD160 (flex-2.6.0.tar.xz) = 07c8ffa268fc4a9a117e9c12736f8b58a583dde8 | ||
| SHA512 (flex-2.6.0.tar.xz) = 9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe | ||
| Size (flex-2.6.0.tar.xz) = 1369552 bytes | ||
| SHA1 (patch-src_Makefile.am) = b50c07da46385500c1a220967c84bea1027b4081 | ||
| SHA1 (patch-src_Makefile.in) = 8d36fbd12918986715c53c772df549a5057325b7 | ||
| SHA1 (patch-src_filter.c) = 377be93afefeca93efa1f8eae0407374bd006ab3 |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| $NetBSD: patch-src_Makefile.am,v 1.1 2016/01/07 12:05:31 wiz Exp $ | ||
|
|
||
| libfl* do not need to be linked against libintl, only the binaries do. | ||
| https://sourceforge.net/p/flex/bugs/198/ | ||
|
|
||
| --- src/Makefile.am.orig 2015-11-13 19:32:53.000000000 +0000 | ||
| +++ src/Makefile.am | ||
| @@ -1,7 +1,7 @@ | ||
| AM_YFLAGS = -d | ||
| localedir = $(datadir)/locale | ||
| AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl | ||
| -LIBS = @LIBINTL@ @LIBS@ | ||
| +LIBS = @LIBS@ | ||
|
|
||
| m4 = @M4@ | ||
|
|
||
| @@ -33,7 +33,7 @@ flex_SOURCES = \ | ||
| filter.c \ | ||
| regex.c | ||
|
|
||
| -LDADD = ../lib/libcompat.la | ||
| +LDADD = ../lib/libcompat.la @LIBINTL@ | ||
|
|
||
| libfl_la_SOURCES = \ | ||
| libmain.c \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| $NetBSD: patch-src_Makefile.in,v 1.1 2016/01/07 12:05:31 wiz Exp $ | ||
|
|
||
| libfl* do not need to be linked against libintl, only the binaries do. | ||
| https://sourceforge.net/p/flex/bugs/198/ | ||
|
|
||
| --- src/Makefile.in.orig 2015-11-17 16:19:45.000000000 +0000 | ||
| +++ src/Makefile.in | ||
| @@ -302,7 +302,7 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ | ||
| LIBICONV = @LIBICONV@ | ||
| LIBINTL = @LIBINTL@ | ||
| LIBOBJS = @LIBOBJS@ | ||
| -LIBS = @LIBINTL@ @LIBS@ | ||
| +LIBS = @LIBS@ | ||
| LIBTOOL = @LIBTOOL@ | ||
| LIPO = @LIPO@ | ||
| LN_S = @LN_S@ | ||
| @@ -428,7 +428,7 @@ flex_SOURCES = \ | ||
| filter.c \ | ||
| regex.c | ||
|
|
||
| -LDADD = ../lib/libcompat.la | ||
| +LDADD = ../lib/libcompat.la @LIBINTL@ | ||
| libfl_la_SOURCES = \ | ||
| libmain.c \ | ||
| libyywrap.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| $NetBSD: patch-src_filter.c,v 1.1 2016/01/07 12:05:31 wiz Exp $ | ||
|
|
||
| Improve stdin-to-pipe hack on NetBSD | ||
| https://sourceforge.net/p/flex/bugs/198/ | ||
|
|
||
| --- src/filter.c.orig 2015-11-10 23:10:20.000000000 +0000 | ||
| +++ src/filter.c | ||
| @@ -174,6 +174,8 @@ clearerr(stdin); | ||
| flexfatal (_("dup2(pipes[0],0)")); | ||
| close (pipes[0]); | ||
| fseek (stdin, 0, SEEK_CUR); | ||
| + ungetc(' ', stdin); /* still an evil hack, but one that works better */ | ||
| + (void)fgetc(stdin); /* on NetBSD than the fseek attempt does */ | ||
|
|
||
| /* run as a filter, either internally or by exec */ | ||
| if (chain->filter_func) { |