Date: Sat, 31 Jan 2015 11:32:43 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378202 - in head/editors/tamago: . files Message-ID: <201501311132.t0VBWhCR008772@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Jan 31 11:32:42 2015 New Revision: 378202 URL: https://svnweb.freebsd.org/changeset/ports/378202 QAT: https://qat.redports.org/buildarchive/r378202/ Log: - 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. Added: head/editors/tamago/files/patch-egg-anthy.el - copied, changed from r378045, head/editors/tamago/files/post-patch-egg-anthy.el head/editors/tamago/files/patch-egg-canna.el - copied, changed from r378045, head/editors/tamago/files/post-patch-egg-canna.el head/editors/tamago/files/patch-helper-Makefile - copied, changed from r378045, head/editors/tamago/files/patch-egg-Makefile Deleted: head/editors/tamago/files/patch-egg-Makefile head/editors/tamago/files/post-patch-egg-anthy.el head/editors/tamago/files/post-patch-egg-canna.el head/editors/tamago/files/post-patch-egg-wnn.el Modified: head/editors/tamago/Makefile head/editors/tamago/files/patch-Makefile.in head/editors/tamago/files/patch-configure head/editors/tamago/files/patch-egg-cnv.el head/editors/tamago/files/patch-egg-com.el head/editors/tamago/files/patch-egg-mlh.el head/editors/tamago/files/patch-egg-sim.el head/editors/tamago/files/patch-egg-sj3.el head/editors/tamago/files/patch-egg-wnn.el head/editors/tamago/files/patch-egg-wnnrpc.el head/editors/tamago/files/patch-egg.el head/editors/tamago/files/patch-its.el head/editors/tamago/files/patch-menudiag.el Modified: head/editors/tamago/Makefile ============================================================================== --- head/editors/tamago/Makefile Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/Makefile Sat Jan 31 11:32:42 2015 (r378202) @@ -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} \ Modified: head/editors/tamago/files/patch-Makefile.in ============================================================================== --- head/editors/tamago/files/patch-Makefile.in Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-Makefile.in Sat Jan 31 11:32:42 2015 (r378202) @@ -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...."; \ Modified: head/editors/tamago/files/patch-configure ============================================================================== --- head/editors/tamago/files/patch-configure Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-configure Sat Jan 31 11:32:42 2015 (r378202) @@ -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 Copied and modified: head/editors/tamago/files/patch-egg-anthy.el (from r378045, head/editors/tamago/files/post-patch-egg-anthy.el) ============================================================================== --- head/editors/tamago/files/post-patch-egg-anthy.el Wed Jan 28 06:35:17 2015 (r378045, copy source) +++ head/editors/tamago/files/patch-egg-anthy.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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") Copied and modified: head/editors/tamago/files/patch-egg-canna.el (from r378045, head/editors/tamago/files/post-patch-egg-canna.el) ============================================================================== --- head/editors/tamago/files/post-patch-egg-canna.el Wed Jan 28 06:35:17 2015 (r378045, copy source) +++ head/editors/tamago/files/patch-egg-canna.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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)))) Modified: head/editors/tamago/files/patch-egg-cnv.el ============================================================================== --- head/editors/tamago/files/patch-egg-cnv.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-cnv.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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") Modified: head/editors/tamago/files/patch-egg-com.el ============================================================================== --- head/editors/tamago/files/patch-egg-com.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-com.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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)))) Modified: head/editors/tamago/files/patch-egg-mlh.el ============================================================================== --- head/editors/tamago/files/patch-egg-mlh.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-mlh.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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) Modified: head/editors/tamago/files/patch-egg-sim.el ============================================================================== --- head/editors/tamago/files/patch-egg-sim.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-sim.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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) Modified: head/editors/tamago/files/patch-egg-sj3.el ============================================================================== --- head/editors/tamago/files/patch-egg-sj3.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-sj3.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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) Modified: head/editors/tamago/files/patch-egg-wnn.el ============================================================================== --- head/editors/tamago/files/patch-egg-wnn.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-wnn.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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) Modified: head/editors/tamago/files/patch-egg-wnnrpc.el ============================================================================== --- head/editors/tamago/files/patch-egg-wnnrpc.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg-wnnrpc.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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)) Modified: head/editors/tamago/files/patch-egg.el ============================================================================== --- head/editors/tamago/files/patch-egg.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-egg.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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))) Copied and modified: head/editors/tamago/files/patch-helper-Makefile (from r378045, head/editors/tamago/files/patch-egg-Makefile) ============================================================================== --- head/editors/tamago/files/patch-egg-Makefile Wed Jan 28 06:35:17 2015 (r378045, copy source) +++ head/editors/tamago/files/patch-helper-Makefile Sat Jan 31 11:32:42 2015 (r378202) @@ -1,5 +1,5 @@ ---- /dev/null 2013-05-05 14:11:00.000000000 +0900 -+++ helper/Makefile 2013-05-05 14:14:52.000000000 +0900 +--- /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$ + Modified: head/editors/tamago/files/patch-its.el ============================================================================== --- head/editors/tamago/files/patch-its.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-its.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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) Modified: head/editors/tamago/files/patch-menudiag.el ============================================================================== --- head/editors/tamago/files/patch-menudiag.el Sat Jan 31 10:54:07 2015 (r378201) +++ head/editors/tamago/files/patch-menudiag.el Sat Jan 31 11:32:42 2015 (r378202) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501311132.t0VBWhCR008772>