Update to version 21.1.10

Rearrange xemacs mule packages

PR:	19021
PR:	19023
Submitted by: KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>

28 files changed, 387 insertions, 527 deletions

diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index 77d19ea97303..062dd29d5190 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -1,29 +1,28 @@
-# New ports collection makefile for:	X-Emacs Packages with Mule
-# Date created:		24 Oct 1999
-# Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
+# New ports collection makefile for:	Basic XEmacs elisp packages with Mule
+# Date created:		03 June 2000
+# Whom:			KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 #
-# $FreeBSD$
+# $FreeBSD$$
 #
 
-PORTNAME=	xemacs-mule-packages
-PORTVERSION=	1.1
+PORTNAME=	xemacs-basic-mule-packages
+PORTVERSION=	1.0
 CATEGORIES=	editors elisp
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
 		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
 		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/ \
-		${MASTER_SITE_PORTS_JP}
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
 
-# These are not smallest set of packages but mostly usage of packages for
-# many `Mule' users.
 DISTFILES=	\
-		mule-base-1.34-pkg.tar.gz	locale-1.15-pkg.tar.gz \
-		skk-1.15-pkg.tar.gz		elib-1.06-pkg.tar.gz \
-		egg-its-1.22-pkg.tar.gz		ps-print-ja-1.01-pkg.tar.gz
+		egg-its-1.22-pkg.tar.gz \
+		elib-1.06-pkg.tar.gz \
+		locale-1.16-pkg.tar.gz \
+		mule-base-1.34-pkg.tar.gz \
+		skk-1.15-pkg.tar.gz
 
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 
 DIST_SUBDIR=	xemacs
 MASTER_SITE_SUBDIR=${DIST_SUBDIR}
@@ -45,18 +44,16 @@ do-install:
 	${CP} -Rp ${WRKDIR}/mule-packages ${XEMACSDIR}
 
 post-install:
-	@${ECHO_MSG} "This is only a subset of the available packages for xemacs"
-	@${ECHO_MSG} "with mule."
-	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
-	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
-	@${ECHO_MSG} "the 'Options' menu of the menubar."
-	@${ECHO_MSG} "To install all packages besides basic packages(xemacs-packages or"
-	@${ECHO_MSG} "xemacs-mule-packages), consider using the xemacs-other-packages or"
-	@${ECHO_MSG} "xemacs-mule-other-packages port."
-
-## for make PLIST (only maintainer use)
-#arrange:
-#	${MAKE} -DPLIST_OVERRIDE DIRRM2RMDIRS="lib/xemacs/mule-packages/pkginfo lib/xemacs/mule-packages/man lib/xemacs/mule-packages/lisp lib/xemacs/mule-packages/info lib/xemacs/mule-packages/etc lib/xemacs/mule-packages" \
-#		DIRRMDEPTH=2 plist
+	@${ECHO_MSG} "    This is the basic mule package for XEmacs(version over 21). You might be"
+	@${ECHO_MSG} "enough with this package installing basic package(editors/xemacs-packages)"
+	@${ECHO_MSG} "altogether for working at XEmacs but if you think it insufficient,you can"
+	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
+	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
+	@${ECHO_MSG} "xemacs-packages, xemacs-basic-packages and xemacs-additional-packages. Where"
+	@${ECHO_MSG} "xemacs-additional-packages is a meta ports for packages out of xemacs, xemacs"
+	@${ECHO_MSG} "mule-basic and xemacs mule category packages."
+	@${ECHO_MSG} "    You can also install with running it as root and using the 'Manage Packes'"
+	@${ECHO_MSG} "menu within the 'Options' menu of the menubar. But using this xemacs package"
+	@${ECHO_MSG} "managing, you could not control under ports managing ;-)"
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-basic-mule-packages/distinfo b/editors/xemacs-basic-mule-packages/distinfo
index 616e9a3a1157..cd272a438dcf 100644
--- a/editors/xemacs-basic-mule-packages/distinfo
+++ b/editors/xemacs-basic-mule-packages/distinfo
@@ -1,6 +1,5 @@
+MD5 (xemacs/egg-its-1.22-pkg.tar.gz) = e6c2684467a316c1c282901d26c02d48
+MD5 (xemacs/elib-1.06-pkg.tar.gz) = 339069723620631e005817292403b19e
+MD5 (xemacs/locale-1.16-pkg.tar.gz) = f8d07dfb54d440329167669689a1f210
 MD5 (xemacs/mule-base-1.34-pkg.tar.gz) = f4f068f34b9200ae63567d3045b6dcaf
-MD5 (xemacs/locale-1.15-pkg.tar.gz) = f36714b847d89db6f2be4197bf3004ca
 MD5 (xemacs/skk-1.15-pkg.tar.gz) = 0a96626408534afa1f47f2db15f0a28b
-MD5 (xemacs/elib-1.06-pkg.tar.gz) = 339069723620631e005817292403b19e
-MD5 (xemacs/egg-its-1.22-pkg.tar.gz) = e6c2684467a316c1c282901d26c02d48
-MD5 (xemacs/ps-print-ja-1.01-pkg.tar.gz) = 6d42af1790d11c1ecde0157d9b0526ca
diff --git a/editors/xemacs-basic-mule-packages/pkg-comment b/editors/xemacs-basic-mule-packages/pkg-comment
index 890d7e97d0bb..31f0c4e9cb05 100644
--- a/editors/xemacs-basic-mule-packages/pkg-comment
+++ b/editors/xemacs-basic-mule-packages/pkg-comment
@@ -1 +1 @@
-Common elisp packages for xemacs 21
+Basic XEmacs elisp packages with Mule(basic-mule)
diff --git a/editors/xemacs-basic-mule-packages/pkg-descr b/editors/xemacs-basic-mule-packages/pkg-descr
index 5059f576405a..cd4a2a1fd07f 100644
--- a/editors/xemacs-basic-mule-packages/pkg-descr
+++ b/editors/xemacs-basic-mule-packages/pkg-descr
@@ -2,8 +2,10 @@ Starting with release 21, xemacs does not come with lisp packages
 any more. Instead, they are distributed separately from the main
 sources.
 
-This port attempts to provide a subset of the available packages that
-should be useful for most users.
+    This port provides a basic package with mule for XEmacs(version over 21).
+which contains basically needed packages provided by xemacs.org(www.xemacs.org)
+in addition to the basic package(editors/xemacs-packages) for usual working at
+XEmacs.
 
-To install additional packages, use the "Manage Packages" menu
-in the "Options" menu of your xemacs' menubar.
+To install other categories' packages, use editors/xemacs-*-packages
+ports/packages.
diff --git a/editors/xemacs-basic-mule-packages/pkg-plist b/editors/xemacs-basic-mule-packages/pkg-plist
index 83bb891333c5..2167473b47ff 100644
--- a/editors/xemacs-basic-mule-packages/pkg-plist
+++ b/editors/xemacs-basic-mule-packages/pkg-plist
@@ -182,12 +182,6 @@ lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.el
 lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.elc
 lib/xemacs/mule-packages/lisp/mule-base/viet-util.el
 lib/xemacs/mule-packages/lisp/mule-base/viet-util.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ChangeLog
-lib/xemacs/mule-packages/lisp/ps-print-ja/_pkg.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.elc
 lib/xemacs/mule-packages/lisp/skk/ChangeLog
 lib/xemacs/mule-packages/lisp/skk/_pkg.el
 lib/xemacs/mule-packages/lisp/skk/auto-autoloads.el
@@ -236,20 +230,14 @@ lib/xemacs/mule-packages/pkginfo/MANIFEST.egg-its
 lib/xemacs/mule-packages/pkginfo/MANIFEST.elib
 lib/xemacs/mule-packages/pkginfo/MANIFEST.locale
 lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base
-lib/xemacs/mule-packages/pkginfo/MANIFEST.ps-print-ja
 lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
-@unexec rmdir %D/lib/xemacs/mule-packages/pkginfo 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/man/skk
 @dirrm lib/xemacs/mule-packages/man/elib
-@unexec rmdir %D/lib/xemacs/mule-packages/man 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/lisp/skk
-@dirrm lib/xemacs/mule-packages/lisp/ps-print-ja
 @dirrm lib/xemacs/mule-packages/lisp/mule-base
 @dirrm lib/xemacs/mule-packages/lisp/locale
 @dirrm lib/xemacs/mule-packages/lisp/elib
 @dirrm lib/xemacs/mule-packages/lisp/egg-its
-@unexec rmdir %D/lib/xemacs/mule-packages/lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/info 2>/dev/null || true
 @dirrm lib/xemacs/mule-packages/etc/start-files/ro
 @dirrm lib/xemacs/mule-packages/etc/start-files/ja
 @dirrm lib/xemacs/mule-packages/etc/start-files/fr
@@ -264,5 +252,3 @@ lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
 @dirrm lib/xemacs/mule-packages/etc/app-defaults/fr
 @dirrm lib/xemacs/mule-packages/etc/app-defaults/de
 @dirrm lib/xemacs/mule-packages/etc/app-defaults
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index 77d19ea97303..66ce8703152f 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -6,24 +6,21 @@
 #
 
 PORTNAME=	xemacs-mule-packages
-PORTVERSION=	1.1
+PORTVERSION=	1.0
 CATEGORIES=	editors elisp
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/packages/ \
 		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
 		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
-		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/ \
-		${MASTER_SITE_PORTS_JP}
+		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
 
-# These are not smallest set of packages but mostly usage of packages for
-# many `Mule' users.
 DISTFILES=	\
-		mule-base-1.34-pkg.tar.gz	locale-1.15-pkg.tar.gz \
-		skk-1.15-pkg.tar.gz		elib-1.06-pkg.tar.gz \
-		egg-its-1.22-pkg.tar.gz		ps-print-ja-1.01-pkg.tar.gz
+		edict-1.09-pkg.tar.gz \
+		leim-1.15-pkg.tar.gz \
+		lookup-1.04-pkg.tar.gz
 
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
+MAINTAINER=	KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 
 DIST_SUBDIR=	xemacs
 MASTER_SITE_SUBDIR=${DIST_SUBDIR}
