- Update to 5.2.1 [1]

- Unbreak with emacs23+ [1]
- Make portlint happier

PR:	ports/151195 [1]
Submitted by:	Takayuki Nakao <t_AT_nakao_DOT_org> (maintainer) [1]

3 files changed, 20 insertions, 56 deletions

diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 03f7761c6499..6dffef4cf1f9 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	yc.el
-PORTVERSION=	5.0.0
-PORTREVISION=	3
+PORTVERSION=	5.2.1
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
-DISTNAME=	yc-${PORTVERSION}
-DISTFILES=	${DISTNAME}.el.gz
+DISTNAME=	yc-${PORTVERSION}.el
+EXTRACT_SUFX=	.gz
 
 MAINTAINER=	t@nakao.org
 COMMENT=	Yet another Canna client for Emacs/XEmacs
 
+EXTRACT_AFTER_ARGS=	> yc.el
 NO_WRKSUBDIR=	yes
 
 USE_EMACS=	yes
@@ -30,29 +30,20 @@ OPTIONS=	ICANNA	"Enable icanna support"	off
 
 .include <bsd.port.pre.mk>
 
-.if $(EMACS_MAJOR_VER) >= 23
-BROKEN=		Does not support emacs23.x or later
-.endif
-
 .if defined(WITH_ICANNA)
-RUN_DEPENDS+=	${LOCALBASE}/bin/icanna:${PORTSDIR}/japanese/icanna
+RUN_DEPENDS+=	icanna:${PORTSDIR}/japanese/icanna
 .endif
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/${DISTNAME}.el.gz >yc.el
-
 do-build:
 	@cd ${WRKDIR} && \
 	${EMACS_CMD} -batch -f batch-byte-compile yc.el
 
 do-install:
-	@${TEST} -f ${YC_LISPDIR} || ${MKDIR} ${YC_LISPDIR}
+	@${MKDIR} ${YC_LISPDIR}
 	@cd ${WRKDIR} && \
 	${INSTALL_SCRIPT} yc.el yc.elc ${YC_LISPDIR}
 
 post-install:
-	@${CAT} ${MASTERDIR}/pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/yc.el/distinfo b/japanese/yc.el/distinfo
index 5c958e8d050a..869968ed9bba 100644
--- a/japanese/yc.el/distinfo
+++ b/japanese/yc.el/distinfo
@@ -1,6 +1,3 @@
-MD5 (yc-5.0.0.el.gz) = 46e30679981c4daeefc8bae688728820
-SHA256 (yc-5.0.0.el.gz) = fc7c08b686efd420b0c674298d85158d16fda6277c0062eca778919c44d95a89
-SIZE (yc-5.0.0.el.gz) = 33202
-MD5 (yc-4.0.13.tar.gz) = 5cc5f04346b806d4157b4b66d7eba69f
-SHA256 (yc-4.0.13.tar.gz) = 5afd06ea819bbf20f5cbfbcd3c60eb58a50b2ef093defc4c93bfdf8ab69444f3
-SIZE (yc-4.0.13.tar.gz) = 43916
+MD5 (yc-5.2.1.el.gz) = 587f9a77f1061bbf1d8e8950f338878e
+SHA256 (yc-5.2.1.el.gz) = 45854b3f51cf74b97c4ed0dd11b0f4bd2a96b78f59b7614d43fea85f9884fd84
+SIZE (yc-5.2.1.el.gz) = 33305
diff --git a/japanese/yc.el/files/patch-yc.el b/japanese/yc.el/files/patch-yc.el
index 340ceb4ac47c..1cb2dbe37c23 100644
--- a/japanese/yc.el/files/patch-yc.el
+++ b/japanese/yc.el/files/patch-yc.el
@@ -1,34 +1,10 @@
---- yc.el.orig	2008-02-17 00:37:39.000000000 +0900
-+++ yc.el	2008-02-17 00:38:16.000000000 +0900
-@@ -393,7 +393,7 @@
- 		       (error nil)))))))
-   (when (processp yc-server)
-     (put 'yc-server 'init nil)
--    (process-kill-without-query yc-server)
-+    (set-process-query-on-exit-flag yc-server nil)
-     (when yc-debug
-       (unwind-protect
- 	  (progn
-@@ -4046,14 +4046,15 @@
-  "japanese-yc" "Japanese" 'yc-activate
-  "あ" "Romaji -> Hiragana -> Kanji&Kana"
-  nil)
--(set-language-info "Japanese" 'input-method "japanese-yc")
--;(setq default-input-method "japanese-yc"))
-+(defun force-yc-input-mode ()
-+  (set-language-info "Japanese" 'input-method "japanese-yc")
-+  (setq default-input-method "japanese-yc"))
- 
--;(yc-setup)
--;(when (and yc-connect-server-at-startup (yc-server-check))
--;  (yc-init)
--;  (force-yc-input-mode)
--;  )
-+(yc-setup)
-+(when (and yc-connect-server-at-startup (yc-server-check))
-+  (yc-init)
-+  (force-yc-input-mode)
-+  )
- 
- (defconst yc-version "5.0.0")
- (provide 'yc)
+--- yc.el.orig	2010-09-30 13:22:22.000000000 +0900
++++ yc.el	2010-09-30 13:26:09.000000000 +0900
+@@ -1736,6 +1736,7 @@
+ 				   (error nil))))
+ 	    (yc-eval-sexp (car expr)))))
+       (setq files (cdr files)))
++    (message "")
+     (if romkana-table
+ 	(setq yc-rH-conv-dic (yc-search-file-first-in-path
+ 			      romkana-table (list "." (getenv "HOME")