Add Linux support.

7 files changed, 73 insertions, 17 deletions

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index c2884e006d7..06dbb71b5cf 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2012/10/08 13:25:16 asau Exp $
+# $NetBSD: Makefile,v 1.47 2013/05/22 07:44:03 sbd Exp $
 
 DISTNAME=	sp3f4.kit
 PKGNAME=	spice-3f5.1
@@ -28,7 +28,9 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5
 MAKE_ENV+=	WRKSRC=${WRKSRC:Q}
 
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} != "SunOS"
+.if ${OPSYS} == "Linux"
+CFLAGS+=	-Dlinux
+.elif ${OPSYS} != "SunOS"
 CFLAGS+=	-Dbsd
 .endif
 
@@ -73,5 +75,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cir ${DESTDIR}${PREFIX}/share/examples/spice3
 
 #.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index 454e8a7f326..72542126fa6 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2013/03/02 17:51:49 joerg Exp $
+$NetBSD: distinfo,v 1.15 2013/05/22 07:44:03 sbd 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) = 36fb6b1b9f92468965daa0ef5caf657d340b36ee
+SHA1 (patch-ac) = 831425307eded1b9dc351d2dba702d8673026ded
 SHA1 (patch-ad) = a1a1a8dbbe7eebb9c224e42a34013ba7918cdad4
 SHA1 (patch-ae) = 858e35606ff1eb622bac3bb1cc90f7ec50064b6d
 SHA1 (patch-af) = 23d047049d5f183af12e14b56c535adf95b9f208
@@ -22,11 +22,13 @@ SHA1 (patch-ap) = f82a0828c1c2681dc1df5e3de7a37cd042c0494f
 SHA1 (patch-aq) = 87739a58999dc7027468ff46c04a65c75cf853e3
 SHA1 (patch-ar) = 7bfa494147b26f7b330498d9c64ae66a79cebd27
 SHA1 (patch-as) = 44d36eedbdb1c9c95886ce0e34417ff8fd3cb72d
-SHA1 (patch-at) = 6627f94e9b875c59c69ea85977b65011bbae0309
-SHA1 (patch-au) = cd5094fc11e4928c5646926a27a2956c1c1ea77a
+SHA1 (patch-at) = 4af0c5013acd8be747c2997a77e801f0039d83d3
+SHA1 (patch-au) = 34875ada90e83cb214746f9dc59613f9ff31b833
 SHA1 (patch-av) = 9828210e621310023e059e4fc7f8f1c5d1c7e187
 SHA1 (patch-aw) = 6bbc7e279d92def9ca90b5544b2777b7f221071a
 SHA1 (patch-ax) = 44ba0f7d871a37d74a4ae47b673c6eb69e6a023a
+SHA1 (patch-src_include_os__linux.h) = c0087661f9634c02c7d3b109039f5b50c976a7e4
+SHA1 (patch-src_include_port.h) = 7b497d55ea4bb64b55dc3e89836a68a3719222d0
 SHA1 (patch-src_lib_fte_device.c) = 2a011e9fcacb2d10cbb4dd506c27bcc84b848cb9
 SHA1 (patch-src_lib_fte_display.c) = ee0ed83b3b9ce6d881ffe021a904100259c38568
 SHA1 (patch-src_lib_mfb_mfbbasic.c) = c2746f9d7dfd70c54df9d0648d3cd3d72e4defc4
diff --git a/cad/spice/patches/patch-ac b/cad/spice/patches/patch-ac
index 79501a59d7d..5c30b74227a 100644
--- a/cad/spice/patches/patch-ac
+++ b/cad/spice/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
+$NetBSD: patch-ac,v 1.8 2013/05/22 07:44:04 sbd Exp $
 
---- src/include/misc.h.orig	1993-04-25 23:37:48.000000000 +0200
+--- src/include/misc.h.orig	1993-04-25 21:37:48.000000000 +0000
 +++ src/include/misc.h
 @@ -5,6 +5,8 @@ Copyright 1990 Regents of the University
  #ifndef MISC_H
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
 -extern char *realloc();
 -extern char *getenv();
 -extern int errno;
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__linux__))
  extern char *sys_errlist[];
 -extern char *getenv();
 +#endif
@@ -41,7 +41,7 @@ $NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
  #    endif /* clearerr */
  #  endif /* HAS_CLEARERR */
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun) || defined(__linux__))
  #  ifndef bzero
  extern int bzero();
  #  endif
@@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
  extern void perror();
  #endif
  
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun) || defined(__linux__))
  #ifdef HAS_TIME_
  #  ifdef HAS_BSDTIME
  extern char *timezone();
@@ -68,7 +68,7 @@ $NetBSD: patch-ac,v 1.7 2011/05/14 18:45:54 hans Exp $
  
  #ifndef HAS_MEMAVL
  #  ifdef HAS_RLIMIT_