@@ -45,18 +42,14 @@ do-install:
 	${CP} -Rp ${WRKDIR}/mule-packages ${XEMACSDIR}
 
 post-install:
-	@${ECHO_MSG} "This is only a subset of the available packages for xemacs"
-	@${ECHO_MSG} "with mule."
-	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
-	@${ECHO_MSG} "running it as root and using the 'Manage Packes' menu within"
-	@${ECHO_MSG} "the 'Options' menu of the menubar."
-	@${ECHO_MSG} "To install all packages besides basic packages(xemacs-packages or"
-	@${ECHO_MSG} "xemacs-mule-packages), consider using the xemacs-other-packages or"
-	@${ECHO_MSG} "xemacs-mule-other-packages port."
-
-## for make PLIST (only maintainer use)
-#arrange:
-#	${MAKE} -DPLIST_OVERRIDE DIRRM2RMDIRS="lib/xemacs/mule-packages/pkginfo lib/xemacs/mule-packages/man lib/xemacs/mule-packages/lisp lib/xemacs/mule-packages/info lib/xemacs/mule-packages/etc lib/xemacs/mule-packages" \
-#		DIRRMDEPTH=2 plist
+	@${ECHO_MSG} "    This is the set of the packages for xemacs with the mule category. You can"
+	@${ECHO_MSG} "install other packages provided by XEmacs.org with editors/xemacs-*-packages"
+	@${ECHO_MSG} "ports. These ports are prepared for corresponding XEmacs packages except for"
+	@${ECHO_MSG} "xemacs-packages, xemacs-basic-packages and xemacs-additional-packages. Where"
+	@${ECHO_MSG} "xemacs-additional-packages is a meta ports for packages out of xemacs, xemacs"
+	@${ECHO_MSG} "mule-basic and xemacs mule category packages."
+	@${ECHO_MSG} "    You can also install with running it as root and using the 'Manage Packes'"
+	@${ECHO_MSG} "menu within the 'Options' menu of the menubar. But using this xemacs package"
+	@${ECHO_MSG} "managing, you could not control under ports managing ;-)"
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-mule-packages/distinfo b/editors/xemacs-mule-packages/distinfo
index 616e9a3a1157..37715d86d4b0 100644
--- a/editors/xemacs-mule-packages/distinfo
+++ b/editors/xemacs-mule-packages/distinfo
@@ -1,6 +1,3 @@
-MD5 (xemacs/mule-base-1.34-pkg.tar.gz) = f4f068f34b9200ae63567d3045b6dcaf
-MD5 (xemacs/locale-1.15-pkg.tar.gz) = f36714b847d89db6f2be4197bf3004ca
-MD5 (xemacs/skk-1.15-pkg.tar.gz) = 0a96626408534afa1f47f2db15f0a28b
-MD5 (xemacs/elib-1.06-pkg.tar.gz) = 339069723620631e005817292403b19e
-MD5 (xemacs/egg-its-1.22-pkg.tar.gz) = e6c2684467a316c1c282901d26c02d48
-MD5 (xemacs/ps-print-ja-1.01-pkg.tar.gz) = 6d42af1790d11c1ecde0157d9b0526ca
+MD5 (xemacs/edict-1.09-pkg.tar.gz) = 46d67e9ecc807edc66f68d4475a0eb66
+MD5 (xemacs/leim-1.15-pkg.tar.gz) = 81278e3840ac1e3ccac1db1632db361d
+MD5 (xemacs/lookup-1.04-pkg.tar.gz) = 8280cf87e96b80d83b95cbe6078117c4
diff --git a/editors/xemacs-mule-packages/pkg-comment b/editors/xemacs-mule-packages/pkg-comment
index 890d7e97d0bb..5fcb5bc25e40 100644
--- a/editors/xemacs-mule-packages/pkg-comment
+++ b/editors/xemacs-mule-packages/pkg-comment
@@ -1 +1 @@
-Common elisp packages for xemacs 21
+XEmacs elisp packages for Mule(mule)
diff --git a/editors/xemacs-mule-packages/pkg-descr b/editors/xemacs-mule-packages/pkg-descr
index 5059f576405a..a78acf124911 100644
--- a/editors/xemacs-mule-packages/pkg-descr
+++ b/editors/xemacs-mule-packages/pkg-descr
@@ -2,8 +2,10 @@ Starting with release 21, xemacs does not come with lisp packages
 any more. Instead, they are distributed separately from the main
 sources.
 
-This port attempts to provide a subset of the available packages that
-should be useful for most users.
+    This port provides a set of the mule category packages provided by
+xemacs.org(www.xemacs.org) except for basic and mule-basic packages(those are
+editors/xemacs-packages and editors/xemacs-mule-basic-packages ports
+respectively).
 
