Pullup ticket #3556 - requested by dholland
devel/cxref: build fix

Revisions pulled up:
- devel/cxref/Makefile                                          1.14
- devel/cxref/distinfo                                          1.8-1.9
- devel/cxref/patches/patch-src_parse_l                         1.1

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Oct 13 21:30:00 UTC 2011

   Modified Files:
   	pkgsrc/devel/cxref: Makefile distinfo

   Log Message:
   Update to 1.6d.

   Version 1.6d of cxref released : Mon Oct 3 14:00:00 2011
   --------------------------------------------------------

   Bug fixes
    Updated for latest version of autoconf.
    Allow structure initialisers to have multiple components (e.g. a.b=1).
    Remove gcc warning messages.
    Change Makefile for better comptibility with FreeBSD.

   Version 1.6c of cxref released : Mon May 31 10:00:00 2010
   ---------------------------------------------------------

   Bug fixes
    Handle the gcc __builtin_offsetof() and offsetof() functions.
    Check that the lex/yacc programs actually exist at configure time.
    Handle ASM statements with named identifiers in them.

   Parsing changes
    Removed the char_varying type.

   Document changes
    Update web page links

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Thu Oct 13 22:11:26 UTC 2011

   Modified Files:
   	pkgsrc/devel/cxref: distinfo
   Added Files:
   	pkgsrc/devel/cxref/patches: patch-src_parse_l

   Log Message:
   Patch the lexer to ignore _Pragma().


(tron)

$NetBSD: patch-src_parse_l,v 1.1.2.2 2011/10/15 08:28:21 tron Exp $

Recognize and ignore _Pragma(), needed for -current's headers.

--- src/parse.l~	2011-06-18 09:45:04.000000000 +0000
+++ src/parse.l
@@ -14,6 +14,7 @@ IS                      ((u|U|l|L)+|([iI
 %x CPP_INCLUDE CPP_INC_FILE CPP_INC_FLAGS
 %x CPP_DEFINE CPP_DEFINE_ARGP CPP_DEFINE_BODY CPP_DEFINE_ARGS
 %x GNU_LABEL GNU_VA_ARG GNU_ATTRIBUTE GNU_TYPEOF GNU_OFFSETOF
+%x C99_PRAGMA
 
 %{
 /***************************************
@@ -83,6 +84,9 @@ static int gnu_typ_depth=0;
 /*+ To get around the GCC __offsetof keyword, skip over matched () counted by this. +*/
 static int gnu_offset_depth=0;
 
+/*+ To get around the C99 _Pragma keyword, skip over matched () counted by this. +*/
+static int c99_prag_depth=0;
+
 /*+ If we see a comment immediately after a ',', ';', '};', '},' or ')' then push it before. +*/
 static int push_past=0;
 
@@ -311,6 +315,11 @@ static int push_past=0;
 "_Complex"              {  }
 "_Bool"                 { yylval="_Bool";    return(BOOL);     }
 
+("_Pragma") { c99_prag_depth=0; BEGIN(C99_PRAGMA); }
+<C99_PRAGMA>"("                    { c99_prag_depth++; }
+<C99_PRAGMA>[^()]+                 { }
+<C99_PRAGMA>")"                    { if(--c99_prag_depth==0) { BEGIN(INITIAL); } }
+
  /* C language keywords. */
 
 "auto"                  { yylval="auto"    ; return(AUTO);     }