-+#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun))
++#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun) || defined(__linux__))
  extern char *sbrk();
 +#endif
  #  endif
diff --git a/cad/spice/patches/patch-at b/cad/spice/patches/patch-at
index 0304ede2bdb..069dc1af351 100644
--- a/cad/spice/patches/patch-at
+++ b/cad/spice/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.3 2013/03/02 17:51:49 joerg Exp $
+$NetBSD: patch-at,v 1.4 2013/05/22 07:44:04 sbd Exp $
 
 --- src/lib/mfb/mfbgnc.c.orig	1991-04-10 02:08:26.000000000 +0000
 +++ src/lib/mfb/mfbgnc.c
@@ -7,7 +7,7 @@ $NetBSD: patch-at,v 1.3 2013/03/02 17:51:49 joerg Exp $
  
  /* Library routines */
 -#ifdef HAS_FTIME
-+#if defined(HAS_FTIME) && !(defined(__DragonFly__) || defined(__sun))
++#if defined(HAS_FTIME) && !(defined(__DragonFly__) || defined(__sun) || defined(__linux__))
  extern void ftime();
  #endif
  
diff --git a/cad/spice/patches/patch-au b/cad/spice/patches/patch-au
index c12fa0f0b2e..4aeedf06b4b 100644
--- a/cad/spice/patches/patch-au
+++ b/cad/spice/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.3 2011/05/14 18:45:54 hans Exp $
+$NetBSD: patch-au,v 1.4 2013/05/22 07:44:04 sbd Exp $
 
---- src/include/cpstd.h.orig	2005-12-17 13:10:09.000000000 +0000
+--- src/include/cpstd.h.orig	1993-04-14 19:57:42.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__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__sun)
++#if !defined(__DragonFly__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(__linux__)
  extern void setenv();
 +#endif
  extern void cp_printword();
diff --git a/cad/spice/patches/patch-src_include_os__linux.h b/cad/spice/patches/patch-src_include_os__linux.h
new file mode 100644
index 00000000000..ced82d3c00d
--- /dev/null
+++ b/cad/spice/patches/patch-src_include_os__linux.h
@@ -0,0 +1,35 @@
+$NetBSD: patch-src_include_os__linux.h,v 1.1 2013/05/22 07:44:04 sbd Exp $
+
+--- src/include/os_linux.h.orig	2013-05-22 07:03:07.803730428 +0000
++++ src/include/os_linux.h
+@@ -0,0 +1,30 @@
++/**********
++Copyright 1990 Regents of the University of California.  All rights reserved.
++**********/
++
++/*
++ *	Linux systems
++ */
++
++#include "os_unix.h"
++
++#define HAS_ATRIGH		/* acosh( ), asinh( ), atanh( )         */
++#define HAS_FTIME		/* ftime( ), <times.h>			*/
++#define HAS_TERMCAP		/* tgetxxx( )				*/
++#define HAS_VFORK		/* BSD-ism, should not be necessary	*/
++#define HAS_BCOPY		/* bcopy( ), bzero( )			*/
++#define HAS_BSDRANDOM		/* srandom( ) and random( )		*/
++#define HAS_SYSVTTY		/* <termio.h>				*/
++#define HAS_BSDDIRS		/* <sys/dir.h>				*/
++#define HAS_BSDRUSAGE		/* getrusage( )				*/
++#define HAS_BSDRLIMIT		/* getrlimit( )				*/
++#define HAS_DUP2
++#define HAS_GETWD		/* getwd(buf)				*/
++
++#define HAS_STDLIB
++#define HAS_FLOAT_H		/* float.h				*/
++#define HAS_BSDTIME		/* gettimeofday( ) return time		*/
++#define HAS_STRCHR		/* strchr( ) instead of index( )	*/
++#define HAS_LIMITS_H		/* limits.h exists			*/
++#define HAS_INTWAITSTATUS	/* wait(int *status)			*/
++/*#define HAS_GNUREADLINE*/		/* compile in readline support		*/
diff --git a/cad/spice/patches/patch-src_include_port.h b/cad/spice/patches/patch-src_include_port.h
new file mode 100644
index 00000000000..a547a730d9f
--- /dev/null
+++ b/cad/spice/patches/patch-src_include_port.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_include_port.h,v 1.1 2013/05/22 07:44:04 sbd Exp $
+
+--- src/include/port.h.orig	1993-04-14 19:51:11.000000000 +0000
++++ src/include/port.h
+@@ -16,6 +16,11 @@ Copyright 1990 Regents of the University
+ #  define CONFIGURED
+ #endif
+ 
++#ifdef linux
++#  include "os_linux.h"
++#  define CONFIGURED
++#endif
++
+ #ifdef ultrix
+ #  include "os_ultrx.h"
+ #  define CONFIGURED