5 files changed, 60 insertions, 6 deletions

diff --git a/MOVED b/MOVED
index 5c9d29983a2c..c73e507e20f6 100644
--- a/MOVED
+++ b/MOVED
@@ -1387,7 +1387,6 @@ french/daCode||2005-02-18|port depended on removed port
 games/kpacman||2005-02-18|port was broken or obsolete
 graphics/ruby-libexif||2005-02-18|port was broken or obsolete
 japanese/postgresql||2005-02-18|port was broken or obsolete
-japanese/xemacs-devel-canna||2005-02-18|port was broken or obsolete
 korean/hlatex-wansung||2005-02-18|port was broken or obsolete
 korean/hlatex-psfonts-wansung||2005-02-18|port was broken or obsolete
 korean/nhppf||2005-02-18|port was broken or obsolete
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 1e79cc173d67..833b3d7eec2e 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -80,11 +80,6 @@ ALL_TARGET=	all dist
 .if defined(PKGNAMEPREFIX)
 INSTALL_TARGET=	install-arch-dep
 PLIST=		${PKGDIR}/pkg-plist.arch-dep
-.if ${PKGNAMEPREFIX} == "ja-"
-DESCR=		${PKGDIR}/pkg-descr.ja
-MANLANG=	ja
-MAN1=		xemacs.1
-.endif
 .else
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
@@ -173,6 +168,15 @@ CONFIGURE_ARGS+=	--with-canna=no --with-wnn=no --with-wnn6=no
 SITE_INCLUDES+=		${LOCALBASE}/include
 SITE_LIBRARIES+=	${LOCALBASE}/lib
 
+.if defined(CANNA)
+PLIST_FILES+=		lib/xemacs-%%XEMACS_VER%%/lisp/mule/canna-leim.elc
+.endif
+.if defined(PKGNAMEPREFIX)
+.if ${PKGNAMEPREFIX} == "ja-"
+PLIST_FILES+=		man/ja/man1/xemacs.1
+.endif
+.endif
+
 # fix .so references in a few man pages
 pre-configure::
 .for f in etc/ctags.1 etc/gnuattach.1 etc/gnuclient.1 etc/gnudoit.1
diff --git a/japanese/Makefile b/japanese/Makefile
index b1a91256a04f..704bca2c477e 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -405,6 +405,7 @@
     SUBDIR += xemacs-devel-canna+wnn6
     SUBDIR += xemacs-devel-freewnn
     SUBDIR += xemacs-devel-wnn6
+    SUBDUR += xemacs21-canna
     SUBDIR += xjman
     SUBDIR += xjman-3
     SUBDIR += xjtext
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
new file mode 100644
index 000000000000..4c52bfa0eb53
--- /dev/null
+++ b/japanese/xemacs21-canna/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	XEmacs for Japanese
+# Date created:		5 Dec 1997
+# Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+#
+# $FreeBSD$
+#
+
+CATEGORIES=	japanese
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	XEmacs(stable version) text editor(SJ3, SKK and Canna)
+
+MASTERDIR=	${.CURDIR}/../../editors/xemacs21-mule
+
+CANNA=		yes
+
+DESCR=		${.CURDIR}/pkg-descr
+
+.include	"${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs21-canna/pkg-descr b/japanese/xemacs21-canna/pkg-descr
new file mode 100644
index 000000000000..b058150a1008
--- /dev/null
+++ b/japanese/xemacs21-canna/pkg-descr
@@ -0,0 +1,31 @@
+This is a package containing only the executables for XEmacs with
+Mule(version 21.1.14), the next generation of 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.14).
+
+This package is built with Japanese support by using SKK, SJ3, Canna,
+Wnn4 or Wnn6 as an external input engine. Each input method would be
+supported in following ports respectively:
+
+	japanese/xemacs21-canna ........ SKK, SJ3, Canna
+	japanese/xemacs21-canna+wnn4 ... SKK, SJ3, Canna, Wnn4
+	japanese/xemacs21-canna+wnn6 ... SKK, SJ3, Canna, Wnn6
+	japanese/xemacs21-wnn4 ......... SKK, SJ3, Wnn4
+	japanese/xemacs21-wnn6 ......... SKK, SJ3, Wnn6
+
+If you use with SJ3 or SKK, you should be installed sj3serv or skkserv
+in advance. SKK is supported as already builtin. Also it will
+support several input methods under leim. 
+
+This package and the package xemacs-common-21.1.14, might clobber any
+existing emacs installation.  In particular, the executables and man
+pages of etags/ctags are installed, and the info pages that come with
+the original emacs will be overwritten too.
+
+Although this shouldn't cause any problems to run both mule and emacs,
+it may cause some confusion when one of them is pkg_delete'd.  If
+someone has a solution to this, please tell me.
+Or to avoid this problem, you could select prefix for top install
+directory. By default it is pointed to the usual place, /usr/local.