Fix build on SunOS.

6 files changed, 61 insertions, 11 deletions

diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile
index 785d48b0d68..833c842a72e 100644
--- a/chat/i2cb/Makefile
+++ b/chat/i2cb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2010/03/04 21:40:29 spz Exp $
+# $NetBSD: Makefile,v 1.23 2012/02/16 14:05:07 hans Exp $
 #
 
 DISTNAME=	i2cb-6.0_ALPHA
@@ -15,6 +15,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 WRKSRC=		${WRKDIR}/icb
 USE_GNU_READLINE=	yes
 
+CFLAGS.SunOS+=	-DBSD_COMP
+LIBS.SunOS+=	-lsocket
+
+MAKE_ENV+=	LIBS=${LIBS:Q}
+
 INSTALLATION_DIRS=	bin libdata
 
 post-extract:
diff --git a/chat/i2cb/distinfo b/chat/i2cb/distinfo
index e465f880df0..8b78351b08d 100644
--- a/chat/i2cb/distinfo
+++ b/chat/i2cb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/03/04 21:40:29 spz Exp $
+$NetBSD: distinfo,v 1.12 2012/02/16 14:05:07 hans Exp $
 
 SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257
 RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 358b366c16290d6d2326e72c281f977e49a8a98b
 SHA1 (patch-ac) = 159060137d850866c04fab0c0b58ce16ca042bb5
 SHA1 (patch-ad) = 9dcb98fe3543d8e4a7b2af338606db8ffe271f56
 SHA1 (patch-ae) = 0f8765883c2b7e77394556405ee7fee7a054ad56
-SHA1 (patch-af) = fa29d029c736e929963749df7744bfbcc71d05d9
+SHA1 (patch-af) = 821de5d1a9a8a1e3dfb5de4ef92737f40f01e03e
 SHA1 (patch-ag) = 5f78d326406e98d912acd0388d0bb98d2d4bd459
 SHA1 (patch-ah) = 1785c0f09a7a0f83b7cb886e9e749959b1753972
 SHA1 (patch-ai) = f2b83d20f6357dd6cb3e468b573c46d6123cae39
@@ -25,7 +25,9 @@ SHA1 (patch-as) = 36130a528b6b1c2fa98bc6402d2d65bb8d55e459
 SHA1 (patch-at) = 2eeaa4dc6e8fd4e31f91b5b8a7004681465925f5
 SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7
 SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a
-SHA1 (patch-aw) = 88d0cdbb02b1f43b16c001925573c547c016b743
+SHA1 (patch-aw) = 8db36d0c1323323477d652601bc0968452004b7f
 SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d
 SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b
 SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf
+SHA1 (patch-src_Makefile) = 1870de457bd29681313a72d6a977b69be5d42bd7
+SHA1 (patch-src_signals.c) = 9a9070a8c6f7350711e340cb6c18b59dfdf8f2ce
diff --git a/chat/i2cb/patches/patch-af b/chat/i2cb/patches/patch-af
index 44b552bb476..4e74d7016ab 100644
--- a/chat/i2cb/patches/patch-af
+++ b/chat/i2cb/patches/patch-af
@@ -1,8 +1,12 @@
-$NetBSD: patch-af,v 1.3 2009/06/05 09:36:15 hasso Exp $
+$NetBSD: patch-af,v 1.4 2012/02/16 14:05:07 hans Exp $
 
 --- src/contoport.c.orig	2000-03-16 00:13:28 +0200
 +++ src/contoport.c	2009-06-05 11:30:39 +0300
-@@ -6,7 +6,7 @@
+@@ -3,10 +3,11 @@
+ /* connect to a port */
+ 
+ #include <stdio.h>
++#include <sys/file.h>
  #include <sys/types.h>
  #include <fcntl.h>
  #include <sys/socket.h>
@@ -11,7 +15,7 @@ $NetBSD: patch-af,v 1.3 2009/06/05 09:36:15 hasso Exp $
  #include <unistd.h>
  #include <netinet/in.h>
  #include <netdb.h>
-@@ -14,14 +14,15 @@
+@@ -14,14 +15,15 @@
  #include "icb.h"
  #include "externs.h"
  
@@ -30,7 +34,7 @@ $NetBSD: patch-af,v 1.3 2009/06/05 09:36:15 hasso Exp $
  
  	snprintf(p, 9, "%d", port_number);
  
-@@ -36,12 +37,43 @@ connecttoport (char *host_name, int port
+@@ -36,12 +38,43 @@ connecttoport (char *host_name, int port
                  perror(gai_strerror(err));
  		return(-1);
  	}
diff --git a/chat/i2cb/patches/patch-aw b/chat/i2cb/patches/patch-aw
index 1c619d064be..0fd49302d87 100644
--- a/chat/i2cb/patches/patch-aw
+++ b/chat/i2cb/patches/patch-aw
@@ -1,8 +1,13 @@
-$NetBSD: patch-aw,v 1.1 2005/12/13 21:30:11 joerg Exp $
+$NetBSD: patch-aw,v 1.2 2012/02/16 14:05:07 hans Exp $
 
 --- src/unix.c.orig	2005-12-13 17:46:52.000000000 +0000
 +++ src/unix.c
-@@ -10,7 +10,8 @@
+@@ -6,11 +6,13 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/ioctl.h>
+ #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <pwd.h>
@@ -12,7 +17,7 @@ $NetBSD: patch-aw,v 1.1 2005/12/13 21:30:11 joerg Exp $
  #include <time.h>
  #include <unistd.h>
  #include "icb.h"
-@@ -235,7 +236,11 @@ tildexpand (char *s)
+@@ -235,7 +237,11 @@ tildexpand (char *s)
  	struct passwd *pw;
  	char login[17];
  	char *p = login;
diff --git a/chat/i2cb/patches/patch-src_Makefile b/chat/i2cb/patches/patch-src_Makefile
new file mode 100644
index 00000000000..2492833a137
--- /dev/null
+++ b/chat/i2cb/patches/patch-src_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makefile,v 1.1 2012/02/16 14:05:08 hans Exp $
+
+--- src/Makefile.orig	2000-03-16 00:15:37.000000000 +0100
++++ src/Makefile	2012-01-20 12:58:46.918323541 +0100
+@@ -8,8 +8,6 @@
+ 
+ .include "../config"
+ 
+-LIBS =
+-
+ SRC = \
+ 	c_hclear.c \
+ 	c_hdel.c \
diff --git a/chat/i2cb/patches/patch-src_signals.c b/chat/i2cb/patches/patch-src_signals.c
new file mode 100644
index 00000000000..23a532d1618
--- /dev/null
+++ b/chat/i2cb/patches/patch-src_signals.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_signals.c,v 1.1 2012/02/16 14:05:08 hans Exp $
+
+--- src/signals.c.orig	2000-03-15 23:13:29.000000000 +0100
++++ src/signals.c	2012-01-20 13:11:43.374363790 +0100
+@@ -45,11 +45,14 @@ trapsignals (void)
+ void
+ suspend (int n)
+ {
++	sigset_t set;
++
+ 	restoreterm();
+ 	signal(SIGTSTP, SIG_DFL);
+-	sigsetmask(sigblock(0) &~ mask(SIGTSTP));
++	sigaddset(&set, SIGTSTP);
++	sigprocmask(SIG_UNBLOCK, &set, NULL);
+ 	kill(0, SIGTSTP);
+-	sigblock(mask(SIGTSTP));
++	sigprocmask(SIG_BLOCK, &set, NULL);
+ 	signal(SIGTSTP, suspend);
+ 	icbterm();
+ 	continued = 1;