From owner-svn-ports-all@freebsd.org Fri Dec 4 12:41:09 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85B5547ED56; Fri, 4 Dec 2020 12:41:09 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CnXPd3QPsz4hCH; Fri, 4 Dec 2020 12:41:09 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6852C383B; Fri, 4 Dec 2020 12:41:09 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B4Cf9B6043489; Fri, 4 Dec 2020 12:41:09 GMT (envelope-from rhurlin@FreeBSD.org) Received: (from rhurlin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B4Cf9nJ043488; Fri, 4 Dec 2020 12:41:09 GMT (envelope-from rhurlin@FreeBSD.org) Message-Id: <202012041241.0B4Cf9nJ043488@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rhurlin set sender to rhurlin@FreeBSD.org using -f From: Rainer Hurling Date: Fri, 4 Dec 2020 12:41:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r556979 - in head/japanese/yc.el: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rhurlin X-SVN-Commit-Paths: in head/japanese/yc.el: . files X-SVN-Commit-Revision: 556979 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2020 12:41:09 -0000 Author: rhurlin Date: Fri Dec 4 12:41:08 2020 New Revision: 556979 URL: https://svnweb.freebsd.org/changeset/ports/556979 Log: japanese/yc.el: Adapt to newer emacs versions The "process-kill-without-query" function was made obsolete in emacs 27.1 [1]. Therefore the function should be replaced in japanese/yc.el by "set-process-query-on-exit-flag" function. [1] http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=f1c48b0 PR: 249873 Submitted by: Takayuki Nakao (maintainer) Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D27473 Modified: head/japanese/yc.el/Makefile head/japanese/yc.el/files/patch-yc.el Modified: head/japanese/yc.el/Makefile ============================================================================== --- head/japanese/yc.el/Makefile Fri Dec 4 12:32:14 2020 (r556978) +++ head/japanese/yc.el/Makefile Fri Dec 4 12:41:08 2020 (r556979) @@ -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 @@ EXTRACT_SUFX= .gz 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} && \ Modified: head/japanese/yc.el/files/patch-yc.el ============================================================================== --- head/japanese/yc.el/files/patch-yc.el Fri Dec 4 12:32:14 2020 (r556978) +++ head/japanese/yc.el/files/patch-yc.el Fri Dec 4 12:41:08 2020 (r556979) @@ -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 の場合、指定文節以降の読みを削除する