Added two patches. patch-ab avoids tons of #line warnings from the cpp

output, patch-ac fixes the special handling of functions called
malloc().

Bumped PKGREVISION.

4 files changed, 58 insertions, 3 deletions

diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index def47220848..f6198047906 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/01/12 00:44:44 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2006/01/13 07:51:42 rillig Exp $
 #
 
 DISTNAME=		cqual-0.991
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cqual/}
 
diff --git a/devel/cqual/distinfo b/devel/cqual/distinfo
index 6d542913392..23d870ab456 100644
--- a/devel/cqual/distinfo
+++ b/devel/cqual/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/01/11 03:12:38 rillig Exp $
+$NetBSD: distinfo,v 1.2 2006/01/13 07:51:42 rillig Exp $
 
 SHA1 (cqual-0.991.tar.gz) = f559af6947465ca242f19c1f499c7cb004e713e4
 RMD160 (cqual-0.991.tar.gz) = e3837a11c75f750196ec4be7f991ec519c1260f6
 Size (cqual-0.991.tar.gz) = 1197696 bytes
 SHA1 (patch-aa) = bf21f9d9213beb54847a79fdf1213c7378ac062d
+SHA1 (patch-ab) = 5ededa6979542cb83c53abd38fe9923495562a99
+SHA1 (patch-ac) = d8865d91707d76f2ce3acedf992cec6821c54344
diff --git a/devel/cqual/patches/patch-ab b/devel/cqual/patches/patch-ab
new file mode 100644
index 00000000000..ecffeeac4c8
--- /dev/null
+++ b/devel/cqual/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2006/01/13 07:51:42 rillig Exp $
+
+This patch avoid tons of #line warnings when parsing the output of newer
+gcc.
+
+--- src/c-lex.c.orig	2003-09-10 20:52:02.000000000 +0200
++++ src/c-lex.c	2006-01-12 03:05:04.000000000 +0100
+@@ -843,6 +843,9 @@ linenum:
+ 	  c = GETC();
+ 	  while (c == ' ' || c == '\t')
+ 	    c = GETC();
++	  /* Skip the file type (3 = system header, ...) of gcc */
++	  if (isdigit(c))
++	    c = GETC();
+ 	  if (c == '\n')
+ 	    return c;
+ 	  UNGETC (c);
diff --git a/devel/cqual/patches/patch-ac b/devel/cqual/patches/patch-ac
new file mode 100644
index 00000000000..cc5a410a47d
--- /dev/null
+++ b/devel/cqual/patches/patch-ac
@@ -0,0 +1,36 @@
+$NetBSD: patch-ac,v 1.1 2006/01/13 07:51:42 rillig Exp $
+
+From the maintainers via private mail. It fixes the special handling of
+malloc(), which had been confusing to me. Fixed in CVS.
+
+Index: src/analyze.c
+===================================================================
+RCS file: /cvsroot/cqual/cqual/src/analyze.c,v
+retrieving revision 1.373
+diff -u -r1.373 analyze.c
+--- src/analyze.c	12 Sep 2005 14:55:48 -0000	1.373
++++ src/analyze.c	13 Jan 2006 05:36:38 -0000
+@@ -2342,13 +2342,16 @@
+       fqt = points_to_qtype(f_info.qt);
+       args = arg_qtypes(fqt);
+ 
+-      magic_info = analyze_magic_function_call(fc, fqt, env, drinfolist);
+-      if (magic_info.qt)
+-        {
+-          magic_info.eff = effect_union(f_info.eff, magic_info.eff);
+-          result = magic_info;
+-          break;
+-        }
++      if (flag_flow_sensitive)
++	{
++	  magic_info = analyze_magic_function_call(fc, fqt, env, drinfolist);
++	  if (magic_info.qt)
++	    {
++	      magic_info.eff = effect_union(f_info.eff, magic_info.eff);
++	      result = magic_info;
++	      break;
++	    }
++	}
+ 
+       if (exists_effect_qual) {
+ 	mkleq_qual(fc->loc, &effect_qgate,