Fix build on Interix.

3 files changed, 22 insertions, 17 deletions

diff --git a/textproc/ispell-base/Makefile b/textproc/ispell-base/Makefile
index a581d9a8f83..13ea3b66fc9 100644
--- a/textproc/ispell-base/Makefile
+++ b/textproc/ispell-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/12/01 12:18:21 markd Exp $
+# $NetBSD: Makefile,v 1.22 2005/03/24 17:08:02 tv Exp $
 #
 
 DISTNAME=	ispell-3.2.06
@@ -46,5 +46,10 @@ do-configure:
 	cd ${WRKSRC};							\
 	${ECHO} "#define USG" >> local.h;
 .endif
+.if ${OPSYS} == "Interix"
+	cd ${WRKSRC};							\
+	${ECHO} "#define SORTTMP \"\"" >> local.h;			\
+	${ECHO} "#define MAKE_SORTTMP \"\"" >> local.h;
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-base/distinfo b/textproc/ispell-base/distinfo
index ebe91c203df..842c92739b0 100644
--- a/textproc/ispell-base/distinfo
+++ b/textproc/ispell-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/02/24 14:48:43 agc Exp $
+$NetBSD: distinfo,v 1.10 2005/03/24 17:08:02 tv Exp $
 
 SHA1 (ispell-3.2.06.tar.gz) = 35f496322cda172d56610417e4e1c7b962f734d7
 RMD160 (ispell-3.2.06.tar.gz) = 3f6a3840540ebc753146c427da8ce2d54317b46e
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = 5d72462faf73b0205cce77d2b8b5769626294732
 SHA1 (patch-ad) = fb49b658513f43ecc07f17cdde0eeebc0b59a9b9
 SHA1 (patch-ae) = 4ebef741c4e092e3d25ec49ff8a45f3fbd8d1d20
 SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
-SHA1 (patch-ak) = 4b06d06ae9641b62bcc46692aaf79460215d161f
+SHA1 (patch-ak) = cfc487ffb4d4d0c96a004f04f98404015f71ae4d
 SHA1 (patch-al) = 8e75a7b529e76ed7137510e5e18f7b87084c62a8
 SHA1 (patch-am) = 15d74f643f88f67a08923a491018cc341bdac44b
 SHA1 (patch-ao) = 6ddf8412689f17cff7632a90ea443513da9d8448
diff --git a/textproc/ispell-base/patches/patch-ak b/textproc/ispell-base/patches/patch-ak
index 731c1248a6a..8ce093a1f28 100644
--- a/textproc/ispell-base/patches/patch-ak
+++ b/textproc/ispell-base/patches/patch-ak
@@ -1,20 +1,20 @@
-$NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
+$NetBSD: patch-ak,v 1.4 2005/03/24 17:08:02 tv Exp $
 
---- term.c.orig	Wed Nov  2 19:44:28 1994
+--- term.c.orig	2001-07-25 17:51:46.000000000 -0400
 +++ term.c
-@@ -64,7 +64,10 @@
+@@ -80,7 +80,10 @@ static char Rcs_Id[] =
  #include "ispell.h"
  #include "proto.h"
  #include "msgs.h"
 -#ifdef USG
-+#if defined(__NetBSD__) || defined(linux) || defined(__sgi)
++#if defined(__NetBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX)
 +#define USE_TERMIOS
 +#include <termios.h>
 +#elif defined(USG)
  #include <termio.h>
  #else
  #include <sgtty.h>
-@@ -135,7 +138,10 @@
+@@ -151,7 +154,10 @@ static int putch (c)
      return putchar (c);
      }
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
  static struct termio	sbuf;
  static struct termio	osbuf;
  #else
-@@ -263,8 +269,31 @@
+@@ -279,8 +285,31 @@ retry:
  
  #endif
  
@@ -59,7 +59,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) sigsetmask (1<<(SIGTSTP-1) | 1<<(SIGTTIN-1) | 1<<(SIGTTOU-1));
  #endif
  #endif
-@@ -290,7 +319,7 @@
+@@ -306,7 +335,7 @@ retry:
  #endif
  #endif
  
@@ -68,7 +68,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TIOCGETP, (char *) &osbuf);
  #ifdef TIOCGLTC
      (void) ioctl (0, TIOCGLTC, (char *) &oltc);
-@@ -343,7 +372,9 @@
+@@ -359,7 +388,9 @@ SIGNAL_TYPE done (signo)
  	{
  	if (te)
  	    tputs (te, 1, putch);
@@ -79,7 +79,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
  	(void) ioctl (0, TCSETAW, (char *) &osbuf);
  #else
  	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -359,7 +390,9 @@
+@@ -375,7 +406,9 @@ SIGNAL_TYPE done (signo)
  static SIGNAL_TYPE onstop (signo)
      int		signo;
      {
@@ -90,7 +90,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TCSETAW, (char *) &osbuf);
  #else
      (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -374,7 +407,9 @@
+@@ -390,7 +423,9 @@ static SIGNAL_TYPE onstop (signo)
      (void) kill (0, signo);
      /* stop here until continued */
      (void) signal (signo, onstop);
@@ -101,7 +101,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TCSETAW, (char *) &sbuf);
  #else
      (void) ioctl (0, TIOCSETP, (char *) &sbuf);
-@@ -434,7 +469,9 @@
+@@ -450,7 +485,9 @@ int shellescape	(buf)
  	}
      argv[i] = NULL;
  
@@ -112,7 +112,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TCSETAW, (char *) &osbuf);
  #else
      (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -480,7 +517,9 @@
+@@ -496,7 +533,9 @@ int shellescape	(buf)
  	(void) signal (SIGTSTP, onstop);
  #endif
  
@@ -123,7 +123,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TCSETAW, (char *) &sbuf);
  #else
      (void) ioctl (0, TIOCSETP, (char *) &sbuf);
-@@ -513,7 +552,9 @@
+@@ -529,7 +568,9 @@ void shescape (buf)
      int		ch;
  #endif
  
@@ -134,7 +134,7 @@ $NetBSD: patch-ak,v 1.3 2004/12/01 12:18:21 markd Exp $
      (void) ioctl (0, TCSETAW, (char *) &osbuf);
  #else
      (void) ioctl (0, TIOCSETP, (char *) &osbuf);
-@@ -545,7 +586,9 @@
+@@ -561,7 +602,9 @@ void shescape (buf)
  	(void) signal (SIGTSTP, onstop);
  #endif