added patches to support IRIX, closing PR#28315.

7 files changed, 96 insertions, 19 deletions

diff --git a/mail/faces/distinfo b/mail/faces/distinfo
index fb583e0c984..056787a5695 100644
--- a/mail/faces/distinfo
+++ b/mail/faces/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/03/12 12:53:56 schwarz Exp $
 
 SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
 RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195
@@ -16,16 +16,19 @@ SHA1 (patch-aj) = 77386cbb0fc62300d61205d68bfb795125cd0ca6
 SHA1 (patch-ak) = 17d2781ad02394ed148ba654bf553f0f46a3db99
 SHA1 (patch-al) = 4cda3f50c6071137abde13f9f1afd7a1d80aa8d4
 SHA1 (patch-am) = 47121da4ec605ef24474ec830615643972b864ab
-SHA1 (patch-an) = 2d85ed93fd2031a21158ff2cf11ecefed312f4ec
-SHA1 (patch-ao) = 386fd23a51cf4c8bcca0f50f1bbb599c7ab23b84
+SHA1 (patch-an) = 826208a9ac5b21e185f64e899ad09a95192e704c
+SHA1 (patch-ao) = 4121b8310a3fa4067f1cbe2b5b8ae51f182f4b23
 SHA1 (patch-ap) = 200bf4c20bc36d5f08505af69084a4de2283e07f
 SHA1 (patch-aq) = 57d3f14ae8229cc4d879fdca5f87f04bb5398edc
 SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9
 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377
-SHA1 (patch-at) = abef0f35020fb8246ecef0dbe148f77da841ec44
+SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c
 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
 SHA1 (patch-av) = 1ef88ca0a9b72d783f318242d152d23510f7949a
 SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
 SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000
 SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93
 SHA1 (patch-az) = 1d753d201e2c4790a027b0ccad1da3ce02e20085
+SHA1 (patch-ba) = 52325ea46828e6c7fd56e0faf8487a15dafbb0b7
+SHA1 (patch-bb) = 4693aa848a3059d291a1fb8b2c391ee2acf07649
+SHA1 (patch-bc) = c6af853a024cb1f4389cb594b0ad8f747bee5ac0
diff --git a/mail/faces/patches/patch-an b/mail/faces/patches/patch-an
index 124b5268089..03a6af1fa95 100644
--- a/mail/faces/patches/patch-an
+++ b/mail/faces/patches/patch-an
@@ -1,34 +1,48 @@
-$NetBSD: patch-an,v 1.4 2001/02/03 01:53:03 dmcmahill Exp $
+$NetBSD: patch-an,v 1.5 2005/03/12 12:53:56 schwarz Exp $
 
---- main.c.orig	Mon Nov 18 23:00:47 1991
-+++ main.c	Fri Feb  2 18:05:38 2001
-@@ -26,5 +26,5 @@
+--- main.c.orig	1991-11-19 05:00:47.000000000 +0100
++++ main.c	2005-03-09 21:51:22.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include <sys/param.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 -#if !defined(mips) || defined(ultrix)
-+#if !defined(mips) || defined(ultrix) || (defined(BSD) && BSD >= 199306)
++#if !defined(mips) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
  #include <netdb.h>
  #else
-@@ -37,4 +37,6 @@
+ #ifdef SYSTYPE_BSD43
+@@ -36,6 +36,13 @@
+ #endif
  #include <ctype.h>
  
 +#include <string.h>
 +
++#ifdef __sgi
++/* for calloc(), malloc(), realloc() */
++#include <stdlib.h>
++#endif
++
  #ifdef DNSLOOKUP
  #include <sys/socket.h>
-@@ -64,4 +66,5 @@
+ #endif /*DNSLOOKUP*/
+@@ -63,6 +70,7 @@
+   "period",                /* Integer: period in seconds between checks. */
    "bell",                  /* Integer: number of beeps for new arrival. */
    "flash",                 /* Integer: number of flashes for new arrival. */
 +  "borderWidth",           /* Integer: border width of window. */
    "lower",                 /* Boolean: lower window if no mail. */
    "raise",                 /* Boolean: raise window on update? */
-@@ -151,4 +154,5 @@
+   "button1clear",          /* Boolean: mouse button 1 clear window? */
+@@ -150,6 +158,7 @@
+ 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. */
 +int border_width = 2 ;	/* Border width of window. */
  int fromc_found = 0 ;   /* Set if "From:" line found during processing. */
  int froms_found = 0 ;   /* Set if "From " line found during processing. */
-@@ -744,7 +748,8 @@
+ int height ;            /* Height in pixels of faces display. */
+@@ -743,9 +752,10 @@
+   if (get_str_resource(R_FONT,      str))      read_str(&fontname,      str) ;
    if (get_str_resource(R_BGICON,    str))      read_str(&bgicon,        str) ;
  
 -  if (get_int_resource(R_PERIOD,    &intval))  period       = intval ;
