CVS commit: pkgsrc/devel/flex

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 11 08:14:55 UTC 2016

Modified Files:
        pkgsrc/devel/flex: Makefile distinfo
Added Files:
        pkgsrc/devel/flex/patches: patch-src_FlexLexer.h

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/flex/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/flex/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/flex/patches/patch-src_FlexLexer.h

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

Modified files:

Index: pkgsrc/devel/flex/Makefile
diff -u pkgsrc/devel/flex/Makefile:1.52 pkgsrc/devel/flex/Makefile:1.53
--- pkgsrc/devel/flex/Makefile:1.52     Sun Nov  6 21:31:38 2016
+++ pkgsrc/devel/flex/Makefile  Fri Nov 11 08:14:54 2016
@@ -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}

Index: pkgsrc/devel/flex/distinfo
diff -u pkgsrc/devel/flex/distinfo:1.26 pkgsrc/devel/flex/distinfo:1.27
--- pkgsrc/devel/flex/distinfo:1.26     Sun Nov  6 21:33:44 2016
+++ pkgsrc/devel/flex/distinfo  Fri Nov 11 08:14:54 2016
@@ -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

Added files:

Index: pkgsrc/devel/flex/patches/patch-src_FlexLexer.h
diff -u /dev/null pkgsrc/devel/flex/patches/patch-src_FlexLexer.h:1.1
--- /dev/null   Fri Nov 11 08:14:55 2016
+++ pkgsrc/devel/flex/patches/patch-src_FlexLexer.h     Fri Nov 11 08:14:54 2016
@@ -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++" {
+