Index: head/editors/tamago/Makefile
===================================================================
--- head/editors/tamago/Makefile	(revision 378201)
+++ head/editors/tamago/Makefile	(revision 378202)
@@ -1,61 +1,57 @@
 # Created by: tetsushi NAKAI <nakai@tsl.pe.u-tokyo.ac.jp>
 # $FreeBSD$
 
 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
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	egg_4.0.6+0.20041122cvs.orig
 
 PATCH_SITES=	${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/e/egg,} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,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
-POST_PATCHES=	${PATCHDIR}/post-patch-*
 WRKSRC=		${WRKDIR}/egg-4.0.6+0.20041122cvs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	lispdir="${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}"
 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
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${EMACS_PORT_NAME:Memacs2[1234]}
 PLIST_SUB+=	HAS_JISX0213=""
 .else
 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} \
 	    ${_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
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/editors/tamago/files/patch-egg-Makefile
===================================================================
--- head/editors/tamago/files/patch-egg-Makefile	(revision 378201)
+++ head/editors/tamago/files/patch-egg-Makefile	(nonexistent)
@@ -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>

Property changes on: head/editors/tamago/files/patch-egg-Makefile
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/tamago/files/post-patch-egg-wnn.el
===================================================================
--- head/editors/tamago/files/post-patch-egg-wnn.el	(revision 378201)
+++ head/editors/tamago/files/post-patch-egg-wnn.el	(nonexistent)
@@ -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)

Property changes on: head/editors/tamago/files/post-patch-egg-wnn.el
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/tamago/files/post-patch-egg-canna.el
===================================================================
--- head/editors/tamago/files/post-patch-egg-canna.el	(revision 378201)
+++ head/editors/tamago/files/post-patch-egg-canna.el	(nonexistent)
@@ -1,29 +0,0 @@
---- egg/canna.el.orig	2014-11-23 16:07:10.000000000 +0900
-+++ egg/canna.el	2014-11-23 16:10:05.000000000 +0900
-@@ -337,7 +337,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 +367,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 +869,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))))

Property changes on: head/editors/tamago/files/post-patch-egg-canna.el
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/tamago/files/post-patch-egg-anthy.el
===================================================================
--- head/editors/tamago/files/post-patch-egg-anthy.el	(revision 378201)
+++ head/editors/tamago/files/post-patch-egg-anthy.el	(nonexistent)
@@ -1,11 +0,0 @@
---- egg/anthy.el.orig	2014-11-23 16:11:09.000000000 +0900
-+++ egg/anthy.el	2014-11-23 16:11:30.000000000 +0900
-@@ -146,7 +146,7 @@
- 		     (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)

Property changes on: head/editors/tamago/files/post-patch-egg-anthy.el
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/editors/tamago/files/patch-Makefile.in
===================================================================
--- head/editors/tamago/files/patch-Makefile.in	(revision 378201)
+++ head/editors/tamago/files/patch-Makefile.in	(revision 378202)
@@ -1,45 +1,45 @@
---- 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...."; \
 -	if [ -d ${lispdir}/egg ]; then \
 +	if [ -d -p ${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}; \
  	  do  \
 -	    ${INSTALL_DATA}  $${FILE} ${lispdir}/egg/; \
 +	    ${INSTALL_DATA}  $${FILE} ${DESTDIR}${lispdir}/egg/; \
  	  done; \
  #
 -	mkdir ${lispdir}/egg/egg ; \
 +	mkdir -p ${DESTDIR}${lispdir}/egg/egg ; \
  	for FILE in ${EGGSRCS} ${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 ; \
 +	mkdir -p ${DESTDIR}${lispdir}/egg/its ; \
  	for FILE in ${ITSSRCS} ${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:
Index: head/editors/tamago/files/patch-configure
===================================================================
--- head/editors/tamago/files/patch-configure	(revision 378201)
+++ head/editors/tamago/files/patch-configure	(revision 378202)
@@ -1,11 +1,11 @@
---- 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
  
  
 -lispdir=${datadir}/emacs/site-lisp
 +: ${lispdir:=${datadir}/emacs/24.4/site-lisp}
  
  trap '' 1 2 15
  cat > confcache <<\EOF
Index: head/editors/tamago/files/patch-egg-anthy.el
===================================================================
--- head/editors/tamago/files/patch-egg-anthy.el	(nonexistent)
+++ head/editors/tamago/files/patch-egg-anthy.el	(revision 378202)
@@ -0,0 +1,11 @@
+--- 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")
+ 		       '("--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)

Property changes on: head/editors/tamago/files/patch-egg-anthy.el
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/tamago/files/patch-egg-canna.el
===================================================================
--- head/editors/tamago/files/patch-egg-canna.el	(nonexistent)
+++ head/editors/tamago/files/patch-egg-canna.el	(revision 378202)
@@ -0,0 +1,29 @@
+--- 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))))
+ 		  (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 +367,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 +869,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))))

