3 files changed, 8 insertions, 23 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index 8cc5c77e7f1d..f914a69aa08a 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	tamago
-PORTVERSION=	${EGG_DEBIAN_VER}.${EGG_ANTHY_VER}
-PORTREVISION=	1
+PORTVERSION=	${EGG_DEBIAN_VER}
 CATEGORIES=	editors elisp
-MASTER_SITES=	${MASTER_SITE_DEBIAN} \
-		http://www.meadowy.org/~shirai/elips/:anthy
+MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTFILES=	egg_4.0.6+0.20041122cvs.orig.tar.gz \
-		egg-anthy.tar.gz:anthy
+DISTFILES=	egg_4.0.6+0.20041122cvs.orig.tar.gz
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-PATCHFILES=	egg_4.0.6+0.20041122cvs-9.diff.gz
+PATCHFILES=	egg_4.0.6+0.20041122cvs-11.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Multilingual Input Method - Egg V4
 
-EGG_DEBIAN_VER=	4.0.6.0.20041122.9
-EGG_ANTHY_VER=	20060606.2
+EGG_DEBIAN_VER=	4.0.6.0.20041122.11
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -34,7 +30,6 @@ USE_EMACS=	yes
 EMACS_PORT_NAME?=	emacs21
 
 WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
-WRKSRC_ANTHY=	${WRKDIR}/egg-anthy-20060606-2
 ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
 PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
 
@@ -44,11 +39,6 @@ PLIST_SUB+=	HAS_JISX0213=""
 PLIST_SUB+=	HAS_JISX0213="@comment "
 .endif
 
-post-extract:
-.for f in anthy.el anthyipc.el
-	@${CP} ${WRKSRC_ANTHY}/${f} ${WRKSRC}/egg
-.endfor
-
 pre-configure:
 	@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
 	    ${WRKSRC}/configure
@@ -64,7 +54,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}/changelog.Debian
-	${INSTALL_DATA} ${WRKSRC_ANTHY}/egg-anthy.readme ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
index c9dca86ffdac..3cccc5f31e9e 100644
--- a/editors/tamago-emacs21/distinfo
+++ b/editors/tamago-emacs21/distinfo
@@ -1,9 +1,6 @@
 MD5 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 64ec1af61f6e265c05447dd4e2a83aae
 SHA256 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 722413515f2d60418d98250c8aed2b811e6b5363cdb69899193d454afe425115
 SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-MD5 (egg-anthy.tar.gz) = b4a7e15f64ca07526ce23d7fb7575045
-SHA256 (egg-anthy.tar.gz) = 46f51b377a70c1a6b07a4a9fc94860010c05651b1bdfa88b47abdfd06d999f4a
-SIZE (egg-anthy.tar.gz) = 9961
-MD5 (egg_4.0.6+0.20041122cvs-9.diff.gz) = 88a69191178c8c8dde7a19e4f7b79420
-SHA256 (egg_4.0.6+0.20041122cvs-9.diff.gz) = e542e72644c317f6eb43aa89a5bbcefff499a8a9418ae42a72c38ea15f540e8c
-SIZE (egg_4.0.6+0.20041122cvs-9.diff.gz) = 16721
+MD5 (egg_4.0.6+0.20041122cvs-11.diff.gz) = 5c45cde2aed743cfc9c9e194c6b411c7
+SHA256 (egg_4.0.6+0.20041122cvs-11.diff.gz) = 31c9d1e161cbebb13412a90374d538792f257047de0b3569d5c3632c2a0860b4
+SIZE (egg_4.0.6+0.20041122cvs-11.diff.gz) = 28295
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
index a77ecaa56a10..6db6798d9857 100644
--- a/editors/tamago-emacs21/pkg-plist
+++ b/editors/tamago-emacs21/pkg-plist
@@ -82,5 +82,4 @@ bin/egg-helper
 %%PORTDOCS%%%%DOCSDIR%%/README.ja.txt
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/changelog.Debian
-%%PORTDOCS%%%%DOCSDIR%%/egg-anthy.readme
 %%PORTDOCS%%@dirrm %%DOCSDIR%%