-To install additional packages, use the "Manage Packages" menu
-in the "Options" menu of your xemacs' menubar.
+To install other categories' packages, use editors/xemacs-*-packages
+ports/packages.
diff --git a/editors/xemacs-mule-packages/pkg-plist b/editors/xemacs-mule-packages/pkg-plist
index 83bb891333c5..15799fcaa5d1 100644
--- a/editors/xemacs-mule-packages/pkg-plist
+++ b/editors/xemacs-mule-packages/pkg-plist
@@ -1,268 +1,175 @@
-lib/xemacs/mule-packages/etc/app-defaults/de/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/fr/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/ja/Emacs
-lib/xemacs/mule-packages/etc/app-defaults/ro/Emacs
-lib/xemacs/mule-packages/etc/mule-doc/ChangeLog.Mule
-lib/xemacs/mule-packages/etc/mule-doc/ChangeLog.Mule-Wnn6
-lib/xemacs/mule-packages/etc/mule-doc/ChinesePoem.cn
-lib/xemacs/mule-packages/etc/mule-doc/INSTALL
-lib/xemacs/mule-packages/etc/mule-doc/ISO2022.ja
-lib/xemacs/mule-packages/etc/mule-doc/NEWFEATURE
-lib/xemacs/mule-packages/etc/mule-doc/NeXT.ja
-lib/xemacs/mule-packages/etc/mule-doc/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/README.SJ3.ja
-lib/xemacs/mule-packages/etc/mule-doc/TAB.ja
-lib/xemacs/mule-packages/etc/mule-doc/Thai/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/Thai/sample.Thai
-lib/xemacs/mule-packages/etc/mule-doc/X11.ja
-lib/xemacs/mule-packages/etc/mule-doc/arabic.txt
-lib/xemacs/mule-packages/etc/mule-doc/sample.ks
-lib/xemacs/mule-packages/etc/mule-doc/viet/FAQ.VISCII
-lib/xemacs/mule-packages/etc/mule-doc/viet/QUAIL
-lib/xemacs/mule-packages/etc/mule-doc/viet/README.Mule
-lib/xemacs/mule-packages/etc/mule-doc/viet/TERMINOLOGY
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.cn
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.ja
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.kr
-lib/xemacs/mule-packages/etc/mule/FAQ-Mule.th
-lib/xemacs/mule-packages/etc/mule/Makefile.in
-lib/xemacs/mule-packages/etc/mule/TUTORIAL.kr
-lib/xemacs/mule-packages/etc/mule/VERSIONS
-lib/xemacs/mule-packages/etc/mule/coco.1
-lib/xemacs/mule-packages/etc/mule/demo.ps
-lib/xemacs/mule-packages/etc/mule/m2ps.1
-lib/xemacs/mule-packages/etc/mule/m2ps.1.in
-lib/xemacs/mule-packages/etc/mule/m2ps.ps
-lib/xemacs/mule-packages/etc/mule/mule-refcard.tex
-lib/xemacs/mule-packages/etc/mule/mule.1
-lib/xemacs/mule-packages/etc/mule/mule.xbm
-lib/xemacs/mule-packages/etc/mule/tom.xbm
-lib/xemacs/mule-packages/etc/skk/ReadMe
-lib/xemacs/mule-packages/etc/skk/ReadMe.10
-lib/xemacs/mule-packages/etc/skk/ReadMe.English
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.L
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.M
-lib/xemacs/mule-packages/etc/skk/SKK-JISYO.S
-lib/xemacs/mule-packages/etc/skk/SKK.tut
-lib/xemacs/mule-packages/etc/skk/SKK.tut.E
-lib/xemacs/mule-packages/etc/start-files/fr/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/fr/locale-start.elc
-lib/xemacs/mule-packages/etc/start-files/ja/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/ja/locale-start.elc
-lib/xemacs/mule-packages/etc/start-files/ro/locale-start.el
-lib/xemacs/mule-packages/etc/start-files/ro/locale-start.elc
-lib/xemacs/mule-packages/info/elib.info
-lib/xemacs/mule-packages/info/elib.info-1
-lib/xemacs/mule-packages/info/elib.info-2
-lib/xemacs/mule-packages/info/skk.info
-lib/xemacs/mule-packages/info/skk.info-1
-lib/xemacs/mule-packages/info/skk.info-2
-lib/xemacs/mule-packages/info/skk.info-3
-lib/xemacs/mule-packages/info/skk.info-4
-lib/xemacs/mule-packages/lisp/egg-its/ChangeLog
-lib/xemacs/mule-packages/lisp/egg-its/_pkg.el
-lib/xemacs/mule-packages/lisp/egg-its/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/egg-its/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-busyu.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-busyu.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-cwnn-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-cwnn-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-jisx0201.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-jisx0201.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-jsymbol.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-jsymbol.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-keymap.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-keymap.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-kwnn-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-kwnn-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-quail.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-quail.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-client.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-client.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-leim.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3-leim.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-sj3.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg-wnn.el
-lib/xemacs/mule-packages/lisp/egg-its/egg-wnn.elc
-lib/xemacs/mule-packages/lisp/egg-its/egg.el
-lib/xemacs/mule-packages/lisp/egg-its/egg.elc
-lib/xemacs/mule-packages/lisp/egg-its/eggrc-sj3
-lib/xemacs/mule-packages/lisp/egg-its/eggrc-wnn
-lib/xemacs/mule-packages/lisp/egg-its/its-han-kata.el
-lib/xemacs/mule-packages/lisp/egg-its/its-han-kata.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hangul.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hangul.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hankaku.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hankaku.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-hira.el
-lib/xemacs/mule-packages/lisp/egg-its/its-hira.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-kanainput.el
-lib/xemacs/mule-packages/lisp/egg-its/its-kanainput.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-kata.el
-lib/xemacs/mule-packages/lisp/egg-its/its-kata.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-pinyin.el
-lib/xemacs/mule-packages/lisp/egg-its/its-pinyin.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-zenkaku.el
-lib/xemacs/mule-packages/lisp/egg-its/its-zenkaku.elc
-lib/xemacs/mule-packages/lisp/egg-its/its-zhuyin.el
-lib/xemacs/mule-packages/lisp/egg-its/its-zhuyin.elc
-lib/xemacs/mule-packages/lisp/elib/ChangeLog
-lib/xemacs/mule-packages/lisp/elib/NEWS
-lib/xemacs/mule-packages/lisp/elib/README
-lib/xemacs/mule-packages/lisp/elib/_pkg.el
-lib/xemacs/mule-packages/lisp/elib/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/elib/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/elib/avltree.el
-lib/xemacs/mule-packages/lisp/elib/avltree.elc
-lib/xemacs/mule-packages/lisp/elib/bintree.el
-lib/xemacs/mule-packages/lisp/elib/bintree.elc
-lib/xemacs/mule-packages/lisp/elib/cookie.el
-lib/xemacs/mule-packages/lisp/elib/cookie.elc
-lib/xemacs/mule-packages/lisp/elib/dll-debug.el
-lib/xemacs/mule-packages/lisp/elib/dll-debug.elc
-lib/xemacs/mule-packages/lisp/elib/dll.el
-lib/xemacs/mule-packages/lisp/elib/dll.elc
-lib/xemacs/mule-packages/lisp/elib/elib-node.el
-lib/xemacs/mule-packages/lisp/elib/elib-node.elc
-lib/xemacs/mule-packages/lisp/elib/queue-f.el
-lib/xemacs/mule-packages/lisp/elib/queue-f.elc
-lib/xemacs/mule-packages/lisp/elib/queue-m.el
-lib/xemacs/mule-packages/lisp/elib/queue-m.elc
-lib/xemacs/mule-packages/lisp/elib/read.el
-lib/xemacs/mule-packages/lisp/elib/read.elc
-lib/xemacs/mule-packages/lisp/elib/stack-f.el
-lib/xemacs/mule-packages/lisp/elib/stack-f.elc
-lib/xemacs/mule-packages/lisp/elib/stack-m.el
-lib/xemacs/mule-packages/lisp/elib/stack-m.elc
-lib/xemacs/mule-packages/lisp/elib/string.el
-lib/xemacs/mule-packages/lisp/elib/string.elc
-lib/xemacs/mule-packages/lisp/locale/ChangeLog
-lib/xemacs/mule-packages/lisp/locale/_pkg.el
-lib/xemacs/mule-packages/lisp/locale/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/locale/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/mule-base/ChangeLog
-lib/xemacs/mule-packages/lisp/mule-base/_pkg.el
-lib/xemacs/mule-packages/lisp/mule-base/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/mule-base/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/mule-base/canna.el
-lib/xemacs/mule-packages/lisp/mule-base/canna.elc
-lib/xemacs/mule-packages/lisp/mule-base/char-table.el
-lib/xemacs/mule-packages/lisp/mule-base/char-table.elc
-lib/xemacs/mule-packages/lisp/mule-base/chartblxmas.el
-lib/xemacs/mule-packages/lisp/mule-base/chartblxmas.elc
-lib/xemacs/mule-packages/lisp/mule-base/china-util.el
-lib/xemacs/mule-packages/lisp/mule-base/china-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/cyril-util.el
-lib/xemacs/mule-packages/lisp/mule-base/cyril-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/ethio-util.el
-lib/xemacs/mule-packages/lisp/mule-base/ethio-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/isearch-mule.el
-lib/xemacs/mule-packages/lisp/mule-base/isearch-mule.elc
-lib/xemacs/mule-packages/lisp/mule-base/japan-util.el
-lib/xemacs/mule-packages/lisp/mule-base/japan-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/kana-keyboard.el
-lib/xemacs/mule-packages/lisp/mule-base/kana-keyboard.elc
-lib/xemacs/mule-packages/lisp/mule-base/korea-util.el
-lib/xemacs/mule-packages/lisp/mule-base/korea-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-cne.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-cne.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-diag.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-diag.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-keyboard.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-keyboard.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-trex.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-trex.elc
-lib/xemacs/mule-packages/lisp/mule-base/mule-util.el
-lib/xemacs/mule-packages/lisp/mule-base/mule-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.el
-lib/xemacs/mule-packages/lisp/mule-base/thai-xtis-util.elc
-lib/xemacs/mule-packages/lisp/mule-base/viet-util.el
-lib/xemacs/mule-packages/lisp/mule-base/viet-util.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ChangeLog
-lib/xemacs/mule-packages/lisp/ps-print-ja/_pkg.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.el
-lib/xemacs/mule-packages/lisp/ps-print-ja/ps-print.elc
-lib/xemacs/mule-packages/lisp/skk/ChangeLog
-lib/xemacs/mule-packages/lisp/skk/_pkg.el
-lib/xemacs/mule-packages/lisp/skk/auto-autoloads.el
-lib/xemacs/mule-packages/lisp/skk/auto-autoloads.elc
-lib/xemacs/mule-packages/lisp/skk/skk-attr.el
-lib/xemacs/mule-packages/lisp/skk/skk-attr.elc
-lib/xemacs/mule-packages/lisp/skk/skk-auto.el
-lib/xemacs/mule-packages/lisp/skk/skk-auto.elc
-lib/xemacs/mule-packages/lisp/skk/skk-comp.el
-lib/xemacs/mule-packages/lisp/skk/skk-comp.elc
-lib/xemacs/mule-packages/lisp/skk/skk-foreword.el
-lib/xemacs/mule-packages/lisp/skk/skk-foreword.elc
-lib/xemacs/mule-packages/lisp/skk/skk-gadget.el
-lib/xemacs/mule-packages/lisp/skk/skk-gadget.elc
-lib/xemacs/mule-packages/lisp/skk/skk-isearch.el
-lib/xemacs/mule-packages/lisp/skk/skk-isearch.elc
-lib/xemacs/mule-packages/lisp/skk/skk-kakasi.el
-lib/xemacs/mule-packages/lisp/skk/skk-kakasi.elc
-lib/xemacs/mule-packages/lisp/skk/skk-kcode.el
-lib/xemacs/mule-packages/lisp/skk/skk-kcode.elc
-lib/xemacs/mule-packages/lisp/skk/skk-leim.el
-lib/xemacs/mule-packages/lisp/skk/skk-leim.elc
-lib/xemacs/mule-packages/lisp/skk/skk-menu.el
-lib/xemacs/mule-packages/lisp/skk/skk-menu.elc
-lib/xemacs/mule-packages/lisp/skk/skk-num.el
-lib/xemacs/mule-packages/lisp/skk/skk-num.elc
-lib/xemacs/mule-packages/lisp/skk/skk-server.el
-lib/xemacs/mule-packages/lisp/skk/skk-server.elc
-lib/xemacs/mule-packages/lisp/skk/skk-tree.el
-lib/xemacs/mule-packages/lisp/skk/skk-tree.elc
-lib/xemacs/mule-packages/lisp/skk/skk-tut.el
-lib/xemacs/mule-packages/lisp/skk/skk-tut.elc
-lib/xemacs/mule-packages/lisp/skk/skk-vars.el
-lib/xemacs/mule-packages/lisp/skk/skk-vars.elc
-lib/xemacs/mule-packages/lisp/skk/skk-vip.el
-lib/xemacs/mule-packages/lisp/skk/skk-vip.elc
-lib/xemacs/mule-packages/lisp/skk/skk-viper.el
-lib/xemacs/mule-packages/lisp/skk/skk-viper.elc
-lib/xemacs/mule-packages/lisp/skk/skk.el
-lib/xemacs/mule-packages/lisp/skk/skk.elc
-lib/xemacs/mule-packages/man/elib/elib.texi
-lib/xemacs/mule-packages/man/elib/gpl.texi
-lib/xemacs/mule-packages/man/skk/gpl.texi
-lib/xemacs/mule-packages/man/skk/skk.texi
-lib/xemacs/mule-packages/pkginfo/MANIFEST.egg-its
-lib/xemacs/mule-packages/pkginfo/MANIFEST.elib
-lib/xemacs/mule-packages/pkginfo/MANIFEST.locale
-lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base
-lib/xemacs/mule-packages/pkginfo/MANIFEST.ps-print-ja
-lib/xemacs/mule-packages/pkginfo/MANIFEST.skk
-@unexec rmdir %D/lib/xemacs/mule-packages/pkginfo 2>/dev/null || true
-@dirrm lib/xemacs/mule-packages/man/skk
-@dirrm lib/xemacs/mule-packages/man/elib
-@unexec rmdir %D/lib/xemacs/mule-packages/man 2>/dev/null || true
-@dirrm lib/xemacs/mule-packages/lisp/skk
-@dirrm lib/xemacs/mule-packages/lisp/ps-print-ja
-@dirrm lib/xemacs/mule-packages/lisp/mule-base
-@dirrm lib/xemacs/mule-packages/lisp/locale
-@dirrm lib/xemacs/mule-packages/lisp/elib
-@dirrm lib/xemacs/mule-packages/lisp/egg-its
-@unexec rmdir %D/lib/xemacs/mule-packages/lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages/info 2>/dev/null || true
-@dirrm lib/xemacs/mule-packages/etc/start-files/ro
-@dirrm lib/xemacs/mule-packages/etc/start-files/ja
-@dirrm lib/xemacs/mule-packages/etc/start-files/fr
-@dirrm lib/xemacs/mule-packages/etc/start-files
-@dirrm lib/xemacs/mule-packages/etc/skk
-@dirrm lib/xemacs/mule-packages/etc/mule-doc/viet
-@dirrm lib/xemacs/mule-packages/etc/mule-doc/Thai
-@dirrm lib/xemacs/mule-packages/etc/mule-doc
-@dirrm lib/xemacs/mule-packages/etc/mule
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/ro
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/ja
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/fr
-@dirrm lib/xemacs/mule-packages/etc/app-defaults/de
-@dirrm lib/xemacs/mule-packages/etc/app-defaults
-@unexec rmdir %D/lib/xemacs/mule-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/mule-packages 2>/dev/null || true
+lib/xemacs/mule-packages/info/lookup.info
+lib/xemacs/mule-packages/info/lookup.info-1
+lib/xemacs/mule-packages/info/lookup.info-2
+lib/xemacs/mule-packages/lisp/edict/ChangeLog
+lib/xemacs/mule-packages/lisp/edict/_pkg.el
+lib/xemacs/mule-packages/lisp/edict/auto-autoloads.el
+lib/xemacs/mule-packages/lisp/edict/auto-autoloads.elc
+lib/xemacs/mule-packages/lisp/edict/dui-registry.el
+lib/xemacs/mule-packages/lisp/edict/dui-registry.elc
+lib/xemacs/mule-packages/lisp/edict/dui.el
+lib/xemacs/mule-packages/lisp/edict/dui.elc
+lib/xemacs/mule-packages/lisp/edict/edict-edit.el
+lib/xemacs/mule-packages/lisp/edict/edict-edit.elc
+lib/xemacs/mule-packages/lisp/edict/edict-english.el
+lib/xemacs/mule-packages/lisp/edict/edict-english.elc
+lib/xemacs/mule-packages/lisp/edict/edict-japanese.el
+lib/xemacs/mule-packages/lisp/edict/edict-japanese.elc
+lib/xemacs/mule-packages/lisp/edict/edict-morphology.el
+lib/xemacs/mule-packages/lisp/edict/edict-morphology.elc
+lib/xemacs/mule-packages/lisp/edict/edict-test.el
+lib/xemacs/mule-packages/lisp/edict/edict-test.elc
+lib/xemacs/mule-packages/lisp/edict/edict.el
+lib/xemacs/mule-packages/lisp/edict/edict.elc
+lib/xemacs/mule-packages/lisp/edict/edictj.demo
+lib/xemacs/mule-packages/lisp/edict/ts-mode.el
+lib/xemacs/mule-packages/lisp/leim/ChangeLog
+lib/xemacs/mule-packages/lisp/leim/_pkg.el
+lib/xemacs/mule-packages/lisp/leim/auto-autoloads.el
+lib/xemacs/mule-packages/lisp/leim/auto-autoloads.elc
+lib/xemacs/mule-packages/lisp/leim/leim-list.el
+lib/xemacs/mule-packages/lisp/leim/leim-list.elc
+lib/xemacs/mule-packages/lisp/leim/quail.el
+lib/xemacs/mule-packages/lisp/leim/quail.elc
+lib/xemacs/mule-packages/lisp/leim/quail/4Corner.el
+lib/xemacs/mule-packages/lisp/leim/quail/4Corner.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ARRAY30.el
+lib/xemacs/mule-packages/lisp/leim/quail/ARRAY30.elc
+lib/xemacs/mule-packages/lisp/leim/quail/CCDOSPY.el
+lib/xemacs/mule-packages/lisp/leim/quail/CCDOSPY.elc
+lib/xemacs/mule-packages/lisp/leim/quail/CTLau.el
+lib/xemacs/mule-packages/lisp/leim/quail/CTLau.elc
+lib/xemacs/mule-packages/lisp/leim/quail/CTLauB.el
+lib/xemacs/mule-packages/lisp/leim/quail/CTLauB.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ECDICT.el
+lib/xemacs/mule-packages/lisp/leim/quail/ECDICT.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ETZY.el
+lib/xemacs/mule-packages/lisp/leim/quail/ETZY.elc
+lib/xemacs/mule-packages/lisp/leim/quail/PY-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/PY-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/PY.el
+lib/xemacs/mule-packages/lisp/leim/quail/PY.elc
+lib/xemacs/mule-packages/lisp/leim/quail/Punct-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/Punct-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/Punct.el
+lib/xemacs/mule-packages/lisp/leim/quail/Punct.elc
+lib/xemacs/mule-packages/lisp/leim/quail/QJ-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/QJ-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/QJ.el
+lib/xemacs/mule-packages/lisp/leim/quail/QJ.elc
+lib/xemacs/mule-packages/lisp/leim/quail/SW.el
+lib/xemacs/mule-packages/lisp/leim/quail/SW.elc
+lib/xemacs/mule-packages/lisp/leim/quail/TONEPY.el
+lib/xemacs/mule-packages/lisp/leim/quail/TONEPY.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ZIRANMA.el
+lib/xemacs/mule-packages/lisp/leim/quail/ZIRANMA.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ZOZY.el
+lib/xemacs/mule-packages/lisp/leim/quail/ZOZY.elc
+lib/xemacs/mule-packages/lisp/leim/quail/cyril-jis.el
+lib/xemacs/mule-packages/lisp/leim/quail/cyril-jis.elc
+lib/xemacs/mule-packages/lisp/leim/quail/cyrillic.el
+lib/xemacs/mule-packages/lisp/leim/quail/cyrillic.elc
+lib/xemacs/mule-packages/lisp/leim/quail/czech.el
+lib/xemacs/mule-packages/lisp/leim/quail/czech.elc
+lib/xemacs/mule-packages/lisp/leim/quail/greek.el
+lib/xemacs/mule-packages/lisp/leim/quail/greek.elc
+lib/xemacs/mule-packages/lisp/leim/quail/hangul.el
+lib/xemacs/mule-packages/lisp/leim/quail/hangul.elc
+lib/xemacs/mule-packages/lisp/leim/quail/hangul3.el
+lib/xemacs/mule-packages/lisp/leim/quail/hangul3.elc
+lib/xemacs/mule-packages/lisp/leim/quail/hanja-jis.el
+lib/xemacs/mule-packages/lisp/leim/quail/hanja-jis.elc
+lib/xemacs/mule-packages/lisp/leim/quail/hanja.el
+lib/xemacs/mule-packages/lisp/leim/quail/hanja.elc
+lib/xemacs/mule-packages/lisp/leim/quail/ipa.el
+lib/xemacs/mule-packages/lisp/leim/quail/ipa.elc
+lib/xemacs/mule-packages/lisp/leim/quail/latin-alt.el
+lib/xemacs/mule-packages/lisp/leim/quail/latin-alt.elc
+lib/xemacs/mule-packages/lisp/leim/quail/latin-post.el
+lib/xemacs/mule-packages/lisp/leim/quail/latin-post.elc
+lib/xemacs/mule-packages/lisp/leim/quail/latin-pre.el
+lib/xemacs/mule-packages/lisp/leim/quail/latin-pre.elc
+lib/xemacs/mule-packages/lisp/leim/quail/py-punct.el
+lib/xemacs/mule-packages/lisp/leim/quail/py-punct.elc
+lib/xemacs/mule-packages/lisp/leim/quail/pypunct-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/pypunct-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/quick-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/quick-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/quick-cns.el
+lib/xemacs/mule-packages/lisp/leim/quail/quick-cns.elc
+lib/xemacs/mule-packages/lisp/leim/quail/symbol-ksc.el
+lib/xemacs/mule-packages/lisp/leim/quail/symbol-ksc.elc
+lib/xemacs/mule-packages/lisp/leim/quail/thai-xtis.el
+lib/xemacs/mule-packages/lisp/leim/quail/thai-xtis.elc
+lib/xemacs/mule-packages/lisp/leim/quail/tsang-b5.el
+lib/xemacs/mule-packages/lisp/leim/quail/tsang-b5.elc
+lib/xemacs/mule-packages/lisp/leim/quail/tsang-cns.el
+lib/xemacs/mule-packages/lisp/leim/quail/tsang-cns.elc
+lib/xemacs/mule-packages/lisp/lookup/ChangeLog
+lib/xemacs/mule-packages/lisp/lookup/_pkg.el
+lib/xemacs/mule-packages/lisp/lookup/auto-autoloads.el
+lib/xemacs/mule-packages/lisp/lookup/auto-autoloads.elc
+lib/xemacs/mule-packages/lisp/lookup/custom-load.el
+lib/xemacs/mule-packages/lisp/lookup/custom-load.elc
+lib/xemacs/mule-packages/lisp/lookup/evi-mule.el
+lib/xemacs/mule-packages/lisp/lookup/evi-mule.elc
+lib/xemacs/mule-packages/lisp/lookup/evi.el
+lib/xemacs/mule-packages/lisp/lookup/evi.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-compile.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-compile.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-content.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-content.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-defs.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-defs.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-entry.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-entry.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-misc.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-misc.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-package.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-package.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-select.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-select.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-types.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-types.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-utils.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-utils.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-vars.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-vars.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup-vse.el
+lib/xemacs/mule-packages/lisp/lookup/lookup-vse.elc
+lib/xemacs/mule-packages/lisp/lookup/lookup.el
+lib/xemacs/mule-packages/lisp/lookup/lookup.elc
+lib/xemacs/mule-packages/lisp/lookup/ndcookie.el
+lib/xemacs/mule-packages/lisp/lookup/ndcookie.elc
+lib/xemacs/mule-packages/lisp/lookup/ndeb.el
+lib/xemacs/mule-packages/lisp/lookup/ndeb.elc
+lib/xemacs/mule-packages/lisp/lookup/ndic.el
+lib/xemacs/mule-packages/lisp/lookup/ndic.elc
+lib/xemacs/mule-packages/lisp/lookup/ndict.el
+lib/xemacs/mule-packages/lisp/lookup/ndict.elc
+lib/xemacs/mule-packages/lisp/lookup/ndkks.el
+lib/xemacs/mule-packages/lisp/lookup/ndkks.elc
+lib/xemacs/mule-packages/lisp/lookup/ndmisc.el
+lib/xemacs/mule-packages/lisp/lookup/ndmisc.elc
+lib/xemacs/mule-packages/lisp/lookup/ndnmz.el
+lib/xemacs/mule-packages/lisp/lookup/ndnmz.elc
+lib/xemacs/mule-packages/lisp/lookup/ndspell.el
+lib/xemacs/mule-packages/lisp/lookup/ndspell.elc
+lib/xemacs/mule-packages/lisp/lookup/ndsrd.el
+lib/xemacs/mule-packages/lisp/lookup/ndsrd.elc
+lib/xemacs/mule-packages/lisp/lookup/ndtp.el
+lib/xemacs/mule-packages/lisp/lookup/ndtp.elc
+lib/xemacs/mule-packages/lisp/lookup/sdicf.el
+lib/xemacs/mule-packages/lisp/lookup/sdicf.elc
+lib/xemacs/mule-packages/lisp/lookup/stem-english.el
+lib/xemacs/mule-packages/lisp/lookup/stem-english.elc
+lib/xemacs/mule-packages/man/lookup/lookup-guide.texi
+lib/xemacs/mule-packages/man/lookup/lookup.texi
+lib/xemacs/mule-packages/pkginfo/MANIFEST.edict
+lib/xemacs/mule-packages/pkginfo/MANIFEST.leim
+lib/xemacs/mule-packages/pkginfo/MANIFEST.lookup
+@dirrm lib/xemacs/mule-packages/man/lookup
+@dirrm lib/xemacs/mule-packages/lisp/lookup
+@dirrm lib/xemacs/mule-packages/lisp/leim/quail
+@dirrm lib/xemacs/mule-packages/lisp/leim
+@dirrm lib/xemacs/mule-packages/lisp/edict
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 1811a1e09fc5..f28ced222250 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	\
 		ftp://ftp.usyd.edu.au/pub/Xemacs/packages/ \
 		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
 		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
