Use LOGIN_NAME_MAX instead of MAXLOGNAME, and don't rely on __unused

existing. Should improve non-NetBSD builds.

4 files changed, 65 insertions, 1 deletions

diff --git a/chat/phone/distinfo b/chat/phone/distinfo
index 20f64bd12dc..a368f244491 100644
--- a/chat/phone/distinfo
+++ b/chat/phone/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.3 2014/01/06 22:11:50 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/09/11 07:15:56 dholland Exp $
 
 SHA1 (phone-2.0nb1/phone-2.0.tar.gz) = 0d89cc63225ee96d821dd3d8ab310ac5ea69b40a
 RMD160 (phone-2.0nb1/phone-2.0.tar.gz) = c43ac0cd5de357cfb5dee1ac1546f2c2926be6ab
 Size (phone-2.0nb1/phone-2.0.tar.gz) = 45663 bytes
 SHA1 (patch-client_Makefile) = dc043bd15130f4d73b761aac25f2d9888212573a
+SHA1 (patch-client_defs.h) = 1c88fff63c7db4d55ee35692e8882c620f9c1b7d
 SHA1 (patch-conv_Makefile) = fdacf30c339aecaf2326da956196e65bf6c8fe47
+SHA1 (patch-conv_convd.c) = 63c33e1571d84e9a51894003d085f136dc4ae4f2
 SHA1 (patch-master_Makefile) = 07215108e5ae85c62c5a06a195e95a804776c8e3
+SHA1 (patch-master_defs.h) = c9d79711b28d629dbe9c1493f2467faf915ee9be
diff --git a/chat/phone/patches/patch-client_defs.h b/chat/phone/patches/patch-client_defs.h
new file mode 100644
index 00000000000..91f7cab418d
--- /dev/null
+++ b/chat/phone/patches/patch-client_defs.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-client_defs.h,v 1.1 2014/09/11 07:15:56 dholland Exp $
+
+- Don't rely on __unused from netbsd's <cdefs.h> existing.
+- Use a more portable username size symbol for the sake of Solaris.
+
+--- client/defs.h~	2013-01-02 23:00:42.000000000 +0000
++++ client/defs.h
+@@ -25,6 +25,10 @@
+ #include <curses.h>
+ #include <netdb.h>
+ 
++#ifndef __unused
++#define __unused __attribute__((__unused__))
++#endif
++
+ int	msgpending;
+ int	killedchild;
+ int	changed_size;
+@@ -38,7 +38,7 @@ char	*mytty;			    /* tty he's on	      
+ char	*home;			    /* home directory	       */
+ const char *shell;		    /* preferred shell	       */
+ char	myhost[MAXHOSTNAMELEN];	    /* local host name	       */
+-char	realname[MAXLOGNAME];	    /* from password file      */
++char	realname[LOGIN_NAME_MAX];   /* from password file      */
+ int	maxx;			    /* max legal x coordinate  */
+ int	maxy;			    /* max legal y coordinate  */
+ int	stream;			    /* stream socket filedes   */
diff --git a/chat/phone/patches/patch-conv_convd.c b/chat/phone/patches/patch-conv_convd.c
new file mode 100644
index 00000000000..f0fa207fd77
--- /dev/null
+++ b/chat/phone/patches/patch-conv_convd.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-conv_convd.c,v 1.1 2014/09/11 07:15:56 dholland Exp $
+
+- Don't rely on __unused from netbsd's <cdefs.h> existing.
+
+--- conv/convd.c~	2013-01-02 23:00:43.000000000 +0000
++++ conv/convd.c
+@@ -48,6 +48,10 @@
+ 
+ #include "../common.h"
+ 
++#ifndef __unused
++#define __unused __attribute__((__unused__))
++#endif
++
+ #ifndef lint
+ #if 0
+ static char __unused char RCSid[] = "Header: convd.c,v 1.1 85/10/29 14:20:06 broome Exp ";
diff --git a/chat/phone/patches/patch-master_defs.h b/chat/phone/patches/patch-master_defs.h
new file mode 100644
index 00000000000..bfe9b911843
--- /dev/null
+++ b/chat/phone/patches/patch-master_defs.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-master_defs.h,v 1.1 2014/09/11 07:15:56 dholland Exp $
+
+- Don't rely on __unused from netbsd's <cdefs.h> existing.
+
+--- master/defs.h~	2013-01-02 23:00:43.000000000 +0000
++++ master/defs.h
+@@ -33,6 +33,10 @@
+ #include <err.h>
+ #include <errno.h>
+ 
++#ifndef __unused
++#define __unused __attribute__((__unused__))
++#endif
++
+ #define SOCKADDR    struct sockaddr_in	  /* shorter to type */
+ 
+ /*