6 files changed, 19 insertions, 12 deletions

diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr
index 693523b2f6a6..ae3f4a6efe70 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.13), the next generation of Emacs. 
+for XEmacs with Mule(version 21.1.14), the next generation of Emacs. 
 
-You must install one of packages, xemacs-mule-21.1.13,
-ja-xemacs-*-21.1.13 (ja-xemacs-canna-21.1.13, ja-xemacs-canna+freewnn-21.1.13, etc.),
-each of which contains only the executables for XEmacs with Mule(vresion 21.1.13).
+You must install one of packages, xemacs-mule-21.1.14,
+ja-xemacs-*-21.1.14 (ja-xemacs-canna-21.1.14, ja-xemacs-canna+freewnn-21.1.14, etc.),
+each of which contains only the executables for XEmacs with Mule(vresion 21.1.14).
 
 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 b504f078e985..8a86c6bb0ebb 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.13 (ja-xemacs-21.1.13, ja-xemacs-canna-21.1.13, etc.)"
-echo ", each of which contains only the executables for XEmacs(version 21.1.13)"
+echo " ja-xemacs-*-21.1.14 (ja-xemacs-21.1.14, ja-xemacs-canna-21.1.14, etc.)"
+echo ", each of which contains only the executables for XEmacs(version 21.1.14)"
 echo "################################################################"
diff --git a/editors/xemacs21-mule-common/pkg-plist b/editors/xemacs21-mule-common/pkg-plist
index 0d27096de826..af843bb6f67e 100644
--- a/editors/xemacs21-mule-common/pkg-plist
+++ b/editors/xemacs21-mule-common/pkg-plist
@@ -711,10 +711,14 @@ lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.el
 lib/xemacs-%%XEMACS_VER%%/lisp/msw-select.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/arabic.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/auto-autoloads.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/chinese.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.el
+lib/xemacs-%%XEMACS_VER%%/lisp/mule/custom-load.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.el
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/cyrillic.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/mule/english.el
@@ -935,6 +939,8 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-sun.elc
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.el
 lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
+lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.el
+lib/xemacs-%%XEMACS_VER%%/lisp/xpm-button.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index b39024d5980c..add8c3ff6445 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -23,7 +23,7 @@
 MULE_SLAVE=	yes
 .endif
 
-MAINTAINER=	kiri@FreeBSD.org
+MAINTAINER?=	kiri@FreeBSD.org
 
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 .if defined(MULE_SLAVE)
@@ -43,6 +43,7 @@ CONFIGURE_ARGS?=--with-x11 \
 		--x-libraries=${X11BASE}/lib \
 		--site-libraries='${SITE_LIBRARIES}' \
 		--site-includes='${SITE_INCLUDES}' \
+		--gung-ho=yes \
 		--with-xface \
 		--with-xpm \
 		--with-sound=native \
diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr
index b5d9d108a1e7..abbc959fa130 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.13), the next generation of Emacs.
+Mule(version 21.1.14), the next generation of Emacs.
 
-You need to install a package, xemacs-common-21.1.13, containing emacs
+You need to install a package, xemacs-common-21.1.14, containing emacs
 lisp files, info pages, and so on (except executables) for
-XEmacs with Mule(version 21.1.13).
+XEmacs with Mule(version 21.1.14).
 
 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, FreeWnn and Wnn6) is available.
 
-This package and the package, xemacs-common-21.1.13 are designed
+This package and the package, xemacs-common-21.1.14 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 5f6b4e21a586..94f4b72d7bf8 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -28,7 +28,7 @@ NO_BUILD=	yes
 
 XEMACS_MAJOR_VER=	21
 XEMACS_REL=		21.1
-XEMACS_VER=		21.1.13
+XEMACS_VER=		21.1.14
 XEMACS_ARCH=		${MACHINE_ARCH}--freebsd
 
 do-install:		# empty