Update to HEAD branch(4 times revised at 2002.09.09 based 4.0.6).

PR:		ports-jp/14676, ports/66656
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org>
Obtained from:	Debian

6 files changed, 40 insertions, 26 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index 884703957416..709dc9032c9b 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.0.6.0.20020909.4
+PORTREVISION=	0
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/tamago/ \
-		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/tamago/
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	egg_4.0.6+0.20020909cvs.orig
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	kuriyama
-PATCHFILES=	tamago-${PORTVERSION}-20011028.patch.gz
+PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
+PATCHFILES=	egg_4.0.6+0.20020909cvs-4.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
@@ -27,6 +28,7 @@ GNU_CONFIGURE=	yes
 
 EMACS_PORT_NAME?=	emacs21
 
+WRKSRC=		${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
index 32843951b251..72eeedd7cc4a 100644
--- a/editors/tamago-emacs21/distinfo
+++ b/editors/tamago-emacs21/distinfo
@@ -1,4 +1,4 @@
-MD5 (tamago-4.0.6.tar.gz) = e1ebac3ec05b2f9c274b831fd64ed7b1
-SIZE (tamago-4.0.6.tar.gz) = 260021
-MD5 (tamago-4.0.6-20011028.patch.gz) = 2f3c02bba2dd3b9d6d039f568a4add1c
-SIZE (tamago-4.0.6-20011028.patch.gz) = 51684
+MD5 (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 7ca91fc186c86a22fbaff9a55c58c433
+SIZE (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 277819
+MD5 (egg_4.0.6+0.20020909cvs-4.diff.gz) = 93bbb35a822bd6bbbc237b6dac18cd2e
+SIZE (egg_4.0.6+0.20020909cvs-4.diff.gz) = 12928
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
index 69de85d67686..fc42ec936992 100644
--- a/editors/tamago-emacs21/pkg-plist
+++ b/editors/tamago-emacs21/pkg-plist
@@ -8,10 +8,12 @@
 %%ELISPDIR%%/egg/egg-mlh.elc
 %%ELISPDIR%%/egg/egg-sim.el
 %%ELISPDIR%%/egg/egg-sim.elc
-%%ELISPDIR%%/egg/egg-util.el
-%%ELISPDIR%%/egg/egg-util.elc
 %%ELISPDIR%%/egg/egg.el
 %%ELISPDIR%%/egg/egg.elc
+%%ELISPDIR%%/egg/egg/anthy.el
+%%ELISPDIR%%/egg/egg/anthy.elc
+%%ELISPDIR%%/egg/egg/anthyipc.el
+%%ELISPDIR%%/egg/egg/anthyipc.elc
 %%ELISPDIR%%/egg/egg/canna.el
 %%ELISPDIR%%/egg/egg/canna.elc
 %%ELISPDIR%%/egg/egg/cannarpc.el
@@ -37,6 +39,8 @@
 %%ELISPDIR%%/egg/its/bixing.elc
 %%ELISPDIR%%/egg/its/erpin.el
 %%ELISPDIR%%/egg/its/erpin.elc
+%%ELISPDIR%%/egg/its/greek.el
+%%ELISPDIR%%/egg/its/greek.elc
 %%ELISPDIR%%/egg/its/hangul.el
 %%ELISPDIR%%/egg/its/hangul.elc
 %%ELISPDIR%%/egg/its/hankata.el
@@ -58,6 +62,7 @@
 %%ELISPDIR%%/egg/its/zhuyin.el
 %%ELISPDIR%%/egg/its/zhuyin.elc
 %%ELISPDIR%%/egg/leim-list.el
+%%ELISPDIR%%/egg/leim-list.elc
 %%ELISPDIR%%/egg/menudiag.el
 %%ELISPDIR%%/egg/menudiag.elc
 @dirrm %%ELISPDIR%%/egg/egg
diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 884703957416..709dc9032c9b 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.0.6.0.20020909.4
+PORTREVISION=	0
 CATEGORIES=	editors elisp
-MASTER_SITES=	ftp://ftp.m17n.org/pub/tamago/ \
-		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/tamago/
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
+MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+DISTNAME=	egg_4.0.6+0.20020909cvs.orig
 
-PATCH_SITES=	${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	kuriyama
-PATCHFILES=	tamago-${PORTVERSION}-20011028.patch.gz
+PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
+		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
+PATCHFILES=	egg_4.0.6+0.20020909cvs-4.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER?=	ports@FreeBSD.org
@@ -27,6 +28,7 @@ GNU_CONFIGURE=	yes
 
 EMACS_PORT_NAME?=	emacs21
 
+WRKSRC=		${WRKDIR}/egg-4.0.6+0.20020909cvs.orig
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo
index 32843951b251..72eeedd7cc4a 100644
--- a/editors/tamago/distinfo
+++ b/editors/tamago/distinfo
@@ -1,4 +1,4 @@
-MD5 (tamago-4.0.6.tar.gz) = e1ebac3ec05b2f9c274b831fd64ed7b1
-SIZE (tamago-4.0.6.tar.gz) = 260021
-MD5 (tamago-4.0.6-20011028.patch.gz) = 2f3c02bba2dd3b9d6d039f568a4add1c
-SIZE (tamago-4.0.6-20011028.patch.gz) = 51684
+MD5 (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 7ca91fc186c86a22fbaff9a55c58c433
+SIZE (egg_4.0.6+0.20020909cvs.orig.tar.gz) = 277819
+MD5 (egg_4.0.6+0.20020909cvs-4.diff.gz) = 93bbb35a822bd6bbbc237b6dac18cd2e
+SIZE (egg_4.0.6+0.20020909cvs-4.diff.gz) = 12928
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index 69de85d67686..fc42ec936992 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -8,10 +8,12 @@
 %%ELISPDIR%%/egg/egg-mlh.elc
 %%ELISPDIR%%/egg/egg-sim.el
 %%ELISPDIR%%/egg/egg-sim.elc
-%%ELISPDIR%%/egg/egg-util.el
-%%ELISPDIR%%/egg/egg-util.elc
 %%ELISPDIR%%/egg/egg.el
 %%ELISPDIR%%/egg/egg.elc
+%%ELISPDIR%%/egg/egg/anthy.el
+%%ELISPDIR%%/egg/egg/anthy.elc
+%%ELISPDIR%%/egg/egg/anthyipc.el
+%%ELISPDIR%%/egg/egg/anthyipc.elc
 %%ELISPDIR%%/egg/egg/canna.el
 %%ELISPDIR%%/egg/egg/canna.elc
 %%ELISPDIR%%/egg/egg/cannarpc.el
@@ -37,6 +39,8 @@
 %%ELISPDIR%%/egg/its/bixing.elc
 %%ELISPDIR%%/egg/its/erpin.el
 %%ELISPDIR%%/egg/its/erpin.elc
+%%ELISPDIR%%/egg/its/greek.el
+%%ELISPDIR%%/egg/its/greek.elc
 %%ELISPDIR%%/egg/its/hangul.el
 %%ELISPDIR%%/egg/its/hangul.elc
 %%ELISPDIR%%/egg/its/hankata.el
@@ -58,6 +62,7 @@
 %%ELISPDIR%%/egg/its/zhuyin.el
 %%ELISPDIR%%/egg/its/zhuyin.elc
 %%ELISPDIR%%/egg/leim-list.el
+%%ELISPDIR%%/egg/leim-list.elc
 %%ELISPDIR%%/egg/menudiag.el
 %%ELISPDIR%%/egg/menudiag.elc
 @dirrm %%ELISPDIR%%/egg/egg