10 files changed, 12 insertions, 86 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index b1f23000cb33..bee3a1b9c503 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20041122.3
+PORTVERSION=	4.0.6.0.20041122.4
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -15,7 +15,7 @@ DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20041122cvs-3.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-4.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
index 594ef7fe771b..b9b8fd787702 100644
--- a/editors/tamago-emacs21/distinfo
+++ b/editors/tamago-emacs21/distinfo
@@ -1,4 +1,4 @@
 MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
 SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-MD5 (egg_4.0.6+0.20041122cvs-3.diff.gz) = 11a3f526211fea5f7ee1a35be42275e7
-SIZE (egg_4.0.6+0.20041122cvs-3.diff.gz) = 16042
+MD5 (egg_4.0.6+0.20041122cvs-4.diff.gz) = 6b5eb09f164e9dc3546d0a87526839d3
+SIZE (egg_4.0.6+0.20041122cvs-4.diff.gz) = 16558
diff --git a/editors/tamago-emacs21/files/patch-egg::canna.el b/editors/tamago-emacs21/files/patch-egg::canna.el
deleted file mode 100644
index b7685bd54caf..000000000000
--- a/editors/tamago-emacs21/files/patch-egg::canna.el
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: egg/canna.el
-diff -u egg/canna.el.orig egg/canna.el
---- egg/canna.el.orig	Thu Feb 24 00:16:28 2005
-+++ egg/canna.el	Thu Feb 24 00:27:33 2005
-@@ -53,7 +53,7 @@
-   "Group Name on CANNA server"
-   :group 'canna :type 'string)
- 
--(defcustom egg-canna-icanna-path "icanna"
-+(defcustom egg-canna-icanna-path "egg-helper"
-   "path of canna unix domain connection helper program"
-   :group 'canna :type 'file)
- 
diff --git a/editors/tamago-emacs21/files/patch-helper::egg-helper.c b/editors/tamago-emacs21/files/patch-helper::egg-helper.c
deleted file mode 100644
index 4736f577b649..000000000000
--- a/editors/tamago-emacs21/files/patch-helper::egg-helper.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: helper/egg-helper.c
-diff -u -p helper/egg-helper.c.orig helper/egg-helper.c
---- helper/egg-helper.c.orig	Thu Feb 24 00:16:28 2005
-+++ helper/egg-helper.c	Thu Feb 24 00:24:12 2005
-@@ -25,7 +25,7 @@
- /*
-  * connect unix domain cannaserver
-  */
--int connect_canna_server(static char *sock_path)
-+int connect_server(char *sock_path)
- {
-   int sockfd;
-   struct sockaddr_un sun;
-@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
- {
-   int server;
-   
--  server = connect_server();	/* connect IM server via unix domain socket */
-+  server = connect_server(CANNA_PATH);	/* connect IM server via unix domain socket */
- 
-   /* transport request & response, until stdin or cannaserver is eof */
-   while (1)
diff --git a/editors/tamago-emacs21/pkg-message b/editors/tamago-emacs21/pkg-message
index 6d3011f40a62..18f5820391a0 100644
--- a/editors/tamago-emacs21/pkg-message
+++ b/editors/tamago-emacs21/pkg-message
@@ -1,12 +1,10 @@
 Enabling Tamago
 =================
-  You can now tell your users to enable Tamago with Emacs 20.5 by adding
 
-  If you use with Asian Languages, select suitable languages, such as
+You can now enable Tamago by adding one of following lines to your
+.emacs file depending on the language you use:
 
 Japanese:	(set-language-environment "Japanese")
 Korean:		(set-language-environment "Korean")
 Chinese-GB:	(set-language-environment "Chinese-GB")
 Chinese-CNS:	(set-language-environment "Chinese-CNS")
-
-add to their `~/.emacs' file.
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index b1f23000cb33..bee3a1b9c503 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20041122.3
+PORTVERSION=	4.0.6.0.20041122.4
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -15,7 +15,7 @@ DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20041122cvs-3.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-4.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo
index 594ef7fe771b..b9b8fd787702 100644
--- a/editors/tamago/distinfo
+++ b/editors/tamago/distinfo
@@ -1,4 +1,4 @@
 MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
 SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-MD5 (egg_4.0.6+0.20041122cvs-3.diff.gz) = 11a3f526211fea5f7ee1a35be42275e7
-SIZE (egg_4.0.6+0.20041122cvs-3.diff.gz) = 16042
+MD5 (egg_4.0.6+0.20041122cvs-4.diff.gz) = 6b5eb09f164e9dc3546d0a87526839d3
+SIZE (egg_4.0.6+0.20041122cvs-4.diff.gz) = 16558
diff --git a/editors/tamago/files/patch-egg::canna.el b/editors/tamago/files/patch-egg::canna.el
deleted file mode 100644
index b7685bd54caf..000000000000
--- a/editors/tamago/files/patch-egg::canna.el
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: egg/canna.el
-diff -u egg/canna.el.orig egg/canna.el
---- egg/canna.el.orig	Thu Feb 24 00:16:28 2005
-+++ egg/canna.el	Thu Feb 24 00:27:33 2005
-@@ -53,7 +53,7 @@
-   "Group Name on CANNA server"
-   :group 'canna :type 'string)
- 
--(defcustom egg-canna-icanna-path "icanna"
-+(defcustom egg-canna-icanna-path "egg-helper"
-   "path of canna unix domain connection helper program"
-   :group 'canna :type 'file)
- 
diff --git a/editors/tamago/files/patch-helper::egg-helper.c b/editors/tamago/files/patch-helper::egg-helper.c
deleted file mode 100644
index 4736f577b649..000000000000
--- a/editors/tamago/files/patch-helper::egg-helper.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: helper/egg-helper.c
-diff -u -p helper/egg-helper.c.orig helper/egg-helper.c
---- helper/egg-helper.c.orig	Thu Feb 24 00:16:28 2005
-+++ helper/egg-helper.c	Thu Feb 24 00:24:12 2005
-@@ -25,7 +25,7 @@
- /*
-  * connect unix domain cannaserver
-  */
--int connect_canna_server(static char *sock_path)
-+int connect_server(char *sock_path)
- {
-   int sockfd;
-   struct sockaddr_un sun;
-@@ -88,7 +88,7 @@ int main(int argc, char *argv[])
- {
-   int server;
-   
--  server = connect_server();	/* connect IM server via unix domain socket */
-+  server = connect_server(CANNA_PATH);	/* connect IM server via unix domain socket */
- 
-   /* transport request & response, until stdin or cannaserver is eof */
-   while (1)
diff --git a/editors/tamago/pkg-message b/editors/tamago/pkg-message
index 6d3011f40a62..18f5820391a0 100644
--- a/editors/tamago/pkg-message
+++ b/editors/tamago/pkg-message
@@ -1,12 +1,10 @@
 Enabling Tamago
 =================
-  You can now tell your users to enable Tamago with Emacs 20.5 by adding
 
-  If you use with Asian Languages, select suitable languages, such as
+You can now enable Tamago by adding one of following lines to your
+.emacs file depending on the language you use:
 
 Japanese:	(set-language-environment "Japanese")
 Korean:		(set-language-environment "Korean")
 Chinese-GB:	(set-language-environment "Chinese-GB")
 Chinese-CNS:	(set-language-environment "Chinese-CNS")
-
-add to their `~/.emacs' file.