fix time.h issues

4 files changed, 30 insertions, 16 deletions

diff --git a/chat/icb/Makefile b/chat/icb/Makefile
index 346b01d1f22..a8942d5d3d1 100644
--- a/chat/icb/Makefile
+++ b/chat/icb/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2008/12/17 02:19:59 christos Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/24 01:24:38 christos Exp $
 #
 
 # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
 #	older than this here. It's got no readline support, tcl, ... - HF
 DISTNAME=		icb-5.0.9
 PKGNAME=		icb-5.0.9pl1
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/chat/icb/distinfo b/chat/icb/distinfo
index a4cdea92bb7..e9644fefcef 100644
--- a/chat/icb/distinfo
+++ b/chat/icb/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/12/17 02:19:59 christos Exp $
+$NetBSD: distinfo,v 1.12 2009/07/24 01:24:39 christos Exp $
 
 SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8
 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf
@@ -24,7 +24,7 @@ SHA1 (patch-ar) = 7fa954914f8c0fdad4f610f37dd81129ec57bc14
 SHA1 (patch-as) = 5c42bfdc2e836fb86e814c396760040560864256
 SHA1 (patch-at) = 703abcc2415b92776241011fe893286de06da034
 SHA1 (patch-au) = 35db5c53aed27f3a73977098b89cf4273e801a22
-SHA1 (patch-av) = ee5d630cf578dcf8150486526b9b96214a06997e
+SHA1 (patch-av) = 7c18f6e81ac82466fd5fc8b30e12264933eab5d6
 SHA1 (patch-aw) = 6dbc66a63f52244ac9b8b29346cb376b98442695
 SHA1 (patch-ax) = 9dbc788c08357e2207f08290a014267f306ead76
 SHA1 (patch-ay) = f8a787d5a6611890d65fa8b0411977fd5c0bc7e9
@@ -45,3 +45,4 @@ SHA1 (patch-bm) = 1171ce0885693b198d8d7ad8960c55dec4604aa0
 SHA1 (patch-bn) = 57972d7c9712755833dc97559edded528e38aa97
 SHA1 (patch-bo) = c04e9b0103b03559896de098a4beea7c3f5c311d
 SHA1 (patch-bp) = f79cfc4a9bd18397611e3dd46b4b85675054da6c
+SHA1 (patch-bq) = dba28647f096cde0ff682ed60f7fea473f74c008
diff --git a/chat/icb/patches/patch-av b/chat/icb/patches/patch-av
index a69380e717d..639a89d9820 100644
--- a/chat/icb/patches/patch-av
+++ b/chat/icb/patches/patch-av
@@ -1,13 +1,14 @@
-$NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
+$NetBSD: patch-av,v 1.3 2009/07/24 01:24:39 christos Exp $
 
 --- icb/unix.c.orig	1995-02-24 16:20:31.000000000 -0500
-+++ icb/unix.c	2008-12-16 21:16:10.000000000 -0500
-@@ -7,20 +7,26 @@
++++ icb/unix.c	2009-07-23 21:22:34.000000000 -0400
+@@ -7,20 +7,27 @@
  #include <stdio.h>
  #include "icb.h"
  #include "externs.h"
 +#include <limits.h>
  #include <pwd.h>
++#include <time.h>
  #include <sys/dir.h>
  
  #undef stty
@@ -31,7 +32,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  #define TTYSTRUCT sgttyb
  #define stty(fd,buf) ioctl((fd),TIOCSETN,(buf))
  #define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf))
-@@ -30,6 +36,7 @@
+@@ -30,6 +37,7 @@
  #define stty(fd,buf) ioctl((fd),TCSETA,(buf))
  #define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
  #endif /* SYSV */
@@ -39,7 +40,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  
  char *getlogin();
  
-@@ -65,13 +72,16 @@
+@@ -65,13 +73,16 @@
  
  /* set line buffering for an open file pointer */
  /* output will be flushed every newline */
@@ -58,7 +59,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  }
  
  
-@@ -79,13 +89,13 @@
+@@ -79,13 +90,13 @@
  pushback(c)
  char c;
  {
@@ -75,7 +76,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  }
  
  
-@@ -94,25 +104,25 @@
+@@ -94,25 +105,25 @@
  
  getterm()
  {
@@ -109,7 +110,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  	/* get local special chars */
   	if (ioctl(0, TIOCGLTC, &lt) < 0) {
  		ttyinfo.redraw = '\022'; /* ^R */
-@@ -121,10 +131,10 @@
+@@ -121,10 +132,10 @@
  		ttyinfo.redraw = lt.t_rprntc;
  		ttyinfo.werase = lt.t_werasc;
  	}
@@ -122,7 +123,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  
  	/* get the current window size */
  	getwinsize();
-@@ -145,14 +155,14 @@
+@@ -145,14 +156,14 @@
  	bcopy((char *)&origtty, (char *)&tty, (unsigned)sizeof(struct TTYSTRUCT));
  
  	/* turn on cbreak - turn off echo */
@@ -142,7 +143,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  
  	echomode = 0;
  	/* set the new flags */
-@@ -206,7 +216,11 @@
+@@ -206,7 +217,11 @@
  	struct passwd *pw;
  	char login[17];
  	char *p = login;
@@ -154,7 +155,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  
  	/* has to start with a tilde */
  	if (*s++ != '~')
-@@ -258,11 +272,11 @@
+@@ -258,11 +273,11 @@
  	}
  
  	/* turn on echo */
@@ -170,7 +171,7 @@ $NetBSD: patch-av,v 1.2 2008/12/17 02:19:59 christos Exp $
  
  	echomode = 1;
  
-@@ -287,11 +301,11 @@
+@@ -287,11 +302,11 @@
  	}
  
  	/* turn off echo */
diff --git a/chat/icb/patches/patch-bq b/chat/icb/patches/patch-bq
new file mode 100644
index 00000000000..e243d78e7e5
--- /dev/null
+++ b/chat/icb/patches/patch-bq
@@ -0,0 +1,12 @@
+$NetBSD: patch-bq,v 1.3 2009/07/24 01:24:39 christos Exp $
+
+--- icb/main.c.orig	1995-02-24 16:20:24.000000000 -0500
++++ icb/main.c	2009-07-23 21:19:32.000000000 -0400
+@@ -7,6 +7,7 @@
+ #include "externs.h"
+ #include <sys/wait.h>
+ #include <sys/dir.h>
++#include <time.h>
+ #include "getswitch.h"
+ 
+ char *optv[] = { "clear", "list", "who", "restricted", "nickname:", "group:",