Make build on Interix.

5 files changed, 37 insertions, 26 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 7c1c6b87c6a..3f0667a3b35 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/12/04 04:43:12 tron Exp $
+# $NetBSD: Makefile,v 1.41 2005/03/15 03:59:38 tv Exp $
 
 DISTNAME=	faces-1.6.1
 PKGREVISION=	3
@@ -33,6 +33,10 @@ MAKE_ENV+=	CC=gcc
 MAKE_ENV+=	CPPFLAGS=
 .endif
 
+.if ${OPSYS} != "Interix"
+MAKE_ENV+=	NISLOOKUP=-DNISLOOKUP
+.endif
+
 REPLACE_PERL=	scripts/addxface scripts/deepen scripts/facesaddr \
 		scripts/facesall scripts/from.faces scripts/lpqall.faces \
 		scripts/mailq.faces scripts/mailqto scripts/mailqto.faces \
diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index 056787a5695..59844c53905 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.9 2005/03/12 12:53:56 schwarz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/15 03:59:38 tv Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
 Size (faces-1.6.1.tar.Z) = 249469 bytes
 SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
-SHA1 (patch-ab) = e4a30df1518dd16014330f119a1590865fee47fb
+SHA1 (patch-ab) = 2cd5dc0291d690060ad24aafa85d69fd9c8a4dee
 SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
-SHA1 (patch-af) = 676c018ecf02ccdd103b113dfde77875cededf7c
+SHA1 (patch-af) = b49060da7e929c4136e4b9b761eec553eef926db
 SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7
 SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6
 SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114
@@ -24,7 +24,7 @@ SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
 SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
-SHA1 (patch-av) = 1ef88ca0a9b72d783f318242d152d23510f7949a
+SHA1 (patch-av) = 856c345ff16873b39ea4e0fdf1df0e6bdfcdd95b
 SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
 SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
 SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
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));