- Fix a bug that deactivate-input-method was not called in

  (egg-exit-from-minibuffer).

- Remove an unnecessary overriding-local-map call in
  (menudiag-select-internal).

- Regenerate patch files.

18 files changed, 45 insertions, 68 deletions

diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile
index 927475220c58..9101dca0021d 100644
--- a/editors/tamago/Makefile
+++ b/editors/tamago/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	editors elisp
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/e/egg
@@ -22,7 +22,6 @@ LICENSE=	GPLv2
 
 USES=		gmake
 USE_EMACS=	yes
-POST_PATCHES=	${PATCHDIR}/post-patch-*
 WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
@@ -40,9 +39,6 @@ PLIST_SUB+=	HAS_JISX0213=""
 PLIST_SUB+=	HAS_JISX0213="@comment "
 .endif
 
-post-patch:
-	cd ${PATCH_WRKSRC} && (${CAT} ${POST_PATCHES} | ${PATCH})
-
 post-build:
 	cd ${WRKSRC}/helper && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
diff --git a/editors/tamago/files/patch-Makefile.in b/editors/tamago/files/patch-Makefile.in
index 26e113eaec6a..a75dee0255ef 100644
--- a/editors/tamago/files/patch-Makefile.in
+++ b/editors/tamago/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2004-11-22 03:53:05.000000000 +0900
-+++ Makefile.in	2014-06-10 13:51:03.000000000 +0900
-@@ -113,32 +115,32 @@
+--- Makefile.in.orig	2015-01-31 19:24:09.000000000 +0900
++++ Makefile.in	2015-01-31 19:25:52.000000000 +0900
+@@ -115,32 +115,32 @@
  
  install-site: all
  	echo "Egg system will be installed in ${lispdir}/egg...."; \
diff --git a/editors/tamago/files/patch-configure b/editors/tamago/files/patch-configure
index 12a3b1334a8a..dcc393e54bb2 100644
--- a/editors/tamago/files/patch-configure
+++ b/editors/tamago/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2002-09-10 07:14:26.000000000 +0900
-+++ configure	2014-11-23 16:22:46.000000000 +0900
+--- configure.orig	2015-01-31 19:23:34.000000000 +0900
++++ configure	2015-01-31 19:25:52.000000000 +0900
 @@ -646,7 +646,7 @@
  fi
  
diff --git a/editors/tamago/files/patch-egg-Makefile b/editors/tamago/files/patch-egg-Makefile
deleted file mode 100644
index 268740e6722c..000000000000
--- a/editors/tamago/files/patch-egg-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- /dev/null	2013-05-05 14:11:00.000000000 +0900
-+++ helper/Makefile	2013-05-05 14:14:52.000000000 +0900
-@@ -0,0 +1,8 @@
-+# $FreeBSD$
-+
-+PROG=	egg-helper
-+SRCS=	egg-helper.c
-+
-+MAN=
-+
-+.include <bsd.prog.mk>
diff --git a/editors/tamago/files/post-patch-egg-anthy.el b/editors/tamago/files/patch-egg-anthy.el
index ccac75c0fa33..a5173376a6fc 100644
--- a/editors/tamago/files/post-patch-egg-anthy.el
+++ b/editors/tamago/files/patch-egg-anthy.el
@@ -1,5 +1,5 @@
---- egg/anthy.el.orig	2014-11-23 16:11:09.000000000 +0900
-+++ egg/anthy.el	2014-11-23 16:11:30.000000000 +0900
+--- egg/anthy.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg/anthy.el	2015-01-31 19:39:19.000000000 +0900
 @@ -146,7 +146,7 @@
  		     (if anthy-egg-use-utf8
  			 '("--egg" "--utf8")
diff --git a/editors/tamago/files/post-patch-egg-canna.el b/editors/tamago/files/patch-egg-canna.el
index 23997bbea8c5..4684eeab0fa8 100644
--- a/editors/tamago/files/post-patch-egg-canna.el
+++ b/editors/tamago/files/patch-egg-canna.el
@@ -1,5 +1,5 @@
---- egg/canna.el.orig	2014-11-23 16:07:10.000000000 +0900
-+++ egg/canna.el	2014-11-23 16:10:05.000000000 +0900
+--- egg/canna.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg/canna.el	2015-01-31 19:39:19.000000000 +0900
 @@ -337,7 +337,7 @@
  		    (setq port (substring hostname (match-end 0))
  			  hostname (substring hostname 0 (match-beginning 0))))
