Makes this compile with NetBSD current's gcc (4.1.2) by reordering

header inclusions.

XXX There are tons of type warnings in this package.

18 files changed, 273 insertions, 1 deletions

diff --git a/databases/gq/distinfo b/databases/gq/distinfo
index 1110112942a..99f04d21f0f 100644
--- a/databases/gq/distinfo
+++ b/databases/gq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/03/17 15:23:57 cube Exp $
+$NetBSD: distinfo,v 1.8 2006/07/17 08:46:28 seb Exp $
 
 SHA1 (gq-1.0beta1.tar.gz) = fcfeb2874326962e891433d54df7932840fab6ff
 RMD160 (gq-1.0beta1.tar.gz) = 6d757f39d2543a41f4c99b5aa39890de726e4d9c
@@ -9,3 +9,20 @@ SHA1 (patch-ac) = b750774ac9292a7c466716fc46ad39cf5bfe1e5f
 SHA1 (patch-ad) = 5a9da1912fea5f7fcbe1cd807caf6b77e498ea05
 SHA1 (patch-ae) = 295196adb9b78af2feab13206dd6e38ef1618d91
 SHA1 (patch-af) = e07d3f6bd24dff4fc46f07e7154bf1c68324900d
+SHA1 (patch-ag) = 67727e7e930723ae343ebcfea27650106f015e97
+SHA1 (patch-ah) = 9ccd7ff5dc8830b41b0e8358cefcb5d5cbbe90a6
+SHA1 (patch-ai) = 2e1e8e8f26c0fb0a42ac92189508e7284f72cac5
+SHA1 (patch-aj) = 3b1be7c4529a7d12f4dcda8a583ac3ba6377a5e3
+SHA1 (patch-ak) = 58a2d7f297be87498197fb04044cfd7d0206be75
+SHA1 (patch-al) = c40683c1380e44b6e2b29379ff4675fdd69a9473
+SHA1 (patch-am) = 98478d32330fc7d6d2a76ca562512ca939b79496
+SHA1 (patch-an) = ce98c982053cd8a297ece506d11b957ad7d2765c
+SHA1 (patch-ao) = 281a9f1c734df028d46592d112c08339cfe75e03
+SHA1 (patch-ap) = 5db49fe6ea5d49bc30ff4c54164ba01b2eeecf5d
+SHA1 (patch-aq) = 5c13baa3d80ed67933fd9820636d06852fe3c341
+SHA1 (patch-ar) = f9381a0540139bb9fed792b58b9049c146d960d2
+SHA1 (patch-as) = 21a28a09820d26335be3c2e21d22ffa57cd83dd3
+SHA1 (patch-at) = 21e98e22751ae900317690cdc6309c26f0d3c60e
+SHA1 (patch-au) = 4f71d878fbf50f6e7c59825368c772133a289183
+SHA1 (patch-av) = 0ec6643d26f898f82c9f51f490f88206b1d4398d
+SHA1 (patch-aw) = b9da541ea6395d53acdbb5db7ef762adcc834bb7
diff --git a/databases/gq/patches/patch-ag b/databases/gq/patches/patch-ag
new file mode 100644
index 00000000000..39f7b48b573
--- /dev/null
+++ b/databases/gq/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/browse-export.c.orig	2003-11-03 22:28:24.000000000 +0000
++++ src/browse-export.c
+@@ -43,9 +43,9 @@
+ 
+ #include "browse-dnd.h"		/* copy_entry et al */
+ 
++#include "util.h"
+ #include "configfile.h"		/* config */
+ #include "errorchain.h"
+-#include "util.h"
+ #include "encode.h"
+ #include "i18n.h"
+ #include "utf8-compat.h"
diff --git a/databases/gq/patches/patch-ah b/databases/gq/patches/patch-ah
new file mode 100644
index 00000000000..fdc6ba539c1
--- /dev/null
+++ b/databases/gq/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/browse.c.orig	2003-11-03 21:16:55.000000000 +0000
++++ src/browse.c
+@@ -34,6 +34,7 @@
+ #include <config.h>
+ 
+ #include "common.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "browse.h"
+ 
+@@ -43,7 +44,6 @@
+ 
+ #include "mainwin.h"
+ #include "template.h"
+-#include "util.h"
+ #include "tinput.h"
+ #include "errorchain.h"
+ #include "ldif.h"
diff --git a/databases/gq/patches/patch-ai b/databases/gq/patches/patch-ai
new file mode 100644
index 00000000000..deba1d66075
--- /dev/null
+++ b/databases/gq/patches/patch-ai
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/configfile.c.orig	2003-11-03 21:34:52.000000000 +0000
++++ src/configfile.c
+@@ -37,9 +37,9 @@
+ 
+ #include <glib.h>
+ 
++#include "util.h"
+ #include "configfile.h"
+ #include "common.h"
+-#include "util.h"
+ #include "template.h"
+ #include "filter.h"
+ #include "encode.h"		/* gq_codeset */
diff --git a/databases/gq/patches/patch-aj b/databases/gq/patches/patch-aj
new file mode 100644
index 00000000000..f6a17156f1c
--- /dev/null
+++ b/databases/gq/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/debug.c.orig	2003-11-03 21:07:57.000000000 +0000
++++ src/debug.c
+@@ -34,6 +34,7 @@
+ #endif /* HAVE_BACKTRACE */
+ 
+ #include "debug.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "common.h"
+ 
diff --git a/databases/gq/patches/patch-ak b/databases/gq/patches/patch-ak
new file mode 100644
index 00000000000..69b6c572cc3
--- /dev/null
+++ b/databases/gq/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/dn-browse.c.orig	2003-11-02 07:20:43.000000000 +0000
++++ src/dn-browse.c
+@@ -47,9 +47,9 @@
+ #include "tinput.h"		/* formfill_from_template */
+ #include "browse-dnd.h"		/* copy_entry et al */
+ 
++#include "util.h"
+ #include "configfile.h"		/* config */
+ #include "errorchain.h"
+-#include "util.h"
+ #include "encode.h"
+ #include "i18n.h"
+ #include "utf8-compat.h"
diff --git a/databases/gq/patches/patch-al b/databases/gq/patches/patch-al
new file mode 100644
index 00000000000..4c308e86f2c
--- /dev/null
+++ b/databases/gq/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/formfill.c.orig	2003-11-03 21:07:57.000000000 +0000
++++ src/formfill.c
+@@ -34,8 +34,8 @@
+ #include <ldap.h>
+ 
+ #include "common.h"
+-#include "configfile.h"
+ #include "util.h"
++#include "configfile.h"
+ #include "formfill.h"
+ #include "ldif.h"
+ #include "syntax.h"
diff --git a/databases/gq/patches/patch-am b/databases/gq/patches/patch-am
new file mode 100644
index 00000000000..5fd3bc781cb
--- /dev/null
+++ b/databases/gq/patches/patch-am
@@ -0,0 +1,17 @@
+$NetBSD: patch-am,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/gq-xml.c.orig	2003-11-03 22:28:24.000000000 +0000
++++ src/gq-xml.c
+@@ -38,11 +38,11 @@
+ #include <fcntl.h>
+ #include <ctype.h>
+ 
++#include "util.h"
+ #include "gq-xml.h"
+ #include "xmlparse.h"
+ #include "xmlutil.h"
+ #include "configfile.h"
+-#include "util.h"
+ #include "i18n.h"
+ #include "ldif.h"
+ #include "syntax.h"
diff --git a/databases/gq/patches/patch-an b/databases/gq/patches/patch-an
new file mode 100644
index 00000000000..c74e196172a
--- /dev/null
+++ b/databases/gq/patches/patch-an
@@ -0,0 +1,12 @@
+$NetBSD: patch-an,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/gq.c.orig	2003-11-03 21:25:53.000000000 +0000
++++ src/gq.c
+@@ -40,6 +40,7 @@
+ #include "gq.h"
+ #include "i18n.h"
+ #include "mainwin.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "syntax.h"
+ #include "encode.h"
diff --git a/databases/gq/patches/patch-ao b/databases/gq/patches/patch-ao
new file mode 100644
index 00000000000..cb5548f30f8
--- /dev/null
+++ b/databases/gq/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/input.c.orig	2003-11-03 21:28:37.000000000 +0000
++++ src/input.c
+@@ -37,8 +37,8 @@
+ 
+ #include "mainwin.h"
+ #include "common.h"
+-#include "configfile.h"
+ #include "util.h"
++#include "configfile.h"
+ #include "errorchain.h"
+ #include "formfill.h"
+ #include "input.h"
diff --git a/databases/gq/patches/patch-ap b/databases/gq/patches/patch-ap
new file mode 100644
index 00000000000..58e1ad70edd
--- /dev/null
+++ b/databases/gq/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/mainwin.c.orig	2003-11-03 21:07:57.000000000 +0000
++++ src/mainwin.c
+@@ -35,10 +35,10 @@
+ #include "common.h"
+ #include "search.h"
+ #include "mainwin.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "browse.h"
+ #include "prefs.h"
+-#include "util.h"
+ #include "template.h"
+ #include "filter.h"
+ #include "COPYING.h"
diff --git a/databases/gq/patches/patch-aq b/databases/gq/patches/patch-aq
new file mode 100644
index 00000000000..4dc87a7b9ba
--- /dev/null
+++ b/databases/gq/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/prefs.c.orig	2003-11-03 21:44:19.000000000 +0000
++++ src/prefs.c
+@@ -35,11 +35,11 @@
+ #include <string.h>
+ #include <ctype.h>
+ 
++#include "util.h"
+ #include "configfile.h"
+ #include "common.h"
+ #include "prefs.h"
+ #include "mainwin.h"
+-#include "util.h"
+ #include "template.h"
+ #include "errorchain.h"
+ #include "debug.h"
diff --git a/databases/gq/patches/patch-ar b/databases/gq/patches/patch-ar
new file mode 100644
index 00000000000..ec2f9aa1d53
--- /dev/null
+++ b/databases/gq/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/ref-browse.c.orig	2003-11-03 21:07:57.000000000 +0000
++++ src/ref-browse.c
+@@ -40,10 +40,10 @@
+ #include "server-browse.h"
+ #include "ref-browse.h"
+ 
++#include "util.h"
+ #include "configfile.h"		/* free_ldapserver */
+ #include "prefs.h"		/* create_edit_server_window */
+ 
+-#include "util.h"
+ #include "i18n.h"
+ #include "errorchain.h"
+ #include "encode.h"
diff --git a/databases/gq/patches/patch-as b/databases/gq/patches/patch-as
new file mode 100644
index 00000000000..ddc6feb2cc1
--- /dev/null
+++ b/databases/gq/patches/patch-as
@@ -0,0 +1,14 @@
+$NetBSD: patch-as,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/schema.c.orig	2003-11-03 21:07:58.000000000 +0000
++++ src/schema.c
+@@ -36,8 +36,8 @@
+ #include <string.h>
+ 
+ #include "common.h"
+-#include "configfile.h"
+ #include "util.h"
++#include "configfile.h"
+ #include "schema.h"
+ #include "i18n.h"
+ #include "debug.h"
diff --git a/databases/gq/patches/patch-at b/databases/gq/patches/patch-at
new file mode 100644
index 00000000000..6e810681e39
--- /dev/null
+++ b/databases/gq/patches/patch-at
@@ -0,0 +1,15 @@
+$NetBSD: patch-at,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/schemabrowse.c.orig	2003-11-03 21:07:58.000000000 +0000
++++ src/schemabrowse.c
+@@ -42,9 +42,9 @@
+ 
+ #include "schemabrowse.h"
+ #include "mainwin.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "common.h"
+-#include "util.h"
+ #include "schema.h"
+ #include "i18n.h"
+ #include "debug.h"
diff --git a/databases/gq/patches/patch-au b/databases/gq/patches/patch-au
new file mode 100644
index 00000000000..aabbf0acec9
--- /dev/null
+++ b/databases/gq/patches/patch-au
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/search.c.orig	2003-11-03 21:07:58.000000000 +0000
++++ src/search.c
+@@ -34,8 +34,8 @@
+ 
+ #include "common.h"
+ #include "mainwin.h"
+-#include "configfile.h"
+ #include "util.h"
++#include "configfile.h"
+ #include "search.h"
+ #include "formfill.h"
+ #include "input.h"
diff --git a/databases/gq/patches/patch-av b/databases/gq/patches/patch-av
new file mode 100644
index 00000000000..ced54069213
--- /dev/null
+++ b/databases/gq/patches/patch-av
@@ -0,0 +1,14 @@
+$NetBSD: patch-av,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/state.c.orig	2003-11-03 21:19:54.000000000 +0000
++++ src/state.c
+@@ -37,8 +37,8 @@
+ #include <gtk/gtk.h>
+ 
+ #include "xmlparse.h"
+-#include "configfile.h"
+ #include "util.h"
++#include "configfile.h"
+ #include "errorchain.h"
+ #include "xmlutil.h"
+ #include "i18n.h"
diff --git a/databases/gq/patches/patch-aw b/databases/gq/patches/patch-aw
new file mode 100644
index 00000000000..2c234410676
--- /dev/null
+++ b/databases/gq/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.1 2006/07/17 08:46:29 seb Exp $
+
+--- src/template.c.orig	2003-11-03 21:41:43.000000000 +0000
++++ src/template.c
+@@ -38,9 +38,9 @@
+ #include <ldap_schema.h>
+ 
+ #include "mainwin.h"
++#include "util.h"
+ #include "configfile.h"
+ #include "common.h"
+-#include "util.h"
+ #include "schema.h"
+ #include "schemabrowse.h"
+ #include "template.h"