@@ -40,3 +54,4 @@ $NetBSD: patch-an,v 1.4 2001/02/03 01:53:03 dmcmahill Exp $
 +  if (get_int_resource(R_BORDERWIDTH,&intval)) border_width = intval ;
  
    if (get_bool_resource(R_LOWER,    &boolval)) lowerwindow  = boolval ;
+   if (get_bool_resource(R_RAISE,    &boolval)) raisewindow  = boolval ;
diff --git a/mail/faces/patches/patch-ao b/mail/faces/patches/patch-ao
index 34e159f708c..c6246962114 100644
--- a/mail/faces/patches/patch-ao
+++ b/mail/faces/patches/patch-ao
@@ -1,14 +1,26 @@
-$NetBSD: patch-ao,v 1.3 2000/07/08 12:47:08 tron Exp $
+$NetBSD: patch-ao,v 1.4 2005/03/12 12:53:56 schwarz Exp $
 
---- mon.c.orig	Tue Nov 19 05:00:48 1991
-+++ mon.c	Sat Jul  8 14:25:27 2000
+--- mon.c.orig	1991-11-19 05:00:48.000000000 +0100
++++ mon.c	2005-03-09 21:52:39.000000000 +0100
 @@ -23,7 +23,8 @@
  #endif /* SYSV32 || hpux */
  #include <sys/types.h>
  #include <sys/stat.h>
 -#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)
 +#include <sys/param.h>
-+#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306)
++#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
  #include <sys/time.h>
  #else
  #ifdef SYSTYPE_BSD43
+@@ -50,6 +51,11 @@
+ #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-at b/mail/faces/patches/patch-at
index bc2ad063a43..590c2ae148e 100644
--- a/mail/faces/patches/patch-at
+++ b/mail/faces/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.5 2001/11/29 18:00:32 wiz Exp $
+$NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $
 
 --- x11.c.orig	Mon Nov 18 23:00:50 1991
 +++ x11.c	Fri Feb  2 20:01:06 2001
@@ -7,7 +7,7 @@ $NetBSD: patch-at,v 1.5 2001/11/29 18:00:32 wiz Exp $
  #include <ctype.h>
 -#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)
 +#include <sys/param.h>
-+#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306)
++#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || defined(__sgi)
  #include <sys/types.h>
  #include <sys/time.h>
 -#include <sys/param.h>
diff --git a/mail/faces/patches/patch-ba b/mail/faces/patches/patch-ba
new file mode 100644
index 00000000000..327d3ef505c
--- /dev/null
+++ b/mail/faces/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 2005/03/12 12:53:56 schwarz 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 @@
+ #else
+ #include <strings.h>
+ #endif /* SYSV32 || hpux */
++#ifdef __sgi
++/* for calloc(), malloc(), realloc() */
++#include <stdlib.h>
++#endif
+ #include "faces.h"
+ #include "extern.h"
+ 
diff --git a/mail/faces/patches/patch-bb b/mail/faces/patches/patch-bb
new file mode 100644
index 00000000000..0ede0d8368a
--- /dev/null
+++ b/mail/faces/patches/patch-bb
@@ -0,0 +1,16 @@
+$NetBSD: patch-bb,v 1.1 2005/03/12 12:53:56 schwarz Exp $
+
+--- xview.c.orig	2005-03-09 21:53:05.000000000 +0100
++++ xview.c	2005-03-09 21:53:26.000000000 +0100
+@@ -27,6 +27,11 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ 
++#ifdef __sgi
++/* for calloc(), malloc(), realloc() */
++#include <stdlib.h>
++#endif
++
+ #define  DEF_FONT  "fixed"
+ #define  F_ICON    0                  /* Icon index to frame array. */
+ #define  F_WINDOW  1                  /* Window index to frame array. */
diff --git a/mail/faces/patches/patch-bc b/mail/faces/patches/patch-bc
new file mode 100644
index 00000000000..c67632ac882
--- /dev/null
+++ b/mail/faces/patches/patch-bc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bc,v 1.1 2005/03/12 12:53:56 schwarz Exp $
+
+--- xface/xface.c.orig	2005-03-09 21:54:30.000000000 +0100
++++ xface/xface.c	2005-03-09 21:54:55.000000000 +0100
+@@ -20,6 +20,11 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ 
++#ifdef __sgi
++/* for calloc(), malloc(), realloc() */
++#include <stdlib.h>
++#endif
++
+ #include "xface.h"
+ 
+ static char empty_bits[(WIDTH/8) * HEIGHT];