diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 2cd6d6d44969..f80dd0c3b327 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	anthy
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	japanese
 MASTER_SITES=	DEBIAN
 DISTFILES=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME:S/-/_/}.orig${EXTRACT_SUFX}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Another Kana-Kanji conversion system
 WWW=		https://salsa.debian.org/debian/anthy
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/alt-cannadic/COPYING
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING
 
 USES=		iconv:patch libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	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
 	${CP} ${WRKSRC}/src-util/rkhelper.c ${WRKSRC}/src-util/rkhelper.c.orig
 	${ICONV_CMD} -f utf-8 -t euc-jp ${WRKSRC}/src-util/rkhelper.c.orig >  ${WRKSRC}/src-util/rkhelper.c
 
 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>
diff --git a/japanese/anthy/files/patch-src-util_anthy.el b/japanese/anthy/files/patch-src-util_anthy.el
index b2052a38b369..e8b6d1da7a6d 100644
--- a/japanese/anthy/files/patch-src-util_anthy.el
+++ b/japanese/anthy/files/patch-src-util_anthy.el
@@ -1,11 +1,20 @@
 --- src-util/anthy.el.orig	2019-07-05 02:37:13 UTC
 +++ src-util/anthy.el
+@@ -71,7 +71,7 @@
+ (defvar anthy-highlight-face nil)
+ (defvar anthy-underline-face nil)
+ (copy-face 'highlight 'anthy-highlight-face)
+-(set-face-underline-p 'anthy-highlight-face t)
++(set-face-underline 'anthy-highlight-face t)
+ (copy-face 'underline 'anthy-underline-face)
+ 
+ ;;
 @@ -745,7 +745,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))