6 files changed, 36 insertions, 32 deletions

diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index fed37163c956..7e71d15f7c62 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -6,27 +6,29 @@
 #
 
 PORTNAME=	yc.el
-PORTVERSION=	3.2.4
+PORTVERSION=	3.4.7
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	honda@kashio.info.mie-u.ac.jp
+MAINTAINER=	t@nakao.org
 
 EXTRACT_AFTER_ARGS=	> yc.el
-
-NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
-ELISPDIR=	${PREFIX}/share/emacs/site-lisp
-XELISPDIR=	${PREFIX}/lib/xemacs/site-lisp
+EMACS_PORT_NAME?=	emacs21
+YC_LISPDIR=		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/yc
+
+do-build:
+	${EMACS_CMD} -batch -f batch-byte-compile ${WRKSRC}/yc.el
 
 do-install:
-	${MKDIR} ${ELISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/yc.el ${ELISPDIR}
-# for xemacs
-	${MKDIR} ${XELISPDIR}
-	${LN} -sf ${ELISPDIR}/yc.el ${XELISPDIR}
+	${MKDIR} ${YC_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/yc.el ${YC_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/yc.elc ${YC_LISPDIR}
+
+post-install:
+	@${CAT} ${MASTERDIR}/pkg-message
 
 .include <bsd.port.mk>
diff --git a/japanese/yc.el/distinfo b/japanese/yc.el/distinfo
index aab50e5ff833..1ee5f00b1f9f 100644
--- a/japanese/yc.el/distinfo
+++ b/japanese/yc.el/distinfo
@@ -1 +1 @@
-MD5 (yc.el-3.2.4.gz) = 576849ef8cd4186d66e5afd374e7b731
+MD5 (yc.el-3.4.7.gz) = 36cf52c47a5b89d3896b92296ee406d2
diff --git a/japanese/yc.el/pkg-comment b/japanese/yc.el/pkg-comment
index 28c76a74858f..eb678b99a65d 100644
--- a/japanese/yc.el/pkg-comment
+++ b/japanese/yc.el/pkg-comment
@@ -1 +1 @@
-Yet another Canna client for Emacs20/XEmacs
+Yet another Canna client for Emacs/XEmacs
diff --git a/japanese/yc.el/pkg-descr b/japanese/yc.el/pkg-descr
index c874ef2f1e52..167356195153 100644
--- a/japanese/yc.el/pkg-descr
+++ b/japanese/yc.el/pkg-descr
@@ -1,22 +1,7 @@
 Yet another Canna client
 
-YC is a Japanese input method on Emacs-20.x/XEmacs.  YC is written in
-emacs lisp and access to Canna server directly.  YC works well even if
+YC is a Japanese input method on Emacs/XEmacs. YC is written in
+emacs lisp and access to Canna server directly. YC works well even if
 your Emacs does not support Canna.
 
-Configuration:
-  1. make user dictionary if you don't have your user dictionary
-      % mkdic user
-  2. specify your Canna server
-	  set enviroment variable CANNAHOST:
-		% setenv CANNAHOST hostname
-	  or add 
-		(setq yc-server-host "hostname")
-	  to ~/.emacs
-  3. add
-	  (load "yc")
-	 to ~/.emacs
-
 WWW: http://www.ceres.dti.ne.jp/~knak/yc.html
-
-- HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
diff --git a/japanese/yc.el/pkg-message b/japanese/yc.el/pkg-message
new file mode 100644
index 000000000000..ebeffb74617a
--- /dev/null
+++ b/japanese/yc.el/pkg-message
@@ -0,0 +1,16 @@
+************************************************************
+Quick Setup:
+
+(1) Add the following two lines in your $HOME/.emacs file;
+
+  (load "yc")
+  (global-yc-mode 1) ;; if you need ANK-conversion-mode in all buffers
+
+(2) Set the following environment variables;
+
+  CANNAHOST	hostname of cannaserver
+  CANNALIBDIR	a full path of the directory containing 'default.canna'
+
+  These values are also configurable in .emacs by setting variables
+  'yc-server-host' and 'yc-canna-lib-path'.
+************************************************************
diff --git a/japanese/yc.el/pkg-plist b/japanese/yc.el/pkg-plist
index 739a37050002..08904df8f094 100644
--- a/japanese/yc.el/pkg-plist
+++ b/japanese/yc.el/pkg-plist
@@ -1,2 +1,3 @@
-share/emacs/site-lisp/yc.el
-lib/xemacs/site-lisp/yc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.el
+%%EMACS_VERSION_SITE_LISPDIR%%/yc/yc.elc
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/yc