+
 DISTFILES=	\
 		apel-1.16-pkg.tar.gz \
 		auctex-1.19-pkg.tar.gz \
@@ -21,33 +22,34 @@ DISTFILES=	\
 		cc-mode-1.17-pkg.tar.gz \
 		debug-1.11-pkg.tar.gz \
 		dired-1.07-pkg.tar.gz \
-		edit-utils-1.45-pkg.tar.gz \
-		efs-1.16-pkg.tar.gz \
+		edit-utils-1.47-pkg.tar.gz \
+		efs-1.19-pkg.tar.gz \
 		fsf-compat-1.07-pkg.tar.gz \
 		hm--html-menus-1.14-pkg.tar.gz \
 		ispell-1.18-pkg.tar.gz \
-		mail-lib-1.28-pkg.tar.gz \
+		mail-lib-1.29-pkg.tar.gz \
 		mailcrypt-2.04-pkg.tar.gz \
 		net-utils-1.13-pkg.tar.gz \
-		os-utils-1.19-pkg.tar.gz \
-		pcl-cvs-1.41-pkg.tar.gz \
-		prog-modes-1.23-pkg.tar.gz \
+		os-utils-1.20-pkg.tar.gz \
+		pcl-cvs-1.46-pkg.tar.gz \
+		prog-modes-1.25-pkg.tar.gz \
 		ps-print-nomule-1.03-pkg.tar.gz \
