- Make the port as slave to editors/tomago

PR:		ports/114671
Submitted by:	KIMURA Yasuhiro <yasu@utahime.org>

6 files changed, 3 insertions, 190 deletions

diff --git a/editors/tamago-emacs21/Makefile b/editors/tamago-emacs21/Makefile
index b9db583e20b6..80705836f884 100644
--- a/editors/tamago-emacs21/Makefile
+++ b/editors/tamago-emacs21/Makefile
@@ -5,58 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	tamago
-PORTVERSION=	${EGG_DEBIAN_VER}
-PORTREVISION=	2
-CATEGORIES=	editors elisp
-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
-
-PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,nork,}
-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.11
-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+MASTERDIR=	${.CURDIR}/../tamago
 
 USE_EMACS=	yes
+EMACS_PORT_NAME=	emacs21
 
-WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
-ELISPDIR=	${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
-PLIST_SUB=	ELISPDIR="${EMACS_LIBDIR_WITH_VER}/site-lisp"
-
-.include <bsd.port.pre.mk>
-
-.if ${EMACS_PORT_NAME} == emacs21 || ${EMACS_PORT_NAME} == emacs22
-PLIST_SUB+=	HAS_JISX0213=""
-.else
-PLIST_SUB+=	HAS_JISX0213="@comment "
-.endif
-
-pre-configure:
-	@${REINPLACE_CMD} -e 's|emacs/site-lisp|${EMACS_NAME}/${EMACS_VER}/site-lisp|g' \
-	    ${WRKSRC}/configure
-
-post-build:
-	(cd ${WRKSRC}/helper && ${MAKE} egg-helper)
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper ${PREFIX}/bin/egg-helper
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for f in AUTHORS ChangeLog ChangeLog.1997-1998 ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO debian/README.Debian
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}/changelog.Debian
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/editors/tamago-emacs21/distinfo b/editors/tamago-emacs21/distinfo
deleted file mode 100644
index 3cccc5f31e9e..000000000000
--- a/editors/tamago-emacs21/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-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_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/files/patch-wnnrpc.el b/editors/tamago-emacs21/files/patch-wnnrpc.el
deleted file mode 100644
index 1df5c148999f..000000000000
--- a/editors/tamago-emacs21/files/patch-wnnrpc.el
+++ /dev/null
@@ -1,21 +0,0 @@
---- egg/wnnrpc.el	Sat Jun 16 23:30:29 2007
-+++ egg/wnnrpc.el	Sat Jun 16 23:29:00 2007
-@@ -714,8 +714,14 @@
-      ,send-expr ,@rcv-exprs))
- 
- (defmacro wnnrpc-get-result (&rest body)
--  `(let (result)
--     (comm-unpack (u) result)
-+  `(let (result resulth)
-+     (comm-unpack (w w) resulth result)
-+     (cond ((and (= result 65535) (= resulth 65535))
-+	    (setq result -1))
-+	   ((= resulth (lsh (lsh resulth 16) -16))
-+	    (setq result (+ (lsh resulth 16) result)))
-+	   (t
-+	    (error "overflow")))
-      (if (< result 0)
-        (progn
- 	 (comm-unpack (u) result)
-
-
diff --git a/editors/tamago-emacs21/pkg-descr b/editors/tamago-emacs21/pkg-descr
deleted file mode 100644
index 1d1ae915c355..000000000000
--- a/editors/tamago-emacs21/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-The Multilingual Input Method - Egg V4
-
-This enables you to input Multilingual Characters.
-
-Tamago is only coded by emacs lisp.
-
-This input method is working with various translation servers 
-(i.e. jserver, cserver, tserver, Wnn6, SJ3 ver 1 and ver 2,
-      cannaserver and wxgserver).
-
-This package also includes enhancements from Debian, some of which are:
-
-- Partial support for Wnn7/Wnn8.
-- Support connection to cannaserver using UNIX domain socket.
-
-WWW: http://www.m17n.org/tamago/
diff --git a/editors/tamago-emacs21/pkg-message b/editors/tamago-emacs21/pkg-message
deleted file mode 100644
index 18f5820391a0..000000000000
--- a/editors/tamago-emacs21/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-Enabling Tamago
-=================
-
-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")
diff --git a/editors/tamago-emacs21/pkg-plist b/editors/tamago-emacs21/pkg-plist
deleted file mode 100644
index 6db6798d9857..000000000000
--- a/editors/tamago-emacs21/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/egg-helper
-%%ELISPDIR%%/egg/egg-cnv.el
-%%ELISPDIR%%/egg/egg-cnv.elc
-%%ELISPDIR%%/egg/egg-com.el
-%%ELISPDIR%%/egg/egg-com.elc
-%%ELISPDIR%%/egg/egg-edep.el
-%%ELISPDIR%%/egg/egg-edep.elc
-%%ELISPDIR%%/egg/egg-mlh.el
-%%ELISPDIR%%/egg/egg-mlh.elc
-%%ELISPDIR%%/egg/egg-sim.el
-%%ELISPDIR%%/egg/egg-sim.elc
-%%ELISPDIR%%/egg/egg.el
-%%ELISPDIR%%/egg/egg.elc
-%%ELISPDIR%%/egg/egg/.nosearch
-%%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
-%%ELISPDIR%%/egg/egg/cannarpc.elc
-%%ELISPDIR%%/egg/egg/sj3.el
-%%ELISPDIR%%/egg/egg/sj3.elc
-%%ELISPDIR%%/egg/egg/sj3rpc.el
-%%ELISPDIR%%/egg/egg/sj3rpc.elc
-%%ELISPDIR%%/egg/egg/wnn.el
-%%ELISPDIR%%/egg/egg/wnn.elc
-%%ELISPDIR%%/egg/egg/wnnrpc.el
-%%ELISPDIR%%/egg/egg/wnnrpc.elc
-%%ELISPDIR%%/egg/eggrc
-%%ELISPDIR%%/egg/its-keydef.el
-%%ELISPDIR%%/egg/its-keydef.elc
-%%ELISPDIR%%/egg/its.el
-%%ELISPDIR%%/egg/its.elc
-%%ELISPDIR%%/egg/its/.nosearch
-%%ELISPDIR%%/egg/its/ascii.el
-%%ELISPDIR%%/egg/its/ascii.elc
-%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.el
-%%HAS_JISX0213%%%%ELISPDIR%%/egg/its/aynu.elc
-%%ELISPDIR%%/egg/its/bixing.el
-%%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
-%%ELISPDIR%%/egg/its/hankata.elc
-%%ELISPDIR%%/egg/its/hira.el
-%%ELISPDIR%%/egg/its/hira.elc
-%%ELISPDIR%%/egg/its/jeonkak.el
-%%ELISPDIR%%/egg/its/jeonkak.elc
-%%ELISPDIR%%/egg/its/jiskana.el
-%%ELISPDIR%%/egg/its/jiskana.elc
-%%ELISPDIR%%/egg/its/kata.el
-%%ELISPDIR%%/egg/its/kata.elc
-%%ELISPDIR%%/egg/its/pinyin.el
-%%ELISPDIR%%/egg/its/pinyin.elc
-%%ELISPDIR%%/egg/its/quanjiao.el
-%%ELISPDIR%%/egg/its/quanjiao.elc
-%%ELISPDIR%%/egg/its/thai.el
-%%ELISPDIR%%/egg/its/thai.elc
-%%ELISPDIR%%/egg/its/zenkaku.el
-%%ELISPDIR%%/egg/its/zenkaku.elc
-%%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
-@dirrm %%ELISPDIR%%/egg/its
-@dirrm %%ELISPDIR%%/egg
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.1997-1998
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2000-2001
-%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
-%%PORTDOCS%%%%DOCSDIR%%/README.Debian
-%%PORTDOCS%%%%DOCSDIR%%/README.ja.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/changelog.Debian
-%%PORTDOCS%%@dirrm %%DOCSDIR%%