[pkgsrc/trunk]: pkgsrc/devel/flex Add workaround for fixing the build of lily...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bb6e464ab33e
branches:  trunk
changeset: 354798:bb6e464ab33e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Nov 11 08:14:54 2016 +0000

description:
Add workaround for fixing the build of lilypond-2.18.2.
See https://github.com/westes/flex/issues/124

Bump PKGREVISION.

diffstat:

 devel/flex/Makefile                      |   3 ++-
 devel/flex/distinfo                      |   3 ++-
 devel/flex/patches/patch-src_FlexLexer.h |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (48 lines):

diff -r 5ee223e67c79 -r bb6e464ab33e devel/flex/Makefile
--- a/devel/flex/Makefile       Thu Nov 10 20:59:43 2016 +0000
+++ b/devel/flex/Makefile       Fri Nov 11 08:14:54 2016 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2016/11/06 21:31:38 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2016/11/11 08:14:54 wiz Exp $
 
 DISTNAME=      flex-2.6.2
+PKGREVISION=   1
 CATEGORIES=    devel lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=westes/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
diff -r 5ee223e67c79 -r bb6e464ab33e devel/flex/distinfo
--- a/devel/flex/distinfo       Thu Nov 10 20:59:43 2016 +0000
+++ b/devel/flex/distinfo       Fri Nov 11 08:14:54 2016 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.26 2016/11/06 21:33:44 wiz Exp $
+$NetBSD: distinfo,v 1.27 2016/11/11 08:14:54 wiz Exp $
 
 SHA1 (flex-2.6.2.tar.gz) = 9eab5eddb6efb34d420b3162fd619a01940b9438
 RMD160 (flex-2.6.2.tar.gz) = f58dca039f2b77b9477e45ac92a57804a6458f13
 SHA512 (flex-2.6.2.tar.gz) = 481fe3f1c370fe04d5a605a826c53dd0afa5b6ea655f0d14fa9bb9cb498c016f68cef8fea806458f07baa7ae5bc1ac729be427cb4e0cc39ce744a809ef6442b3
 Size (flex-2.6.2.tar.gz) = 1402237 bytes
 SHA1 (patch-configure) = dfd8bf7682d99991911b355af5015961f1333195
+SHA1 (patch-src_FlexLexer.h) = 9a585219bc8f24c862070969045739d6a303b0bf
 SHA1 (patch-tests_Makefile.am) = f30524f9b8c22a37cb04b4406ec142ea1ecb8e59
 SHA1 (patch-tests_Makefile.in) = 709d5f117418bbcbcc54926f582bc808daf12f3b
diff -r 5ee223e67c79 -r bb6e464ab33e devel/flex/patches/patch-src_FlexLexer.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/flex/patches/patch-src_FlexLexer.h  Fri Nov 11 08:14:54 2016 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_FlexLexer.h,v 1.1 2016/11/11 08:14:54 wiz Exp $
+
+Add workaround for building lilypond-2.18.2.
+See https://github.com/westes/flex/issues/124
+
+--- src/FlexLexer.h.orig       2016-10-21 00:43:44.000000000 +0000
++++ src/FlexLexer.h
+@@ -49,6 +49,9 @@
+ #define __FLEX_LEXER_H
+ 
+ #include <iostream>
++#  ifndef FLEX_STD
++#    define FLEX_STD std::
++#  endif
+ 
+ extern "C++" {
+