From 48b755ab2d5322efec6356517dba542b1c637c0f Mon Sep 17 00:00:00 2001
From: adrianp <adrianp@pkgsrc.org>
Date: Sat, 26 Jun 2004 22:17:36 +0000
Subject: Update icbirc to 1.7

Ok'ed wiz@/snj@/tron@

No Changelog available, diff looks like minor code fixes.
---
 chat/icbirc/DESCR            |  2 +-
 chat/icbirc/Makefile         | 11 +++--------
 chat/icbirc/distinfo         |  8 ++++----
 chat/icbirc/patches/patch-ad | 14 +++++++-------
 4 files changed, 15 insertions(+), 20 deletions(-)

(limited to 'chat/icbirc')

diff --git a/chat/icbirc/DESCR b/chat/icbirc/DESCR
index b8bd19d310e..57e5d4a8d6d 100644
--- a/chat/icbirc/DESCR
+++ b/chat/icbirc/DESCR
@@ -1,4 +1,4 @@
-icbirc is a proxy that allows to connect an IRC client to an ICB server.
+icbirc is a proxy that allows users to connect an IRC client to an ICB server.
 The proxy accepts client connections, connects to the server, and for-
 wards data between those two connections.
 
diff --git a/chat/icbirc/Makefile b/chat/icbirc/Makefile
index 623d3aa3536..1cc09cebcf1 100644
--- a/chat/icbirc/Makefile
+++ b/chat/icbirc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2004/04/01 16:00:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2004/06/26 22:17:36 adrianp Exp $
 
-DISTNAME=	icbirc-1.6
-PKGREVISION=	1
+DISTNAME=	icbirc-1.7
 CATEGORIES=	chat
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -13,11 +12,7 @@ MAKE_ENV+=	BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man"
 
 SRCS=		icb.c irc.c icbirc.c
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == SunOS
-LIBS+=	-lsocket -lnsl
-.endif
+LIBS.SunOS+=	-lsocket -lnsl
 
 do-build:
 	cd ${WRKSRC};							\
diff --git a/chat/icbirc/distinfo b/chat/icbirc/distinfo
index b0cba9ae1c3..8132264252e 100644
--- a/chat/icbirc/distinfo
+++ b/chat/icbirc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2004/04/01 16:00:42 tv Exp $
+$NetBSD: distinfo,v 1.3 2004/06/26 22:17:36 adrianp Exp $
 
-SHA1 (icbirc-1.6.tar.gz) = ed34478deae940e5cd97e5eb7415b279e87484d9
-Size (icbirc-1.6.tar.gz) = 10936 bytes
+SHA1 (icbirc-1.7.tar.gz) = abeaf7c2143733b8e869fbae0838096d4f30e239
+Size (icbirc-1.7.tar.gz) = 10980 bytes
 SHA1 (patch-aa) = a660db6b48e3af9ccf566128e7f31177dcda3e1b
 SHA1 (patch-ab) = 067cca58c86971f1f0f2f426622be1e906a95508
 SHA1 (patch-ac) = 513482d11aeb0efa5dd6cee620deab7b6f756c96
-SHA1 (patch-ad) = 039e10c46d9a5fa15b4a7fbd83ffbf3d4a139210
+SHA1 (patch-ad) = a66bf9e00f964b904074a934d6fa6282913ff414
 SHA1 (patch-ae) = 74133ff7125740943cef136a59fbc7641261212b
diff --git a/chat/icbirc/patches/patch-ad b/chat/icbirc/patches/patch-ad
index e9c9623ae38..42ccd3d961f 100644
--- a/chat/icbirc/patches/patch-ad
+++ b/chat/icbirc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2004/04/01 16:00:42 tv Exp $
+$NetBSD: patch-ad,v 1.2 2004/06/26 22:17:36 adrianp Exp $
 
---- irc.c.orig	Thu Apr  1 10:50:38 2004
-+++ irc.c
-@@ -50,6 +50,7 @@ char irc_pass[256];
+--- irc.c.orig	Sat May 29 14:41:29 2004
++++ irc.c	Sat May 29 14:54:37 2004
+@@ -52,6 +52,7 @@
  char irc_ident[256];
  char irc_nick[256];
  char irc_channel[256];
@@ -10,16 +10,16 @@ $NetBSD: patch-ad,v 1.1 2004/04/01 16:00:42 tv Exp $
  
  /*
   * irc_recv() receives read(2) chunks and assembles complete lines, which are
-@@ -115,6 +116,8 @@ irc_cmd(const char *cmd, int fd)
+@@ -119,6 +120,8 @@
  			cmd++;
  		scan(&cmd, group, sizeof(group), " ", " ");
- 		icb_send_group(fd, group);
+ 		icb_send_group(server_fd, group);
 +	} else if (!strncasecmp(cmd, "PART ", 5)) {
 +		in_irc_channel = 0;
  	} else if (!strncasecmp(cmd, "PRIVMSG ", 8) ||
  	    !strncasecmp(cmd, "NOTICE ", 7)) {
  		char dst[128];
-@@ -242,6 +245,7 @@ irc_send_join(int fd, const char *src, c
+@@ -249,6 +252,7 @@
  
  	snprintf(cmd, sizeof(cmd), ":%s JOIN :%s\r\n", src, dst);
  	sync_write(fd, cmd, strlen(cmd));
-- 
cgit v1.2.3