Index: head/japanese/yc.el/Makefile
===================================================================
--- head/japanese/yc.el/Makefile
+++ head/japanese/yc.el/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yc.el
 PORTVERSION=	5.2.1
-PORTREVISION=	16
+PORTREVISION=	17
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
@@ -14,22 +14,22 @@
 MAINTAINER=	t@nakao.org
 COMMENT=	Yet another Canna client for Emacs
 
+USES=		emacs
+EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
+
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=	#
 EXTRACT_AFTER_ARGS=	> yc.el
 NO_WRKSUBDIR=	yes
 
-USES=		emacs
-EMACS_FLAVORS_EXCLUDE=	devel_full devel_nox # fail to build
-
-YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
-
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/yc/yc.el \
 		${EMACS_VERSION_SITE_LISPDIR}/yc/yc.elc
 
 OPTIONS_DEFINE=	ICANNA
 ICANNA_DESC=	Enable icanna support
 ICANNA_RUN_DEPENDS=	icanna:japanese/icanna
+
+YC_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
 
 do-build:
 	@(cd ${WRKSRC} && \
Index: head/japanese/yc.el/files/patch-yc.el
===================================================================
--- head/japanese/yc.el/files/patch-yc.el
+++ head/japanese/yc.el/files/patch-yc.el
@@ -1,6 +1,17 @@
---- yc.el.orig	2018-06-04 13:46:33.083915000 +0900
-+++ yc.el	2018-06-04 14:48:21.116298000 +0900
-@@ -1736,6 +1736,7 @@
+--- yc.el.orig	2020-09-25 04:51:12 UTC
++++ yc.el
+@@ -393,7 +393,9 @@ OBJ を返却する。"
+ 		       (error nil)))))))
+   (when (processp yc-server)
+     (put 'yc-server 'init nil)
+-    (process-kill-without-query yc-server)
++    (if (boundp 'process-kill-without-query)
++	(process-kill-without-query yc-server)
++      (set-process-query-on-exit-flag yc-server nil))
+     (when yc-debug
+       (unwind-protect
+ 	  (progn
+@@ -1736,6 +1738,7 @@ OBJ を返却する。"
  				   (error nil))))
  	    (yc-eval-sexp (car expr)))))
        (setq files (cdr files)))
@@ -8,7 +19,7 @@
      (if romkana-table
  	(setq yc-rH-conv-dic (yc-search-file-first-in-path
  			      romkana-table (list "." (getenv "HOME")
-@@ -2071,7 +2072,7 @@
+@@ -2071,7 +2074,7 @@ OBJ を返却する。"
  ;; 文節を指定しない場合、現在の文節が対象となる
  ;; 読みを取得した文節はその読みをキャッシュする
  ;; cut が 非nil の場合、指定文節以降の読みを削除する