Make this package compile with gcc3.

5 files changed, 113 insertions, 1 deletions

diff --git a/sysutils/depot/distinfo b/sysutils/depot/distinfo
index 7c2a59f26a2..d1f07c7faff 100644
--- a/sysutils/depot/distinfo
+++ b/sysutils/depot/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/12/15 16:19:43 agc Exp $
 
 SHA1 (depot-5.14.tar.gz) = 378e09973fcc5f42e69d3988b04fc64fde5c974a
 Size (depot-5.14.tar.gz) = 204216 bytes
 SHA1 (patch-aa) = 5b11b84bf134b292e65b05c42bf2dce277f6bc37
+SHA1 (patch-ab) = 0192d647a8c3aca8ea08c84988a02a4736f30204
+SHA1 (patch-ac) = 40a751dbdabe617e0217c4626e41e35efec200ad
+SHA1 (patch-ad) = cc1d804231036d8ac836f21a29099b55c26dbd5e
+SHA1 (patch-ae) = 929ab7e07603b887e72368782ad96229621c2b26
diff --git a/sysutils/depot/patches/patch-ab b/sysutils/depot/patches/patch-ab
new file mode 100644
index 00000000000..ac15a0b544e
--- /dev/null
+++ b/sysutils/depot/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/12/15 16:19:43 agc Exp $
+
+--- src/lib/include/depotlib.h	2003/12/15 16:03:26	1.1
++++ src/lib/include/depotlib.h	2003/12/15 16:04:54
+@@ -38,7 +38,7 @@
+ #include <netinet/in.h> /* for htonl, ntohl */
+ 
+ #ifndef INHIBIT_VARARGS_H
+-#include <varargs.h>
++#include <stdarg.h>
+ #endif
+ 
+ /* taken from the example in gnu-autoconf */
diff --git a/sysutils/depot/patches/patch-ac b/sysutils/depot/patches/patch-ac
new file mode 100644
index 00000000000..24ba567984b
--- /dev/null
+++ b/sysutils/depot/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.1 2003/12/15 16:19:43 agc Exp $
+
+--- src/lib/util/message.c	2003/12/15 16:08:23	1.1
++++ src/lib/util/message.c	2003/12/15 16:10:07
+@@ -41,15 +41,11 @@
+ int PROGRAM_Verbose;
+ 
+ 
+-void Message(va_alist)
+-va_dcl
++void Message(char *fmt, ...)
+ {
+   va_list ap;
+-  char *fmt;
+ 
+-  va_start(ap);
+-
+-  fmt = va_arg(ap, char *);
++  va_start(ap, fmt);
+   (void)vfprintf(stdout, fmt, ap);
+   fflush(stdout);
+   va_end(ap);
+@@ -58,19 +54,14 @@
+ }
+ 
+ 
+-void Filtered_Message(va_alist)
+-     va_dcl
++void Filtered_Message(unsigned filter, char *fmt, ...)
+ {
+   va_list ap;
+-  unsigned filter;
+-  char *fmt;
+ 
+-  va_start(ap);
++  va_start(ap, fmt);
+ 
+-  filter = va_arg(ap, Boolean);
+   if (filter)
+     {
+-      fmt = va_arg(ap, char *);
+       (void)vfprintf(stdout, fmt, ap);
+       fflush(stdout);
+     }
diff --git a/sysutils/depot/patches/patch-ad b/sysutils/depot/patches/patch-ad
new file mode 100644
index 00000000000..af69030bc94
--- /dev/null
+++ b/sysutils/depot/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2003/12/15 16:19:43 agc Exp $
+
+--- src/lib/util/util.h	2003/12/15 16:11:55	1.1
++++ src/lib/util/util.h	2003/12/15 16:12:25
+@@ -134,8 +134,8 @@
+ extern int PROGRAM_Verbose;
+ #define PROGRAM_TRACEVAL 50
+ 
+-extern void Message();
+-extern void Filtered_Message();
++extern void Message(char *, ...);
++extern void Filtered_Message(unsigned, char *, ...);
+ 
+ /* Error.c */
+ 
+@@ -146,7 +146,7 @@
+ #define FatalError __DepotErrorInfoFile=__FILE__, \
+                    __DepotErrorInfoLineNo=__LINE__, __FatalError
+ 
+-void __FatalError();
++void __FatalError(int, char *, ...);
+ 
+ /* timer.c */
+ extern void timer_start();
diff --git a/sysutils/depot/patches/patch-ae b/sysutils/depot/patches/patch-ae
new file mode 100644
index 00000000000..bcaac6c9ac6
--- /dev/null
+++ b/sysutils/depot/patches/patch-ae
@@ -0,0 +1,27 @@
+$NetBSD: patch-ae,v 1.1 2003/12/15 16:19:43 agc Exp $
+
+--- src/lib/util/Error.c	2003/12/15 16:13:57	1.1
++++ src/lib/util/Error.c	2003/12/15 16:15:42
+@@ -195,19 +195,14 @@
+ 
+ 
+ void 
+-__FatalError(va_alist)
+-va_dcl
++__FatalError(int e, char *fmt, ...)
+ {
+   va_list ap;
+-  char *fmt;
+ 
+-  va_start(ap);
++  va_start(ap, fmt);
+ 
+   if (PROGRAM_ErrorNo == E_NULL)
+-    PROGRAM_ErrorNo = va_arg(ap, int);
+-  else
+-    (void) va_arg(ap, int); /* skip the first argument */
+-  fmt = va_arg(ap, char *);
++    PROGRAM_ErrorNo = e;
+   (void)fprintf(stderr,"Depot Error: %s:%d: ",__DepotErrorInfoFile, 
+ 		__DepotErrorInfoLineNo);
+   (void)vfprintf(stderr, fmt, ap);