Various fixes for SunOS support.

11 files changed, 161 insertions, 10 deletions

diff --git a/editors/mg/distinfo b/editors/mg/distinfo
index 3dd4bf6d16d..ac29072e91d 100644
--- a/editors/mg/distinfo
+++ b/editors/mg/distinfo
@@ -1,11 +1,18 @@
-$NetBSD: distinfo,v 1.6 2012/12/12 12:47:50 wiz Exp $
+$NetBSD: distinfo,v 1.7 2014/07/07 18:06:58 jperkin Exp $
 
 SHA1 (mg-20110905.tar.gz) = 51d2bac801cab33c9b552c36db5f8637fbbe9363
 RMD160 (mg-20110905.tar.gz) = 721b2a2e9059ddf6ea637dafd205575150b58c8c
 Size (mg-20110905.tar.gz) = 138805 bytes
 SHA1 (patch-ab) = 2deb4c7e78d580434cfedfe9ea23add3b19cc300
-SHA1 (patch-ad) = 735fbcdc5dd0693a9ae3f0da347f5456cf73217e
-SHA1 (patch-af) = 3c36053fe5ad58751b26ea23672f6107d2fa3046
+SHA1 (patch-ad) = 12515e4f5ce063f2984e5a144e467ba9b1693a7e
+SHA1 (patch-af) = b3c845deb4d7d70d006b8e00eeb5cf89a4b1027b
 SHA1 (patch-ag) = f6ac048ea94517fd0c4e3fb9b72045b8eca063fd
-SHA1 (patch-ah) = b18b967789b006d42e9da1c0133ac64bfe8673b3
+SHA1 (patch-ah) = 4c30216b73e895c0905c1245918c1bf04363ab16
 SHA1 (patch-ai) = bc9950469e4792867532dcaddba331f07131215c
+SHA1 (patch-basic.c) = bf528fd1b41d669427b00eb39c3c244cca725b5a
+SHA1 (patch-echo.c) = 4efb1e8205a399e5486ee81728e02b0358d7cf86
+SHA1 (patch-fgetln.c) = b2df2ccb26dea1c03cb159b2dea81a99583a933d
+SHA1 (patch-line.c) = 789afe647e1cb8d34280399f2ee5fbf31cce4926
+SHA1 (patch-main.c) = 32d374128558aae6db10e2326af8084d75eefe26
+SHA1 (patch-paragraph.c) = d68754b802c99fecb63a6cfa634f0360945f034f
+SHA1 (patch-ttyio.c) = 29009af12c5f6a95e083128baef5fef602b16f28
diff --git a/editors/mg/patches/patch-ad b/editors/mg/patches/patch-ad
index 1c1a3af8fe2..5fb66ef8034 100644
--- a/editors/mg/patches/patch-ad
+++ b/editors/mg/patches/patch-ad
@@ -1,11 +1,20 @@
-$NetBSD: patch-ad,v 1.3 2012/12/12 12:47:50 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2014/07/07 18:06:58 jperkin Exp $
 
 - use toupper() correctly
 - suppress initialization warning that sometimes (?) arises with gcc 4.5
+- include limits.h for INT_{MIN,MAX}
 
 --- extend.c.orig	2011-06-18 09:18:54.000000000 +0000
 +++ extend.c
