3 files changed, 7 insertions, 81 deletions

diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 309a6be7df8d..fed37163c956 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -6,31 +6,27 @@
 #
 
 PORTNAME=	yc.el
-PORTVERSION=	19991203
+PORTVERSION=	3.2.4
+PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/
 EXTRACT_SUFX=	.gz
-DISTNAME=	${PORTNAME}
 
 MAINTAINER=	honda@kashio.info.mie-u.ac.jp
 
+EXTRACT_AFTER_ARGS=	> yc.el
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 ELISPDIR=	${PREFIX}/share/emacs/site-lisp
 XELISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
-	@(cd ${WRKSRC} ; ${GUNZIP_CMD} ${DISTNAME}${EXTRACT_SUFX})
-
 do-install:
 	${MKDIR} ${ELISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${ELISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/yc.el ${ELISPDIR}
 # for xemacs
 	${MKDIR} ${XELISPDIR}
-	${LN} -sf ${ELISPDIR}/${DISTNAME} ${XELISPDIR}
+	${LN} -sf ${ELISPDIR}/yc.el ${XELISPDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/yc.el/distinfo b/japanese/yc.el/distinfo
index 0dfca2f4d61d..aab50e5ff833 100644
--- a/japanese/yc.el/distinfo
+++ b/japanese/yc.el/distinfo
@@ -1 +1 @@
-MD5 (yc.el.gz) = e229c9f522918a8cdc1231e00066cc59
+MD5 (yc.el-3.2.4.gz) = 576849ef8cd4186d66e5afd374e7b731
diff --git a/japanese/yc.el/files/patch-aa b/japanese/yc.el/files/patch-aa
deleted file mode 100644
index 9f0717282b80..000000000000
--- a/japanese/yc.el/files/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-*** yc.el.orig	Sun Dec  5 15:50:23 1999
---- yc.el	Sun Dec  5 16:08:09 1999
-***************
-*** 251,257 ****
-  
-  (require 'cl)
-  
-! (defconst yc-canna-lib-path "/usr/lib/canna/dic/";"/usr/local/canna/lib/dic/"
-    "$B$+$s$J$N<-=q%Q%9$r@_Dj$9$k(B")
-  (defconst yc-select-count 2		; $B0lMw%b!<%I$K$J$k7+$jJV$7?t(B
-    "$B0lMw%b!<%I$K$J$k7+JV$7?t$r@_Dj$9$k!#%G%U%)%k%H$O(B3$B2s!#(B
---- 251,257 ----
-  
-  (require 'cl)
-  
-! (defconst yc-canna-lib-path "/usr/local/lib/canna/dic/"
-    "$B$+$s$J$N<-=q%Q%9$r@_Dj$9$k(B")
-  (defconst yc-select-count 2		; $B0lMw%b!<%I$K$J$k7+$jJV$7?t(B
-    "$B0lMw%b!<%I$K$J$k7+JV$7?t$r@_Dj$9$k!#%G%U%)%k%H$O(B3$B2s!#(B
-***************
-*** 655,661 ****
-  (defvar yc-user-dic-list nil)
-  (defvar yc-default-bushu-dic-list '("bushu"))
-  (defvar yc-bushu-dic-list nil)
-! (defvar yc-rH-conv-dic "/usr/local/canna/lib/dic/default.cbp")
-  (defvar yc-default-rH-table
-    '(("~" "$B!1(B" "") ("}" "$B!Y(B" "") ("|" "$B!C(B" "") ("{" "$B!X(B" "") ("zz" "$B$C(B" "z")
-      ("zyu" "$B$8$e(B" "") ("zyo" "$B$8$g(B" "") ("zyi" "$B$8$#(B" "") ("zye" "$B$8$'(B" "")
---- 655,661 ----
-  (defvar yc-user-dic-list nil)
-  (defvar yc-default-bushu-dic-list '("bushu"))
-  (defvar yc-bushu-dic-list nil)
-! (defvar yc-rH-conv-dic (concat (file-name-as-directory yc-canna-lib-path) "default.kp"))
-  (defvar yc-default-rH-table
-    '(("~" "$B!1(B" "") ("}" "$B!Y(B" "") ("|" "$B!C(B" "") ("{" "$B!X(B" "") ("zz" "$B$C(B" "z")
-      ("zyu" "$B$8$e(B" "") ("zyo" "$B$8$g(B" "") ("zyi" "$B$8$#(B" "") ("zye" "$B$8$'(B" "")
-***************
-*** 1603,1609 ****
-  (defun yc-read-string-from-file (file)
-    (let* (;; emacs-20.x
-  	 (auto-coding-alist
-! 	  (cons '("\\.cbp" . japanese-iso-8bit)
-  		(and (boundp 'auto-coding-alist)
-  		     auto-coding-alist)))
-  	 (auto-coding-alist
---- 1603,1609 ----
-  (defun yc-read-string-from-file (file)
-    (let* (;; emacs-20.x
-  	 (auto-coding-alist
-! 	  (cons '("\\.kp" . japanese-iso-8bit)
-  		(and (boundp 'auto-coding-alist)
-  		     auto-coding-alist)))
-  	 (auto-coding-alist
-***************
-*** 1613,1619 ****
-  
-  	 ;; XEmacs-20.x
-  	 (file-coding-system-alist
-! 	  (cons '("\\.cbp" . euc-jp)
-  		(and (boundp 'file-coding-system-alist)
-  		     file-coding-system-alist)))
-  	 (file-coding-system-alist
---- 1613,1619 ----
-  
-  	 ;; XEmacs-20.x
-  	 (file-coding-system-alist
-! 	  (cons '("\\.kp" . euc-jp)
-  		(and (boundp 'file-coding-system-alist)
-  		     file-coding-system-alist)))
-  	 (file-coding-system-alist