6 files changed, 13 insertions, 12 deletions

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