7 files changed, 13 insertions, 0 deletions
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index a5999e04132f..2b2cb56629b9 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -193,6 +193,13 @@ LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
 .else
 CONFIGURE_ARGS+=	--with-canna=no --with-wnn=no --with-wnn6=no
 .endif
+
+.if defined(CANNA)
+PLIST_SUB+=		CANNA=""
+.else
+PLIST_SUB+=		CANNA="@comment "
+.endif
+
 SITE_INCLUDES+=		${LOCALBASE}/include
 SITE_LIBRARIES+=	${LOCALBASE}/lib
 
diff --git a/editors/xemacs-devel-mule/pkg-plist b/editors/xemacs-devel-mule/pkg-plist
index ed4a027040a9..acad3206728e 100644
--- a/editors/xemacs-devel-mule/pkg-plist
+++ b/editors/xemacs-devel-mule/pkg-plist
@@ -847,6 +847,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/mmencode
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.el
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.elc
 %%WITH_PGSQL%%lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/postgresql.ell
+%%CANNA%%lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/canna_api.ell
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/movemail
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/profile
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/rcs2log
diff --git a/editors/xemacs-devel-mule/pkg-plist.arch-dep b/editors/xemacs-devel-mule/pkg-plist.arch-dep
index 4a240f7aa89b..9d817ea16c1e 100644
--- a/editors/xemacs-devel-mule/pkg-plist.arch-dep
+++ b/editors/xemacs-devel-mule/pkg-plist.arch-dep
@@ -396,6 +396,7 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/mmencode
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.el
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/auto-autoloads.elc
 %%WITH_PGSQL%%lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/postgresql.ell
+%%CANNA%%lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/modules/canna_api.ell
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/movemail
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/profile
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/rcs2log
diff --git a/japanese/xemacs-devel-canna+freewnn/Makefile b/japanese/xemacs-devel-canna+freewnn/Makefile
index 4239749dfce3..0974e69835ec 100644
--- a/japanese/xemacs-devel-canna+freewnn/Makefile
+++ b/japanese/xemacs-devel-canna+freewnn/Makefile
@@ -7,6 +7,7 @@
 
 CATEGORIES=	japanese
 
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XEmacs(beta version) text editor(SJ3, SKK, Canna and FreeWnn)
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
diff --git a/japanese/xemacs-devel-canna+wnn6/Makefile b/japanese/xemacs-devel-canna+wnn6/Makefile
index 7f29e8efd232..d9b02f5e37eb 100644
--- a/japanese/xemacs-devel-canna+wnn6/Makefile
+++ b/japanese/xemacs-devel-canna+wnn6/Makefile
@@ -7,6 +7,7 @@
 
 CATEGORIES=	japanese
 
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XEmacs(beta version) text editor(SJ3, SKK, Canna and Wnn6)
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
diff --git a/japanese/xemacs-devel-freewnn/Makefile b/japanese/xemacs-devel-freewnn/Makefile
index 6efc73f82a93..17d1aac60e17 100644
--- a/japanese/xemacs-devel-freewnn/Makefile
+++ b/japanese/xemacs-devel-freewnn/Makefile
@@ -7,6 +7,7 @@
 
 CATEGORIES=	japanese
 
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XEmacs(beta version) text editor(SJ3, SKK and FreeWnn)
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
diff --git a/japanese/xemacs-devel-wnn6/Makefile b/japanese/xemacs-devel-wnn6/Makefile
index f7deb910f575..b0129a31fb8e 100644
--- a/japanese/xemacs-devel-wnn6/Makefile
+++ b/japanese/xemacs-devel-wnn6/Makefile
@@ -7,6 +7,7 @@
 
 CATEGORIES=	japanese
 
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XEmacs(beta version) text editor(SJ3, SKK and Wnn6)
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule