[pkgsrc/trunk]: pkgsrc Ensure the local yywrap is used. Fixes build with new...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b00a699f683f
branches:  trunk
changeset: 356730:b00a699f683f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jan 04 11:52:24 2017 +0000

description:
Ensure the local yywrap is used.  Fixes build with newer flex.

diffstat:

 emulators/wine/distinfo                                    |   4 ++-
 emulators/wine/patches/patch-programs_winhlp32_macro.lex.l |  14 ++++++++++
 emulators/wine/patches/patch-tools_wrc_parser.l            |  14 ++++++++++
 wm/tvtwm/distinfo                                          |   4 +-
 wm/tvtwm/patches/patch-ak                                  |  19 +++++--------
 5 files changed, 41 insertions(+), 14 deletions(-)

diffs (109 lines):

diff -r ecf7780a546b -r b00a699f683f emulators/wine/distinfo
--- a/emulators/wine/distinfo   Wed Jan 04 11:48:24 2017 +0000
+++ b/emulators/wine/distinfo   Wed Jan 04 11:52:24 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.91 2016/06/09 15:26:35 fhajny Exp $
+$NetBSD: distinfo,v 1.92 2017/01/04 11:52:24 jperkin Exp $
 
 SHA1 (wine-1.6.2.tar.bz2) = 574b9ccedbf213622b7ee55f715764673fc27692
 RMD160 (wine-1.6.2.tar.bz2) = 7252851af5e9f748750685900c918e4fcb31c1f6
@@ -8,3 +8,5 @@
 SHA1 (patch-dlls_ntdll_signal__i386.c) = 23028c77cda2611e5fe9c3f78dde55259d0bd6d6
 SHA1 (patch-dlls_wbemprox_builtin.c) = a120531c3ac1e5eddc3c82424d96c0afae69cc7a
 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 9ea9ad05a32b3f684f22986b227534d87c7dafe7
+SHA1 (patch-programs_winhlp32_macro.lex.l) = 6d37626d44a38559d268b568583f314d2bd31203
+SHA1 (patch-tools_wrc_parser.l) = 6a061055b9f3b2c892f614154c8c15053ac7d9e6
diff -r ecf7780a546b -r b00a699f683f emulators/wine/patches/patch-programs_winhlp32_macro.lex.l
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine/patches/patch-programs_winhlp32_macro.lex.l        Wed Jan 04 11:52:24 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-programs_winhlp32_macro.lex.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $
+
+Ensure the local yywrap is used.
+
+--- programs/winhlp32/macro.lex.l.orig 2014-01-10 20:37:29.000000000 +0000
++++ programs/winhlp32/macro.lex.l
+@@ -35,6 +35,7 @@
+ #include "winhelp.h"
+ 
+ #include "wine/debug.h"
++#undef yywrap
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
+ 
diff -r ecf7780a546b -r b00a699f683f emulators/wine/patches/patch-tools_wrc_parser.l
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/wine/patches/patch-tools_wrc_parser.l   Wed Jan 04 11:52:24 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_wrc_parser.l,v 1.1 2017/01/04 11:52:24 jperkin Exp $
+
+Ensure the local yywrap is used.
+
+--- tools/wrc/parser.l.orig    2014-01-10 20:37:29.000000000 +0000
++++ tools/wrc/parser.l
+@@ -119,6 +119,7 @@ cident     [a-zA-Z_][0-9a-zA-Z_]*
+ #include "newstruc.h"
+ 
+ #include "parser.tab.h"
++#undef yywrap
+ 
+ /* Always update the current character position within a line */
+ #define YY_USER_ACTION        char_number+=yyleng; wanted_id = want_id; want_id = 0;
diff -r ecf7780a546b -r b00a699f683f wm/tvtwm/distinfo
--- a/wm/tvtwm/distinfo Wed Jan 04 11:48:24 2017 +0000
+++ b/wm/tvtwm/distinfo Wed Jan 04 11:52:24 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/02 23:42:54 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/01/04 12:20:07 jperkin Exp $
 
 SHA1 (tvtwm.pl11.tar.gz) = a0e092c6dbab072b488606c28a78746d1b55d078
 RMD160 (tvtwm.pl11.tar.gz) = ec346d31b1e9302d781ba5d67d08e8c2728f4a4f
@@ -12,7 +12,7 @@
 SHA1 (patch-ah) = d2fbfe56a5588c6b490df4c9ada37ee3bc3b0cb9
 SHA1 (patch-ai) = 81475df3d97a1d3506ffc5075d9687857d32af83
 SHA1 (patch-aj) = ec674f384a42375765576873cfba98b292c76e82
-SHA1 (patch-ak) = 952a03dbe17e520a46384c61ecd9b6655eeeb793
+SHA1 (patch-ak) = 6eef3a42620782067542cc2b4c8e0ef413236d18
 SHA1 (patch-al) = 6614b46b5f348ebaf8418494ab1eac71bf845f63
 SHA1 (patch-am) = 3691648d9a7f1b25f742f359cdf50e32bb11ddc3
 SHA1 (patch-an) = db292b1aa120da9a95629352175b5042a1bb7d77
diff -r ecf7780a546b -r b00a699f683f wm/tvtwm/patches/patch-ak
--- a/wm/tvtwm/patches/patch-ak Wed Jan 04 11:48:24 2017 +0000
+++ b/wm/tvtwm/patches/patch-ak Wed Jan 04 11:52:24 2017 +0000
@@ -1,20 +1,17 @@
-$NetBSD: patch-ak,v 1.2 2004/05/23 23:28:29 danw Exp $
+$NetBSD: patch-ak,v 1.3 2017/01/04 12:20:07 jperkin Exp $
+
+Ensure the local yywrap is used.
 
-Index: lex.l
-===================================================================
-RCS file: /home/siren/src/tvtwm/lex.l,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- lex.l      1999/08/08 05:46:53     1.1.1.1
-+++ lex.l      1999/08/08 05:56:51     1.2
-@@ -37,12 +37,34 @@
+--- lex.l.orig 1993-03-10 20:57:51.000000000 +0000
++++ lex.l
+@@ -37,12 +37,35 @@
   ***********************************************************************/
  
  /* #include <stdio.h> */              /* lex already includes stdio.h */
 +#include "twm.h"
  #include "gram.h"
  #include "parse.h"
++#undef yywrap
  extern char *ProgramName;
  
  extern int ParseError;
@@ -43,7 +40,7 @@
  %}
  
  string                                \"([^"]|\\.)*\"
-@@ -94,7 +116,10 @@
+@@ -94,7 +117,10 @@ number                             [0-9]+
                                }
  %%
  #ifndef yywrap