- Update to 0.84.

- Maintainance MASTER_SITES and remove an unneed setting of `ALL_TARGET'.
- Sort rules of the port's custom `do-build' target.
- Use %%PORTDOCS%% in `pkg-plist'.

10 files changed, 46 insertions, 46 deletions

diff --git a/converters/mule-ucs-emacs20/Makefile b/converters/mule-ucs-emacs20/Makefile
index 9f34b7d9c68a..b0f30a929670 100644
--- a/converters/mule-ucs-emacs20/Makefile
+++ b/converters/mule-ucs-emacs20/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	mule-ucs
-PORTVERSION=	0.83
+PORTVERSION=	0.84
 CATEGORIES=	converters elisp
-MASTER_SITES=	ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/Mule-UCS/ \
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/Mule-UCS/ \
 		ftp://ftp.etl.go.jp/pub/mule/Mule-UCS/ \
-		ftp://ftp.win.or.jp/pub/word/mule/Mule-UCS/ \
-		ftp://ftp.m17n.org/pub/mule/Mule-UCS/
+		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/Mule-UCS/ \
+		ftp://ftp.media.kyoto-u.ac.jp/mule/Mule-UCS/ \
+		ftp://ftp.nihon-u.ac.jp/pub/text/m17n/mule/Mule-UCS/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	Mule-UCS-${PORTVERSION}
 
@@ -19,20 +20,18 @@ MAINTAINER=	okazaki@FreeBSD.org
 
 EMACS_PORT_NAME=	emacs20
 
-ALL_TARGET=	elc
-
 PLIST_SUB=	PORTDOCDIR=${PORTDOCDIR}
 PORTDOCDIR=	share/doc/mule-ucs
-MULEUCS_DESTDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
+MULEUCS_DESTDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
 EMACS_ARGS=	-q --no-site-file -batch
 
 do-build:
-	cd ${WRKSRC} && \
-	    ${EMACS_CMD} ${EMACS_ARGS} -l mucs-comp.el
 	cd ${WRKSRC}/lisp/big5conv && \
 	    ${EMACS_CMD} ${EMACS_ARGS} -l big5-comp.el
 	cd ${WRKSRC}/lisp/jisx0213 && \
 	    ${EMACS_CMD} ${EMACS_ARGS} -l x0213-comp.el
+	cd ${WRKSRC} && \
+	    ${EMACS_CMD} ${EMACS_ARGS} -l mucs-comp.el
 
 do-install:
 	@${MKDIR} ${MULEUCS_DESTDIR}
diff --git a/converters/mule-ucs-emacs20/distinfo b/converters/mule-ucs-emacs20/distinfo
index 20efadf93579..0d13c6ddd409 100644
--- a/converters/mule-ucs-emacs20/distinfo
+++ b/converters/mule-ucs-emacs20/distinfo
@@ -1 +1 @@
-MD5 (Mule-UCS-0.83.tar.gz) = b24301a4b1e23b705de52054a9ddca3e
+MD5 (Mule-UCS-0.84.tar.gz) = 4c91c2e427a182ac748573d19e095107
diff --git a/converters/mule-ucs-emacs20/pkg-descr b/converters/mule-ucs-emacs20/pkg-descr
index d7765964eef5..142df958d4ba 100644
--- a/converters/mule-ucs-emacs20/pkg-descr
+++ b/converters/mule-ucs-emacs20/pkg-descr
@@ -21,4 +21,4 @@ Predefined conversions for Mule-UCS included in this package are:
   (3) ... JIS X 0213 support.
 
 ---
-Ported by okazaki@be.to
+Ported by okazaki@FreeBSD.org
diff --git a/converters/mule-ucs-emacs20/pkg-message b/converters/mule-ucs-emacs20/pkg-message
index acc717e0b624..8d8fe59472a0 100644
--- a/converters/mule-ucs-emacs20/pkg-message
+++ b/converters/mule-ucs-emacs20/pkg-message
@@ -8,7 +8,7 @@ If you want to use auto detection feature on UTF-8/16, add one more:
 
 (require 'un-tools)
 
-See ${PREFIX}/share/doc/mule-ucs/README.Unicode for details.
+See PREFIX/share/doc/mule-ucs/README.Unicode for details.
 
 If you want to use BIG5 conversion support, add the below line either:
 
@@ -19,14 +19,14 @@ or
 (require 'big5c-cns)
 
 to your .emacs depends on which conversion methods you would like to use.
-See ${PREFIX}/share/doc/mule-ucs/README.big5conv for details.
+See PREFIX/share/doc/mule-ucs/README.big5conv for details.
 
 If you want to use JIS X 0213 support, add the following line:
 
 (require 'jisx0213)
 
-to your .emacs. See ${PREFIX}/share/doc/mule-ucs/README.jisx0213
+to your .emacs.  See PREFIX/share/doc/mule-ucs/README.jisx0213
 (written in Japanese) for details.
 
 Mule-UCS is installed under the following directory:
-	${PREFIX}/share/emacs/20.x/site-lisp/mule-ucs/	--- Mule-UCS
+	PREFIX/share/emacs/20.x/site-lisp/mule-ucs/	--- Mule-UCS
diff --git a/converters/mule-ucs-emacs20/pkg-plist b/converters/mule-ucs-emacs20/pkg-plist
index 357fae6a94fe..a74699bbadd8 100644
--- a/converters/mule-ucs-emacs20/pkg-plist
+++ b/converters/mule-ucs-emacs20/pkg-plist
@@ -66,6 +66,7 @@
 %%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/utibetan.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
@@ -95,11 +96,11 @@
 @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
-%%PORTDOCDIR%%/ChangeLog
-%%PORTDOCDIR%%/ChangeLog.jisx0213
-%%PORTDOCDIR%%/MuleUni.txt
-%%PORTDOCDIR%%/README
-%%PORTDOCDIR%%/README.Unicode
-%%PORTDOCDIR%%/README.big5conv
-%%PORTDOCDIR%%/README.jisx0213
-@dirrm %%PORTDOCDIR%%
+%%PORTDOCS%%%%PORTDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%PORTDOCDIR%%/ChangeLog.jisx0213
+%%PORTDOCS%%%%PORTDOCDIR%%/MuleUni.txt
+%%PORTDOCS%%%%PORTDOCDIR%%/README
+%%PORTDOCS%%%%PORTDOCDIR%%/README.Unicode
+%%PORTDOCS%%%%PORTDOCDIR%%/README.big5conv
+%%PORTDOCS%%%%PORTDOCDIR%%/README.jisx0213
+%%PORTDOCS%%@dirrm %%PORTDOCDIR%%
diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile
index 9f34b7d9c68a..b0f30a929670 100644
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	mule-ucs
-PORTVERSION=	0.83
+PORTVERSION=	0.84
 CATEGORIES=	converters elisp
-MASTER_SITES=	ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/Mule-UCS/ \
+MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/Mule-UCS/ \
 		ftp://ftp.etl.go.jp/pub/mule/Mule-UCS/ \
-		ftp://ftp.win.or.jp/pub/word/mule/Mule-UCS/ \
-		ftp://ftp.m17n.org/pub/mule/Mule-UCS/
+		ftp://ftp.kddlabs.co.jp/Japan/m17n.org/mule/Mule-UCS/ \
+		ftp://ftp.media.kyoto-u.ac.jp/mule/Mule-UCS/ \
+		ftp://ftp.nihon-u.ac.jp/pub/text/m17n/mule/Mule-UCS/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	Mule-UCS-${PORTVERSION}
 
@@ -19,20 +20,18 @@ MAINTAINER=	okazaki@FreeBSD.org
 
 EMACS_PORT_NAME=	emacs20
 
-ALL_TARGET=	elc
-
 PLIST_SUB=	PORTDOCDIR=${PORTDOCDIR}
 PORTDOCDIR=	share/doc/mule-ucs
-MULEUCS_DESTDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
+MULEUCS_DESTDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/mule-ucs
 EMACS_ARGS=	-q --no-site-file -batch
 
 do-build:
-	cd ${WRKSRC} && \
-	    ${EMACS_CMD} ${EMACS_ARGS} -l mucs-comp.el
 	cd ${WRKSRC}/lisp/big5conv && \
 	    ${EMACS_CMD} ${EMACS_ARGS} -l big5-comp.el
 	cd ${WRKSRC}/lisp/jisx0213 && \
 	    ${EMACS_CMD} ${EMACS_ARGS} -l x0213-comp.el
+	cd ${WRKSRC} && \
+	    ${EMACS_CMD} ${EMACS_ARGS} -l mucs-comp.el
 
 do-install:
 	@${MKDIR} ${MULEUCS_DESTDIR}
diff --git a/converters/mule-ucs/distinfo b/converters/mule-ucs/distinfo
index 20efadf93579..0d13c6ddd409 100644
--- a/converters/mule-ucs/distinfo
+++ b/converters/mule-ucs/distinfo
@@ -1 +1 @@
-MD5 (Mule-UCS-0.83.tar.gz) = b24301a4b1e23b705de52054a9ddca3e
+MD5 (Mule-UCS-0.84.tar.gz) = 4c91c2e427a182ac748573d19e095107
diff --git a/converters/mule-ucs/pkg-descr b/converters/mule-ucs/pkg-descr
index d7765964eef5..142df958d4ba 100644
--- a/converters/mule-ucs/pkg-descr
+++ b/converters/mule-ucs/pkg-descr
@@ -21,4 +21,4 @@ Predefined conversions for Mule-UCS included in this package are:
   (3) ... JIS X 0213 support.
 
 ---
-Ported by okazaki@be.to
+Ported by okazaki@FreeBSD.org
diff --git a/converters/mule-ucs/pkg-message b/converters/mule-ucs/pkg-message
index acc717e0b624..8d8fe59472a0 100644
--- a/converters/mule-ucs/pkg-message
+++ b/converters/mule-ucs/pkg-message
@@ -8,7 +8,7 @@ If you want to use auto detection feature on UTF-8/16, add one more:
 
 (require 'un-tools)
 
-See ${PREFIX}/share/doc/mule-ucs/README.Unicode for details.
+See PREFIX/share/doc/mule-ucs/README.Unicode for details.
 
 If you want to use BIG5 conversion support, add the below line either:
 
@@ -19,14 +19,14 @@ or
 (require 'big5c-cns)
 
 to your .emacs depends on which conversion methods you would like to use.
-See ${PREFIX}/share/doc/mule-ucs/README.big5conv for details.
+See PREFIX/share/doc/mule-ucs/README.big5conv for details.
 
 If you want to use JIS X 0213 support, add the following line:
 
 (require 'jisx0213)
 
-to your .emacs. See ${PREFIX}/share/doc/mule-ucs/README.jisx0213
+to your .emacs.  See PREFIX/share/doc/mule-ucs/README.jisx0213
 (written in Japanese) for details.
 
 Mule-UCS is installed under the following directory:
-	${PREFIX}/share/emacs/20.x/site-lisp/mule-ucs/	--- Mule-UCS
+	PREFIX/share/emacs/20.x/site-lisp/mule-ucs/	--- Mule-UCS
diff --git a/converters/mule-ucs/pkg-plist b/converters/mule-ucs/pkg-plist
index 357fae6a94fe..a74699bbadd8 100644
--- a/converters/mule-ucs/pkg-plist
+++ b/converters/mule-ucs/pkg-plist
@@ -66,6 +66,7 @@
 %%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/utibetan.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
@@ -95,11 +96,11 @@
 @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
-%%PORTDOCDIR%%/ChangeLog
-%%PORTDOCDIR%%/ChangeLog.jisx0213
-%%PORTDOCDIR%%/MuleUni.txt
-%%PORTDOCDIR%%/README
-%%PORTDOCDIR%%/README.Unicode
-%%PORTDOCDIR%%/README.big5conv
-%%PORTDOCDIR%%/README.jisx0213
-@dirrm %%PORTDOCDIR%%
+%%PORTDOCS%%%%PORTDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%PORTDOCDIR%%/ChangeLog.jisx0213
+%%PORTDOCS%%%%PORTDOCDIR%%/MuleUni.txt
+%%PORTDOCS%%%%PORTDOCDIR%%/README
+%%PORTDOCS%%%%PORTDOCDIR%%/README.Unicode
+%%PORTDOCS%%%%PORTDOCDIR%%/README.big5conv
+%%PORTDOCS%%%%PORTDOCDIR%%/README.jisx0213
+%%PORTDOCS%%@dirrm %%PORTDOCDIR%%