Fix build on -current. Fix PLIST.

Bump PKGREVISION.

5 files changed, 41 insertions, 14 deletions

diff --git a/devel/cqual/Makefile b/devel/cqual/Makefile
index 8c65e4d85c7..692f626b7f5 100644
--- a/devel/cqual/Makefile
+++ b/devel/cqual/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2006/02/12 06:32:59 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2006/03/02 19:56:24 wiz Exp $
 #
 
 DISTNAME=		cqual-0.991
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cqual/}
 
diff --git a/devel/cqual/PLIST b/devel/cqual/PLIST
index 620eeb6c806..b09862cf3ea 100644
--- a/devel/cqual/PLIST
+++ b/devel/cqual/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/11 22:50:21 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/02 19:56:24 wiz Exp $
 bin/cqual
 bin/gcqual
 bin/iquals
@@ -53,5 +53,7 @@ share/examples/cqual/y2k1.c
 share/examples/cqual/y2k2.c
 share/examples/cqual/y2k3.c
 share/examples/cqual/y2k4.c
+@dirrm share/examples/cqual
 @dirrm share/emacs/site-lisp/cqual
+@dirrm share/doc/cqual
 @dirrm share/cqual
diff --git a/devel/cqual/distinfo b/devel/cqual/distinfo
index a928b6a7d4c..8cac077ca67 100644
--- a/devel/cqual/distinfo
+++ b/devel/cqual/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/01/19 04:21:39 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/03/02 19:56:24 wiz 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-aa) = d1477b709c9b3569fe4fa4e3e0afc1f8314892c2
 SHA1 (patch-ab) = 5ededa6979542cb83c53abd38fe9923495562a99
 SHA1 (patch-ac) = 0aee16d388ff2d40ca176c0f313505d83ee3aa52
 SHA1 (patch-ba) = 316aae97a0031bbe229baaa0519ad25a2b901663
@@ -14,7 +14,7 @@ SHA1 (patch-be) = 0a1a9bd41f57805da84922538fe2c42d84fd33f0
 SHA1 (patch-bf) = 2192b53278568ca783687d025ecca85569185f42
 SHA1 (patch-bg) = 4b53d4caac2c24a98e8acbc054877256c6ddebac
 SHA1 (patch-bh) = b4e05070ced650b4dea42620e2ebb78eabf743ee
-SHA1 (patch-bi) = d6786e93d2f77c56f2de3cdb8d29cb34dc43916b
+SHA1 (patch-bi) = 7997cb5b9f5f8b51bf382ae18cf355a74a7c3624
 SHA1 (patch-bj) = 66c4c93fe18841db68ccdc2bb8e4d22a06abd731
 SHA1 (patch-bk) = 58edca8937cd587911d58bebc5d6bbbea87ca028
 SHA1 (patch-bl) = 70fe692644529a38bdaefbff67a264db9179e5f7
diff --git a/devel/cqual/patches/patch-aa b/devel/cqual/patches/patch-aa
index 10fa6cad11a..4f9805332b5 100644
--- a/devel/cqual/patches/patch-aa
+++ b/devel/cqual/patches/patch-aa
@@ -1,9 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/11 03:12:38 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2006/03/02 19:56:24 wiz Exp $
 
 Removed C++-style comments.
 
---- src/qtype.c.orig	2003-10-06 23:28:57.000000000 +0200
-+++ src/qtype.c	2006-01-11 03:26:12.000000000 +0100
+--- src/qtype.c.orig	2003-10-06 21:28:57.000000000 +0000
++++ src/qtype.c
+@@ -774,7 +774,7 @@ static void mktoplev_struct_cons_qtype(l
+   }
+   else if (exists_fieldflow_qual && fqt && (qtype_struct(qt) || qtype_union(qt))) {
+     qual outer = qual_qtype(qt);
+-    qual inner;
++    qual inner = outer;
+ 
+     if (qtype_pointer(fqt))
+       inner = qual_qtype(points_to_qtype(fqt));
 @@ -1156,7 +1156,7 @@ qtype get_fdecl_qtype(const char *tag_na
    type lifted_t;
    struct ctq_info ctqi;
diff --git a/devel/cqual/patches/patch-bi b/devel/cqual/patches/patch-bi
index 91b58bbc8cb..24a9bccc631 100644
--- a/devel/cqual/patches/patch-bi
+++ b/devel/cqual/patches/patch-bi
@@ -1,10 +1,26 @@
-$NetBSD: patch-bi,v 1.1 2006/01/18 23:24:12 rillig Exp $
+$NetBSD: patch-bi,v 1.2 2006/03/02 19:56:24 wiz Exp $
 
 SunPro says: void functions cannot return a value.
 
---- src/poly-quals.c.orig	2003-12-10 19:31:03.000000000 +0100
-+++ src/poly-quals.c	2006-01-16 14:45:40.906477400 +0100
-@@ -2833,13 +2833,13 @@ static void _traverse_error_path_edges(q
+--- src/poly-quals.c.orig	2003-12-10 18:31:03.000000000 +0000
++++ src/poly-quals.c
+@@ -1356,6 +1356,7 @@ static bool _leq_qual (qual q1, qual q2,
+   else
+     {
+       assert (0);
++      return FALSE;
+     }
+ }
+ 
+@@ -1581,6 +1582,7 @@ static int _print_qual(printf_func pf, q
+       return 0;
+     default:
+       assert (0);
++      return 0;
+     }
+ 
+ }
+@@ -2833,13 +2835,13 @@ static void _traverse_error_path_edges(q
  void traverse_error_path_edges(qual q, bool expand_summaries, bool nonerrors,
  			       edge_traverse_fn f, void *arg)
  {
@@ -20,7 +36,7 @@ SunPro says: void functions cannot return a value.
  }
  
  /**************************************************************************
-@@ -3016,7 +3016,8 @@ static void _dn_dfs (FILE* f, region scr
+@@ -3016,7 +3018,8 @@ static void _dn_dfs (FILE* f, region scr
    if (root->link)
      {
        add_graph_edge (f, root, ecr_qual (root), "+", TRUE);