Add DragonFly support. Remove some pre-ANSI cruft which conflicts

with DragonFly's system headers. Fix errno.

6 files changed, 125 insertions, 41 deletions

diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index d5d328878cc..2061283aecc 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 14:59:25 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/01/06 18:21:44 joerg Exp $
 
 SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e
 RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c
 Size (sp3f4.kit.tar.Z) = 2086528 bytes
 SHA1 (patch-aa) = 35d8d9ecfb2beaa54e0763197b551d5e26fc7f4e
-SHA1 (patch-ab) = 4cbb89af1ef070ea0f5847ee59362aa587db3652
-SHA1 (patch-ac) = 1554932f75b8532b1e2293390b5cea03a7133bb4
-SHA1 (patch-ad) = 265d8d6fb8fe8441d9d096c0ca20d6692a03adea
+SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496
+SHA1 (patch-ac) = 5939be87e7ffeea545360b6ff02dfdc9181746eb
+SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4
 SHA1 (patch-ae) = cad6420b959acadedeeaaa17e4d8ff06511cda10
 SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
 SHA1 (patch-ag) = d03a660e2e1f96eb4b5edb71c32fb0b44cc7921e
@@ -22,3 +22,5 @@ SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f
 SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3
 SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27
 SHA1 (patch-as) = b1c077eb64eb1a4401604283cfc1534a0ee4269b
+SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac
+SHA1 (patch-au) = be680cf2cd75b7735eeb072fc1b9b59ef7553ea4
diff --git a/cad/spice/patches/patch-ab b/cad/spice/patches/patch-ab
index 25dab97421d..06d090801bc 100644
--- a/cad/spice/patches/patch-ab
+++ b/cad/spice/patches/patch-ab
@@ -1,16 +1,35 @@
-$NetBSD: patch-ab,v 1.3 1999/10/01 17:05:15 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2006/01/06 18:21:44 joerg Exp $
 
