Instead of patching in a mess of machine-dependent logic for printing

error messages, always use strerror.

While here, also correct warnings about implicit declaration of malloc
... which turned out to arise because someone patched stdlib.h into
all the right places years ago, but for some bizarre reason decided the
change should be OS-specific.

grmbl.

6 files changed, 48 insertions, 54 deletions

diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index d96456c1b4c..73da3abfec4 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/03/02 05:42:41 obache Exp $
+$NetBSD: distinfo,v 1.17 2012/06/23 22:27:11 dholland Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 98836fea05bd250aab1497022dcf6515829e39ce
 SHA1 (patch-ac) = 4d61574110437dd0ec3b2756608ce384ae3baaf4
 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
 SHA1 (patch-ae) = 95d1df85d315926970a446490b42ee812ce4df43
-SHA1 (patch-af) = 28eca0e38e04aef8b51d596d00f19d329f7570ec
+SHA1 (patch-af) = b10bdd8bd629a9c3a8c429a1bbff7d04dc8a2a90
 SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7
 SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6
 SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114
@@ -16,20 +16,20 @@ SHA1 (patch-aj) = 77386cbb0fc62300d61205d68bfb795125cd0ca6
 SHA1 (patch-ak) = 17d2781ad02394ed148ba654bf553f0f46a3db99
 SHA1 (patch-al) = 4cda3f50c6071137abde13f9f1afd7a1d80aa8d4
 SHA1 (patch-am) = 47121da4ec605ef24474ec830615643972b864ab
-SHA1 (patch-an) = 826208a9ac5b21e185f64e899ad09a95192e704c
-SHA1 (patch-ao) = 4121b8310a3fa4067f1cbe2b5b8ae51f182f4b23
+SHA1 (patch-an) = a6fa37cb3e8b556eef8b73f068d064259d3f7edb
+SHA1 (patch-ao) = a1e6897c54a4766e7db0da6b68d4a31e6e12e8c7
 SHA1 (patch-ap) = 200bf4c20bc36d5f08505af69084a4de2283e07f
 SHA1 (patch-aq) = 57d3f14ae8229cc4d879fdca5f87f04bb5398edc
 SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
 SHA1 (patch-at) = 2972ee83bae66ca60fe34436c67869019b8c2be5
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
-SHA1 (patch-av) = 0167d89f23dcc997af9a9b9ab78439d5840e0724
+SHA1 (patch-av) = f4123b34e4486be8e65abd792197b33e2272ed7c
 SHA1 (patch-aw) = 654de6c7e5e1164fad2bbd60606f50cb45ad8da3
 SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
 SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
 SHA1 (patch-az) = 1d753d201e2c4790a027b0ccad1da3ce02e20085
-SHA1 (patch-ba) = 52325ea46828e6c7fd56e0faf8487a15dafbb0b7
+SHA1 (patch-ba) = 31d40d3b9055be1cfe862bf43fda5cc29e103ab9
 SHA1 (patch-bb) = 4693aa848a3059d291a1fb8b2c391ee2acf07649
 SHA1 (patch-bc) = c6af853a024cb1f4389cb594b0ad8f747bee5ac0
 SHA1 (patch-bd) = b8c185796629344fa00da94cbec9ca92d1b301b0
diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af
index cf7e468ec96..114d8cde58f 100644
--- a/mail/faces/patches/patch-af
+++ b/mail/faces/patches/patch-af
@@ -1,7 +1,10 @@
-$NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $
+$NetBSD: patch-af,v 1.8 2012/06/23 22:27:11 dholland Exp $
 
---- compface/uncmain.c.orig	1991-10-24 03:28:07.000000000 +0100
-+++ compface/uncmain.c	2006-01-08 14:24:41.000000000 +0000
+- use strerror()
+- ...?
+
+--- compface/uncmain.c.orig	1991-10-24 02:28:07.000000000 +0000
++++ compface/uncmain.c
 @@ -18,6 +18,8 @@
  #include <fcntl.h>
  #include "compface.h"
