Update to 1.8.

4 files changed, 22 insertions, 30 deletions

diff --git a/irc/icbirc/Makefile b/irc/icbirc/Makefile
index 47f1b2bfcbcd..3b92bbffbe76 100644
--- a/irc/icbirc/Makefile
+++ b/irc/icbirc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	icbirc
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	irc
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -13,6 +13,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Proxy IRC client and ICB server
 
 MAKE_ENV=	BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAN8=		icbirc.8
 MANCOMPRESSED=	maybe
diff --git a/irc/icbirc/distinfo b/irc/icbirc/distinfo
index 93e9ff149ed5..5acf35ed871a 100644
--- a/irc/icbirc/distinfo
+++ b/irc/icbirc/distinfo
@@ -1,3 +1,3 @@
-MD5 (icbirc-1.7.tar.gz) = 65cacf7bc63008404df26210834051e2
-SHA256 (icbirc-1.7.tar.gz) = 4b378e629dd7e7a063bb26cc8ab37e95f5825fc940016627d3f2d6d5d4901a0b
-SIZE (icbirc-1.7.tar.gz) = 10980
+MD5 (icbirc-1.8.tar.gz) = dd26ef4f7bd807639c307d2a8f0d790c
+SHA256 (icbirc-1.8.tar.gz) = ebc4c2482ac531149874ee77c188f6adcf509862ca2b600e9fe5057f555ecd92
+SIZE (icbirc-1.8.tar.gz) = 11061
diff --git a/irc/icbirc/files/patch-icb.c b/irc/icbirc/files/patch-icb.c
index 70feb78b005f..5b0a7b341462 100644
--- a/irc/icbirc/files/patch-icb.c
+++ b/irc/icbirc/files/patch-icb.c
@@ -1,13 +1,13 @@
---- icb.c.orig	Fri Feb 27 10:17:09 2004
-+++ icb.c	Wed Jan  3 06:06:20 2007
+--- icb.c.orig	Fri Nov 19 06:14:28 2004
++++ icb.c	Tue Aug 28 05:09:38 2007
 @@ -40,8 +40,8 @@
  
  extern int	 sync_write(int, const char *, int);
  
 -static unsigned char	 icb_args(const char *, unsigned char, char [255][255]);
--static void		 icb_cmd(const char *, unsigned char, int);
+-static void		 icb_cmd(const char *, unsigned char, int, int);
 +static unsigned char	 icb_args(const unsigned char *, unsigned char, char [255][255]);
-+static void		 icb_cmd(const unsigned char *, unsigned char, int);
++static void		 icb_cmd(const unsigned char *, unsigned char, int, int);
  static void		 icb_ico(int, const char *);
  static void		 icb_iwl(int, const char *, const char *, long,
  			    long, const char *, const char *);
@@ -33,8 +33,8 @@
  }
  
  static void
--icb_cmd(const char *cmd, unsigned char len, int fd)
-+icb_cmd(const unsigned char *cmd, unsigned char len, int fd)
+-icb_cmd(const char *cmd, unsigned char len, int fd, int server_fd)
++icb_cmd(const unsigned char *cmd, unsigned char len, int fd, int server_fd)
  {
  	char args[255][255];
 -	const char *a = args[1];
@@ -42,7 +42,7 @@
  	unsigned char i, j;
  	char s[8192];
  
-@@ -244,7 +244,7 @@
+@@ -254,7 +254,7 @@
  			char old_nick[256], new_nick[256];
  
  			scan(&a, old_nick, sizeof(old_nick), " ", " ");
@@ -51,7 +51,7 @@
  				return;
  			a += 21;
  			scan(&a, new_nick, sizeof(new_nick), " ", " ");
-@@ -258,7 +258,7 @@
+@@ -268,7 +268,7 @@
  			char nick[256], topic[256];
  
  			scan(&a, nick, sizeof(nick), " ", " ");
@@ -60,7 +60,7 @@
  				return;
  			a += 23;
  			scan(&a, topic, sizeof(topic), "", "\"");
-@@ -269,13 +269,13 @@
+@@ -279,13 +279,13 @@
  			char old_mod[256], new_mod[256];
  
  			scan(&a, old_mod, sizeof(old_mod), " ", " ");
@@ -76,7 +76,7 @@
  				snprintf(s, sizeof(s),
  				    ":%s MODE %s +o %s\r\n",
  				    icb_hostid, irc_channel, old_mod);
-@@ -287,7 +287,7 @@
+@@ -297,7 +297,7 @@
  			char nick[256];
  
  			scan(&a, nick, sizeof(nick), " ", " ");
@@ -85,7 +85,7 @@
  				return;
  			snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",
  			    icb_moderator, irc_channel, nick);
-@@ -498,7 +498,7 @@
+@@ -508,7 +508,7 @@
  		cmd[off++] = 0;
  		cmd[0] = off - 1;
  		/* cmd[0] <= MAX_MSG_SIZE */
@@ -94,7 +94,7 @@
  	}
  }
  
-@@ -523,7 +523,7 @@
+@@ -533,7 +533,7 @@
  		cmd[off++] = 0;
  		cmd[0] = off - 1;
  		/* cmd[0] <= MAX_MSG_SIZE */
diff --git a/irc/icbirc/files/patch-icbirc.c b/irc/icbirc/files/patch-icbirc.c
index 2e4a9d19882c..72dac2faf679 100644
--- a/irc/icbirc/files/patch-icbirc.c
+++ b/irc/icbirc/files/patch-icbirc.c
@@ -1,22 +1,13 @@
-
-$FreeBSD$
-
---- icbirc.c.orig	Wed Aug 20 23:55:59 2003
-+++ icbirc.c	Sat Feb 14 23:09:01 2004
-@@ -318,12 +318,12 @@
- done:
- 	if (server_fd >= 0)
- 		close(server_fd);
--	printf("(%u seconds, %lu:%lu bytes)\n",
--	    time(NULL) - t, bytes_out, bytes_in);
-+	printf("(%lu seconds, %lu:%lu bytes)\n",
-+	    (long)time(NULL) - t, bytes_out, bytes_in);
+--- icbirc.c.orig	Fri Nov 19 06:14:28 2004
++++ icbirc.c	Tue Aug 28 05:12:05 2007
+@@ -322,8 +322,8 @@
+ 	    (unsigned long)(time(NULL) - t), bytes_out, bytes_in);
  	if (terminate_client)
  		irc_send_notice(client_fd, "Closing connection "
 -		    "(%u seconds, %lu:%lu bytes)",
 -		    time(NULL) - t, bytes_out, bytes_in);
 +		    "(%lu seconds, %lu:%lu bytes)",
-+		    (long)time(NULL) - t, bytes_out, bytes_in);
++		     (unsigned long)(time(NULL) - t), bytes_out, bytes_in);
  }
  
  int