diff --git a/editors/tamago/files/patch-egg-cnv.el b/editors/tamago/files/patch-egg-cnv.el
index 4cd606680dc9..7decdbb749fa 100644
--- a/editors/tamago/files/patch-egg-cnv.el
+++ b/editors/tamago/files/patch-egg-cnv.el
@@ -1,5 +1,5 @@
---- egg-cnv.el.orig	2002-07-23 06:59:44.000000000 +0900
-+++ egg-cnv.el	2014-11-23 16:00:50.000000000 +0900
+--- 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")
diff --git a/editors/tamago/files/patch-egg-com.el b/editors/tamago/files/patch-egg-com.el
index a1d5f29c4e36..64743cbb8079 100644
--- a/editors/tamago/files/patch-egg-com.el
+++ b/editors/tamago/files/patch-egg-com.el
@@ -1,5 +1,5 @@
---- egg-com.el.orig	2014-11-23 15:54:16.000000000 +0900
-+++ egg-com.el	2014-11-23 15:58:24.000000000 +0900
+--- egg-com.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg-com.el	2015-01-31 19:25:52.000000000 +0900
 @@ -99,9 +99,10 @@
      (prog1 (- (point) pos)
        (goto-char pos))))
diff --git a/editors/tamago/files/patch-egg-mlh.el b/editors/tamago/files/patch-egg-mlh.el
index f58bfd89e562..5c4a316e9e66 100644
--- a/editors/tamago/files/patch-egg-mlh.el
+++ b/editors/tamago/files/patch-egg-mlh.el
@@ -1,5 +1,5 @@
---- egg-mlh.el.orig	2014-11-22 15:28:22.000000000 +0900
-+++ egg-mlh.el	2014-11-22 15:28:40.000000000 +0900
+--- 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)
diff --git a/editors/tamago/files/patch-egg-sim.el b/editors/tamago/files/patch-egg-sim.el
index 8ca01857b5ca..281dc7b9cee5 100644
--- a/editors/tamago/files/patch-egg-sim.el
+++ b/editors/tamago/files/patch-egg-sim.el
@@ -1,5 +1,5 @@
---- egg-sim.el.orig	2001-01-28 03:53:13.000000000 +0900
-+++ egg-sim.el	2015-01-28 19:42:32.000000000 +0900
+--- 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)
diff --git a/editors/tamago/files/patch-egg-sj3.el b/editors/tamago/files/patch-egg-sj3.el
index fef8cf60884f..d73b8dede330 100644
--- a/editors/tamago/files/patch-egg-sj3.el
+++ b/editors/tamago/files/patch-egg-sj3.el
@@ -1,5 +1,5 @@
---- egg/sj3.el.orig	2014-11-23 16:07:41.000000000 +0900
-+++ egg/sj3.el	2014-11-23 16:08:04.000000000 +0900
+--- egg/sj3.el.orig	2015-01-31 19:23:34.000000000 +0900
++++ egg/sj3.el	2015-01-31 19:25:52.000000000 +0900
 @@ -146,7 +146,7 @@
  	(setq proc (open-network-stream "SJ3" buf hostname sj3-server-port))
        ((error quit)
diff --git a/editors/tamago/files/patch-egg-wnn.el b/editors/tamago/files/patch-egg-wnn.el
index 11c6de2c5799..c6e7061711ec 100644
--- a/editors/tamago/files/patch-egg-wnn.el
+++ b/editors/tamago/files/patch-egg-wnn.el
@@ -1,5 +1,5 @@
---- egg/wnn.el.2	2010-03-02 10:35:45.000000000 +0900
-+++ egg/wnn.el	2010-03-02 11:54:30.000000000 +0900
+--- egg/wnn.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg/wnn.el	2015-01-31 19:55:02.000000000 +0900
 @@ -82,6 +82,10 @@
  			     (const wnn-uniq)
  			     (const wnn-uniq-kanji)))
@@ -123,6 +123,7 @@
 -						  (+ 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))
@@ -134,7 +135,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 'wnn-comm-sentinel)
  	      (set-marker-insertion-type (process-mark proc) t)
diff --git a/editors/tamago/files/patch-egg-wnnrpc.el b/editors/tamago/files/patch-egg-wnnrpc.el
index e6730da755b1..f5cbf240dcff 100644
--- a/editors/tamago/files/patch-egg-wnnrpc.el
+++ b/editors/tamago/files/patch-egg-wnnrpc.el
@@ -1,5 +1,5 @@
---- egg/wnnrpc.el.2	2010-03-02 10:34:18.000000000 +0900
-+++ egg/wnnrpc.el	2010-03-02 10:34:42.000000000 +0900
+--- egg/wnnrpc.el.orig	2015-01-31 19:24:10.000000000 +0900
++++ egg/wnnrpc.el	2015-01-31 19:25:52.000000000 +0900
 @@ -714,8 +714,14 @@
       ,send-expr ,@rcv-exprs))
  
