added support for IRIX 5

4 files changed, 58 insertions, 28 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 37edb228586..20c34a7a20f 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/10/01 07:34:16 dsainty Exp $
+# $NetBSD: Makefile,v 1.63 2006/12/16 13:18:54 schwarz Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		7
@@ -13,9 +13,6 @@ COMMENT=		Cleaned up MH mailer suite
 CONFLICTS=		ja-mh-[0-9]*
 CONFLICTS+=		ja-mh6-[0-9]*
 
-# Avoids SEGV in nmh's private version of strcasecmp() under gcc4
-CFLAGS+=		-O1
-
 # We choose DOT_LOCKING in our patches because ".lock" files are
 # the most common locking mechanism supported by mail software.
 # It also works well over NFS.
@@ -23,6 +20,15 @@ CFLAGS+=		-O1
 # Locks supported by `mail.local' are ".lock" and flock(2).
 
 .include "../../mk/bsd.prefs.mk"
+# Avoids SEGV in nmh's private version of strcasecmp() under gcc4
+.if !empty(PKGSRC_COMPILER:Mgcc*)
+CFLAGS+=		-O1
+.endif
+
+.if !empty(LOWER_OPSYS:Mirix5*)
+CPPFLAGS+=		-DIRIX5 # for a patch with extra typedefs
+.endif
+
 .include "options.mk"
 
 # Mail Transport Agent - either "smtp" or "sendmail"
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index 4def44f0983..d93d8fcb6e4 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/03/02 21:28:23 joerg Exp $
+$NetBSD: distinfo,v 1.12 2006/12/16 13:18:54 schwarz Exp $
 
 SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
 RMD160 (nmh-1.0.4.tar.gz) = 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037
@@ -40,7 +40,8 @@ SHA1 (patch-bh) = f6d5371d0366e9fd7b432208beec399c05ade010
 SHA1 (patch-bi) = 3ad7237c2331bf957aa1736cf2182f6a14d45ed1
 SHA1 (patch-ca) = 126d53b3af216754c40b828d7c444a6ee077073f
 SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
-SHA1 (patch-cd) = 13901025ef3a1b7fc07d0c13f8e1aef3e9bee2d6
+SHA1 (patch-cd) = 501fe014d4eca0b2f66d0213bd2f002ba12b9ee0
 SHA1 (patch-ce) = b93b07c3ee82e6ab8599f362e14ad2dbe1955325
 SHA1 (patch-ci) = 98f1c80281656d05c460bdb237de3efbf80b9e32
 SHA1 (patch-cj) = cb6a8ca83a7a94651668a70c697c4ec5fa402b48
+SHA1 (patch-ck) = 8577047243b5538b2bab5878c11782b2499df46a
diff --git a/mail/nmh/patches/patch-cd b/mail/nmh/patches/patch-cd
index 191e35a7c03..3062f2ae1e6 100644
--- a/mail/nmh/patches/patch-cd
+++ b/mail/nmh/patches/patch-cd
@@ -1,23 +1,25 @@
-$NetBSD: patch-cd,v 1.3 2001/09/21 17:07:13 sommerfeld Exp $
+$NetBSD: patch-cd,v 1.4 2006/12/16 13:18:54 schwarz Exp $
 
-*** sbr/fmt_scan.c.~1~	Sun Sep 26 13:45:56 1999
---- sbr/fmt_scan.c	Fri Sep 21 12:09:25 2001
-***************
-*** 282,289 ****
-      char *cp, *ep, *sp;
-      char *savestr, *str = NULL;
-      char buffer[BUFSIZ], buffer2[BUFSIZ];
-!     int i, c, ljust;
-!     int value = 0;
-      time_t t;
-      struct format *fmt;
-      struct comp *comp;
---- 282,289 ----
-      char *cp, *ep, *sp;
-      char *savestr, *str = NULL;
-      char buffer[BUFSIZ], buffer2[BUFSIZ];
-!     int i, ljust;
-!     int64_t c, value = 0;
-      time_t t;
-      struct format *fmt;
-      struct comp *comp;
+--- sbr/fmt_scan.c.orig	1999-09-26 19:45:56.000000000 +0200
++++ sbr/fmt_scan.c	2006-12-10 22:42:29.000000000 +0100
+@@ -24,6 +24,9 @@
+ 
+ #define	NFMTS MAXARGS
+ 
++#ifdef IRIX5
++typedef signed long long int	int64_t;
++#endif
+ extern char *formataddr ();	/* hook for custom address formatting */
+ 
+ #ifdef LBL
+@@ -282,8 +285,8 @@
+     char *cp, *ep, *sp;
+     char *savestr, *str = NULL;
+     char buffer[BUFSIZ], buffer2[BUFSIZ];
+-    int i, c, ljust;
+-    int value = 0;
++    int i, ljust;
++    int64_t c, value = 0;
+     time_t t;
+     struct format *fmt;
+     struct comp *comp;
diff --git a/mail/nmh/patches/patch-ck b/mail/nmh/patches/patch-ck
new file mode 100644
index 00000000000..beddc85248d
--- /dev/null
+++ b/mail/nmh/patches/patch-ck
@@ -0,0 +1,21 @@
+$NetBSD: patch-ck,v 1.1 2006/12/16 13:18:54 schwarz Exp $
+
+--- sbr/Makefile.in.orig	2006-12-10 23:23:02.000000000 +0100
++++ sbr/Makefile.in	2006-12-10 23:23:42.000000000 +0100
+@@ -12,6 +12,7 @@
+ 
+ CC       = @CC@
+ CFLAGS   = @CFLAGS@
++CPPFLAGS = @CPPFLAGS@
+ DEFS     = @DEFS@
+ INCLUDES = -I.. -I. -I$(top_srcdir)
+ 
+@@ -24,7 +25,7 @@
+ 
+ LIBOBJS = @LIBOBJS@
+ 
+-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
++COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) $(CFLAGS)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o