- Use Github for the distfile instead of old, unmaintained tarball

  and local patches.
- Compress .el files by default.
- Remove egg-helper.
- Fix some warnings due to obsolete functions or variables.

22 files changed, 46 insertions, 810 deletions

diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 9ea426fd52b2..0815999536e9 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -2,46 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	tamago
-PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	13
+PORTVERSION=	4.0.6.0.20041122.19.14
+DISTVERSIONPREFIX=	v
 CATEGORIES=	editors elisp
-MASTER_SITES=	DEBIAN/pool/main/e/egg
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	egg_4.0.6+0.20041122cvs.orig
-
-PATCH_SITES=	DEBIAN/pool/main/e/egg LOCAL/nork
-PATCHFILES=	egg_4.0.6+0.20041122cvs-19.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Egg V4, Multilingual Input Method for Emacsen
 
 LICENSE=	GPLv2
 
-USES=		gmake
 USE_EMACS=	yes
-WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
+USE_GITHUB=	yes
+GH_ACCOUNT=	hrs-allbsd
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
+CONFIGURE_ARGS=	--with-lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
+CONFIGURE_ENV=	EMACS="${EMACS_CMD}"
 PLIST_SUB=	ELISPDIR="${EMACS_VERSION_SITE_LISPDIR}"
 PORTDOCS=	AUTHORS ChangeLog ChangeLog.1997-1998 \
-		ChangeLog.2000-2001 PROBLEMS README.ja.txt TODO \
-		README.Debian changelog.Debian
+		ChangeLog.2000-2001 ChangeLog.2002-2004 \
+		PROBLEMS README README.ja.txt TODO egg-anthy.readme
 OPTIONS_DEFINE=	DOCS
-
-post-build:
-	cd ${WRKSRC}/helper && \
-	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
-	    ${_MAKE_JOBS} ${MAKE_ARGS} egg-helper
-	${INSTALL_DATA} ${WRKSRC}/debian/changelog ${WRKSRC}/changelog.Debian
-	${INSTALL_DATA} ${WRKSRC}/debian/README.Debian ${WRKSRC}
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/helper/egg-helper \
-	    ${STAGEDIR}${PREFIX}/bin/egg-helper
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+DOCS_CONFIGURE_ENABLE=	doc
 
 .include <bsd.port.mk>