-		psgml-1.15-pkg.tar.gz \
+		psgml-1.16-pkg.tar.gz \
 		sgml-1.06-pkg.tar.gz \
 		sh-script-1.11-pkg.tar.gz \
-		texinfo-1.18-pkg.tar.gz \
-		text-modes-1.22-pkg.tar.gz \
+		texinfo-1.19-pkg.tar.gz \
+		text-modes-1.25-pkg.tar.gz \
 		time-1.09-pkg.tar.gz \
-		vc-1.22-pkg.tar.gz \
-		viper-1.18-pkg.tar.gz \
+		vc-1.23-pkg.tar.gz \
+		viper-1.20-pkg.tar.gz \
 		w3-1.15-pkg.tar.gz \
-		xemacs-base-1.37-pkg.tar.gz \
-		xemacs-devel-1.25-pkg.tar.gz
+		xemacs-base-1.39-pkg.tar.gz \
+		xemacs-devel-1.26-pkg.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 DIST_SUBDIR=	xemacs
+MASTER_SITE_SUBDIR=${DIST_SUBDIR}
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/xemacs-packages
@@ -63,15 +65,18 @@ do-extract:
 
 do-install:
 	${MKDIR} ${XEMACSDIR}
-	${CP} -Rp ${WRKSRC} ${XEMACSDIR}
+	${CP} -Rp ${WRKDIR}/xemacs-packages ${XEMACSDIR}
 
 post-install:
-	@${ECHO_MSG} "This is only a subset of the available packages for xemacs."
-	@${ECHO_MSG} "You can install additional packages yourself from within xemacs by"
-	@${ECHO_MSG} "running it as root and using the 'Manage Packages' menu within"
-	@${ECHO_MSG} "the 'Options' menu of the menubar."
-	@${ECHO_MSG} "To install all packages besides basic packages(xemacs-packages or"
-	@${ECHO_MSG} "xemacs-mule-packages), consider using the xemacs-sumo-packages or"
-	@${ECHO_MSG} "xemacs-mule-sumo-packages port."
+	@${ECHO_MSG} "    This is the basic package for XEmacs(version over 21). You might be enough"
+	@${ECHO_MSG} "only with this package for working at XEmacs but if you think it"
+	@${ECHO_MSG} "insufficient,you can install other packages provided by XEmacs.org with"
+	@${ECHO_MSG} "editors/xemacs-*-packages ports. These ports are prepared for corresponding"
+	@${ECHO_MSG} "XEmacs packages except for xemacs-packages, xemacs-mule-basic-packages and"
+	@${ECHO_MSG} "xemacs-additional-packages. Where xemacs-additional-packages is a meta ports for"
+	@${ECHO_MSG} "packages out of xemacs, xemacs mule-basic and xemacs mule category packages."
+	@${ECHO_MSG} "    You can also install with running it as root and using the 'Manage Packes'"
+	@${ECHO_MSG} "menu within the 'Options' menu of the menubar. But using this xemacs package"
+	@${ECHO_MSG} "managing, you could not control under ports managing ;-)"
 
 .include <bsd.port.mk>
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 310d697cb360..842bcaadc82c 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -4,26 +4,26 @@ MD5 (xemacs/c-support-1.14-pkg.tar.gz) = c804b3eb5a395bbe39020a5115c3d5e5
 MD5 (xemacs/cc-mode-1.17-pkg.tar.gz) = ac9ed86d107513eb22173e8893e8ae78
 MD5 (xemacs/debug-1.11-pkg.tar.gz) = 034e56577b306bb9f4cb822c2adc89b0
 MD5 (xemacs/dired-1.07-pkg.tar.gz) = f7ecf6faf11794e18299c2aa139e6b1e
-MD5 (xemacs/edit-utils-1.45-pkg.tar.gz) = b541b5c1f63f69a32864d609fbb4ead9
-MD5 (xemacs/efs-1.16-pkg.tar.gz) = c04ecaf45f6e090b8f0bdcb6ce7a04ab
+MD5 (xemacs/edit-utils-1.47-pkg.tar.gz) = db5985c901721eac65e6ff9126df20f5
+MD5 (xemacs/efs-1.19-pkg.tar.gz) = db531e86ba8ac4c48d9dadbd868e245a
 MD5 (xemacs/fsf-compat-1.07-pkg.tar.gz) = c6c353c516ce02153e93348768589b47
 MD5 (xemacs/hm--html-menus-1.14-pkg.tar.gz) = 92bcfc9112da3c16f3b922576c79facc
 MD5 (xemacs/ispell-1.18-pkg.tar.gz) = 11ae38e4e89498a44502fe596a9cd563
-MD5 (xemacs/mail-lib-1.28-pkg.tar.gz) = bef2f5542871e820f0f0bcd918fd3676
+MD5 (xemacs/mail-lib-1.29-pkg.tar.gz) = 38798e07bb63350135477fcb046e97f0
 MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 69807743b44a35a99eb03054642d8a25
 MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
-MD5 (xemacs/os-utils-1.19-pkg.tar.gz) = 9202c67fdd110d546c2d6ae96a16ee4e
-MD5 (xemacs/pcl-cvs-1.41-pkg.tar.gz) = 86e3b1e6bbb60931c31ba0d98162da26
-MD5 (xemacs/prog-modes-1.23-pkg.tar.gz) = 108b0bdbecc0b648e27a5760572e283e
+MD5 (xemacs/os-utils-1.20-pkg.tar.gz) = ae25336b47085f86f3ff73542d848a0e
+MD5 (xemacs/pcl-cvs-1.46-pkg.tar.gz) = 41bb10c9a91773fe5a3971ea6e1e635b
+MD5 (xemacs/prog-modes-1.25-pkg.tar.gz) = ebd814c93af479a3dc0fdf6f86d89b74
 MD5 (xemacs/ps-print-nomule-1.03-pkg.tar.gz) = 4656fbaccd48ab097d791b03e9f40f76
