CVS commit: pkgsrc/wm/tvtwm

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan  4 12:20:07 UTC 2017

Modified Files:
        pkgsrc/wm/tvtwm: distinfo
        pkgsrc/wm/tvtwm/patches: patch-ak

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/tvtwm/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/tvtwm/patches/patch-ak

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/tvtwm/distinfo
diff -u pkgsrc/wm/tvtwm/distinfo:1.6 pkgsrc/wm/tvtwm/distinfo:1.7
--- pkgsrc/wm/tvtwm/distinfo:1.6        Mon Nov  2 23:42:54 2015
+++ pkgsrc/wm/tvtwm/distinfo    Wed Jan  4 12:20:07 2017
@@ -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-ag) = ee456b9eef5ef6e1ab55af
 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

Index: pkgsrc/wm/tvtwm/patches/patch-ak
diff -u pkgsrc/wm/tvtwm/patches/patch-ak:1.2 pkgsrc/wm/tvtwm/patches/patch-ak:1.3
--- pkgsrc/wm/tvtwm/patches/patch-ak:1.2        Sun May 23 23:28:29 2004
+++ pkgsrc/wm/tvtwm/patches/patch-ak    Wed Jan  4 12:20:07 2017
@@ -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 $
 
-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 @@
+Ensure the local yywrap is used.
+
+--- 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 @@ diff -u -r1.1.1.1 -r1.2
  %}
  
  string                                \"([^"]|\\.)*\"
-@@ -94,7 +116,10 @@
+@@ -94,7 +117,10 @@ number                             [0-9]+
                                }
  %%
  #ifndef yywrap