Try to fix a network stream error which has caused Zenicb client unstable.

Patch provided by Martin Hauseman with help from Faried Nawaz, the author.
Should close PR 21620.

While here, merge misplaced patch files.

Bump revision to 2.

4 files changed, 26 insertions, 30 deletions

diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
index 0966963305e..6cbc4538b4d 100644
--- a/chat/zenicb/Makefile
+++ b/chat/zenicb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 21:26:30 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/10/10 14:13:29 uebayasi Exp $
 
 DISTNAME=		zenicb-19981202
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/chat/zenicb/distinfo b/chat/zenicb/distinfo
index d71c8b2dfbb..a06ff6467ed 100644
--- a/chat/zenicb/distinfo
+++ b/chat/zenicb/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/05/24 07:51:35 uebayasi Exp $
+$NetBSD: distinfo,v 1.6 2003/10/10 14:13:29 uebayasi Exp $
 
 SHA1 (zenicb-19981202.tar.gz) = c700e51084a123e210a8aa7335ebc1b2464a85e7
 Size (zenicb-19981202.tar.gz) = 30833 bytes
-SHA1 (patch-aa) = 55f84c908156edeb8c02bc43950b6ce416345b90
+SHA1 (patch-aa) = 9077cfcddf33c64c14cd8c609e7921e339d60ce2
 SHA1 (patch-ab) = 26e994ed66a0b0792f9741edaae5a2bf86e39345
-SHA1 (patch-ac) = a2ab8c0c13f440351d87be534c7500fe75f81cc6
diff --git a/chat/zenicb/patches/patch-aa b/chat/zenicb/patches/patch-aa
index ace1d9783e6..ac417684a3e 100644
--- a/chat/zenicb/patches/patch-aa
+++ b/chat/zenicb/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/11/02 10:56:03 martin Exp $
+$NetBSD: patch-aa,v 1.3 2003/10/10 14:13:29 uebayasi Exp $
 
---- src/zenicb.el.orig	Mon Jul 20 00:37:51 1998
-+++ src/zenicb.el	Fri Nov  2 11:50:08 2001
-@@ -143,6 +143,7 @@
+--- src/zenicb.el.orig	Mon Jul 20 07:37:51 1998
++++ src/zenicb.el
+@@ -143,6 +143,7 @@ line separately.")
  ;(defvar zenicb-command-bcount-hook 'zenicb-command-bcount) ; byte count
  (defvar zenicb-command-beep-hook 'zenicb-command-beep) ; beep someone
  (defvar zenicb-command-boot-hook 'zenicb-command-boot) ; boot off group
@@ -10,16 +10,31 @@ $NetBSD: patch-aa,v 1.2 2001/11/02 10:56:03 martin Exp $
  (defvar zenicb-command-cancel-hook 'zenicb-command-cancel) ; cancel invite
  (defvar zenicb-command-drop-hook 'zenicb-command-drop) ; drop nick
  (defvar zenicb-command-echo-hook 'zenicb-command-echo) ; echoback
-@@ -211,6 +212,8 @@
+@@ -211,6 +212,9 @@ line separately.")
  	      (if (not zenicb-process)
  		  ()
  		(set-marker (process-mark zenicb-process) (point-max))
 +		(if (fboundp 'set-buffer-multibyte) (set-buffer-multibyte nil))
-+		(set-process-coding-system zenicb-process nil nil)
++		(if (fboundp 'set-process-coding-system)
++		    (set-process-coding-system zenicb-process 'binary 'binary))
  		(set-process-buffer zenicb-process zenicb-buffer)
  		(set-process-filter zenicb-process 'zenicb-filter)
  		(set-process-sentinel zenicb-process 'zenicb-sentinel)
-@@ -753,6 +756,12 @@
+@@ -279,8 +283,12 @@ line separately.")
+       (set-buffer orig-buffer)
+       (store-match-data data))))
+ 
++(if (not (fboundp 'char-int))
++    (defun char-int (a)
++      a))
++
+ (defun zenicb-parselines (proc string)
+-  (while (let ((length (+ (aref string 0))))
++  (while (let ((length (+ (char-int (aref string 0)))))
+ 	   (and (> (length string) length)
+ 		(let ((type (aref string 1))
+ 		      (line (substring string 2 length)))
+@@ -753,6 +761,12 @@ list of hooks to run in HOOK, then nothi
  ;;
  (defun zenicb-command-boot (proc parsedcmd)
    (zenicb-send-string proc ?h (concat "boot\C-a" (cdr parsedcmd))))
diff --git a/chat/zenicb/patches/patch-ac b/chat/zenicb/patches/patch-ac
deleted file mode 100644
index c33cb195e6a..00000000000
--- a/chat/zenicb/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/05/24 07:51:36 uebayasi Exp $
-
---- src/zenicb.el.orig	Mon Jul 20 07:37:51 1998
-+++ src/zenicb.el
-@@ -279,8 +279,12 @@
-       (set-buffer orig-buffer)
-       (store-match-data data))))
- 
-+(if (not (fboundp 'char-int))
-+	(defun char-int (a)
-+	  a))
-+
- (defun zenicb-parselines (proc string)
--  (while (let ((length (+ (aref string 0))))
-+  (while (let ((length (+ (char-int (aref string 0)))))
- 	   (and (> (length string) length)
- 		(let ((type (aref string 1))
- 		      (line (substring string 2 length)))