-MD5 (xemacs/psgml-1.15-pkg.tar.gz) = 3f7835cf7f2e891a731179a698473a16
+MD5 (xemacs/psgml-1.16-pkg.tar.gz) = eaa4104c2d688962519b72976252283f
 MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 4761323697a995beb53896f350c3f3d6
 MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
-MD5 (xemacs/texinfo-1.18-pkg.tar.gz) = ddfced14a51de83ce4db4d5036538124
-MD5 (xemacs/text-modes-1.22-pkg.tar.gz) = 969a6a4b259153b17365c68dda516ce0
+MD5 (xemacs/texinfo-1.19-pkg.tar.gz) = 1b0835a00f1d3d5772e251a23368e98e
+MD5 (xemacs/text-modes-1.25-pkg.tar.gz) = 3db7095b4b378f222e6d21f6f9483f98
 MD5 (xemacs/time-1.09-pkg.tar.gz) = fe670ec58c71b6720e97af24f2fb9893
-MD5 (xemacs/vc-1.22-pkg.tar.gz) = 203309aa4378cc3fce8eff5f7b8ac622
-MD5 (xemacs/viper-1.18-pkg.tar.gz) = 66c988d8f43927d2998ba4bad4ce36b1
+MD5 (xemacs/vc-1.23-pkg.tar.gz) = 238c499b5cdd6ad6a19b682a4a3d7fb2
+MD5 (xemacs/viper-1.20-pkg.tar.gz) = 87306b858388bb7f36b17c41b049b1d4
 MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
-MD5 (xemacs/xemacs-base-1.37-pkg.tar.gz) = 08ae3bd521b19cfa59cd80a9892f2656
-MD5 (xemacs/xemacs-devel-1.25-pkg.tar.gz) = 521f5b549326278261ec1d2dd293dd65
+MD5 (xemacs/xemacs-base-1.39-pkg.tar.gz) = 8c0a2ab3855712e4c3771c83b63a9aa3
+MD5 (xemacs/xemacs-devel-1.26-pkg.tar.gz) = 91c111d1997128ddb323530383750eb3
diff --git a/editors/xemacs-packages/pkg-comment b/editors/xemacs-packages/pkg-comment
index 890d7e97d0bb..b9b465ef359a 100644
--- a/editors/xemacs-packages/pkg-comment
+++ b/editors/xemacs-packages/pkg-comment
@@ -1 +1 @@
-Common elisp packages for xemacs 21
+Basic XEmacs elisp packages(basic)
diff --git a/editors/xemacs-packages/pkg-descr b/editors/xemacs-packages/pkg-descr
index 5059f576405a..212291496213 100644
--- a/editors/xemacs-packages/pkg-descr
+++ b/editors/xemacs-packages/pkg-descr
@@ -2,8 +2,9 @@ Starting with release 21, xemacs does not come with lisp packages
 any more. Instead, they are distributed separately from the main
 sources.
 
-This port attempts to provide a subset of the available packages that
-should be useful for most users.
+    This port provides a basic package for XEmacs(version over 21). which
+contains basically needed packages in usual working at XEmacs provided by
+xemacs.org(www.xemacs.org).
 
-To install additional packages, use the "Manage Packages" menu
-in the "Options" menu of your xemacs' menubar.
+To install other categories' packages, use editors/xemacs-*-packages
+ports/packages.
diff --git a/editors/xemacs-packages/pkg-plist b/editors/xemacs-packages/pkg-plist
index 4a6579c82edf..097dad44f57f 100644
--- a/editors/xemacs-packages/pkg-plist
+++ b/editors/xemacs-packages/pkg-plist
@@ -77,6 +77,9 @@ lib/xemacs/xemacs-packages/etc/hm--html-menus/templates/command-description.html
 lib/xemacs/xemacs-packages/etc/hm--html-menus/templates/frame.html.tmpl
 lib/xemacs/xemacs-packages/etc/psgml/CATALOG
 lib/xemacs/xemacs-packages/etc/psgml/ECAT
+lib/xemacs/xemacs-packages/etc/psgml/HTML3.2.decl
+lib/xemacs/xemacs-packages/etc/psgml/HTML4.01.decl
+lib/xemacs/xemacs-packages/etc/psgml/HTML4.decl
 lib/xemacs/xemacs-packages/etc/psgml/HTMLlat1.ent
 lib/xemacs/xemacs-packages/etc/psgml/HTMLspecial.ent
 lib/xemacs/xemacs-packages/etc/psgml/HTMLsymbol.ent
@@ -108,53 +111,33 @@ lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOnum
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOpub
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/ISOtech
 lib/xemacs/xemacs-packages/etc/psgml/ISO_8879-1986/entities/Numeric_and_Special_Graphic
-lib/xemacs/xemacs-packages/etc/psgml/ISOlat1.sgml
 lib/xemacs/xemacs-packages/etc/psgml/README.cdtd
-lib/xemacs/xemacs-packages/etc/psgml/README.htmlpro
-lib/xemacs/xemacs-packages/etc/psgml/Wing.ISOlat1.sgml
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-2
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3-r
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3.2
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-3.2f
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4l
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-hj
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-mcom
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4.01frame
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4.01s
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4frame
+lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-4s
 lib/xemacs/xemacs-packages/etc/psgml/cdtd/html-r
-lib/xemacs/xemacs-packages/etc/psgml/cdtd/iehtml
-lib/xemacs/xemacs-packages/etc/psgml/html-0.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-0s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-1.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-1s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-2.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.2.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-3.2f.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-3s.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01frame.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01l.dtd
+lib/xemacs/xemacs-packages/etc/psgml/html-4.01s.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4frame.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4l.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-4s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-cougar.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-hj.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-hjs.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-icons.sgml
 lib/xemacs/xemacs-packages/etc/psgml/html-latin.sgml
 lib/xemacs/xemacs-packages/etc/psgml/html-math.sgml
-lib/xemacs/xemacs-packages/etc/psgml/html-mcom.dtd
-lib/xemacs/xemacs-packages/etc/psgml/html-mcoms.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html-s.dtd
 lib/xemacs/xemacs-packages/etc/psgml/html.decl
 lib/xemacs/xemacs-packages/etc/psgml/html.dtd
-lib/xemacs/xemacs-packages/etc/psgml/htmlpro.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie30-s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie30.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ie3tables.dtd
-lib/xemacs/xemacs-packages/etc/psgml/iehtml-s.dtd
-lib/xemacs/xemacs-packages/etc/psgml/iehtml.dtd
-lib/xemacs/xemacs-packages/etc/psgml/ietables.dtd
 lib/xemacs/xemacs-packages/etc/psgml/iso88591.map
-lib/xemacs/xemacs-packages/etc/psgml/sinfo.dtd
-lib/xemacs/xemacs-packages/etc/psgml/webtechs.catalog
+lib/xemacs/xemacs-packages/etc/psgml/structures.dtd
 lib/xemacs/xemacs-packages/etc/time/0.xpm
 lib/xemacs/xemacs-packages/etc/time/1.xpm
 lib/xemacs/xemacs-packages/etc/time/2.xpm
@@ -768,8 +751,6 @@ lib/xemacs/xemacs-packages/lisp/efs/efs-ti-twenex.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-ti-twenex.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-tops-20.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-tops-20.elc
-lib/xemacs/xemacs-packages/lisp/efs/efs-vm.el
-lib/xemacs/xemacs-packages/lisp/efs/efs-vm.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-vms.el
 lib/xemacs/xemacs-packages/lisp/efs/efs-vms.elc
 lib/xemacs/xemacs-packages/lisp/efs/efs-vos.el
@@ -958,16 +939,23 @@ lib/xemacs/xemacs-packages/lisp/pcl-cvs/auto-autoloads.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/auto-autoloads.elc
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/custom-load.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/custom-load.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/dired-cvs.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/dired-cvs.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/generic-sc.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/generic-sc.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-bindings.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-bindings.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-buffer.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-buffer.elc
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-xemacs.el
-lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-xemacs.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-compat.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-compat.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-edit.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-edit.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-log.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-log.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-status.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/cvs-status.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/easy-mmode.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-defs.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-defs.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-info.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-info.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-parse.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-parse.elc
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-util.el
+lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs-util.elc
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs.el
 lib/xemacs/xemacs-packages/lisp/pcl-cvs/pcl-cvs.elc
 lib/xemacs/xemacs-packages/lisp/prog-modes/ChangeLog
@@ -1064,8 +1052,6 @@ lib/xemacs/xemacs-packages/lisp/psgml/psgml-html.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-html.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-info.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-info.elc
-lib/xemacs/xemacs-packages/lisp/psgml/psgml-other.el
-lib/xemacs/xemacs-packages/lisp/psgml/psgml-other.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-parse.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-parse.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-xemacs.el
@@ -1498,7 +1484,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.viper
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.w3
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-base
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
-@unexec rmdir %D/lib/xemacs/xemacs-packages/pkginfo 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/man/w3
 @dirrm lib/xemacs/xemacs-packages/man/viper
 @dirrm lib/xemacs/xemacs-packages/man/psgml
@@ -1509,7 +1494,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/man/efs
 @dirrm lib/xemacs/xemacs-packages/man/cc-mode
 @dirrm lib/xemacs/xemacs-packages/man/auctex
-@unexec rmdir %D/lib/xemacs/xemacs-packages/man 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/lisp/xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/xemacs-base
 @dirrm lib/xemacs/xemacs-packages/lisp/w3
@@ -1539,8 +1523,6 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/c-support
 @dirrm lib/xemacs/xemacs-packages/lisp/auctex
 @dirrm lib/xemacs/xemacs-packages/lisp/apel
-@unexec rmdir %D/lib/xemacs/xemacs-packages/lisp 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages/info 2>/dev/null || true
 @dirrm lib/xemacs/xemacs-packages/etc/w3
 @dirrm lib/xemacs/xemacs-packages/etc/time
 @dirrm lib/xemacs/xemacs-packages/etc/psgml/cdtd