diff --git a/editors/tamago/distinfo b/editors/tamago/distinfo
index c4389b654df9..2ea05e640dd6 100644
--- a/editors/tamago/distinfo
+++ b/editors/tamago/distinfo
@@ -1,4 +1,3 @@
-SHA256 (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 722413515f2d60418d98250c8aed2b811e6b5363cdb69899193d454afe425115
-SIZE (egg_4.0.6+0.20041122cvs.orig.tar.gz) = 287308
-SHA256 (egg_4.0.6+0.20041122cvs-19.diff.gz) = bd4252d0536c1eeb526789063b822b9b9e75f2bbec9c3db97792ce0ee3b89fb0
-SIZE (egg_4.0.6+0.20041122cvs-19.diff.gz) = 28417
+TIMESTAMP = 1463347411
+SHA256 (hrs-allbsd-tamago-v4.0.6.0.20041122.19.14_GH0.tar.gz) = c9ffa59b5d56c1dc97c09fb2fc0a7b0abde1b1cb25cb338cc976c6c59689f5cd
+SIZE (hrs-allbsd-tamago-v4.0.6.0.20041122.19.14_GH0.tar.gz) = 365797
diff --git a/editors/tamago/files/patch-Makefile.in b/editors/tamago/files/patch-Makefile.in
deleted file mode 100644
index 61a5eb0726e9..000000000000
--- a/editors/tamago/files/patch-Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.in.orig	2015-01-31 19:24:09.000000000 +0900
-+++ Makefile.in	2015-02-02 01:32:47.000000000 +0900
-@@ -54,8 +54,7 @@
- 	egg-sim.el \
- 	menudiag.el \
- 	its.el \
--	its-keydef.el \
--	leim-list.el \
-+	its-keydef.el
- 
- #
- EGGSRCS	= \
-@@ -115,32 +114,32 @@
- 
- install-site: all
- 	echo "Egg system will be installed in ${lispdir}/egg...."; \
--	if [ -d ${lispdir}/egg ]; then \
-+	if [ -d ${DESTDIR}${lispdir}/egg ]; then \
- 	  echo "Clean up the previsous installation...."; \
--	  rm -rf ${lispdir}/egg/*;  \
-+	  rm -rf ${DESTDIR}${lispdir}/egg/*;  \
- 	else \
- 	  echo "Make the directory ${lispdir}/egg..."; \
--	  mkdir ${lispdir}/egg; \
-+	  mkdir -p ${DESTDIR}${lispdir}/egg; \
- 	fi; \
- #
--	for FILE in ${TOPSRCS} ${TOPELCS} ${INITELS}; \
-+	for FILE in ${TOPELCS} ${INITELS}; \
- 	  do  \
--	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/; \
-+	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/; \
- 	  done; \
- #
--	mkdir ${lispdir}/egg/egg ; \
--	for FILE in ${EGGSRCS} ${EGGELCS} ; \
-+	mkdir -p ${DESTDIR}${lispdir}/egg/egg ; \
-+	for FILE in ${EGGELCS} ; \
- 	  do  \
--	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/egg; \
-+	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/egg; \
- 	  done; \
--	touch ${lispdir}/egg/egg/.nosearch; \
-+	touch ${DESTDIR}${lispdir}/egg/egg/.nosearch; \
- #
--	mkdir ${lispdir}/egg/its ; \
--	for FILE in ${ITSSRCS} ${ITSELCS} ; \
-+	mkdir -p ${DESTDIR}${lispdir}/egg/its ; \
-+	for FILE in ${ITSELCS} ; \
- 	  do  \
--	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/its ; \
-+	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/its ; \
- 	  done; \
--	touch ${lispdir}/egg/its/.nosearch; \
-+	touch ${DESTDIR}${lispdir}/egg/its/.nosearch; \
- 
- 
- uninstall-site:
diff --git a/editors/tamago/files/patch-configure b/editors/tamago/files/patch-configure
deleted file mode 100644
index dcc393e54bb2..000000000000
--- a/editors/tamago/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2015-01-31 19:23:34.000000000 +0900
-+++ configure	2015-01-31 19:25:52.000000000 +0900
-@@ -646,7 +646,7 @@
- fi
- 
- 
--lispdir=${datadir}/emacs/site-lisp
-+: ${lispdir:=${datadir}/emacs/24.4/site-lisp}
- 
- trap '' 1 2 15
- cat > confcache <<\EOF
diff --git a/editors/tamago/files/patch-egg-anthy.el b/editors/tamago/files/patch-egg-anthy.el
deleted file mode 100644
index ff2107ec5b38..000000000000
--- a/editors/tamago/files/patch-egg-anthy.el
+++ /dev/null
@@ -1,27 +0,0 @@
---- egg/anthy.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/anthy.el	2015-02-02 00:32:09.000000000 +0900
-@@ -146,12 +146,11 @@
- 		     (if anthy-egg-use-utf8
- 			 '("--egg" "--utf8")
- 		       '("--egg"))))
--	(process-kill-without-query anthy-egg-proc)
-+	(set-process-query-on-exit-flag anthy-egg-proc nil)
- 	(set-process-coding-system anthy-egg-proc cs cs)
- 	(set-process-sentinel anthy-egg-proc 'anthy-egg-proc-sentinel)
- 	(set-marker-insertion-type (process-mark anthy-egg-proc) t)
--	(save-excursion
--	  (set-buffer buf)
-+	(with-current-buffer buf
- 	  (erase-buffer)
- 	  (buffer-disable-undo))
- 	(anthyipc-get-greeting anthy-egg-proc)))
-@@ -404,8 +403,7 @@
-   (let ((buf (get-buffer-create anthy-egg-dic-buffer-name))
- 	(cs (if anthy-egg-use-utf8 'utf-8-unix 'euc-japan-unix))
- 	proc)
--    (save-excursion
--      (set-buffer buf)
-+    (with-current-buffer buf
-       (setq proc (apply 'start-process "anthy-egg-dic" buf
- 			anthy-egg-dic-util-command
- 			(if anthy-egg-use-utf8
diff --git a/editors/tamago/files/patch-egg-anthyipc.el b/editors/tamago/files/patch-egg-anthyipc.el
deleted file mode 100644
index f5922f70f3e9..000000000000
--- a/editors/tamago/files/patch-egg-anthyipc.el
+++ /dev/null
@@ -1,12 +0,0 @@
---- egg/anthyipc.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/anthyipc.el	2015-02-02 00:32:22.000000000 +0900
-@@ -46,8 +46,7 @@
- 	  ,@vlist)
-      (if (and (eq (process-status proc) 'run)
- 	      (buffer-live-p buffer))
--	 (save-excursion
--	   (set-buffer buffer)
-+	 (with-current-buffer buffer
- 	   (erase-buffer)
- 	   ,send-expr
- 	   (goto-char (point-max))
diff --git a/editors/tamago/files/patch-egg-canna.el b/editors/tamago/files/patch-egg-canna.el
deleted file mode 100644
index 9ce890dfb8b0..000000000000
--- a/editors/tamago/files/patch-egg-canna.el
+++ /dev/null
@@ -1,48 +0,0 @@
---- egg/canna.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/canna.el	2015-02-02 00:52:59.000000000 +0900
-@@ -134,7 +134,7 @@
- (defun canna-make-backend (lang env &optional source-lang converted-lang)
-   (let ((finalize (canna-backend-func-name "canna-finalize-backend" lang))
- 	(backend (canna-backend-func-name "canna-backend" lang env)))
--    (if (null (fboundp finalize))
-+    (if (null (fboundp 'finalize))
- 	(progn
- 	  (fset finalize (function (lambda () (canna-finalize-backend))))
- 	  (egg-set-finalize-backend (list finalize))))
-@@ -319,8 +319,7 @@
-     (unwind-protect
- 	(progn
- 	  (setq buf (generate-new-buffer " *CANNA*"))
--    (save-excursion
--      (set-buffer buf)
-+    (with-current-buffer buf
-       (erase-buffer)
-       (buffer-disable-undo)
- 	    (set-buffer-multibyte nil)
-@@ -337,7 +336,7 @@
- 		    (setq port (substring hostname (match-end 0))
- 			  hostname (substring hostname 0 (match-beginning 0))))
- 		  (if (and (stringp port) (string-match "^[0-9]+$" port))
--		      (setq port (string-to-int port)))
-+		      (setq port (string-to-number port)))
- 		  (and (equal hostname "")
- 		       (setq hostname (or (getenv "CANNAHOST") "localhost")))
- 		  (setq host hostname)
-@@ -367,7 +366,7 @@
- 		      (setq proc (open-network-stream proc-name buf hostname port))
- 		    (error quit)))))
- 	    (when (processp proc)
--	      (process-kill-without-query proc)
-+	      (set-process-query-on-exit-flag proc nil)
- 	      (set-process-coding-system proc 'binary 'binary)
- 	      (set-process-sentinel proc 'canna-comm-sentinel)
- 	      (set-marker-insertion-type (process-mark proc) t)
-@@ -869,7 +868,7 @@
-     (setq kouho-list (cdr (reverse kouho-list)))
-     (setq kouho-list (reverse kouho-list))
-     (setq i 0)
--    (setq kouho-list (mapcar '(lambda (k)
-+    (setq kouho-list (mapcar #'(lambda (k)
- 				(prog1
- 				    (cons k i)
- 				  (setq i (1+ i))))
diff --git a/editors/tamago/files/patch-egg-cannarpc.el b/editors/tamago/files/patch-egg-cannarpc.el
deleted file mode 100644
index 9586a0131851..000000000000
--- a/editors/tamago/files/patch-egg-cannarpc.el
+++ /dev/null
@@ -1,12 +0,0 @@
---- egg/cannarpc.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg/cannarpc.el	2015-02-02 00:32:59.000000000 +0900
-@@ -79,8 +79,7 @@
-     (list
-      'let v
-      (append
--	`(save-excursion
--	   (set-buffer (process-buffer proc))
-+	`(with-current-buffer (process-buffer proc)
- 	   (erase-buffer)
- 	   ,send-expr
- 	   (process-send-region proc (point-min) (point-max))
diff --git a/editors/tamago/files/patch-egg-cnv.el b/editors/tamago/files/patch-egg-cnv.el
deleted file mode 100644
index 7decdbb749fa..000000000000
--- a/editors/tamago/files/patch-egg-cnv.el
+++ /dev/null
@@ -1,12 +0,0 @@
---- egg-cnv.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg-cnv.el	2015-01-31 19:25:52.000000000 +0900
-@@ -1245,7 +1245,8 @@
-   (with-output-to-temp-buffer "*Help*"
-     (princ "EGG Conversion mode:\n")
-     (princ (documentation 'egg-conversion-mode))
--    (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p))))
-+    (help-setup-xref (cons #'help-xref-mode (current-buffer))
-+      (called-interactively-p 'interactive))))
- 
- (provide 'egg-cnv)
- 
diff --git a/editors/tamago/files/patch-egg-com.el b/editors/tamago/files/patch-egg-com.el
deleted file mode 100644
index a088d9f36fa3..000000000000
--- a/editors/tamago/files/patch-egg-com.el
+++ /dev/null
@@ -1,118 +0,0 @@
---- egg-com.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg-com.el	2015-02-02 00:29:50.000000000 +0900
-@@ -99,9 +99,10 @@
-     (prog1 (- (point) pos)
-       (goto-char pos))))
- 
--(eval-and-compile
--  (if (string< mule-version "6.0") ;; for before Emacs23
--      (progn
-+(if (and (fboundp 'make-coding-system)
-+         (null (get 'make-coding-system 'byte-obsolete-info)))
-+;; since Emacs 23.1, make-coding-system has been marked as obsolete. 
-+    (eval-and-compile
- 	(define-ccl-program ccl-decode-fixed-euc-jp
- 	  `(2
- 	    ((r2 = ,(charset-id 'japanese-jisx0208))
-@@ -156,7 +157,8 @@
- 	(make-coding-system 'fixed-euc-jp 4 ?W "Coding System for fixed EUC Japanese"
- 			    (cons ccl-decode-fixed-euc-jp ccl-encode-fixed-euc-jp))
- 	)
--    ;; Emacs23 or later
-+    (eval-and-compile
-+    ;; since Emacs 23.1, make-coding-system has been marked as obsolete. 
-     ;; From Handa-san. [mule-ja : No.09414]
-     (define-charset 'fixed-euc-jp
-       "Fixed EUC Japanese"
-@@ -175,7 +177,10 @@
- 
- ;; Korean
- 
--(eval-and-compile
-+(if (and (fboundp 'make-coding-system)
-+         (null (get 'make-coding-system 'byte-obsolete-info)))
-+;; since Emacs 23.1, make-coding-system has been marked as obsolete. 
-+    (eval-and-compile
- (define-ccl-program ccl-decode-fixed-euc-kr
-   `(2
-     ((r2 = ,(charset-id 'korean-ksc5601))
-@@ -202,12 +207,27 @@
- 	   (write-read-repeat r0)))
-       (read r0)
-       (repeat)))))
-+(make-coding-system 'fixed-euc-kr 4 ?W "Coding System for fixed EUC Korean"
-+		    (cons ccl-decode-fixed-euc-kr ccl-encode-fixed-euc-kr)))
-+    (eval-and-compile
-+    ;; since Emacs 23.1, make-coding-system has been marked as obsolete. 
-+    (define-charset 'fixed-euc-kr
-+      "Fixed EUC Korean"
-+      :dimension 2
-+      :superset '(ascii
-+		  (korean-ksc5601 . #x8080)))
-+    (define-coding-system 'fixed-euc-kr
-+      "Coding System for fixed EUC Korean"
-+      :mnemonic ?W
-+      :coding-type 'charset
-+      :charset-list '(fixed-euc-kr))
-+    )
- )
- 
--(make-coding-system 'fixed-euc-kr 4 ?W "Coding System for fixed EUC Korean"
--		    (cons ccl-decode-fixed-euc-kr ccl-encode-fixed-euc-kr))
- 
- ;; Chinese
-+;;
-+;; TODO: convert an obsolete make-coding-system to define-coding-system.
- 
- (defconst egg-pinyin-shengmu
-   '((""  . 0)  ("B" . 1)  ("C"  . 2)  ("Ch" . 3)  ("D" . 4)
-@@ -578,8 +598,7 @@
-     (set-buffer work)
-     (erase-buffer)
-     (if (null (stringp from))
--	(save-excursion
--	  (set-buffer buf)
-+	(with-current-buffer buf
- 	  (setq from (buffer-substring from to))))
-     (insert (string-as-multibyte from))
-     (encode-fixed-euc-china-region 1 (point-max) type)
-@@ -828,9 +847,10 @@
- ;; Do not move the point, leave it where it was.
- (defmacro comm-accept-process-output ()
-   `(let ((p (point)))
--     (if (null (accept-process-output proc comm-accept-timeout))
--	 (egg-error "backend timeout (comm-accept-process-output)"))
--     (goto-char p)))
-+     (with-local-quit
-+       (if (null (accept-process-output proc comm-accept-timeout))
-+	   (egg-error "backend timeout (comm-accept-process-output)"))
-+       (goto-char p))))
- 
- (defmacro comm-require-process-output (n)
-   `(if (< (point-max) (+ (point) ,n))
-@@ -839,10 +859,11 @@
- (defun comm-wait-for-space (proc n)
-   (let ((p (point))
- 	(r (+ (point) n)))
--    (while (< (point-max) r)
--      (if (null (accept-process-output proc comm-accept-timeout))
--	  (egg-error "backend timeout (comm-wait-for-space)"))
--      (goto-char p))))
-+    (with-local-quit
-+      (while (< (point-max) r)
-+	(if (null (accept-process-output proc comm-accept-timeout))
-+	    (egg-error "backend timeout (comm-wait-for-space)"))
-+	(goto-char p)))))
- 
- (defmacro comm-following+forward-char ()
-   `(prog1
-@@ -967,8 +988,7 @@
- 	  ,@vlist)
-      (if (and (memq (process-status proc) '(open run))
- 	      (buffer-live-p buffer))
--	 (save-excursion
--	   (set-buffer buffer)
-+	 (with-current-buffer buffer
- 	   (let ,euc-select
- 	     (erase-buffer)
- 	     ,send-expr
diff --git a/editors/tamago/files/patch-egg-mlh.el b/editors/tamago/files/patch-egg-mlh.el
deleted file mode 100644
index 5c4a316e9e66..000000000000
--- a/editors/tamago/files/patch-egg-mlh.el
+++ /dev/null
@@ -1,20 +0,0 @@
---- egg-mlh.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg-mlh.el	2015-01-31 19:25:52.000000000 +0900
-@@ -122,7 +122,7 @@
-   (goto-char end-marker)
-   (backward-delete-char 2)
-   (let* ((str (buffer-substring beg (point)))
--         (val (string-to-int str)))
-+         (val (string-to-number str)))
-     (delete-region beg (point))
-     (if (= val 0)
-         (setq val 1))
-@@ -220,7 +220,7 @@
-   (goto-char end-marker)
-   (backward-delete-char 2)
-   (let* ((str (buffer-substring beg (point)))
--         (val (string-to-int str)))
-+         (val (string-to-number str)))
-     (delete-region beg (point))
-     (if (= val 0)
-         (setq val 1))
diff --git a/editors/tamago/files/patch-egg-sim.el b/editors/tamago/files/patch-egg-sim.el
deleted file mode 100644
index 281dc7b9cee5..000000000000
--- a/editors/tamago/files/patch-egg-sim.el
+++ /dev/null
@@ -1,70 +0,0 @@
---- egg-sim.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg-sim.el	2015-01-31 19:25:52.000000000 +0900
-@@ -56,19 +56,23 @@
- 	 (<= to max)
- 	 (cond ((= (charset-dimension charset) 1)
- 		(while (<= from to)
--		  (setq result (cons (char-to-string
--				      (make-char charset to))
--				     result)
--			to (1- to)))
-+		  (let ((c (ignore-errors (make-char charset to))))
-+		    (if c (progn
-+			    (setq result (cons
-+					  (char-to-string c)
-+					  result)))))
-+		  (setq to (1- to)))
- 		result)
- 	       ((= (charset-dimension charset) 2)
- 		(while (<= from to)
- 		  (let ((code max))
- 		    (while (<= min code)
--		      (setq result (cons (char-to-string
--					  (make-char charset to code))
--					 result)
--			    code (1- code))))
-+		      (let ((c (ignore-errors (make-char charset to code))))
-+		        (if c (progn
-+				(setq result (cons
-+					      (char-to-string c)
-+					      result)))))
-+		      (setq code (1- code))))
- 		  (setq to (1- to)))
- 		result)))))
- 
-@@ -432,7 +436,7 @@
-     (insert "-+")
-     (let ((i 0))
-       (while (< i 16)
--	(insert (format "----" i))
-+	(insert (format "----"))
- 	(setq i (1+ i))))
-     (insert "\n")
- 
-@@ -461,7 +465,7 @@
-     (insert "-+")
-     (let ((i 0))
-       (while (< i 16)
--	(insert (format "----" i))
-+	(insert (format "----"))
- 	(setq i (1+ i))))
-     (insert "\n")
- 
-@@ -496,7 +500,7 @@
-     (insert "-+")
-     (let ((i 0))
-       (while (< i 16)
--	(insert (format "----" i))
-+	(insert (format "----"))
- 	(setq i (1+ i))))
-     (insert "\n")
- 
-@@ -531,7 +535,7 @@
-     (insert "-+")
-     (let ((i 1))
-       (while (<= i 94)
--	(insert (format "-----" i))
-+	(insert (format "-----"))
- 	(setq i (1+ i))))
-     (insert "\n")
- 
diff --git a/editors/tamago/files/patch-egg-sj3.el b/editors/tamago/files/patch-egg-sj3.el
deleted file mode 100644
index 1b0814534ea5..000000000000
--- a/editors/tamago/files/patch-egg-sj3.el
+++ /dev/null
@@ -1,26 +0,0 @@
---- egg/sj3.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg/sj3.el	2015-02-02 00:33:30.000000000 +0900
-@@ -146,11 +146,10 @@
- 	(setq proc (open-network-stream "SJ3" buf hostname sj3-server-port))
-       ((error quit)
-        (egg-error "failed to connect sj3 server")))
--    (process-kill-without-query proc)
-+    (set-process-query-on-exit-flag proc nil)
-     (set-process-coding-system proc 'binary 'binary)
-     (set-marker-insertion-type (process-mark proc) t)
--    (save-excursion
--      (set-buffer buf)
-+    (with-current-buffer buf
-       (erase-buffer)
-       (buffer-disable-undo)
-       (set-buffer-multibyte nil))
-@@ -177,8 +176,7 @@
- ;;   (let* ((buf (generate-new-buffer " *SJ3*"))
- ;; 	 (msg-form "SJ3: connecting to sj3serv at %s...")
- ;; 	 hostname proc result msg)
--;;     (save-excursion
--;;       (set-buffer buf)
-+;;     (with-current-buffer buf
- ;;       (erase-buffer)
- ;;       (buffer-disable-undo)
- ;;       (setq enable-multibyte-characters nil))
diff --git a/editors/tamago/files/patch-egg-sj3rpc.el b/editors/tamago/files/patch-egg-sj3rpc.el
deleted file mode 100644
index c2b611435fb5..000000000000
--- a/editors/tamago/files/patch-egg-sj3rpc.el
+++ /dev/null
@@ -1,12 +0,0 @@
---- egg/sj3rpc.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ egg/sj3rpc.el	2015-02-02 00:33:47.000000000 +0900
-@@ -86,8 +86,7 @@
-     (list
-      'let v
-      (append
--	`(save-excursion
--	   (set-buffer (process-buffer proc))
-+	`(with-current-buffer (process-buffer proc)
- 	   (erase-buffer)
- 	   ,send-expr
- 	   (process-send-region proc (point-min) (point-max))
diff --git a/editors/tamago/files/patch-egg-wnn.el b/editors/tamago/files/patch-egg-wnn.el
deleted file mode 100644
index 2045e910905c..000000000000
--- a/editors/tamago/files/patch-egg-wnn.el
+++ /dev/null
@@ -1,161 +0,0 @@
---- egg/wnn.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg/wnn.el	2015-02-02 00:53:09.000000000 +0900
-@@ -82,6 +82,10 @@
- 			     (const wnn-uniq)
- 			     (const wnn-uniq-kanji)))
- 
-+(defcustom egg-wnn-helper-path "egg-helper"
-+  "path of wnn unix domain connection helper program"
-+  :group 'wnn :type 'file)
-+
- (defcustom wnn-jserver nil
-   "jserver hostname list.  Use N-th port, if hostname is followed
- by ':' and digit N."
-@@ -99,11 +103,21 @@
-  by ':' and digit N."
-   :group 'wnn :type '(repeat string))
- 
-+(setq wnn-jserverenv "JSERVER")
-+(setq wnn-cserverenv "CSERVER")
-+(setq wnn-tserverenv "TSERVER")
-+(setq wnn-kserverenv "KSERVER")
-+
- (defcustom wnn-jport 22273 "jserver port number" :group 'wnn :type 'integer)
- (defcustom wnn-cport 22289 "cserver port number" :group 'wnn :type 'integer)
- (defcustom wnn-tport 22321 "tserver port number" :group 'wnn :type 'integer)
- (defcustom wnn-kport 22305 "kserver port number" :group 'wnn :type 'integer)
- 
-+(defcustom wnn-judpath "/tmp/jd_sockV4" "jserver unix domain socket name" :group 'wnn :type 'string)
-+(defcustom wnn-cudpath "/tmp/cd_sockV4" "cserver unix domain socket name" :group 'wnn :type 'string)
-+(defcustom wnn-tudpath "/tmp/td_sockV4" "tserver unix domain socket name" :group 'wnn :type 'string)
-+(defcustom wnn-kudpath "/tmp/kd_sockV4" "kserver unix domain socket name" :group 'wnn :type 'string)
-+
- (defmacro wnn-backend-plist ()
-   ''(egg-initialize-backend        wnn-init
-      egg-start-conversion          wnn-start-conversion
-@@ -128,7 +142,7 @@
- (defun wnn-make-backend (lang env &optional source-lang converted-lang)
-   (let ((finalize (wnn-backend-func-name "wnn-finalize-backend" lang))
- 	(backend (wnn-backend-func-name "wnn-backend" lang env)))
--    (if (null (fboundp finalize))
-+    (if (null (fboundp 'finalize))
- 	(progn
- 	  (fset finalize `(lambda () (wnn-finalize-backend ',lang)))
- 	  (egg-set-finalize-backend (list finalize))))
-@@ -559,11 +573,11 @@
- 	  bunsetsu))
- 
- (defvar wnn-server-info-list
--  ;; language    server  port      hostname    proc   coding-system
--  '((Japanese    jserver wnn-jport wnn-jserver "Wnn"  (fixed-euc-jp    fixed-euc-jp))
--    (Chinese-GB  cserver wnn-cport wnn-cserver "cWnn" (fixed-euc-py-cn fixed-euc-zy-cn))
--    (Chinese-CNS tserver wnn-tport wnn-tserver "tWnn" (fixed-euc-py-tw fixed-euc-zy-tw))
--    (Korean      kserver wnn-kport wnn-kserver "kWnn" (fixed-euc-kr    fixed-euc-kr))))
-+  ;; language    server  port      hostname    unixdomain  serverenv      proc   coding-system
-+  '((Japanese    jserver wnn-jport wnn-jserver wnn-judpath wnn-jserverenv "Wnn"  (fixed-euc-jp    fixed-euc-jp))
-+    (Chinese-GB  cserver wnn-cport wnn-cserver wnn-cudpath wnn-cserverenv "cWnn" (fixed-euc-py-cn fixed-euc-zy-cn))
-+    (Chinese-CNS tserver wnn-tport wnn-tserver wnn-tudpath wnn-tserverenv "tWnn" (fixed-euc-py-tw fixed-euc-zy-tw))
-+    (Korean      kserver wnn-kport wnn-kserver wnn-kudpath wnn-kserverenv "kWnn" (fixed-euc-kr    fixed-euc-kr))))
- 
- (defsubst wnn-server-get-info (lang)
-   (or (assq lang wnn-server-info-list)
-@@ -577,12 +591,16 @@
-   (symbol-value (nth 2 info)))
- (defsubst wnn-server-hostname (info)
-   (symbol-value (nth 3 info)))
-+(defsubst wnn-server-udpath-name (info)
-+  (symbol-value (nth 4 info)))
-+(defsubst wnn-server-env-name (info)
-+  (symbol-value (nth 5 info)))
- (defsubst wnn-server-proc-name (info)
--  (nth 4 info))
-+  (nth 6 info))
- (defsubst wnn-server-buffer-name (info)
-   (concat " *" (wnn-server-proc-name info) "*"))
- (defsubst wnn-server-coding-system (info)
--  (nth 5 info))
-+  (nth 7 info))
- 
- (defconst wnn-accept-charset-alist
-   '((Chinese-CNS ascii chinese-sisheng chinese-cns11643-1 chinese-cns11643-2)))
-@@ -1209,14 +1227,15 @@
- 	(port (wnn-server-port server-info))
- 	(hostname-list (wnn-server-hostname server-info))
- 	(proc-name (wnn-server-proc-name server-info))
-+	(udpath (wnn-server-udpath-name server-info))
-+	(serverenv (wnn-server-env-name server-info))
- 	(msg-form "Wnn: connecting to %S at %s...")
- 	(user-name (user-login-name))
--	buf hostname myname port-off proc result msg)
-+	buf hostname port-off proc result msg)
-     (unwind-protect
- 	(progn
- 	  (setq buf (generate-new-buffer (wnn-server-buffer-name server-info)))
--	  (save-excursion
--	    (set-buffer buf)
-+	  (with-current-buffer buf
- 	    (erase-buffer)
- 	    (buffer-disable-undo)
- 	    (set-buffer-multibyte nil)
-@@ -1225,13 +1244,24 @@
- 	      (setq hostname-list (list hostname-list)))
- 	  (while (and hostname-list (null proc))
- 	    (setq hostname (or (car hostname-list) "")
--		  hostname-list (cdr hostname-list)
--		  myname (if (equal hostname "") "unix" wnn-system-name))
--	    (if (null (string-match ":" hostname))
--		(setq port-off 0)
--	      (setq port-off (string-to-int (substring hostname (match-end 0)))
--		    hostname (substring hostname 0 (match-beginning 0))))
--	    (and (equal hostname "") (setq hostname "localhost"))
-+		hostname-list (cdr hostname-list))
-+	    (if (or (and (getenv serverenv)
-+			 (string-match "^unix$" (getenv serverenv)))
-+		    (and (null (getenv serverenv))
-+			 (or (equal hostname "")
-+			     (string-match "^unix$" hostname))))
-+		(progn
-+		  (setq hostname "unix"
-+			family 'local
-+			port udpath))
-+	       (progn
-+		(setq hostname (or (getenv serverenv) hostname "localhost"))
-+		(if (null (string-match ":" hostname))
-+		    (setq port-off 0)
-+		  (setq port-off (string-to-number (substring hostname (match-end 0)))
-+			hostname (substring hostname 0 (match-beginning 0))))
-+		(setq family nil)))
-+	    (setq host hostname)
- 	    (let ((inhibit-quit save-inhibit-quit))
- 	      (if (and msg
- 		       (null (y-or-n-p (format "%s failed. Try to %s? "
-@@ -1241,16 +1271,22 @@
- 			      server-type hostname))
- 	    (message "%s" msg)
- 	    (let ((inhibit-quit save-inhibit-quit))
--	      (condition-case nil
--		  (setq proc (open-network-stream proc-name buf hostname
--						  (+ port port-off)))
--		((error quit))))
--	    (when proc
--	      (process-kill-without-query proc)
-+             (if (fboundp 'make-network-process)
-+                 (condition-case nil
-+                     (setq proc (make-network-process :name proc-name :buffer buf :host host :service port :family family))
-+                   ((error quit)))
-+               (if (string-match "^unix$" hostname)
-+                   (let ((process-connection-type nil))
-+                     (setq proc (start-process proc-name buf egg-wnn-helper-path port)))
-+                 (condition-case nil
-+                     (setq proc (open-network-stream proc-name buf hostname port))
-+                   (error quit)))))
-+           (when (processp proc)
-+	      (set-process-query-on-exit-flag proc nil)
- 	      (set-process-coding-system proc 'binary 'binary)
- 	      (set-process-sentinel proc 'wnn-comm-sentinel)
- 	      (set-marker-insertion-type (process-mark proc) t)
--	      (setq result (wnnrpc-open proc myname user-name))
-+	      (setq result (wnnrpc-open proc host user-name))
- 	      (when (numberp result)
- 		(delete-process proc)
- 		(setq proc nil))))
diff --git a/editors/tamago/files/patch-egg-wnnrpc.el b/editors/tamago/files/patch-egg-wnnrpc.el
deleted file mode 100644
index 404e4228ea2c..000000000000
--- a/editors/tamago/files/patch-egg-wnnrpc.el
+++ /dev/null
@@ -1,29 +0,0 @@
---- egg/wnnrpc.el.orig	2015-01-31 19:24:10.000000000 +0900
-+++ egg/wnnrpc.el	2015-02-02 00:34:15.000000000 +0900
-@@ -714,8 +714,14 @@
-      ,send-expr ,@rcv-exprs))
- 
- (defmacro wnnrpc-get-result (&rest body)
--  `(let (result)
--     (comm-unpack (i) 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 (i) result)
-@@ -1716,8 +1722,7 @@
- 		  (insert contents)
- 		  (if (= result 2)
- 		      (insert-file-contents local-filename nil (1- (point))))
--		  (save-excursion
--		    (set-buffer (process-buffer proc))
-+		  (with-current-buffer (process-buffer proc)
- 		    (wnnrpc-get-result)))))))))
-     ((quit error)
-      (wnnrpc-call-with-environment env ()
diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el
deleted file mode 100644
index 91e85c950809..000000000000
--- a/editors/tamago/files/patch-egg.el
+++ /dev/null
@@ -1,55 +0,0 @@
---- egg.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ egg.el	2015-02-02 00:38:37.000000000 +0900
-@@ -120,10 +120,10 @@
- 
- (defun egg-activate-keymap-after-command ()
-   (while egg-change-major-mode-buffer
--    (save-excursion
--      (when (buffer-live-p (car egg-change-major-mode-buffer))
--	(set-buffer (car egg-change-major-mode-buffer))
--	(egg-activate-keymap))
-+    (let ((buf (car egg-change-major-mode-buffer)))
-+      (if (buffer-live-p buf)
-+          (with-current-buffer buf
-+            (egg-activate-keymap)))
-       (setq egg-change-major-mode-buffer (cdr egg-change-major-mode-buffer))))
-   (remove-hook 'post-command-hook 'egg-activate-keymap-after-command))
- 
-@@ -167,16 +167,22 @@
- 	  (setq egg-modefull-mode t)
- 	  (its-define-select-keys egg-modefull-map))
-       (setq egg-modeless-mode t))
--    (setq inactivate-current-input-method-function 'egg-mode)
-+    (set (if (fboundp 'deactivate-current-input-method-function)
-+	     'deactivate-current-input-method-function
-+	   'inactivate-current-input-method-function)
-+	 'egg-mode)
-     (setq describe-current-input-method-function 'egg-help)
--    (make-local-hook 'input-method-activate-hook)
-+    (if (fboundp 'make-local-hook)
-+      (eval '(make-local-hook 'input-method-activate-hook)))
-     (add-hook 'input-method-activate-hook 'its-set-mode-line-title nil t)
-     (if (eq (selected-window) (minibuffer-window))
- 	(add-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer))
-     (run-hooks 'egg-mode-hook)))
- 
- (defun egg-exit-from-minibuffer ()
--  (inactivate-input-method)
-+  (if (fboundp 'deactivate-input-method)
-+      (deactivate-input-method)
-+    (inactivate-input-method))
-   (if (<= (minibuffer-depth) 1)
-       (remove-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer)))
- 
-@@ -184,7 +190,10 @@
- 
- (defun egg-self-insert-char ()
-   (interactive)
--  (its-start last-command-char (and (eq last-command 'egg-use-context)
-+  (its-start (if (boundp 'last-command-event)
-+		 last-command-event
-+	       last-command-char)
-+	     (and (eq last-command 'egg-use-context)
- 				    egg-context)))
- 
- (defun egg-remove-all-text-properties (from to &optional object)
diff --git a/editors/tamago/files/patch-helper-Makefile b/editors/tamago/files/patch-helper-Makefile
deleted file mode 100644
index a08519553cda..000000000000
--- a/editors/tamago/files/patch-helper-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- /dev/null	2015-01-31 20:00:00.000000000 +0900
-+++ helper/Makefile	2015-01-31 19:27:23.000000000 +0900
-@@ -0,0 +1,6 @@
-+PROG=	egg-helper
-+SRCS=	egg-helper.c
-+
-+MAN=
-+
-+.include <bsd.prog.mk>
diff --git a/editors/tamago/files/patch-its.el b/editors/tamago/files/patch-its.el
deleted file mode 100644
index c9089f7e0139..000000000000
--- a/editors/tamago/files/patch-its.el
+++ /dev/null
@@ -1,30 +0,0 @@
---- its.el.orig	2015-01-31 19:24:09.000000000 +0900
-+++ its.el	2015-01-31 19:25:52.000000000 +0900
-@@ -397,7 +397,7 @@
- (defun its-self-insert-char ()
-   (interactive)
-   (let ((inhibit-read-only t)
--	(key last-command-char)
-+	(key last-command-event)
- 	(cursor (get-text-property (point) 'its-cursor))
- 	(syl (get-text-property (1- (point)) 'its-syl)))
-     (cond
-@@ -1264,7 +1264,7 @@
-   (interactive "P")
-   (let ((syl (and (null (get-text-property (point) 'its-cursor))
- 		  (get-text-property (1- (point)) 'its-syl))))
--    (if (its-keyseq-acceptable-p (vector last-command-char) syl)
-+    (if (its-keyseq-acceptable-p (vector last-command-event) syl)
- 	(its-self-insert-char)
-       (its-kick-convert-region n))))
- 
-@@ -1554,7 +1554,8 @@
-   (with-output-to-temp-buffer "*Help*"
-     (princ "ITS mode:\n")
-     (princ (documentation 'its-mode))
--    (help-setup-xref (cons #'help-xref-mode (current-buffer)) (interactive-p))))
-+    (help-setup-xref (cons #'help-xref-mode (current-buffer))
-+      (called-interactively-p 'interactive))))
- 
- ;; The `point-left' hook function will never be called in Emacs 21.2.50
- ;; when the command `next-line' is used in the last line of a buffer
diff --git a/editors/tamago/files/patch-menudiag.el b/editors/tamago/files/patch-menudiag.el
deleted file mode 100644
index 9986163652b1..000000000000
--- a/editors/tamago/files/patch-menudiag.el
+++ /dev/null
@@ -1,62 +0,0 @@
---- menudiag.el.orig	2015-01-31 19:23:34.000000000 +0900
-+++ menudiag.el	2015-02-02 00:30:59.000000000 +0900
-@@ -226,6 +226,9 @@
-   (remove-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
-   (setq menudiag-minibuffer-list (cons (current-buffer)
- 				       menudiag-minibuffer-list))
-+  (if (boundp 'deactivate-input-method)
-+    (deactivate-input-method)
-+    (inactivate-input-method))
-   (buffer-disable-undo)
-   (menudiag-receive-variables)
-   (menudiag-beginning-of-items)
-@@ -296,7 +299,7 @@
- (defun menudiag-goto-item ()
-   (interactive)
-   (menudiag-check-current-menu)
--  (let ((ch last-command-char)
-+  (let ((ch last-command-event)
- 	(n 0))
-     (setq n (menudiag-char-to-item-num ch))
-     (if (>= n (length menudiag-line))
-@@ -503,7 +506,8 @@
-   (make-local-variable 'inhibit-read-only)
-   (setq buffer-read-only t
- 	inhibit-read-only nil)
--  (make-local-hook 'post-command-hook)
-+  (if (fboundp 'make-local-hook)
-+    (eval '(make-local-hook 'post-command-hook)))
-   (add-hook 'post-command-hook 'menudiag-selection-align-to-item nil t)
-   (use-local-map menudiag-selection-map)
-   (setq mode-name "Menudiag Selection")
-@@ -595,10 +599,10 @@
-       (set-buffer sel-buf)
-       (setq completion-reference-buffer tmp-buf)
-       (if event
--	  (mouse-choose-completion event)
-+         (choose-completion event)
- 	(choose-completion))
-       (set-buffer tmp-buf)
--      (setq n (string-to-int (buffer-string))))
-+      (setq n (string-to-number (buffer-string))))
-     (pop-to-buffer org-buf)
-     (while (and item-list (>= n (length (car item-list))))
-       (setq l (1+ l)
-@@ -619,15 +623,14 @@
-   (unless (eq last-command 'menudiag-selection-goto)
-     (setq menudiag-goto-number-list nil
- 	  menudiag-original-point (point)))
--  (setq menudiag-goto-number-list (cons (- last-command-char ?0)
-+  (setq menudiag-goto-number-list (cons (- last-command-event ?0)
- 					menudiag-goto-number-list))
-   (menudiag-selection-goto-internal))
- 
- (defun menudiag-selection-goto-internal ()
-   (let* ((list menudiag-goto-number-list)
- 	 (n (menudiag-selection-item-number list))
--	 (len (save-excursion
--		(set-buffer menudiag-selection-main-buffer)
-+	 (len (with-current-buffer menudiag-selection-main-buffer
- 		(length menudiag-current-items))))
-     (setq this-command 'menudiag-selection-goto)
-     (if (>= n len)
diff --git a/editors/tamago/pkg-descr b/editors/tamago/pkg-descr
index 02aee63bb689..b022185c5bef 100644
--- a/editors/tamago/pkg-descr
+++ b/editors/tamago/pkg-descr
@@ -3,9 +3,5 @@ written in only Emacs-Lisp.  It supports the following translating servers:
 jserver, cserver, tserver, Wnn6, SJ3 ver 1 and ver 2, cannaserver, wxgserver,
 and anthy.
 
-This package also includes the following enhancements from Debian:
-
-- Partial support for Wnn7/Wnn8.
-- Support connection to cannaserver using UNIX domain socket.
-
 WWW: http://git.chise.org/gitweb/?p=elisp/tamago.git;a=summary
+WWW: https://github.com/hrs-allbsd/tamago
diff --git a/editors/tamago/pkg-plist b/editors/tamago/pkg-plist
index ec33364afb3b..519b0bbc0892 100644
--- a/editors/tamago/pkg-plist
+++ b/editors/tamago/pkg-plist
@@ -1,38 +1,70 @@
-bin/egg-helper
+%%ELISPDIR%%/egg/egg-cnv.el.gz
 %%ELISPDIR%%/egg/egg-cnv.elc
+%%ELISPDIR%%/egg/egg-com.el.gz
 %%ELISPDIR%%/egg/egg-com.elc
+%%ELISPDIR%%/egg/egg-edep.el.gz
 %%ELISPDIR%%/egg/egg-edep.elc
+%%ELISPDIR%%/egg/egg-mlh.el.gz
 %%ELISPDIR%%/egg/egg-mlh.elc
+%%ELISPDIR%%/egg/egg-sim.el.gz
 %%ELISPDIR%%/egg/egg-sim.elc
+%%ELISPDIR%%/egg/egg.el.gz
 %%ELISPDIR%%/egg/egg.elc
 %%ELISPDIR%%/egg/egg/.nosearch
+%%ELISPDIR%%/egg/egg/anthy.el.gz
 %%ELISPDIR%%/egg/egg/anthy.elc
+%%ELISPDIR%%/egg/egg/anthyipc.el.gz
 %%ELISPDIR%%/egg/egg/anthyipc.elc
+%%ELISPDIR%%/egg/egg/canna.el.gz
 %%ELISPDIR%%/egg/egg/canna.elc
+%%ELISPDIR%%/egg/egg/cannarpc.el.gz
 %%ELISPDIR%%/egg/egg/cannarpc.elc
+%%ELISPDIR%%/egg/egg/sj3.el.gz
 %%ELISPDIR%%/egg/egg/sj3.elc
+%%ELISPDIR%%/egg/egg/sj3rpc.el.gz
 %%ELISPDIR%%/egg/egg/sj3rpc.elc
+%%ELISPDIR%%/egg/egg/wnn.el.gz
 %%ELISPDIR%%/egg/egg/wnn.elc
+%%ELISPDIR%%/egg/egg/wnnrpc.el.gz
 %%ELISPDIR%%/egg/egg/wnnrpc.elc
 %%ELISPDIR%%/egg/eggrc
+%%ELISPDIR%%/egg/its-keydef.el.gz
 %%ELISPDIR%%/egg/its-keydef.elc
+%%ELISPDIR%%/egg/its.el.gz
 %%ELISPDIR%%/egg/its.elc
 %%ELISPDIR%%/egg/its/.nosearch
+%%ELISPDIR%%/egg/its/ascii.el.gz
 %%ELISPDIR%%/egg/its/ascii.elc
+%%ELISPDIR%%/egg/its/aynu.el.gz
 %%ELISPDIR%%/egg/its/aynu.elc
+%%ELISPDIR%%/egg/its/bixing.el.gz
 %%ELISPDIR%%/egg/its/bixing.elc
+%%ELISPDIR%%/egg/its/erpin.el.gz
 %%ELISPDIR%%/egg/its/erpin.elc
+%%ELISPDIR%%/egg/its/greek.el.gz
 %%ELISPDIR%%/egg/its/greek.elc
+%%ELISPDIR%%/egg/its/hangul.el.gz
 %%ELISPDIR%%/egg/its/hangul.elc
+%%ELISPDIR%%/egg/its/hankata.el.gz
 %%ELISPDIR%%/egg/its/hankata.elc
+%%ELISPDIR%%/egg/its/hira.el.gz
 %%ELISPDIR%%/egg/its/hira.elc
+%%ELISPDIR%%/egg/its/jeonkak.el.gz
 %%ELISPDIR%%/egg/its/jeonkak.elc
+%%ELISPDIR%%/egg/its/jiskana.el.gz
 %%ELISPDIR%%/egg/its/jiskana.elc
+%%ELISPDIR%%/egg/its/kata.el.gz
 %%ELISPDIR%%/egg/its/kata.elc
+%%ELISPDIR%%/egg/its/pinyin.el.gz
 %%ELISPDIR%%/egg/its/pinyin.elc
+%%ELISPDIR%%/egg/its/quanjiao.el.gz
 %%ELISPDIR%%/egg/its/quanjiao.elc
+%%ELISPDIR%%/egg/its/thai.el.gz
 %%ELISPDIR%%/egg/its/thai.elc
+%%ELISPDIR%%/egg/its/zenkaku.el.gz
 %%ELISPDIR%%/egg/its/zenkaku.elc
+%%ELISPDIR%%/egg/its/zhuyin.el.gz
 %%ELISPDIR%%/egg/its/zhuyin.elc
 %%ELISPDIR%%/egg/leim-list.el
+%%ELISPDIR%%/egg/menudiag.el.gz
 %%ELISPDIR%%/egg/menudiag.elc