5 files changed, 36 insertions, 38 deletions

diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile
index 9048512e59d3..5366c8ece9dc 100644
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@@ -5,38 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mule-ucs-${EMACS_PORT}
-PORTVERSION=	0.74
+PORTNAME=	mule-ucs
+PORTVERSION=	0.82
 CATEGORIES=	converters elisp
 MASTER_SITES=	ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/Mule-UCS/ \
 		ftp://ftp.etl.go.jp/pub/mule/Mule-UCS/ \
 		ftp://ftp.win.or.jp/pub/word/mule/Mule-UCS/ \
-		ftp://ftp.center.osaka-u.ac.jp/mule/Mule-UCS/ \
-		ftp://ftp.kreonet.re.kr/pub/tools/emacs/mule/Mule-UCS/ \
 		ftp://ftp.m17n.org/pub/mule/Mule-UCS/
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	Mule-UCS-${PORTVERSION}
 
 MAINTAINER=	okazaki@be.to
 
-MULEUCSDOCDIR=	share/doc/mule-ucs
-
-# emacs20
 EMACS_PORT_NAME=	emacs20
 
-# target name for make build
 ALL_TARGET=	elc
 
-EMACS_CMD=	${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
-RUN_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT_NAME}
-SCRIPTS_ENV=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER}
-PLIST_SUB=	EMACS_LIBDIR=${EMACS_LIBDIR} EMACS_VER=${EMACS_VER} \
-		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \
-		MULEUCSDOCDIR=${MULEUCSDOCDIR}
-MAKE_FLAGS=	EMACS=${EMACS_CMD}
-
-MULEUCS_DESTDIR= ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp/mule-ucs
+PLIST_SUB=	PORTDOCDIR=${PORTDOCDIR}
+PORTDOCDIR=	share/doc/mule-ucs
+MULEUCS_DESTDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
 EMACS_ARGS=	-q --no-site-file -batch
 
 do-build:
@@ -59,17 +46,18 @@ do-install:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/${MULEUCSDOCDIR}
+	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
 	cd ${WRKSRC}/lisp; \
 	for i in ChangeLog MuleUni.txt README* ; do \
-		${INSTALL_DATA} $${i} ${PREFIX}/${MULEUCSDOCDIR}/ ; \
+		${INSTALL_DATA} $${i} ${PREFIX}/${PORTDOCDIR} ; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/lisp/big5conv/README \
-			 ${PREFIX}/${MULEUCSDOCDIR}/README.big5conv
+			 ${PREFIX}/${PORTDOCDIR}/README.big5conv
 	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/ChangeLog \
-			 ${PREFIX}/${MULEUCSDOCDIR}/ChangeLog.jisx0213
+			 ${PREFIX}/${PORTDOCDIR}/ChangeLog.jisx0213
 	${INSTALL_DATA} ${WRKSRC}/lisp/jisx0213/readme.txt \
-			 ${PREFIX}/${MULEUCSDOCDIR}/README.jisx0213
+			 ${PREFIX}/${PORTDOCDIR}/README.jisx0213
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/converters/mule-ucs/distinfo b/converters/mule-ucs/distinfo
index c9aab9fa76c1..e73f16804409 100644
--- a/converters/mule-ucs/distinfo
+++ b/converters/mule-ucs/distinfo
@@ -1 +1 @@
-MD5 (Mule-UCS-0.74.tar.gz) = dae96a8086fd9eb215dee2088d88ef68
+MD5 (Mule-UCS-0.82.tar.gz) = 4ed5fb7474d72820ed7ca5f734831dee
diff --git a/converters/mule-ucs/pkg-comment b/converters/mule-ucs/pkg-comment
index 9c1fcdc2431e..2c4818bb7900 100644
--- a/converters/mule-ucs/pkg-comment
+++ b/converters/mule-ucs/pkg-comment
@@ -1 +1 @@
-Universal enCoding System for FSF Emacs 20
+Universal encoding system for GNU Emacs 20
diff --git a/converters/mule-ucs/pkg-descr b/converters/mule-ucs/pkg-descr
index d0a465b4238e..d7765964eef5 100644
--- a/converters/mule-ucs/pkg-descr
+++ b/converters/mule-ucs/pkg-descr
@@ -9,16 +9,16 @@ Emacs prepares encoding/decoding schemes in the following 2 mechanisms.
 Although (A) provides powerful encoding/decoding schemes as to
 ISO/IEC 2022, we cannot utilize this for any other encoding schemes.
 (B) is a simple register machine. However, CCL program is arcane
-language because it is infamous and mysterious:-P.
+language because it is mysterious and obscure:-P.
 
 Mule-UCS provides flexible and comprehensible encoding mechanism to Emacs.
 Currently, Mule-UCS generates CCL program from the translation rule, but
 in the future, Mule-UCS may support another conversion engine on Emacs.
 
 Predefined conversions for Mule-UCS included in this package are:
-
-  *  Unicode(UTF-7/8/16) support.
-  *  Big5 <-> CNS conversion support.
+  (1) ... Unicode(UTF-7/8/16) support.
+  (2) ... Big5 <-> CNS conversion support.
+  (3) ... JIS X 0213 support.
 
 ---
 Ported by okazaki@be.to
diff --git a/converters/mule-ucs/pkg-plist b/converters/mule-ucs/pkg-plist
index 97f5b415c0df..081f6fa63ee8 100644
--- a/converters/mule-ucs/pkg-plist
+++ b/converters/mule-ucs/pkg-plist
@@ -35,6 +35,7 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mucs.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mule-uni.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/mule-uni.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-1.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-2.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-3.el
@@ -44,8 +45,10 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/u-cns-7.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uascii.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ubig5.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uethiopic.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ugb2312.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uipa.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiscii.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-1.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-2.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uiso8859-3.el
@@ -59,7 +62,10 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ujisx0208.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/ujisx0212.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uksc5601.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/usisheng.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/usupple.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/utis620.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata/uviscii.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tae.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tae.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/tbl-mg.el
@@ -72,22 +78,26 @@
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-data.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-define.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-define.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-supple.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-supple.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-tools.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-tools.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/un-trbase.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unicode.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unicode.elc
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unidata.el
+%%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/unidata.elc
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/utf.el
 %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/utf.elc
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/big5conv
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/jisx0213
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs/reldata
 @dirrm %%EMACS_LIBDIR_WITH_VER%%/site-lisp/mule-ucs
-%%MULEUCSDOCDIR%%/ChangeLog
-%%MULEUCSDOCDIR%%/ChangeLog.jisx0213
-%%MULEUCSDOCDIR%%/MuleUni.txt
-%%MULEUCSDOCDIR%%/README
-%%MULEUCSDOCDIR%%/README.Unicode
-%%MULEUCSDOCDIR%%/README.big5conv
-%%MULEUCSDOCDIR%%/README.jisx0213
-@dirrm %%MULEUCSDOCDIR%%
+%%PORTDOCDIR%%/ChangeLog
+%%PORTDOCDIR%%/ChangeLog.jisx0213
+%%PORTDOCDIR%%/MuleUni.txt
+%%PORTDOCDIR%%/README
+%%PORTDOCDIR%%/README.Unicode
+%%PORTDOCDIR%%/README.big5conv
+%%PORTDOCDIR%%/README.jisx0213
+@dirrm %%PORTDOCDIR%%