@@ -1552,6 +1534,3 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/etc/hm--html-menus
 @dirrm lib/xemacs/xemacs-packages/etc/auctex/style
 @dirrm lib/xemacs/xemacs-packages/etc/auctex
-@unexec rmdir %D/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
-@unexec rmdir %D/lib/xemacs 2>/dev/null || true
diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile
index 9efad8989a13..566d605a00df 100644
--- a/editors/xemacs21-mule-common/Makefile
+++ b/editors/xemacs21-mule-common/Makefile
@@ -13,8 +13,6 @@
 #	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
 #	MULE_COMMON       : COMMON port if defined
 #	MULE_SLAVE        : SLAVE port if defined
-#	PKGLDIR           : Local PKGDIR of editors/xemacs${XEMACS_MAJOR_VER}-mule
-#                           (that is editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg)
 #	SITE_INCLUDES     : site include path(configure arguments)
 #	SITE_LIBRARIES    : site libraries path(configure arguments)
 #	WITH_INPUT_METHOD : input methods(configure arguments)
@@ -51,6 +49,9 @@ CONFIGURE_ARGS=	--with-x11 \
 		--x-libraries=${X11BASE}/lib
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
+
+PKGDIR=		${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule-common/pkg
+
 INSTALL_TARGET=	install-arch-indep
 PLIST=		${PKGDIR}/PLIST
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER}
diff --git a/editors/xemacs21-mule-common/files/DESCR.tmpl b/editors/xemacs21-mule-common/files/DESCR.tmpl
index 4d857e1ab88d..10f90be633ce 100644
--- a/editors/xemacs21-mule-common/files/DESCR.tmpl
+++ b/editors/xemacs21-mule-common/files/DESCR.tmpl
@@ -1,8 +1,8 @@
 This is XEmacs lisp files, info pages, and so on (except executables)
 for XEmacs with Mule(version %%XEMACS_VER%%), the next generation of Emacs. 
 
-You must install one of packages, xemacs-mule-%%XEMACS_REL%%,
-ja-xemacs-*-%%XEMACS_REL%% (ja-xemacs-canna-%%XEMACS_REL%%, ja-xemacs-canna+wnn4-%%XEMACS_REL%%, etc.),
+You must install one of packages, xemacs-mule-%%XEMACS_VER%%,
+ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+wnn4-%%XEMACS_VER%%, etc.),
 each of which contains only the executables for XEmacs with Mule(vresion %%XEMACS_VER%%).
 
 This package and the above package of the executables *will* clobber any
diff --git a/editors/xemacs21-mule-common/files/INSTALL.tmpl b/editors/xemacs21-mule-common/files/INSTALL.tmpl
index 74bf72412e05..0fa358204930 100644
--- a/editors/xemacs21-mule-common/files/INSTALL.tmpl
+++ b/editors/xemacs21-mule-common/files/INSTALL.tmpl
@@ -2,6 +2,6 @@
 if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
 echo "################################################################"
 echo "You must install one of packages, xemacs-mule and "
-echo " ja-xemacs-*-%%XEMACS_REL%% (ja-xemacs-%%XEMACS_REL%%, ja-xemacs-canna-%%XEMACS_REL%%, etc.)"
+echo " ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-%%XEMACS_VER%%, ja-xemacs-canna-%%XEMACS_VER%%, etc.)"
 echo ", each of which contains only the executables for XEmacs(version %%XEMACS_VER%%)"
 echo "################################################################"
diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index 30eb00ab1707..7a8c079f2e6b 100644
--- a/editors/xemacs21-mule-common/pkg-descr
+++ b/editors/xemacs21-mule-common/pkg-descr
@@ -1,9 +1,9 @@
 This is XEmacs lisp files, info pages, and so on (except executables)
-for XEmacs with Mule(version 21.1.9), the next generation of Emacs. 
+for XEmacs with Mule(version 21.1.10), the next generation of Emacs. 
 
-You must install one of packages, xemacs-mule-21.1,
-ja-xemacs-*-21.1 (ja-xemacs-canna-21.1, ja-xemacs-canna+wnn4-21.1, etc.),
-each of which contains only the executables for XEmacs with Mule(vresion 21.1.9).
+You must install one of packages, xemacs-mule-21.1.10,
+ja-xemacs-*-21.1.10 (ja-xemacs-canna-21.1.10, ja-xemacs-canna+wnn4-21.1.10, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.10).
 
 This package and the above package of the executables *will* clobber any
 existing XEmacs installation.  In particular, the executables and man
diff --git a/editors/xemacs21-mule-common/pkg-install b/editors/xemacs21-mule-common/pkg-install
index f50fc365f2a9..053667e8e29a 100644
--- a/editors/xemacs21-mule-common/pkg-install
+++ b/editors/xemacs21-mule-common/pkg-install
@@ -2,6 +2,6 @@
 if [ "$2" != "POST-INSTALL" ]; then exit 0; fi
 echo "################################################################"
 echo "You must install one of packages, xemacs-mule and "
-echo " ja-xemacs-*-21.1 (ja-xemacs-21.1, ja-xemacs-canna-21.1, etc.)"
-echo ", each of which contains only the executables for XEmacs(version 21.1.9)"
+echo " ja-xemacs-*-21.1.10 (ja-xemacs-21.1.10, ja-xemacs-canna-21.1.10, etc.)"
+echo ", each of which contains only the executables for XEmacs(version 21.1.10)"
 echo "################################################################"
diff --git a/editors/xemacs21-mule-common/pkg-plist b/editors/xemacs21-mule-common/pkg-plist
index ee3b9e52804d..43a9eac43d2b 100644
--- a/editors/xemacs21-mule-common/pkg-plist
+++ b/editors/xemacs21-mule-common/pkg-plist
@@ -395,7 +395,6 @@ lib/xemacs-%%XEMACS_VER%%/info/cl.info-4
 lib/xemacs-%%XEMACS_VER%%/info/cl.info-5
 lib/xemacs-%%XEMACS_VER%%/info/cl.info-6
 lib/xemacs-%%XEMACS_VER%%/info/custom.info
-lib/xemacs-%%XEMACS_VER%%/info/dir
 lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
 lib/xemacs-%%XEMACS_VER%%/info/info.info
 lib/xemacs-%%XEMACS_VER%%/info/internals.info
@@ -485,6 +484,7 @@ lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-3
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-4
 lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-5
+lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-6
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
 lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-10
diff --git a/editors/xemacs21-mule-sumo/Makefile b/editors/xemacs21-mule-sumo/Makefile
index e89cc034c481..9d5e5690ea87 100644
--- a/editors/xemacs21-mule-sumo/Makefile
+++ b/editors/xemacs21-mule-sumo/Makefile
@@ -5,35 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xemacs-${NAMEPREFIX}sumo
-PORTVERSION=	${XEMACS_REL}
-CATEGORIES+=	editors elisp
-MASTER_SITES=	# empty
-DISTFILES=	# empty
-EXTRACT_ONLY=	# empty
-
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
-
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-sumo-packages \
-		${RUN_DEP_LIST}
-
-NO_BUILD=	yes
-
 XEMACS_MAJOR_VER=	21
-XEMACS_REL=		21.1
-XEMACS_VER=		21.1.10
-XEMACS_ARCH=		${MACHINE_ARCH}--freebsd
-
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMEPREFIX) && (${PKGNAMEPREFIX} == "ja-")
-RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${PKGNAMESUFFIX}
-.else
-RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule
 NAMEPREFIX=		mule-
-.endif
 
-do-install:		# empty
+MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo
 
-.include <bsd.port.post.mk>
+.include	"${MASTERDIR}/Makefile"
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 24d539277495..27de45d493b4 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -12,8 +12,6 @@
 #	MULE_PORT         : Mule port if defined(means COMMN or SLAVE)
 #	MULE_COMMON       : COMMON port if defined
 #	MULE_SLAVE        : SLAVE port if defined
-#	PKGLDIR           : Local PKGDIR of editors/xemacs${XEMACS_MAJOR_VER}-mule
-#                           (that is editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg)
 #	SITE_INCLUDES     : site include path(configure arguments)
 #	SITE_LIBRARIES    : site libraries path(configure arguments)
 #	WITH_INPUT_METHOD : input methods(configure arguments)
@@ -26,14 +24,14 @@ MULE_SLAVE=	yes
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages \
-		${BUILD_INPUT_METHOD}
+#BUILD_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel:${PORTSDIR}/editors/xemacs-packages \
+#		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-basic-mule-packages \
+BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 .if defined(MULE_SLAVE)
 RUN_DEPENDS=	${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule-common \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-basic-mule-packages
 .else
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-packages
+RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-basic-mule-packages
 .endif
 LIB_DEPENDS=	compface.1:${PORTSDIR}/mail/faces \
 		${LIB_INPUT_METHOD}
@@ -70,7 +68,7 @@ STRIP=
 INSTALL_TARGET?=install-arch-dep
 FILESDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/files
 PATCHDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}/patches
-PLIST?=		${PKGLDIR}/PLIST
+PKGDIR?=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg
 
 SLAVEDIRS=	editors/xemacs21-mule-common editors/xemacs21-mule-sumo
 
@@ -81,7 +79,6 @@ DESCR_TMPL?=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-mule/files/DESCR.tmpl
 COMMENT_TEXT?=		XEmacs(version ${XEMACS_MAJOR_VER}) text editor with mule(Only the executables)
 .if defined(MULE_SLAVE)
 BINNAMEEXT=		-mule