-@@ -445,7 +445,7 @@ dobindkey(KEYMAP *map, const char *func,
+@@ -12,6 +12,7 @@
+ 
+ #include <sys/types.h>
+ #include <ctype.h>
++#include <limits.h>
+ 
+ #ifndef NO_MACRO
+ #include "macro.h"
+@@ -445,7 +446,7 @@ dobindkey(KEYMAP *map, const char *func,
  	for (i = 0; *str && i < MAXKEY; i++) {
  		/* XXX - convert numbers w/ strol()? */
  		if (*str == '^' && *(str + 1) !=  '\0') {
diff --git a/editors/mg/patches/patch-af b/editors/mg/patches/patch-af
index c08e1f29ca5..47f91f39e1b 100644
--- a/editors/mg/patches/patch-af
+++ b/editors/mg/patches/patch-af
@@ -1,8 +1,18 @@
-$NetBSD: patch-af,v 1.2 2012/12/12 12:47:50 wiz Exp $
+$NetBSD: patch-af,v 1.3 2014/07/07 18:06:58 jperkin Exp $
+
+Include limits.h for INT_{MIN,MAX}
 
 --- grep.c.orig	2011-01-02 22:57:56.000000000 +0000
 +++ grep.c
-@@ -152,7 +152,7 @@ gid(int f, int n)
+@@ -8,6 +8,7 @@
+ 
+ #include <sys/types.h>
+ #include <ctype.h>
++#include <limits.h>
+ 
+ #include "libgen.h"
+ 
+@@ -152,7 +153,7 @@ gid(int f, int n)
  	/* Skip backwards over delimiters we are currently on */
  	while (i > 0) {
  		c = lgetc(curwp->w_dotp, i);
@@ -11,7 +21,7 @@ $NetBSD: patch-af,v 1.2 2012/12/12 12:47:50 wiz Exp $
  			break;
  
  		i--;
-@@ -161,14 +161,14 @@ gid(int f, int n)
+@@ -161,14 +162,14 @@ gid(int f, int n)
  	/* Skip the symbol itself */
  	for (; i > 0; i--) {
  		c = lgetc(curwp->w_dotp, i - 1);
diff --git a/editors/mg/patches/patch-ah b/editors/mg/patches/patch-ah
index a63918e899c..f87f98e229c 100644
--- a/editors/mg/patches/patch-ah
+++ b/editors/mg/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2012/12/12 12:47:50 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2014/07/07 18:06:58 jperkin Exp $
+
+Support SunOS.
 
 --- fileio.c.orig	2011-09-05 18:26:37.000000000 +0000
 +++ fileio.c
@@ -25,3 +27,21 @@ $NetBSD: patch-ah,v 1.2 2012/12/12 12:47:50 wiz Exp $
  		return (NULL);
  
  	/* loop over the specified directory, making up the list of files */
+@@ -570,7 +570,7 @@ make_file_list(char *buf)
+ #if defined (__CYGWIN__)	/* Cygwin lacks reclen/namlen. */
+ 		if (strlen(dent->d_name) < len
+ 		    || memcmp(cp, dent->d_name, len) != 0)
+-#elif defined (__GLIBC__)		/* Linux uses reclen instead. */
++#elif defined (__GLIBC__) || defined(__sun) /* Linux uses reclen instead. */
+ 		if (dent->d_reclen < len || memcmp(cp, dent->d_name, len) != 0)
+ #else
+ 		if (dent->d_namlen < len || memcmp(cp, dent->d_name, len) != 0)
+@@ -579,7 +579,7 @@ make_file_list(char *buf)
+ 
+ 		isdir = 0;
+ 
+-#ifndef __CYGWIN__      /* No support for d_type in Cygwin, do all
++#if !defined(__CYGWIN__) && !defined(__sun) /* No support for d_type in Cygwin, do all
+ 			     type cheking with stat. */
+ 		if (dent->d_type == DT_DIR) {
+ 			isdir = 1;
diff --git a/editors/mg/patches/patch-basic.c b/editors/mg/patches/patch-basic.c
new file mode 100644
index 00000000000..1b8fd46cb03
--- /dev/null
+++ b/editors/mg/patches/patch-basic.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-basic.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+Include limits.h for INT_{MIN,MAX}
+
+--- basic.c.orig	2011-01-02 22:57:56.000000000 +0000
++++ basic.c
+@@ -14,6 +14,7 @@
+ #include "def.h"
+ 
+ #include <ctype.h>
++#include <limits.h>
+ 
+ /*
+  * Go to beginning of line.
diff --git a/editors/mg/patches/patch-echo.c b/editors/mg/patches/patch-echo.c
new file mode 100644
index 00000000000..5f46477a7c9
--- /dev/null
+++ b/editors/mg/patches/patch-echo.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-echo.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+Compat define for MAX()
+
+--- echo.c.orig	2011-01-02 22:57:56.000000000 +0000
++++ echo.c
+@@ -20,6 +20,10 @@
+ #include <stdarg.h>
+ #include <term.h>
+ 
++#ifndef MAX
++#define MAX(x,y)	((x) > (y) ? (x) : (y))
++#endif
++
+ static char	*veread(const char *, char *, size_t, int, va_list);
+ static int	 complt(int, int, char *, size_t, int, int *);
+ static int	 complt_list(int, char *, int);
diff --git a/editors/mg/patches/patch-fgetln.c b/editors/mg/patches/patch-fgetln.c
new file mode 100644
index 00000000000..e8d143f0683
--- /dev/null
+++ b/editors/mg/patches/patch-fgetln.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-fgetln.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+SunOS needs fgetln support.
+
+--- fgetln.c.orig	2008-12-30 12:41:23.000000000 +0000
++++ fgetln.c
+@@ -27,7 +27,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#if defined (__GLIBC__) || defined (__CYGWIN__)  /* FreeWRT: only build
++#if defined (__GLIBC__) || defined (__CYGWIN__) || defined(__sun) /* FreeWRT: only build
+ 						      this where needed */
+ char *fgetln(FILE *, size_t *);
+ 
diff --git a/editors/mg/patches/patch-line.c b/editors/mg/patches/patch-line.c
new file mode 100644
index 00000000000..dc35068198d
--- /dev/null
+++ b/editors/mg/patches/patch-line.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-line.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+Include limits.h for INT_{MIN,MAX}
+
+--- line.c.orig	2011-01-20 04:36:13.000000000 +0000
++++ line.c
+@@ -20,6 +20,7 @@
+ 
+ #include "def.h"
+ 
++#include <limits.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/editors/mg/patches/patch-main.c b/editors/mg/patches/patch-main.c
new file mode 100644
index 00000000000..2073cc4951e
--- /dev/null
+++ b/editors/mg/patches/patch-main.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-main.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+Include limits.h for INT_{MIN,MAX}
+
+--- main.c.orig	2011-01-02 22:57:56.000000000 +0000
++++ main.c
+@@ -15,6 +15,7 @@
+ #endif	/* NO_MACRO */
+ 
+ #include <err.h>
++#include <limits.h>
+ 
+ int		 thisflag;			/* flags, this command	*/
+ int		 lastflag;			/* flags, last command	*/
diff --git a/editors/mg/patches/patch-paragraph.c b/editors/mg/patches/patch-paragraph.c
new file mode 100644
index 00000000000..4c41d9c4bbe
--- /dev/null
+++ b/editors/mg/patches/patch-paragraph.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-paragraph.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+Include limits.h for INT_{MIN,MAX}
+
+--- paragraph.c.orig	2011-01-02 22:57:56.000000000 +0000
++++ paragraph.c
+@@ -9,6 +9,8 @@
+ 
+ #include "def.h"
+ 
++#include <limits.h>
++
+ static int	fillcol = 70;
+ 
+ #define MAXWORD 256
diff --git a/editors/mg/patches/patch-ttyio.c b/editors/mg/patches/patch-ttyio.c
new file mode 100644
index 00000000000..baddfcdc8b1
--- /dev/null
+++ b/editors/mg/patches/patch-ttyio.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-ttyio.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+
+SunOS needs sys/filio.h for FIONREAD.
+
+--- ttyio.c.orig	2008-12-11 08:59:08.000000000 +0000
++++ ttyio.c
+@@ -14,6 +14,9 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
++#ifdef __sun
++#include <sys/filio.h>
++#endif
+ #include <fcntl.h>
+ #include <termios.h>
+ #include <term.h>