Fix build on NetBSD current.

4 files changed, 120 insertions, 1 deletions

diff --git a/cad/pcb/distinfo b/cad/pcb/distinfo
index ea245a97aba..eb5a49b77f1 100644
--- a/cad/pcb/distinfo
+++ b/cad/pcb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/09/21 06:49:25 jlam Exp $
+$NetBSD: distinfo,v 1.6 2004/01/12 11:19:58 seb Exp $
 
 SHA1 (pcb-1.6.3.tgz) = 79cca1a0ed9567cefd2e98556e1895c86e453010
 Size (pcb-1.6.3.tgz) = 577803 bytes
@@ -22,3 +22,6 @@ SHA1 (patch-ao) = 23277a25c79fa45ff704049274c73c6837fd6595
 SHA1 (patch-ap) = 1e68a6b6e4cccfa29c8944fad05218fab7cf46ff
 SHA1 (patch-aq) = 1964ce89b506a5b70510dd8e8e795eb94bfe055a
 SHA1 (patch-ar) = 055a31f976afb9caf05b972ec5b2c9b4e9930218
+SHA1 (patch-as) = e0fdad72eba52a2170208ead4745872ab2fbc10d
+SHA1 (patch-at) = 79156e2776788a753995740eb4cbd35b9b711c18
+SHA1 (patch-au) = ec6cffdd9b0cb55e42f8430349b057dc5ff05312
diff --git a/cad/pcb/patches/patch-as b/cad/pcb/patches/patch-as
new file mode 100644
index 00000000000..9470f9cf53e
--- /dev/null
+++ b/cad/pcb/patches/patch-as
@@ -0,0 +1,34 @@
+$NetBSD: patch-as,v 1.1 2004/01/12 11:19:58 seb Exp $
+
+--- src/dev_rs274x.c.orig	1998-05-13 10:29:43.000000000 +0000
++++ src/dev_rs274x.c
+@@ -51,7 +51,7 @@
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <unistd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ #include "global.h"
+ 
+@@ -218,10 +218,7 @@
+ /*----------------------------------------------------------------------------*/
+ /* Error Logging Routines                                                     */
+ /*----------------------------------------------------------------------------*/
+-static void logError(fp, format, va_alist)
+-	FILE *fp;
+-	char *format;
+-	va_dcl
++static void logError(FILE* fp, char * format, ...)
+ {
+ 	va_list args;
+ 	char    s[1024];
+@@ -229,7 +226,7 @@ static void logError(fp, format, va_alis
+ 		/* FIXME: Is it legitimate to use Message() from within a
+ 			driver? */
+ 
+-	va_start(args);
++	va_start(args, format);
+ 	vsprintf(s, format, args);
+ 	fputs(s, fp);
+ /*
diff --git a/cad/pcb/patches/patch-at b/cad/pcb/patches/patch-at
new file mode 100644
index 00000000000..b35cef4b4bd
--- /dev/null
+++ b/cad/pcb/patches/patch-at
@@ -0,0 +1,62 @@
+$NetBSD: patch-at,v 1.1 2004/01/12 11:19:58 seb Exp $
+
+--- src/error.c.orig	1998-05-13 10:29:45.000000000 +0000
++++ src/error.c
+@@ -34,7 +34,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <signal.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -51,8 +51,10 @@
+ /* ----------------------------------------------------------------------
+  * some external identifiers
+  */
++#ifndef __NetBSD__
+ extern	int		errno,			/* system error code */
+ 				sys_nerr;		/* number of messages available from array */
++#endif
+ 
+ /* the list is already defined for some OS */
+ #if !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__linux__) 
+@@ -68,15 +70,13 @@
+ /* ---------------------------------------------------------------------------
+  * output of message in a dialog window or log window
+  */
+-void Message(Format, va_alist)
+-char *Format;
+-va_dcl
++void Message(char *Format, ...)
+ {
+ 	va_list	args;
+ 	char	s[1024];
+ 	XEvent	event;
+ 
+-	va_start(args);
++	va_start(args, Format);
+ 	vsprintf(s, Format, args);
+ 	va_end(args);
+ 
+@@ -156,9 +156,7 @@
+ /* ---------------------------------------------------------------------------
+  * output of fatal error message
+  */
+-void MyFatal(Format, va_alist)
+-char *Format;
+-va_dcl
++void MyFatal( char *Format, ...)
+ {
+ 	va_list	args;
+ 
+@@ -166,7 +164,7 @@
+ 	RestoreStderr();
+ 	EmergencySave();
+ 
+-	va_start(args);
++	va_start(args, Format);
+ 	fprintf(stderr, "%s (%i): fatal, ", Progname, (int) getpid());
+ 	vfprintf(stderr, Format, args);
+ 	fflush(stderr);
diff --git a/cad/pcb/patches/patch-au b/cad/pcb/patches/patch-au
new file mode 100644
index 00000000000..ae87bd6ec31
--- /dev/null
+++ b/cad/pcb/patches/patch-au
@@ -0,0 +1,20 @@
+$NetBSD: patch-au,v 1.1 2004/01/12 11:19:58 seb Exp $
+
+--- src/error.h.orig	1998-05-13 10:29:45.000000000 +0000
++++ src/error.h
+@@ -37,13 +37,13 @@
+ #define	STATUS_BREAK	1
+ #define	STATUS_ERROR	-1
+ 
+-void	Message();
++void	Message(char *, ...);
+ void	OpenErrorMessage(char *);
+ void	PopenErrorMessage(char *);
+ void	OpendirErrorMessage(char *);
+ void	ChdirErrorMessage(char *);
+ void	RestoreStderr(void);
+-void	MyFatal();
++void	MyFatal(char *, ...);
+ void	CatchSignal(int);
+ void	X11ErrorHandler(String);
+ void	InitErrorLog(void);