flex: update to 2.6.4

flex/.md5sum

@@ -1,2 +1 @@
-46620c53d99157a506cfdd183c999dd6  flex-2.6.3-add_defines.patch
-a5f65570cd9107ec8a8ec88f17b31bb1  flex-2.6.3.tar.gz
+2882e3179748cc9f9c23ec593d6adc8d  flex-2.6.4.tar.gz

flex/.signature

@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqqJYaBIKu21dDJ+z9UuSb6ITzwLdzGON5LKwz/vpbZMhYEOkijj1mEoQH//ZfTQV9vLmrVpTk6MTuDuYlnPi7wM=
-SHA256 (Pkgfile) = 13dd58260456b9e72fa148dc0a63a71f36a66648150a3beabf169dc8f97e27b5
+RWRJc1FUaeVeqs+ZctdHT3cW5UCRFFdbgpV2Aqp6/fvYxEVDjudowRDBpmczVUDs13J21cC8KLIoYpRQqYCtV00CziFr7XI+HA0=
+SHA256 (Pkgfile) = 895d06d077660d9b622ca94f6057d7ae57c4c035d0d262997239d05b29f8cbdc
 SHA256 (.footprint) = 4ded7e479fbecaf724eeed412013d7ec19ee65eceb2d4ef2804a6b575dd190d4
-SHA256 (flex-2.6.3.tar.gz) = 68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa
-SHA256 (flex-2.6.3-add_defines.patch) = 461f0843bc4a1fe2ccea751453d89716502c31a374b5645703ec3a333427c5ac
+SHA256 (flex-2.6.4.tar.gz) = e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995

flex/Pkgfile

@@ -3,17 +3,13 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=flex
-version=2.6.3
-release=2
-source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz
-        $name-$version-add_defines.patch)
+version=2.6.4
+release=1
+source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz)
 
 build() {
     cd $name-$version
-    
-    patch -p1 -i $SRC/$name-$version-add_defines.patch
-    touch doc/flex.1
-
+   
     ./configure --prefix=/usr --disable-nls
     
     make

flex/flex-2.6.3-add_defines.patch

@@ -1,82 +0,0 @@
-From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 22 Jan 2017 18:34:30 +0100
-Subject: [PATCH] Add more defines in the non-reentrant part.
-
-Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks
-code that does #ifndef yywrap ..
----
- src/flex.skl | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/src/flex.skl b/src/flex.skl
-index 190700f..6a7cde4 100644
---- a/src/flex.skl
-+++ b/src/flex.skl
-@@ -61,11 +61,17 @@ m4_changequote([[, ]])
- m4_ifelse(M4_YY_PREFIX,yy,,
- #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]
- #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]
--#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]
-+#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]]
-+#define yy_scan_string M4_YY_PREFIX[[_scan_string]]
-+#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]]
- #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]
- #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]
- #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]
- #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]
-+#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]]
-+#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]]
-+#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]]
-+#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]
- #define yyin M4_YY_PREFIX[[in]]
- #define yyleng M4_YY_PREFIX[[leng]]
- #define yylex M4_YY_PREFIX[[lex]]
-@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]])
- 
- m4preproc_define(`M4_GEN_PREFIX',
-     ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]]
--m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
-+%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
- 
- %if-c++-only
-     /* The c++ scanner is a mess. The FlexLexer.h header file relies on the
-@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
- %endif
- 
- %if-c-only
-+m4_ifelse(M4_YY_PREFIX,yy,,
-     M4_GEN_PREFIX(`_create_buffer')
-     M4_GEN_PREFIX(`_delete_buffer')
-     M4_GEN_PREFIX(`_scan_buffer')
-@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'')
-         M4_GEN_PREFIX(`set_column')
-     ]])
-     M4_GEN_PREFIX(`wrap')
-+)
- %endif
- 
- m4_ifdef( [[M4_YY_BISON_LVAL]],
-@@ -170,11 +178,14 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]],
- ]])
- 
- 
-+m4_ifelse(M4_YY_PREFIX,yy,,
-     M4_GEN_PREFIX(`alloc')
-     M4_GEN_PREFIX(`realloc')
-     M4_GEN_PREFIX(`free')
-+)
- 
- %if-c-only
-+m4_ifelse(M4_YY_PREFIX,yy,,
- m4_ifdef( [[M4_YY_NOT_REENTRANT]],
- [[
-     M4_GEN_PREFIX(`text')
-@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
-     M4_GEN_PREFIX(`_flex_debug')
-     M4_GEN_PREFIX(`lineno')
- ]])
-+)
- %endif
- 
-