Property changes on: head/editors/tamago/files/patch-egg-canna.el
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/tamago/files/patch-egg-cnv.el
===================================================================
--- head/editors/tamago/files/patch-egg-cnv.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-cnv.el	(revision 378202)
@@ -1,12 +1,12 @@
---- 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")
      (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)
  
Index: head/editors/tamago/files/patch-egg-com.el
===================================================================
--- head/editors/tamago/files/patch-egg-com.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-com.el	(revision 378202)
@@ -1,98 +1,98 @@
---- 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))))
  
 -(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)
 @@ -828,9 +848,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 +860,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
Index: head/editors/tamago/files/patch-egg-mlh.el
===================================================================
--- head/editors/tamago/files/patch-egg-mlh.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-mlh.el	(revision 378202)
@@ -1,20 +1,20 @@
---- 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)
    (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))
Index: head/editors/tamago/files/patch-egg-sim.el
===================================================================
--- head/editors/tamago/files/patch-egg-sim.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-sim.el	(revision 378202)
@@ -1,70 +1,70 @@
---- 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)
  		(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")
  
Index: head/editors/tamago/files/patch-egg-sj3.el
===================================================================
--- head/editors/tamago/files/patch-egg-sj3.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-sj3.el	(revision 378202)
@@ -1,11 +1,11 @@
---- 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)
         (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
Index: head/editors/tamago/files/patch-egg-wnn.el
===================================================================
--- head/editors/tamago/files/patch-egg-wnn.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-wnn.el	(revision 378202)
@@ -1,145 +1,146 @@
---- 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)))
  
 +(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
 @@ -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,9 +1227,11 @@
  	(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)))
 @@ -1225,13 +1245,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 +1272,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)
- 	      (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)
 -	      (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))))
Index: head/editors/tamago/files/patch-egg-wnnrpc.el
===================================================================
--- head/editors/tamago/files/patch-egg-wnnrpc.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg-wnnrpc.el	(revision 378202)
@@ -1,19 +1,19 @@
---- 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))
  
  (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)
Index: head/editors/tamago/files/patch-egg.el
===================================================================
--- head/editors/tamago/files/patch-egg.el	(revision 378201)
+++ head/editors/tamago/files/patch-egg.el	(revision 378202)
@@ -1,40 +1,40 @@
---- 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))
        (setq egg-modeless-mode t))
 -    (setq inactivate-current-input-method-function 'egg-mode)
 +    (set (if (boundp '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 (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)))
  
 @@ -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)
Index: head/editors/tamago/files/patch-helper-Makefile
===================================================================
--- head/editors/tamago/files/patch-helper-Makefile	(nonexistent)
+++ head/editors/tamago/files/patch-helper-Makefile	(revision 378202)
@@ -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>

Property changes on: head/editors/tamago/files/patch-helper-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/editors/tamago/files/patch-its.el
===================================================================
--- head/editors/tamago/files/patch-its.el	(revision 378201)
+++ head/editors/tamago/files/patch-its.el	(revision 378202)
@@ -1,30 +1,30 @@
---- 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)
    (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
Index: head/editors/tamago/files/patch-menudiag.el
===================================================================
--- head/editors/tamago/files/patch-menudiag.el	(revision 378201)
+++ head/editors/tamago/files/patch-menudiag.el	(revision 378202)
@@ -1,62 +1,53 @@
---- 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)
  				       menudiag-minibuffer-list))
 +  (if (boundp 'deactivate-input-method)
 +    (deactivate-input-method)
 +    (inactivate-input-method))
    (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)
    (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,7 +623,7 @@
    (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))