-*** src/lib/fte/resource.c.orig	Sun Mar 31 10:59:57 1996
---- src/lib/fte/resource.c	Sun Mar 31 11:00:57 1996
-***************
-*** 369,375 ****
---- 369,377 ----
-  	long x;
-  	SIGNAL_TYPE	(*orig_signal)( );
-  
-+ #if !(defined(__FreeBSD__) || defined(__NetBSD__))
-  	if (getenv("SPICE_NO_DATASEG_CHECK"))
-+ #endif
-  		return 0;
-  
-  	low = 0;
+--- src/lib/fte/resource.c.orig	1993-04-28 22:39:03.000000000 +0000
++++ src/lib/fte/resource.c
+@@ -12,6 +12,7 @@ Author: 1985 Wayne A. Christopher, U. C.
+ #include "ftedefs.h"
+ 
+ #include <sys/types.h>
++#include <unistd.h>
+ 
+ #ifdef HAS_BSDRLIMIT
+ #  include <sys/time.h>
+@@ -144,7 +145,7 @@ ft_ckspace()
+ 
+ #    endif
+ 
+-    usage = sbrk(0) - enddata;
++    usage = (char *)sbrk(0) - enddata;
+ 
+ #  endif
+ 
+@@ -365,11 +366,12 @@ static void *
+ baseaddr( )
+ {
+ 	char *low, *high, *at;
+-	char *sbrk( );
+ 	long x;
+ 	SIGNAL_TYPE	(*orig_signal)( );
+ 
++#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ 	if (getenv("SPICE_NO_DATASEG_CHECK"))
++#endif
+ 		return 0;
+ 
+ 	low = 0;
diff --git a/cad/spice/patches/patch-ac b/cad/spice/patches/patch-ac
index b89f65d722a..4e9fe1470aa 100644
--- a/cad/spice/patches/patch-ac
+++ b/cad/spice/patches/patch-ac
@@ -1,22 +1,47 @@
-$NetBSD: patch-ac,v 1.4 2002/02/27 17:14:28 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2006/01/06 18:21:44 joerg Exp $
 
---- src/include/misc.h.orig	Sun Apr 25 17:37:48 1993
+--- src/include/misc.h.orig	1993-04-25 21:37:48.000000000 +0000
 +++ src/include/misc.h
-@@ -86,7 +86,9 @@
- extern char *realloc();
- extern char *getenv();
- extern int errno;
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+@@ -5,6 +5,8 @@ Copyright 1990 Regents of the University
+ #ifndef MISC_H
+ #define MISC_H
+ 
++#include <stdlib.h>
++
+ #define BSIZE_SP      512
+ 
+ #ifdef HAS_EXIT1
+@@ -81,23 +83,12 @@ extern void srandom();
+ #    define srandom	srand
+ #  endif
+ 
+-extern char *calloc();
+-extern char *malloc();
+-extern char *realloc();
+-extern char *getenv();
+-extern int errno;
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
  extern char *sys_errlist[];
+-extern char *getenv();
 +#endif
- extern char *getenv();
  extern char *getwd();
- extern int rand();
-@@ -109,12 +111,14 @@
+-extern int rand();
+-extern int srand();
+-extern int atoi();
+ extern int kill();
+ extern int getpid();
+-extern int qsort();
+-#  ifdef notdef
+-extern void exit();
+-#  endif
+ 
+ #  ifdef HAS_GETCWD
+ extern char *getcwd( );
+@@ -109,12 +100,14 @@ extern void clearerr();
  #    endif /* clearerr */
  #  endif /* HAS_CLEARERR */
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
  #  ifndef bzero
  extern int bzero();
  #  endif
@@ -27,18 +52,25 @@ $NetBSD: patch-ac,v 1.4 2002/02/27 17:14:28 jlam Exp $
  
  #  ifndef index
  #    ifdef HAS_INDEX
-@@ -144,12 +148,14 @@
+@@ -144,6 +137,7 @@ extern char *strrchr();
  extern void perror();
  #endif
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
  #ifdef HAS_TIME_
  #  ifdef HAS_BSDTIME
  extern char *timezone();
- #  endif
+@@ -151,10 +145,13 @@ extern char *timezone();
  extern char *asctime();
  extern struct tm *localtime();
-+#endif
  #endif
++#endif
  
  #ifndef HAS_MEMAVL
+ #  ifdef HAS_RLIMIT_
++#if !defined(__DragonFly__)
+ extern char *sbrk();
++#endif
+ #  endif
+ #endif
+ 
diff --git a/cad/spice/patches/patch-ad b/cad/spice/patches/patch-ad
index fd4068887a5..c31f49dd506 100644
--- a/cad/spice/patches/patch-ad
+++ b/cad/spice/patches/patch-ad
@@ -1,11 +1,12 @@
-$NetBSD: patch-ad,v 1.3 2005/01/11 22:26:01 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2006/01/06 18:21:44 joerg Exp $
 
---- src/include/os_bsd.h.orig	Sat Apr 24 19:09:46 1993
-+++ src/include/os_bsd.h	Thu Sep 30 12:02:51 1999
-@@ -9,10 +9,14 @@
+--- src/include/os_bsd.h.orig	1993-04-24 23:09:46.000000000 +0000
++++ src/include/os_bsd.h
+@@ -8,12 +8,16 @@ Copyright 1990 Regents of the University
+ 
  #include "os_unix.h"
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
  #define HAS_NO_ATRIGH_DECL	/* if asinh( ) is not in math.h		*/
 -#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
  #define HAS_FTIME		/* ftime( ), <times.h>			*/
@@ -19,12 +20,15 @@ $NetBSD: patch-ad,v 1.3 2005/01/11 22:26:01 dmcmahill Exp $
 -#define HAS_INDEX		/* index( ) instead of strchr( )	*/
  #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
  #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
-@@ -23,3 +27,12 @@
+ #define HAS_BSDTTY		/* <sgtty.h>				*/
+@@ -22,4 +26,14 @@ Copyright 1990 Regents of the University
+ #define HAS_BSDRLIMIT		/* getrlimit( )				*/
  #define HAS_DUP2
  #define HAS_GETWD		/* getwd(buf)				*/
 -#define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
 +
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#define HAS_STDLIB
 +#define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
 +#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
 +#define HAS_FLOAT_H		/* float.h				*/
diff --git a/cad/spice/patches/patch-at b/cad/spice/patches/patch-at
new file mode 100644
index 00000000000..e66fc5a193b
--- /dev/null
+++ b/cad/spice/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2006/01/06 18:21:44 joerg Exp $
+
+--- src/lib/mfb/mfbgnc.c.orig	2005-12-16 16:27:15.000000000 +0000
++++ src/lib/mfb/mfbgnc.c
+@@ -24,7 +24,7 @@ Author: -C- 1982 Giles C. Billingsley
+ #include "suffix.h"
+ 
+ /* Library routines */
+-#ifdef HAS_FTIME
++#if defined(HAS_FTIME) && !(defined(__DragonFly__))
+ extern void ftime();
+ #endif
+ 
diff --git a/cad/spice/patches/patch-au b/cad/spice/patches/patch-au
new file mode 100644
index 00000000000..9df3617cec5
--- /dev/null
+++ b/cad/spice/patches/patch-au
@@ -0,0 +1,14 @@
+$NetBSD: patch-au,v 1.1 2006/01/06 18:21:44 joerg Exp $
+
+--- src/include/cpstd.h.orig	2005-12-17 13:10:09.000000000 +0000
++++ src/include/cpstd.h
+@@ -50,7 +50,9 @@ extern char *tildexpand();
+ extern char *printnum();
+ extern int cp_numdgt;
+ extern void fatal();
++#if !defined(__DragonFly__)
+ extern void setenv();
++#endif
+ extern void cp_printword();
+ 
+ /* Externs from wlist.c */