CVS commit: pkgsrc/wm/amiwm

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jan  5 09:40:00 UTC 2017

Modified Files:
        pkgsrc/wm/amiwm: distinfo
        pkgsrc/wm/amiwm/patches: patch-ab
Added Files:
        pkgsrc/wm/amiwm/patches: patch-kbdlexer.l

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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/wm/amiwm/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/amiwm/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/amiwm/patches/patch-kbdlexer.l

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

Modified files:

Index: pkgsrc/wm/amiwm/distinfo
diff -u pkgsrc/wm/amiwm/distinfo:1.7 pkgsrc/wm/amiwm/distinfo:1.8
--- pkgsrc/wm/amiwm/distinfo:1.7        Mon Nov  2 23:42:50 2015
+++ pkgsrc/wm/amiwm/distinfo    Thu Jan  5 09:40:00 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/02 23:42:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/01/05 09:40:00 jperkin Exp $
 
 SHA1 (amiwm0.20pl48.tar.gz) = 6cf5f7197403a9519ea1f3b272e67a8de4fdca43
 RMD160 (amiwm0.20pl48.tar.gz) = abb5922a84501a28a73684c9e056dba6ac6969b7
@@ -6,4 +6,5 @@ SHA512 (amiwm0.20pl48.tar.gz) = 7f05b949
 Size (amiwm0.20pl48.tar.gz) = 141542 bytes
 SHA1 (patch-Makefile.in) = 8428fd6533ead1ebe955da4d7df6ba6673639f7d
 SHA1 (patch-aa) = 4927276af44a0c2257eb723959002eef90db6aaf
-SHA1 (patch-ab) = 047bd7f8c495a3d872c98515368f87131eea7162
+SHA1 (patch-ab) = 0079bf1da97dbf70ae3d7a215e2fec2ff0ffe797
+SHA1 (patch-kbdlexer.l) = 2608c0fa1c471110a589f9e34b94e461d681aa91

Index: pkgsrc/wm/amiwm/patches/patch-ab
diff -u pkgsrc/wm/amiwm/patches/patch-ab:1.1 pkgsrc/wm/amiwm/patches/patch-ab:1.2
--- pkgsrc/wm/amiwm/patches/patch-ab:1.1        Thu Apr 29 00:02:07 2010
+++ pkgsrc/wm/amiwm/patches/patch-ab    Thu Jan  5 09:40:00 2017
@@ -1,12 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2010/04/29 00:02:07 dholland Exp $
+$NetBSD: patch-ab,v 1.2 2017/01/05 09:40:00 jperkin Exp $
 
---- lex.l~     1997-12-12 17:21:58.000000000 +0000
+Ensure the local yywrap is used.
+
+--- lex.l.orig 1997-12-12 17:21:58.000000000 +0000
 +++ lex.l
-@@ -6,7 +6,7 @@ extern int ParseError;
+@@ -6,7 +6,8 @@ extern int ParseError;
  extern FILE *rcfile;
  #undef yyin
  #define yyin rcfile
 -#define yywrap() 1
++#undef yywrap
 +static int yywrap(void) { return 1; }
  extern int parse_keyword(char *);
  void fixup_string(char *, char *);

Added files:

Index: pkgsrc/wm/amiwm/patches/patch-kbdlexer.l
diff -u /dev/null pkgsrc/wm/amiwm/patches/patch-kbdlexer.l:1.1
--- /dev/null   Thu Jan  5 09:40:00 2017
+++ pkgsrc/wm/amiwm/patches/patch-kbdlexer.l    Thu Jan  5 09:40:00 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-kbdlexer.l,v 1.1 2017/01/05 09:40:00 jperkin Exp $
+
+Ensure the local yywrap is used.
+
+--- kbdlexer.l.orig    1998-03-15 19:46:16.000000000 +0000
++++ kbdlexer.l
+@@ -10,6 +10,7 @@ extern char *progname;
+ 
+ #ifdef FLEX_SCANNER
+ 
++#undef yywrap
+ #undef YY_INPUT
+ #define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
+ int doinput (char *buf, int size)