Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Dec 2020 12:41:09 +0000 (UTC)
From:      Rainer Hurling <rhurlin@FreeBSD.org>
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
Message-ID:  <202012041241.0B4Cf9nJ043488@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <t@nakao.org> (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 $B$rJV5Q$9$k!#(B"
+ 		       (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 $B$rJV5Q$9$k!#(B"
  				   (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 $B$rJV5Q$9$k!#(B"
  ;; $BJ8@a$r;XDj$7$J$$>l9g!"8=:_$NJ8@a$,BP>]$H$J$k(B
  ;; $BFI$_$r<hF@$7$?J8@a$O$=$NFI$_$r%-%c%C%7%e$9$k(B
  ;; cut $B$,(B $BHs(Bnil $B$N>l9g!";XDjJ8@a0J9_$NFI$_$r:o=|$9$k(B



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012041241.0B4Cf9nJ043488>