Index: head/japanese/anthy/Makefile
===================================================================
--- head/japanese/anthy/Makefile	(revision 501919)
+++ head/japanese/anthy/Makefile	(revision 501920)
@@ -1,87 +1,87 @@
 # Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	anthy
 PORTVERSION=	9100h
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese
 MASTER_SITES=	OSDN/${PORTNAME}/37536
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	anthy
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another Kana-Kanji conversion system
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/alt-cannadic/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/ja/anthy
 ELISPDIR=	share/emacs/site-lisp/anthy
 PLIST_SUB=	ELISPDIR=${ELISPDIR}
 
 OPTIONS_DEFINE=	2CHDIC ODIC GSKKDIC DOCS
 
 2CHDIC_DESC=	2ch Dictionary
 ODIC_DESC=	Okinawa Dictionary
 GSKKDIC_DESC=	SKK Dictionary
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:M2CHDIC}
 MASTER_SITES+=	http://omaemona.sourceforge.net/packages/Zisyo/:2chdic
 DISTFILES+=	2ch.t:2chdic
 .endif
 
 .if ${PORT_OPTIONS:MODIC}
 MASTER_SITES+=	http://www.ofug.net/~yamajun/files/:odic
 DISTFILES+=	${ODIC_SRCS}:odic
 ODIC_SRCS=	${ODIC_VERS}.t
 ODIC_VERS=	okinawa-20070717
 .endif
 
 .if ${PORT_OPTIONS:MGSKKDIC}
 MASTER_SITES+=	http://www.ohnolab.org/~kimoto/:gskk
 DISTFILES+=	${GSKK_SRCS}:gskk
 GSKK_SRCS=	${GSKK_VERS}.t.gz
 GSKK_VERS=	gskk-20041208
 .endif
 
 post-extract:
 .if ${PORT_OPTIONS:M2CHDIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/2ch.t ${WRKSRC}/mkworddic
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/2ch.t\\n" | \
 	${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
 .if ${PORT_OPTIONS:MODIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${ODIC_SRCS} ${WRKSRC}/mkworddic
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${ODIC_SRCS}\\n" | \
 	${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
 .if ${PORT_OPTIONS:MGSKKDIC}
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${GSKK_SRCS} ${WRKSRC}/mkworddic
 	${GUNZIP_CMD} ${WRKSRC}/mkworddic/${GSKK_SRCS}
 	${PRINTF} "/mkworddic\\\\/base.t/a\\\\\\nread @top_srcdir@/mkworddic/${GSKK_VERS}.t\\n" | \
 	${REINPLACE_CMD} -f /dev/stdin ${WRKSRC}/mkworddic/dict.args.in
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's| install-lispLISP||g' ${WRKSRC}/src-util/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${ELISPDIR}
 	${INSTALL_DATA} ${WRKSRC}/src-util/*.el ${STAGEDIR}${PREFIX}/${ELISPDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/ELISP ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/japanese/anthy/files/patch-src-util_anthy.el
===================================================================
--- head/japanese/anthy/files/patch-src-util_anthy.el	(revision 501919)
+++ head/japanese/anthy/files/patch-src-util_anthy.el	(revision 501920)
@@ -1,11 +1,35 @@
---- src-util/anthy.el.orig	2013-05-15 01:57:21.000000000 +0900
-+++ src-util/anthy.el	2013-05-15 01:58:25.000000000 +0900
-@@ -892,7 +892,7 @@
+--- src-util/anthy.el.orig	2008-11-29 12:46:00 UTC
++++ src-util/anthy.el
+@@ -161,11 +161,9 @@
+ 
+ ;; From skk-macs.el From viper-util.el.  Welcome!
+ (defmacro anthy-deflocalvar (var default-value &optional documentation)
+-  (` (progn
+-       (defvar (, var) (, default-value)
+-	 (, (format "%s\n\(buffer local\)" documentation)))
+-       (make-variable-buffer-local '(, var))
+-       )))
++  `(defvar ,var ,default-value
++         ,(format "%s\n\(buffer local\)" documentation))
++       )
+ 
+ ;; buffer local variables
+ (anthy-deflocalvar anthy-context-id nil "コンテキストのid")
+@@ -745,7 +743,7 @@
+ 	(if anthy-agent-process
+ 	    (kill-process anthy-agent-process))
+ 	(setq anthy-agent-process proc)
+-	(process-kill-without-query proc)
++	(set-process-query-on-exit-flag proc nil)
+ 	(if anthy-xemacs
+ 	    (if (coding-system-p (find-coding-system 'euc-japan))
+ 		(set-process-coding-system proc 'euc-japan 'euc-japan))
+@@ -892,7 +890,7 @@
  	 ((event-matches-key-specifier-p event 'backspace) 8)
  	 (t
  	  (char-to-int (event-to-character event)))))
 -    last-command-char))
 +    last-command-event))
  
  ;;
  ;;