Make build on Interix.

3 files changed, 28 insertions, 21 deletions

diff --git a/mail/faces/patches/patch-ab b/mail/faces/patches/patch-ab
index e21326bcecf..2db34fbc978 100644
--- a/mail/faces/patches/patch-ab
+++ b/mail/faces/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.11 2002/09/21 12:13:44 jlam Exp $
+$NetBSD: patch-ab,v 1.12 2005/03/15 03:59:38 tv Exp $
 
 --- Makefile.dist.orig	Sun Nov 24 18:55:28 1991
 +++ Makefile.dist
@@ -58,15 +58,6 @@ $NetBSD: patch-ab,v 1.11 2002/09/21 12:13:44 jlam Exp $
  CFACEDIR	= -DFACEDIR=\"$(FACEDIR)\"
  #------------------------------------------------------------------------
  #  It is possible to determine what type of monitoring faces does at
-@@ -123,7 +126,7 @@
- #  Note that the domain name will be converted to lower case before
- #  attempting to match in the machines file, or create an icon filename.
- #
--#NISLOOKUP	= -DNISLOOKUP
-+NISLOOKUP	= -DNISLOOKUP
- #------------------------------------------------------------------------
- #  If you don't want faces to use full domain names for extracting face
- #  icons, then you should uncomment the NODOMAINS definition below.
 @@ -188,7 +191,7 @@
  #  to the select call are different, and this definition should be
  #  uncommented. You need to uncomment this for SunOS v3.x.
diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af
index 260e00b2d72..d931c50bf07 100644
--- a/mail/faces/patches/patch-af
+++ b/mail/faces/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.4 2000/09/06 12:31:50 tron Exp $
+$NetBSD: patch-af,v 1.5 2005/03/15 03:59:38 tv Exp $
 
---- compface/uncmain.c.orig	Thu Oct 24 03:28:07 1991
-+++ compface/uncmain.c	Wed Sep  6 14:28:50 2000
+--- compface/uncmain.c.orig	Wed Oct 23 22:28:07 1991
++++ compface/uncmain.c
 @@ -18,6 +18,8 @@
  #include <fcntl.h>
  #include "compface.h"
@@ -11,11 +11,11 @@ $NetBSD: patch-af,v 1.4 2000/09/06 12:31:50 tron Exp $
  /* the buffer is longer than needed to handle sparse input formats */
  #define FACEBUFLEN 2048
  char fbuf[FACEBUFLEN];
-@@ -33,8 +35,12 @@
+@@ -33,12 +35,20 @@ char *cmdname;
  
  /* error handling definitions follow */
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__INTERIX)
 +#include <errno.h>
 +#else
  extern int errno, sys_nerr;
@@ -24,7 +24,15 @@ $NetBSD: patch-af,v 1.4 2000/09/06 12:31:50 tron Exp $
  
  extern void exit P((int)) ;
  
-@@ -59,6 +65,13 @@
++#ifdef __INTERIX
++#define ERR strerror(errno)
++#else
+ #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
++#endif
+ #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
+ 					(void)strcat(fbuf, (s));}
+ #define ADDERR(s) (void)strcat(fbuf, (s));
+@@ -59,6 +69,13 @@ char *argv[];
    while (**argv)
      if (*((*argv)++) == '/')
        cmdname = *argv;               /* find the command's basename */
diff --git a/mail/faces/patches/patch-av b/mail/faces/patches/patch-av
index 85be937c961..5da3ee89854 100644
--- a/mail/faces/patches/patch-av
+++ b/mail/faces/patches/patch-av
@@ -1,12 +1,12 @@
-$NetBSD: patch-av,v 1.1 2000/09/06 12:31:50 tron Exp $
+$NetBSD: patch-av,v 1.2 2005/03/15 03:59:38 tv Exp $
 
---- compface/cmain.c.orig	Thu Oct 24 03:28:07 1991
-+++ compface/cmain.c	Wed Sep  6 14:26:33 2000
-@@ -33,8 +33,12 @@
+--- compface/cmain.c.orig	Wed Oct 23 22:28:07 1991
++++ compface/cmain.c
+@@ -33,12 +33,20 @@ char *cmdname;
  
  /* error handling definitions follow */
  
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__INTERIX)
 +#include <errno.h>
 +#else
  extern int errno, sys_nerr;
@@ -15,3 +15,11 @@ $NetBSD: patch-av,v 1.1 2000/09/06 12:31:50 tron Exp $
  
  extern void exit P((int)) ;
  
++#ifdef __INTERIX
++#define ERR strerror(errno)
++#else
+ #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
++#endif
+ #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\
+ 					(void)strcat(fbuf, (s));}
+ #define ADDERR(s) (void)strcat(fbuf, (s));