pkg/28315: mail/faces needs modifications to compile on IRIX 5

[georg.schwarz%freenet.de@localhost]

>Number:         28315
>Category:       pkg
>Synopsis:       mail/faces needs modifications to compile on IRIX 5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 14 17:16:00 +0000 2004
>Originator:     Georg Schwarz
>Release:        current pkgsrc
>Organization:
>Environment:
IRIX lorenz 5.3 08031225 IP20 mips
>Description:
mail/faces needs modifications to compile on IRIX 5 (and likely IRIX 6 as well, 
but please check that).
>How-To-Repeat:

>Fix:
Modify the existing patches to account for the following changes:

--- main.c.orig1        Sun Nov 14 16:29:17 2004
+++ main.c      Sun Nov 14 16:31:49 2004
@@ -25,14 +25,10 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if !defined(mips) || defined(ultrix) || (defined(BSD) && BSD >= 199306)
+#if !defined(mips) || defined(ultrix) || (defined(BSD) && BSD >= 199306) || 
defined (SYSTYPE_BSD43) || defined(__sgi)
 #include <netdb.h>
 #else
-#ifdef SYSTYPE_BSD43
-#include <netdb.h>
-#else
 #include <bsd/netdb.h>
-#endif
 #endif
 #include <ctype.h>

--- mon.c.orig1 Sun Nov 14 16:41:34 2004
+++ mon.c       Sun Nov 14 16:42:57 2004
@@ -24,18 +24,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #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(SYSTYPE_BSD43) || defined(__sgi)
 #include <sys/time.h>
 #else
-#ifdef SYSTYPE_BSD43
-#include <sys/time.h>
-#else
 #ifndef TOPIX
 #include <bsd/sys/time.h>
 #else
 #include <sys/bsd_time.h>
 #endif /*TOPIX*/
-#endif /*SYSTYPE_BSD43*/
 #endif /*( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)*/
 #include <sys/file.h>
 #ifndef NOUTIME

--- x11.c.orig1 Sun Nov 14 16:44:41 2004
+++ x11.c       Sun Nov 14 16:45:26 2004
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #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 <string.h>