Fix build on SunOS, also tested on NetBSD.

I think files/NetBSD should be renamed to files/pkgsrc.

4 files changed, 31 insertions, 8 deletions

diff --git a/cad/spice/patches/patch-ac b/cad/spice/patches/patch-ac
index fdb65657d13..79501a59d7d 100644
--- a/cad/spice/patches/patch-ac
+++ b/cad/spice/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2006/10/09 20:04:38 mlelstv Exp $
+$NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
 
 --- src/include/misc.h.orig	1993-04-25 23:37:48.000000000 +0200
 +++ src/include/misc.h
@@ -41,7 +41,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/09 20:04:38 mlelstv Exp $
  #    endif /* clearerr */
  #  endif /* HAS_CLEARERR */
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
  #  ifndef bzero
  extern int bzero();
  #  endif
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/09 20:04:38 mlelstv Exp $
  extern void perror();
  #endif
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
  #ifdef HAS_TIME_
  #  ifdef HAS_BSDTIME
  extern char *timezone();
@@ -68,7 +68,7 @@ $NetBSD: patch-ac,v 1.6 2006/10/09 20:04:38 mlelstv Exp $
  
  #ifndef HAS_MEMAVL
  #  ifdef HAS_RLIMIT_
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
  extern char *sbrk();
 +#endif
  #  endif
diff --git a/cad/spice/patches/patch-at b/cad/spice/patches/patch-at
index e66fc5a193b..ba3dda168e3 100644
--- a/cad/spice/patches/patch-at
+++ b/cad/spice/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.1 2006/01/06 18:21:44 joerg Exp $
+$NetBSD: patch-at,v 1.2 2011/05/14 18:45:54 hans Exp $
 
 --- src/lib/mfb/mfbgnc.c.orig	2005-12-16 16:27:15.000000000 +0000
 +++ src/lib/mfb/mfbgnc.c
@@ -7,7 +7,7 @@ $NetBSD: patch-at,v 1.1 2006/01/06 18:21:44 joerg Exp $
  
  /* Library routines */
 -#ifdef HAS_FTIME
-+#if defined(HAS_FTIME) && !(defined(__DragonFly__))
++#if defined(HAS_FTIME) && !(defined(__DragonFly__) || defined(__sun))
  extern void ftime();
  #endif
  
diff --git a/cad/spice/patches/patch-au b/cad/spice/patches/patch-au
index 65a5cdcc448..c12fa0f0b2e 100644
--- a/cad/spice/patches/patch-au
+++ b/cad/spice/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.2 2006/01/10 10:59:06 joerg Exp $
+$NetBSD: patch-au,v 1.3 2011/05/14 18:45:54 hans Exp $
 
 --- src/include/cpstd.h.orig	2005-12-17 13:10:09.000000000 +0000
 +++ src/include/cpstd.h
@@ -6,7 +6,7 @@ $NetBSD: patch-au,v 1.2 2006/01/10 10:59:06 joerg Exp $
  extern char *printnum();
  extern int cp_numdgt;
  extern void fatal();
-+#if !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
++#if !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__sun)
  extern void setenv();
 +#endif
  extern void cp_printword();
diff --git a/cad/spice/patches/patch-ax b/cad/spice/patches/patch-ax
new file mode 100644
index 00000000000..9885b3b7d60
--- /dev/null
+++ b/cad/spice/patches/patch-ax
@@ -0,0 +1,23 @@
+--- src/include/os_sun.h.orig	1993-04-25 01:10:15.000000000 +0200
++++ src/include/os_sun.h	2011-05-14 20:00:05.515105748 +0200
+@@ -17,12 +17,19 @@ Copyright 1991 Regents of the University
+ #define HAS_BCOPY		/* bcopy( ), bzero( )			*/
+ #define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
+ #define HAS_POSIXTTY		/* <termios.h>				*/
+-#define HAS_BSDDIRS		/* <sys/dir.h>				*/
++#define HAS_SYSVDIRS		/* <sys/dirent.h>			*/
+ #define HAS_BSDRUSAGE		/* getrusage( )				*/
+ #define HAS_BSDRLIMIT		/* getrlimit( )				*/
+ #define HAS_BSDSOCKETS		/* <net/inet.h>, socket( ), etc.	*/
++#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
+ #define HAS_DUP2
++#define HAS_FLOAT_H		/* float.h				*/
+ #define HAS_GETWD		/* getwd(buf)				*/
++#define HAS_INTWAITSTATUS	/* wait(int *status)			*/
++#define HAS_LIMITS_H		/* limits.h exists			*/
++#define HAS_STDLIB		
++#define HAS_STDLIB
++#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
+ #define HAS_STRINGS		/* use <strings.h> instead of <string.h> */
+ #define HAS_IEEE_SCALBN		/* Use "scalbn( )" for "scalb( )"	*/
+