[pkgsrc/trunk]: pkgsrc/devel/flex flex: apply upstream commit to avoid redefi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3048fe0169d5
branches:  trunk
changeset: 365724:3048fe0169d5
user:      maya <maya%pkgsrc.org@localhost>
date:      Mon Jul 24 10:07:44 2017 +0000

description:
flex: apply upstream commit to avoid redefining yywrap.
we are still redefining some.

bump pkgrevision

diffstat:

 devel/flex/Makefile                 |   4 ++--
 devel/flex/distinfo                 |   3 ++-
 devel/flex/patches/patch-src_main.c |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r fcd95084ed92 -r 3048fe0169d5 devel/flex/Makefile
--- a/devel/flex/Makefile       Mon Jul 24 09:40:17 2017 +0000
+++ b/devel/flex/Makefile       Mon Jul 24 10:07:44 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2017/01/12 16:53:22 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2017/07/24 10:07:44 maya Exp $
 
 DISTNAME=      flex-2.6.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=westes/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
diff -r fcd95084ed92 -r 3048fe0169d5 devel/flex/distinfo
--- a/devel/flex/distinfo       Mon Jul 24 09:40:17 2017 +0000
+++ b/devel/flex/distinfo       Mon Jul 24 10:07:44 2017 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.31 2017/01/12 16:53:22 wiz Exp $
+$NetBSD: distinfo,v 1.32 2017/07/24 10:07:44 maya Exp $
 
 SHA1 (flex-2.6.3.tar.gz) = 8008eb0e4ccc634c334ac1d9e04716be2ba527a9
 RMD160 (flex-2.6.3.tar.gz) = 992f79f75e167bd062b8c8f00c783ea6349f9fd4
 SHA512 (flex-2.6.3.tar.gz) = f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00
 Size (flex-2.6.3.tar.gz) = 1405560 bytes
+SHA1 (patch-src_main.c) = 39f1682a7809a8db308c92bb127780fd98d52b3e
 SHA1 (patch-tests_Makefile.am) = f30524f9b8c22a37cb04b4406ec142ea1ecb8e59
 SHA1 (patch-tests_Makefile.in) = 709d5f117418bbcbcc54926f582bc808daf12f3b
diff -r fcd95084ed92 -r 3048fe0169d5 devel/flex/patches/patch-src_main.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/flex/patches/patch-src_main.c       Mon Jul 24 10:07:44 2017 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_main.c,v 1.1 2017/07/24 10:07:44 maya Exp $
+
+Pull in upstream commit:
+[PATCH] scanner: Use prefix when defining yywrap to avoid redefinition.
+Fixes regression introduced in v2.6.3.
+
+--- src/main.c.orig    2016-12-29 20:03:14.000000000 +0000
++++ src/main.c
+@@ -1586,9 +1586,9 @@ void readin (void)
+       if (!do_yywrap) {
+               if (!C_plus_plus) {
+                        if (reentrant)
+-                              outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)");
++                              out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix);
+                        else
+-                              outn ("\n#define yywrap() (/*CONSTCOND*/1)");
++                              out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix);
+               }
+               outn ("#define YY_SKIP_YYWRAP");
+       }
+-- 
+2.13.1
+