diff options
| author | obache <obache@pkgsrc.org> | 2012-03-26 11:56:12 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2012-03-26 11:56:12 +0000 |
| commit | a2697e72d816baafcaa927a17607b0f015e78702 (patch) | |
| tree | e6ecc8a71d12df3e77d0fc4cea889246865b5f46 /net | |
| parent | 284fcd1f8efa98fee62864fa8f711960c2225f37 (diff) | |
| download | pkgsrc-a2697e72d816baafcaa927a17607b0f015e78702.tar.gz | |
* `lex' and `yacc' are required to build.
* yylineno is present in all scanners by flex>=2.5.20.
fixes PR 46194.
Diffstat (limited to 'net')
| -rw-r--r-- | net/gated/Makefile | 4 | ||||
| -rw-r--r-- | net/gated/distinfo | 4 | ||||
| -rw-r--r-- | net/gated/patches/patch-src-lexer.l | 16 |
3 files changed, 15 insertions, 9 deletions
diff --git a/net/gated/Makefile b/net/gated/Makefile index 48569d29247..0abb725882b 100644 --- a/net/gated/Makefile +++ b/net/gated/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2011/11/11 23:43:43 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2012/03/26 11:56:12 obache Exp $ DISTNAME= gated-3-5-11 PKGNAME= gated-3.5.11 @@ -24,7 +24,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} NOT_FOR_PLATFORM= Interix-*-* # no userland routing table support -USE_TOOLS+= pax +USE_TOOLS+= lex yacc pax RCD_SCRIPTS= gated RCD_SCRIPT_SRC.gated= ${FILESDIR}/gated diff --git a/net/gated/distinfo b/net/gated/distinfo index 24bcce44dde..b8e9e69f08b 100644 --- a/net/gated/distinfo +++ b/net/gated/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/11/11 23:43:43 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/03/26 11:56:12 obache Exp $ SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07 RMD160 (gated-3-5-11.tar.gz) = 16624c1e2229fb783dd3bbc5759945e5e368c1f3 @@ -15,4 +15,4 @@ SHA1 (patch-aj) = d8aab039599d1cf152d8bb39bba629c4d5d37c66 SHA1 (patch-ak) = 04857d0be869480812138b059e303f6a3aac00e7 SHA1 (patch-if) = 8430686ee894c1fc4f9fb58784ebf729a26083af SHA1 (patch-is) = 17bb369653948890a41e61f27a198075c7b22214 -SHA1 (patch-src-lexer.l) = 45b9aeade98eff68911c7e02c1eecb5bf2c75b5e +SHA1 (patch-src-lexer.l) = 3e4e5bf60e21e880a8774fc1392d8ae6ba24b0ac diff --git a/net/gated/patches/patch-src-lexer.l b/net/gated/patches/patch-src-lexer.l index b4fe883556f..f0d223c3c24 100644 --- a/net/gated/patches/patch-src-lexer.l +++ b/net/gated/patches/patch-src-lexer.l @@ -1,13 +1,19 @@ -$NetBSD: patch-src-lexer.l,v 1.1 2011/11/11 23:43:43 joerg Exp $ +$NetBSD: patch-src-lexer.l,v 1.2 2012/03/26 11:56:12 obache Exp $ + +* yylineno is present in all scanners by flex>=2.5.20 --- src/lexer.l.orig 1998-09-15 16:46:49.000000000 +0000 +++ src/lexer.l -@@ -176,8 +176,6 @@ PROTOTYPE(parse_eof, +@@ -176,7 +176,12 @@ PROTOTYPE(parse_eof, #define YYTEXT yytext --int yylineno = 0; -- ++#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 + #undef YY_INPUT #define YY_INPUT(buf, result, max_size) \ - { \ |