-PKGLDIR=		${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-mule/pkg
 SITE_INCLUDES+=		${PREFIX}/include
 SITE_LIBRARIES+=	${PREFIX}/lib
 WITH_INPUT_METHOD?=	--with-canna=no --with-wnn=no --with-wnn6=no
@@ -120,32 +117,41 @@ post-package:
 #
 ## for make PLIST (only maintainer use)
 #arrange::
-#.if (${PKGNAMESUFFIX} == "-mule")||(${PKGNAMESUFFIX} == "-mule-common")
-#	${RM} -f ${PLIST}
 #.if (${PKGNAMESUFFIX} == "-mule")
+#	${RM} -f ${WRKPLIST}
+#	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
 #	${MAKE} DIRRM2RMDIRS="lib/xemacs/mule-packages/etc lib/xemacs/mule-packages lib/xemacs/mule-packages/etc/app-defaults" \
 #		DIRRMDEPTH=2 plist
+#	${RM} -f ${PLIST}.org
 #.endif
-#.if (${PKGNAMESUFFIX} == "-mule-common")
-#	${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" DIRRMDEPTH=1 plist
+#.if ${PKGNAMESUFFIX} == "-mule-common"
+#	${RM} -f ${WRKPLIST}.tmp
+#	if [ -f ${PLIST} ]; then ${MV} ${PLIST} ${PLIST}.org; fi
+#	${TOUCH} ${PLIST}
+#	${MAKE} DIRRM2RMDIRS="lib/xemacs-${XEMACS_VER} etc/rc.d" \
+#		DIRRMDEPTH=1 plist
 #.for dirp in site mule xemacs
 #.for dir in etc info man pkginfo
-#	${ECHO} "@exec mkdir -p %D/lib/xemacs/${dirp}-packages/${dir}" >> ${PLIST}
-#	${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages/${dir} 2>/dev/null || true" >> ${PLIST}
+#	${ECHO} "@exec mkdir -p %D/lib/xemacs/${dirp}-packages/${dir}" >> ${WRKPLIST}.tmp
+#	${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages/${dir} 2>/dev/null || true" >> ${WRKPLIST}.tmp
 #.endfor
-#	${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages 2>/dev/null || true" >> ${PLIST}
+#	${ECHO} "@unexec rmdir %D/lib/xemacs/${dirp}-packages 2>/dev/null || true" >> ${WRKPLIST}.tmp
 #.endfor
-#	${ECHO} "@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock" >> ${PLIST}
-#	${CAT} ${WRKPLIST} >> ${PLIST}
-#	${CHOWN} kiri:staff ${PLIST}
-#.endif
+#	${ECHO} "@exec mkdir -p /var/run/emacs/lock ; chmod 1777 /var/run/emacs/lock" >> ${WRKPLIST}.tmp
+#	${CAT} ${WRKPLIST} >> ${WRKPLIST}.tmp
+#	${MV} ${WRKPLIST}.tmp ${WRKPLIST}
+#	${CHOWN} kiri:staff ${WRKPLIST}
+#	if [ ! -s ${PLIST} ]; then \
+#		${MV} ${WRKPLIST} ${PLIST}; \
+#	fi
+#	${RM} -f ${PLIST}.org
 #.endif
 #
-#.if (${PKGNAMESUFFIX} != "-mule-common")
-#pre-plist:
-#	@${ECHO} "===> pre-plist of ${PKGNAME}"
-#	${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults
-#.endif
+.if ${PKGNAMESUFFIX} != "-mule-common"
+pre-plist:
+	@${ECHO} "===> pre-plist of ${PKGNAME}"
+	${MKDIR} ${PREFIX}/lib/xemacs/mule-packages/etc/app-defaults/ja
+.endif
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}
 
diff --git a/editors/xemacs21-mule/files/DESCR.tmpl b/editors/xemacs21-mule/files/DESCR.tmpl
index 71fc5de290b6..29eb7e59ee17 100644
--- a/editors/xemacs21-mule/files/DESCR.tmpl
+++ b/editors/xemacs21-mule/files/DESCR.tmpl
@@ -1,7 +1,7 @@
 This is a package containing only the executables for XEmacs with
 Mule(version %%XEMACS_VER%%), the next generation of Emacs.
 
-You need to install a package, xemacs-common-%%XEMACS_REL%%, containing emacs
+You need to install a package, xemacs-common-%%XEMACS_VER%%, containing emacs
 lisp files, info pages, and so on (except executables) for
 XEmacs with Mule(version %%XEMACS_VER%%).
 
@@ -10,7 +10,7 @@ already built-in Imput Method - SKK and SJ3.  If you want other built-in
 input method, look into the xemacs ports in language- specific directories.
 Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
 
-This package and the package, xemacs-common-%%XEMACS_REL%% are designed
+This package and the package, xemacs-common-%%XEMACS_VER%% are designed
 *not* to clobber any existing emacs installation.  In particular, the
 executables and man pages of etags/ctags are not installed, and the
 info pages that come with the original emacs don't get installed too.
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index 650ed8d32c4c..119cd11d7588 100644
--- a/editors/xemacs21-mule/pkg-descr
+++ b/editors/xemacs21-mule/pkg-descr
@@ -1,16 +1,16 @@
 This is a package containing only the executables for XEmacs with
-Mule(version 21.1.9), the next generation of Emacs.
+Mule(version 21.1.10), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1, containing emacs
+You need to install a package, xemacs-common-21.1.10, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.9).
+XEmacs with Mule(version 21.1.10).
 
 This package is not built with any particular language support except for
 already built-in Imput Method - SKK and SJ3.  If you want other built-in
 input method, look into the xemacs ports in language- specific directories.
 Currently only Japanese (Canna,Wnn4 and Wnn6) is available.
 
-This package and the package, xemacs-common-21.1 are designed
+This package and the package, xemacs-common-21.1.10 are designed
 *not* to clobber any existing emacs installation.  In particular, the
 executables and man pages of etags/ctags are not installed, and the
 info pages that come with the original emacs don't get installed too.
diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index e89cc034c481..62a45deb15dc 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   Meta port of XEmacs mule with sumo package
+# New ports collection makefile for:   Meta port of XEmacs with sumo package
 # Date created:        19 August 1999
 # Whom:                KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
@@ -6,17 +6,23 @@
 #
 
 PORTNAME=	xemacs-${NAMEPREFIX}sumo
-PORTVERSION=	${XEMACS_REL}
-CATEGORIES+=	editors elisp
+PORTVERSION=	${XEMACS_VER}
+CATEGORIES=	editors
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
-RUN_DEPENDS=	${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-sumo-packages \
-		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.skk:${PORTSDIR}/editors/xemacs-mule-sumo-packages \
+.if defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-" || \
+	defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} != ""
+RUN_DEPENDS=	${LOCALBASE}/share/doc/xemacs-additional-packages:${PORTSDIR}/editors/xemacs-additional-packages \
+		${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.leim:${PORTSDIR}/editors/xemacs-mule-packages \
 		${RUN_DEP_LIST}
+.else
+RUN_DEPENDS=	${LOCALBASE}/share/doc/xemacs-additional-packages:${PORTSDIR}/editors/xemacs-additional-packages \
+		${RUN_DEP_LIST}
+.endif
 
 NO_BUILD=	yes
 
@@ -25,15 +31,17 @@ XEMACS_REL=		21.1
 XEMACS_VER=		21.1.10
 XEMACS_ARCH=		${MACHINE_ARCH}--freebsd
 
+do-install:		# empty
+
 .include <bsd.port.pre.mk>
 
-.if defined(PKGNAMEPREFIX) && (${PKGNAMEPREFIX} == "ja-")
+.if defined(PKGNAMEPREFIX) && ${PKGNAMEPREFIX} == "ja-"
 RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/japanese/xemacs${XEMACS_MAJOR_VER}${PKGNAMESUFFIX}
-.else
+.elif defined(NAMEPREFIX) && ${NAMEPREFIX} == "mule-"
 RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}-mule
 NAMEPREFIX=		mule-
+.else
+RUN_DEP_LIST=		${LOCALBASE}/lib/xemacs-${XEMACS_VER}/${XEMACS_ARCH}/config.values:${PORTSDIR}/editors/xemacs${XEMACS_MAJOR_VER}
 .endif
 
-do-install:		# empty
-
 .include <bsd.port.post.mk>
diff --git a/editors/xemacs21-sumo/pkg-comment b/editors/xemacs21-sumo/pkg-comment
index b3108fb03250..7e0724b12229 100644
--- a/editors/xemacs21-sumo/pkg-comment
+++ b/editors/xemacs21-sumo/pkg-comment
@@ -1 +1 @@
-The "meta-port" for XEmacs Mule with SUMO packages
+The "meta-port" for XEmacs with SUMO packages
diff --git a/editors/xemacs21-sumo/pkg-descr b/editors/xemacs21-sumo/pkg-descr
index 48ca1e9e8f17..fad3a4ce8939 100644
--- a/editors/xemacs21-sumo/pkg-descr
+++ b/editors/xemacs21-sumo/pkg-descr
@@ -1,11 +1,14 @@
-This port is for XEmacs environment using XEmacs mule ports and 
-Mule SUMO packages. 
+This port is for XEmacs environment using XEmacs ports and Mule SUMO
+packages. `SUMO package would be made by installing xemacs-packages and
+xemacs-additonal-packages(for Mule SUMO xemacs-basic-mule-packages and
+xemacs-mule-packages in addition).
 
-This package is built with Multilingual Imput Methods. Especially, Japanese
-input is supported by using SKK, SJ3, Canna, Wnn4 or Wnn6 as an external
-input engine . Each input method would be supported in following ports
-respectively:
+Each package except for xemacs21-sumo is built with Multilingual Imput
+Methods. Especially, Japanese input is supported by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine . Each input method would be
+supported in following ports respectively:
 
+	editors/xemacs21-sumo ............... No input method supports
 	editors/xemacs21-mule-sumo .......... SKK, SJ3
 	japanese/xemacs21-sumo-canna ........ SKK, SJ3, Canna
 	japanese/xemacs21-sumo-canna+wnn4 ... SKK, SJ3, Canna, Wnn4