Index: head/editors/tamago/Makefile
===================================================================
--- head/editors/tamago/Makefile	(revision 378103)
+++ head/editors/tamago/Makefile	(revision 378104)
@@ -1,61 +1,61 @@
 # Created by: tetsushi NAKAI <nakai@tsl.pe.u-tokyo.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	tamago
 PORTVERSION=	4.0.6.0.20041122.19
-PORTREVISION=	8
+PORTREVISION=	9
 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-sim.el
===================================================================
--- head/editors/tamago/files/patch-egg-sim.el	(revision 378103)
+++ head/editors/tamago/files/patch-egg-sim.el	(revision 378104)
@@ -1,38 +1,70 @@
---- egg-sim.el.orig	2014-11-23 15:19:11.000000000 +0900
-+++ egg-sim.el	2014-11-23 15:20:02.000000000 +0900
-@@ -432,7 +432,7 @@
+--- egg-sim.el.orig	2001-01-28 03:53:13.000000000 +0900
++++ egg-sim.el	2015-01-28 19:42:32.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 +461,7 @@
+@@ -461,7 +465,7 @@
      (insert "-+")
      (let ((i 0))
        (while (< i 16)
 -	(insert (format "----" i))
 +	(insert (format "----"))
  	(setq i (1+ i))))
      (insert "\n")
  
-@@ -496,7 +496,7 @@
+@@ -496,7 +500,7 @@
      (insert "-+")
      (let ((i 0))
        (while (< i 16)
 -	(insert (format "----" i))
 +	(insert (format "----"))
  	(setq i (1+ i))))
      (insert "\n")
  
-@@ -531,7 +531,7 @@
+@@ -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/pkg-descr
===================================================================
--- head/editors/tamago/pkg-descr	(revision 378103)
+++ head/editors/tamago/pkg-descr	(revision 378104)
@@ -1,16 +1,11 @@
-The Multilingual Input Method - Egg V4
+Egg V4 (tamago) is a multilingual input method for Emacsen
+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 enables you to input Multilingual Characters.
-
-Tamago is only coded by emacs lisp.
-
-This input method is working with various translation servers 
-(i.e. jserver, cserver, tserver, Wnn6, SJ3 ver 1 and ver 2,
-      cannaserver and wxgserver).
-
-This package also includes enhancements from Debian, some of which are:
+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