@@ -11,30 +14,24 @@ $NetBSD: patch-af,v 1.7 2006/01/08 14:30:01 tron Exp $
  /* the buffer is longer than needed to handle sparse input formats */
  #define FACEBUFLEN 2048
  char fbuf[FACEBUFLEN];
-@@ -33,12 +35,21 @@
+@@ -33,12 +35,13 @@ char *cmdname;
  
  /* error handling definitions follow */
  
 -extern int errno, sys_nerr;
+-extern char *sys_errlist[];
 +#include <errno.h>
 +#include <stdio.h>
-+
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
-+extern int sys_nerr;
- extern char *sys_errlist[];
-+#endif
++#include <string.h>
  
  extern void exit P((int)) ;
  
-+#ifdef __INTERIX
+-#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
 +#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));
-@@ -60,6 +71,13 @@
+@@ -60,6 +63,13 @@ char *argv[];
      if (*((*argv)++) == '/')
        cmdname = *argv;               /* find the command's basename */
  
diff --git a/mail/faces/patches/patch-an b/mail/faces/patches/patch-an
index 03a6af1fa95..d35510e6ce9 100644
--- a/mail/faces/patches/patch-an
+++ b/mail/faces/patches/patch-an
@@ -1,7 +1,10 @@
-$NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
+$NetBSD: patch-an,v 1.6 2012/06/23 22:27:11 dholland Exp $
 
---- main.c.orig	1991-11-19 05:00:47.000000000 +0100
-+++ main.c	2005-03-09 21:51:22.000000000 +0100
+- use standard headers
+- ...?
+
+--- main.c.orig	1991-11-19 04:00:47.000000000 +0000
++++ main.c
 @@ -25,7 +25,7 @@
  #include <sys/param.h>
  #include <sys/types.h>
@@ -11,21 +14,19 @@ $NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
  #include <netdb.h>
  #else
  #ifdef SYSTYPE_BSD43
-@@ -36,6 +36,13 @@
+@@ -36,6 +36,11 @@
  #endif
  #include <ctype.h>
  
 +#include <string.h>
 +
-+#ifdef __sgi
 +/* for calloc(), malloc(), realloc() */
 +#include <stdlib.h>
-+#endif
 +
  #ifdef DNSLOOKUP
  #include <sys/socket.h>
  #endif /*DNSLOOKUP*/
