Fix build on SunOS, also tested on NetBSD.

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

7 files changed, 43 insertions, 15 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 2115048dd0e..dbf97b21474 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2010/06/25 21:05:57 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2011/05/14 18:45:54 hans Exp $
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
@@ -29,6 +29,11 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
 
 MAKE_ENV+=	WRKSRC=${WRKSRC:Q}
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "SunOS"
+CFLAGS+=	-Dbsd
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/NetBSD ${WRKSRC}/conf
 
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index d0ff160aee6..c7a9e7d36e3 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2010/06/25 21:05:57 joerg Exp $
+$NetBSD: distinfo,v 1.12 2011/05/14 18:45:54 hans Exp $
 
 SHA1 (sp3f4.kit.tar.Z) = bded1e078d0acfef090117490a7ac8a57887f39e
 RMD160 (sp3f4.kit.tar.Z) = 0bd293298c41791a9a452648f5c6a936175e220c
 Size (sp3f4.kit.tar.Z) = 2086528 bytes
 SHA1 (patch-aa) = e02c604b9d32b395dd8d7ac22255c96229fff72a
 SHA1 (patch-ab) = aa036badf15b69f199861b1f1d0d10f85471f496
-SHA1 (patch-ac) = 6b0a62e2f153401cd4dd806d08e5df24a9a7d488
+SHA1 (patch-ac) = 36fb6b1b9f92468965daa0ef5caf657d340b36ee
 SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4
 SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d
 SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
@@ -22,7 +22,8 @@ SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f
 SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3
 SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27
 SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d
-SHA1 (patch-at) = cf0156a20f3fdadca74434d1ee26f023f7d40bac
-SHA1 (patch-au) = 5b69fde30ec2cc301b970e2c40d83fac1b00c874
+SHA1 (patch-at) = d71bbc85a75c456f0b79ff95139699756e00c970
+SHA1 (patch-au) = cd5094fc11e4928c5646926a27a2956c1c1ea77a
 SHA1 (patch-av) = 9828210e621310023e059e4fc7f8f1c5d1c7e187
 SHA1 (patch-aw) = 6bbc7e279d92def9ca90b5544b2777b7f221071a
+SHA1 (patch-ax) = 31641ee99ae8d9cd270ba47dfd8974d589be54b7
diff --git a/cad/spice/files/NetBSD b/cad/spice/files/NetBSD
index c3c0310eeee..9305a2b0eb2 100644
--- a/cad/spice/files/NetBSD
+++ b/cad/spice/files/NetBSD
@@ -1,5 +1,5 @@
 # FreeBSD/NetBSD config exception file
-# $NetBSD: NetBSD,v 1.6 2005/01/11 22:26:01 dmcmahill Exp $
+# $NetBSD: NetBSD,v 1.7 2011/05/14 18:45:54 hans Exp $
 
 
 MAKE		= @MAKE_PROGRAM@
@@ -10,4 +10,3 @@ CC_OPT_SAFE     = -O2 -fno-strength-reduce -pipe -I@WRKSRC@/src/include @CFLAGS@
 #LDFLAGS	= @LDFLAGS@ -lreadline -lm -ltermcap
 LDFLAGS		= @LDFLAGS@ -lm -ltermcap
 ASM_HACK	= < /dev/null
-SYS_CFLAGS	= -Dbsd
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( )"	*/
+