[pkgsrc/trunk]: pkgsrc/devel/cqual Added two patches. patch-ab avoids tons of...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db002e73b3a9
branches:  trunk
changeset: 506241:db002e73b3a9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jan 13 07:51:42 2006 +0000

description:
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.

diffstat:

 devel/cqual/Makefile         |   4 ++--
 devel/cqual/distinfo         |   4 +++-
 devel/cqual/patches/patch-ab |  17 +++++++++++++++++
 devel/cqual/patches/patch-ac |  36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 3 deletions(-)

diffs (88 lines):

diff -r 382a4f13477d -r db002e73b3a9 devel/cqual/Makefile
--- a/devel/cqual/Makefile      Fri Jan 13 02:03:42 2006 +0000
+++ b/devel/cqual/Makefile      Fri Jan 13 07:51:42 2006 +0000
@@ -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 -r 382a4f13477d -r db002e73b3a9 devel/cqual/distinfo
--- a/devel/cqual/distinfo      Fri Jan 13 02:03:42 2006 +0000
+++ b/devel/cqual/distinfo      Fri Jan 13 07:51:42 2006 +0000
@@ -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 -r 382a4f13477d -r db002e73b3a9 devel/cqual/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-ab      Fri Jan 13 07:51:42 2006 +0000
@@ -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 -r 382a4f13477d -r db002e73b3a9 devel/cqual/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cqual/patches/patch-ac      Fri Jan 13 07:51:42 2006 +0000
@@ -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,