patch-aa: Convert to use stdarg instead of varargs for gcc3

Should resolve pr pkg/23091.
Patch approved by Johnny C. Lam.

2 files changed, 89 insertions, 1 deletions

diff --git a/mbone/imm/distinfo b/mbone/imm/distinfo
index b474cde24e7..4b0f4083cca 100644
--- a/mbone/imm/distinfo
+++ b/mbone/imm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2003/01/19 07:13:49 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/10/08 10:40:37 rtr Exp $
 
 SHA1 (imm36a1.tar.Z) = a3c0bd042ebed930739f22ebfec2bf28080a88f6
 Size (imm36a1.tar.Z) = 87695 bytes
+SHA1 (patch-aa) = b8133dd4ab0b25c9c6e5ae87ceca6ab7870a438b
 SHA1 (patch-ad) = dc9bc795bc177f5e0087b1bb2bcb2f5d654bdb66
diff --git a/mbone/imm/patches/patch-aa b/mbone/imm/patches/patch-aa
new file mode 100644
index 00000000000..4018261904b
--- /dev/null
+++ b/mbone/imm/patches/patch-aa
@@ -0,0 +1,87 @@
+--- utils.c.orig	2003-10-08 16:18:08.000000000 +1000
++++ utils.c	2003-10-08 16:18:18.000000000 +1000
+@@ -20,7 +20,7 @@
+  * These notices must be retained in any copies of any part of this software.
+  ******************************************************************************/
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #ifdef __NetBSD__
+@@ -40,14 +40,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void warn( va_alist )
+-va_dcl
++void
++warn(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Warning: " );
+     vfprintf( stderr, fmt, args );
+     va_end( args );
+@@ -55,14 +53,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void die( va_alist )
+-va_dcl
++void
++die(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Error: " );
+     vfprintf( stderr, fmt, args );
+     exit( 1 );
+@@ -70,14 +66,12 @@
+ 
+ /*----------------------------------------------------------------------------*/
+ 
+-void fatal( va_alist )
+-va_dcl
++void
++fatal(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+ 
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( stderr, "Internal Error: " );
+     vfprintf( stderr, fmt, args );
+     exit( 2 );
+@@ -142,18 +136,16 @@
+     
+ /*----------------------------------------------------------------------------*/
+ 
+-void mailmessage( va_alist )
+-va_dcl
++void
++mailmessage(const char *fmt, ...)
+ {
+     va_list args;
+-    char *fmt;
+     FILE *popen(), *fp;
+     char cmdline[80];
+      if (whome == NULL) whome = getlogin();
+ 	sprintf(cmdline,"%s %s",mailprog,whome);
+ 	fp = popen(cmdline,"w");
+-    va_start( args );
+-    fmt = va_arg( args, char * );
++    va_start(args, fmt);
+     fprintf( fp, "MNM Warning: " );
+     vfprintf( fp, fmt, args );
+     va_end( args );