diff options
| author | jperkin <jperkin> | 2017-01-05 09:40:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-01-05 09:40:00 +0000 |
| commit | bf2430b88a0da677b6461ea660ae0685b40660d3 (patch) | |
| tree | d3a9c76a36912da5058aa45bd0417a65eb764844 /wm | |
| parent | 70df8e8d379acc87ece6013ecc0e50d36ec8d09e (diff) | |
| download | pkgsrc-bf2430b88a0da677b6461ea660ae0685b40660d3.tar.gz | |
Ensure the local yywrap is used. Fixes build with newer flex.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/amiwm/distinfo | 5 | ||||
| -rw-r--r-- | wm/amiwm/patches/patch-ab | 9 | ||||
| -rw-r--r-- | wm/amiwm/patches/patch-kbdlexer.l | 14 |
3 files changed, 23 insertions, 5 deletions
diff --git a/wm/amiwm/distinfo b/wm/amiwm/distinfo index 43f26589e0e..89925dd5e67 100644 --- a/wm/amiwm/distinfo +++ b/wm/amiwm/distinfo @@ -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) = 7f05b9494bb0e4c4fe1c8e85dc4b2202c8998a34551e6405 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 diff --git a/wm/amiwm/patches/patch-ab b/wm/amiwm/patches/patch-ab index 6f0cefa1260..5d2bf3eec12 100644 --- a/wm/amiwm/patches/patch-ab +++ b/wm/amiwm/patches/patch-ab @@ -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 *); diff --git a/wm/amiwm/patches/patch-kbdlexer.l b/wm/amiwm/patches/patch-kbdlexer.l new file mode 100644 index 00000000000..a35aa4c1c23 --- /dev/null +++ b/wm/amiwm/patches/patch-kbdlexer.l @@ -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) |