[pkgsrc/trunk]: pkgsrc/news/xrn fixes build with fiex<2.5.20, yylineno is req...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1570d39441bd
branches:  trunk
changeset: 603298:1570d39441bd
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu May 03 09:08:11 2012 +0000

description:
fixes build with fiex<2.5.20, yylineno is required condifionally.

diffstat:

 news/xrn/distinfo              |   4 ++--
 news/xrn/patches/patch-rclex.l |  14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 5e9dcf926d1f -r 1570d39441bd news/xrn/distinfo
--- a/news/xrn/distinfo Thu May 03 09:08:03 2012 +0000
+++ b/news/xrn/distinfo Thu May 03 09:08:11 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2012/04/16 04:33:30 dholland Exp $
+$NetBSD: distinfo,v 1.7 2012/05/03 09:08:11 obache Exp $
 
 SHA1 (xrn/9.01.tgz) = a560d07629efaa907ae01527192dd474e11555ad
 RMD160 (xrn/9.01.tgz) = c98d26e17fd8c511d9272378a54943ef9a453d3a
@@ -10,4 +10,4 @@
 SHA1 (patch-ae) = 3a1eef86f89acaa3b0bb6a78bfbd8d7c4be969d2
 SHA1 (patch-af) = 849b86cac73328cf2a773bc289f97c3e21456f71
 SHA1 (patch-ag) = f42c743a45c68b7702494399dbf40c3ac9cefd13
-SHA1 (patch-rclex.l) = 598c68250fa30ce166c135b0b413cf59a1ef64ca
+SHA1 (patch-rclex.l) = 9fa36815375c1d389cbf286cd15a8322d7006209
diff -r 5e9dcf926d1f -r 1570d39441bd news/xrn/patches/patch-rclex.l
--- a/news/xrn/patches/patch-rclex.l    Thu May 03 09:08:03 2012 +0000
+++ b/news/xrn/patches/patch-rclex.l    Thu May 03 09:08:11 2012 +0000
@@ -1,12 +1,20 @@
-$NetBSD: patch-rclex.l,v 1.1 2011/12/22 00:28:20 joerg Exp $
+$NetBSD: patch-rclex.l,v 1.2 2012/05/03 09:08:11 obache Exp $
+
+* yylineno is present in all scanners by flex>=2.5.20 
 
---- rclex.l.orig       2011-12-22 00:05:52.000000000 +0000
+--- rclex.l.orig       1997-06-05 11:11:42.000000000 +0000
 +++ rclex.l
-@@ -15,7 +15,6 @@
+@@ -15,7 +15,12 @@
   * the Makefile from the Imakefile (with "xmkmf" or whatever else you
   * used the first time), and (d) trying to compile again.
   */
 -int yylineno = 1;
++#if !defined(YY_FLEX_MAJOR_VERSION) || \
++      (YY_FLEX_MAJOR_VERSION == 2 && (YY_FLEX_MINOR_VERSION < 5) || \
++      (YY_FLEX_MINOR_VERSION == 5 && (!defined(YY_FLEX_SUBMINOR_VERSION) || \
++                                      YY_FLEX_SUBMINOR_VERSION < 20)))
++int yylineno = 0;
++#endif
  #define YYLINE yylineno++
  #undef yywrap
  #else