-@@ -63,6 +70,7 @@
+@@ -63,6 +68,7 @@ char *resources[] = {      /* Faces X re
    "period",                /* Integer: period in seconds between checks. */
    "bell",                  /* Integer: number of beeps for new arrival. */
    "flash",                 /* Integer: number of flashes for new arrival. */
@@ -33,7 +34,7 @@ $NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
    "lower",                 /* Boolean: lower window if no mail. */
    "raise",                 /* Boolean: raise window on update? */
    "button1clear",          /* Boolean: mouse button 1 clear window? */
-@@ -150,6 +158,7 @@
+@@ -150,6 +156,7 @@ int dontshowuser = 0 ;  /* Set if userna
  int facetype ;          /* Type of face file found. */
  int firsttime = 1 ;     /* Zeroised after first mail/printer check. */
  int flashes = 0 ;       /* Number of flashes for arrival of new mail. */
@@ -41,7 +42,7 @@ $NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
  int fromc_found = 0 ;   /* Set if "From:" line found during processing. */
  int froms_found = 0 ;   /* Set if "From " line found during processing. */
  int height ;            /* Height in pixels of faces display. */
-@@ -743,9 +752,10 @@
+@@ -743,9 +750,10 @@ read_resources()            /* Read all 
    if (get_str_resource(R_FONT,      str))      read_str(&fontname,      str) ;
    if (get_str_resource(R_BGICON,    str))      read_str(&bgicon,        str) ;
  
diff --git a/mail/faces/patches/patch-ao b/mail/faces/patches/patch-ao
index c6246962114..65e8388c9b7 100644
--- a/mail/faces/patches/patch-ao
+++ b/mail/faces/patches/patch-ao
@@ -1,7 +1,9 @@
-$NetBSD: patch-ao,v 1.4 2005/03/12 12:53:56 schwarz Exp $
+$NetBSD: patch-ao,v 1.5 2012/06/23 22:27:11 dholland Exp $
 
---- mon.c.orig	1991-11-19 05:00:48.000000000 +0100
-+++ mon.c	2005-03-09 21:52:39.000000000 +0100
+- use standard headers
+
+--- mon.c.orig	1991-11-19 04:00:48.000000000 +0000
++++ mon.c
 @@ -23,7 +23,8 @@
  #endif /* SYSV32 || hpux */
  #include <sys/types.h>
@@ -12,14 +14,12 @@ $NetBSD: patch-ao,v 1.4 2005/03/12 12:53:56 schwarz Exp $
  #include <sys/time.h>
  #else
  #ifdef SYSTYPE_BSD43
-@@ -50,6 +51,11 @@
+@@ -50,6 +51,9 @@ struct utimbuf {
  #endif /*TOPIX*/
  #endif /*!NOUTIME*/
  
-+#ifdef __sgi
 +/* for calloc(), malloc(), realloc() */
 +#include <stdlib.h>
-+#endif
 +
  #include "faces.h"
  #include "extern.h"
diff --git a/mail/faces/patches/patch-av b/mail/faces/patches/patch-av
index a5c5fad19d4..9c8f15c6322 100644
--- a/mail/faces/patches/patch-av
+++ b/mail/faces/patches/patch-av
@@ -1,27 +1,23 @@
-$NetBSD: patch-av,v 1.4 2006/01/08 14:30:01 tron Exp $
+$NetBSD: patch-av,v 1.5 2012/06/23 22:27:11 dholland Exp $
 
---- compface/cmain.c.orig	1991-10-24 03:28:07.000000000 +0100
-+++ compface/cmain.c	2006-01-08 14:19:04.000000000 +0000
-@@ -33,12 +33,21 @@
+- use strerror()
+
+--- compface/cmain.c.orig	1991-10-24 02:28:07.000000000 +0000
++++ compface/cmain.c
+@@ -33,12 +33,13 @@ char *cmdname;
  
  /* error handling definitions follow */
  
 -extern int errno, sys_nerr;
+-extern char *sys_errlist[];
 +#include <errno.h>
 +#include <stdio.h>
-+
-+#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
-+extern int sys_nerr;
- extern char *sys_errlist[];
-+#endif
++#include <string.h>
  
  extern void exit P((int)) ;
  
-+#ifdef __INTERIX
+-#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
 +#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));
diff --git a/mail/faces/patches/patch-ba b/mail/faces/patches/patch-ba
index 327d3ef505c..62cb044d52f 100644
--- a/mail/faces/patches/patch-ba
+++ b/mail/faces/patches/patch-ba
@@ -1,15 +1,15 @@
-$NetBSD: patch-ba,v 1.1 2005/03/12 12:53:56 schwarz Exp $
+$NetBSD: patch-ba,v 1.2 2012/06/23 22:27:11 dholland Exp $
 
---- rec.c.orig	2005-03-09 21:51:57.000000000 +0100
-+++ rec.c	2005-03-09 21:52:19.000000000 +0100
-@@ -20,6 +20,10 @@
+Use standard headers.
+
+--- rec.c.orig	1991-10-24 02:24:19.000000000 +0000
++++ rec.c
+@@ -20,6 +20,8 @@
  #else
  #include <strings.h>
  #endif /* SYSV32 || hpux */
-+#ifdef __sgi
 +/* for calloc(), malloc(), realloc() */
 +#include <stdlib.h>
-+#endif
  #include "faces.h"
  #include "extern.h"