diff --git a/editors/tamago/files/patch-egg.el b/editors/tamago/files/patch-egg.el
index 7243a34ecced..ad417ebeec3f 100644
--- a/editors/tamago/files/patch-egg.el
+++ b/editors/tamago/files/patch-egg.el
@@ -1,5 +1,5 @@
---- egg.el.orig	2013-05-05 14:02:05.000000000 +0900
-+++ egg.el	2013-05-05 14:02:05.000000000 +0900
+--- egg.el.orig	2015-01-31 19:24:09.000000000 +0900
++++ egg.el	2015-01-31 19:48:25.000000000 +0900
 @@ -167,16 +167,22 @@
  	  (setq egg-modefull-mode t)
  	  (its-define-select-keys egg-modefull-map))
@@ -21,8 +21,8 @@
  (defun egg-exit-from-minibuffer ()
 -  (inactivate-input-method)
 +  (if (boundp 'deactivate-input-method)
-+      deactivate-input-method
-+    inactivate-input-method)
++      (deactivate-input-method)
++    (inactivate-input-method))
    (if (<= (minibuffer-depth) 1)
        (remove-hook 'minibuffer-exit-hook 'egg-exit-from-minibuffer)))
  
diff --git a/editors/tamago/files/patch-helper-Makefile b/editors/tamago/files/patch-helper-Makefile
new file mode 100644
index 000000000000..0ac8f62d94f3
--- /dev/null
+++ b/editors/tamago/files/patch-helper-Makefile
@@ -0,0 +1,11 @@
+--- /dev/null	2015-01-31 20:00:00.000000000 +0900
++++ helper/Makefile	2015-01-31 19:27:23.000000000 +0900
+@@ -0,0 +1,8 @@
++# $FreeBSD$
++
++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
index edb93f05ad50..c9089f7e0139 100644
--- a/editors/tamago/files/patch-its.el
+++ b/editors/tamago/files/patch-its.el
@@ -1,5 +1,5 @@
---- its.el.orig	2014-11-23 16:01:01.000000000 +0900
-+++ its.el	2014-11-23 16:01:52.000000000 +0900
+--- 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)
diff --git a/editors/tamago/files/patch-menudiag.el b/editors/tamago/files/patch-menudiag.el
index fb190d627acc..c3fc73b8bf93 100644
--- a/editors/tamago/files/patch-menudiag.el
+++ b/editors/tamago/files/patch-menudiag.el
@@ -1,5 +1,5 @@
---- menudiag.el.orig	2001-01-28 03:53:13.000000000 +0900
-+++ menudiag.el	2015-01-29 18:32:59.000000000 +0900
+--- menudiag.el.orig	2015-01-31 19:23:34.000000000 +0900
++++ menudiag.el	2015-01-31 19:25:52.000000000 +0900
 @@ -226,6 +226,9 @@
    (remove-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
    (setq menudiag-minibuffer-list (cons (current-buffer)
@@ -10,15 +10,6 @@
    (buffer-disable-undo)
    (menudiag-receive-variables)
    (menudiag-beginning-of-items)
-@@ -248,7 +251,7 @@
- 			       (string-width (cadr menu)))))
-   (add-hook 'minibuffer-setup-hook 'menudiag-minibuffer-hook)
-   (unwind-protect
--      (progn
-+      (let ((overriding-local-map menudiag-mode-map))
- 	(read-from-minibuffer "" "" menudiag-mode-map)
- 	(menudiag-receive-variables))
-     (setq menudiag-minibuffer-list (cdr menudiag-minibuffer-list))
 @@ -296,7 +299,7 @@
  (defun menudiag-goto-item ()
    (interactive)
diff --git a/editors/tamago/files/post-patch-egg-wnn.el b/editors/tamago/files/post-patch-egg-wnn.el
deleted file mode 100644
index 7162c3b56aea..000000000000
--- a/editors/tamago/files/post-patch-egg-wnn.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- egg/wnn.el.orig	2014-11-23 16:11:58.000000000 +0900
-+++ egg/wnn.el	2014-11-23 16:12:19.000000000 +0900
-@@ -1283,7 +1283,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 'wnn-comm-sentinel)
- 	      (set-marker-insertion-type (process-mark proc) t)