- Tamago didn't work with Canna since last update.

- add note how to use recent Tamago with Canna.

6 files changed, 66 insertions, 0 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index f67ffb1d5443..ed35b43227ff 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.1
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
diff --git a/editors/tamago-emacs21/files/patch-egg::canna.el b/editors/tamago-emacs21/files/patch-egg::canna.el
new file mode 100644
index 000000000000..a3d546ddfb48
--- /dev/null
+++ b/editors/tamago-emacs21/files/patch-egg::canna.el
@@ -0,0 +1,24 @@
+Index: egg/canna.el
+diff -u egg/canna.el.orig egg/canna.el
+--- egg/canna.el.orig	Wed Feb 23 21:57:47 2005
++++ egg/canna.el	Wed Feb 23 21:58:47 2005
+@@ -360,13 +360,12 @@
+ 		      (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
+ 		    ((error quit)))
+ 		; for old emacs (<= 21.3) bellow
+-		(setq proc
+-		      (cond ((string-match "^unix/" hostname)
+-			     (let ((process-connection-type nil))
+-			       (start-process proc-name buf egg-canna-icanna-path)))
+-			    (condition-case nil
+-				(open-network-stream proc-name buf hostname port)
+-			      (error nil))))))
++		(if (string-match "^unix/" hostname)
++		    (let ((process-connection-type nil))
++		      (setq proc (start-process proc-name buf egg-canna-icanna-path)))
++		  (condition-case nil
++		      (setq proc (open-network-stream proc-name buf hostname port))
++		    (error quit)))))
+ 	    (when (processp proc)
+ 	      (process-kill-without-query proc)
+ 	      (set-process-coding-system proc 'binary 'binary)
diff --git a/editors/tamago-emacs21/pkg-message b/editors/tamago-emacs21/pkg-message
index 6d3011f40a62..7403cbfcb926 100644
--- a/editors/tamago-emacs21/pkg-message
+++ b/editors/tamago-emacs21/pkg-message
@@ -10,3 +10,11 @@ Chinese-GB:	(set-language-environment "Chinese-GB")
 Chinese-CNS:	(set-language-environment "Chinese-CNS")
 
 add to their `~/.emacs' file.
+
+Tamago uses unix domain socket to connect to Canna server by default.
+If you want to use Canna via unix domain socket, you need to install
+japanese/yc.el, too.  Or, you may want to use inet domain socket by
+following settings:
+
+	(setq canna-hostname "localhost")
+	(setq canna-server-port "canna")
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index f67ffb1d5443..ed35b43227ff 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.1
+PORTREVISION=	1
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
diff --git a/editors/tamago/files/patch-egg::canna.el b/editors/tamago/files/patch-egg::canna.el
new file mode 100644
index 000000000000..a3d546ddfb48
--- /dev/null
+++ b/editors/tamago/files/patch-egg::canna.el
@@ -0,0 +1,24 @@
+Index: egg/canna.el
+diff -u egg/canna.el.orig egg/canna.el
+--- egg/canna.el.orig	Wed Feb 23 21:57:47 2005
++++ egg/canna.el	Wed Feb 23 21:58:47 2005
+@@ -360,13 +360,12 @@
+ 		      (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
+ 		    ((error quit)))
+ 		; for old emacs (<= 21.3) bellow
+-		(setq proc
+-		      (cond ((string-match "^unix/" hostname)
+-			     (let ((process-connection-type nil))
+-			       (start-process proc-name buf egg-canna-icanna-path)))
+-			    (condition-case nil
+-				(open-network-stream proc-name buf hostname port)
+-			      (error nil))))))
++		(if (string-match "^unix/" hostname)
++		    (let ((process-connection-type nil))
++		      (setq proc (start-process proc-name buf egg-canna-icanna-path)))
++		  (condition-case nil
++		      (setq proc (open-network-stream proc-name buf hostname port))
++		    (error quit)))))
+ 	    (when (processp proc)
+ 	      (process-kill-without-query proc)
+ 	      (set-process-coding-system proc 'binary 'binary)
diff --git a/editors/tamago/pkg-message b/editors/tamago/pkg-message
index 6d3011f40a62..7403cbfcb926 100644
--- a/editors/tamago/pkg-message
+++ b/editors/tamago/pkg-message
@@ -10,3 +10,11 @@ Chinese-GB:	(set-language-environment "Chinese-GB")
 Chinese-CNS:	(set-language-environment "Chinese-CNS")
 
 add to their `~/.emacs' file.
+
+Tamago uses unix domain socket to connect to Canna server by default.
+If you want to use Canna via unix domain socket, you need to install
+japanese/yc.el, too.  Or, you may want to use inet domain socket by
+following settings:
+
+	(setq canna-hostname "localhost")
+	(setq canna-server-port "canna")