4 files changed, 88 insertions, 36 deletions

diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index fc43e9b50c0e..3b3091b752c9 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -30,10 +30,10 @@ USE_GMAKE=	YES
 EMACS_VER=	21.2
 
 # Change these as you like.
-USE_WNN6?=	YES
-USE_FREEWNN?=	NO
-USE_CANNA?=	YES
-USE_SJ3?=	NO
+WITH_WNN6?=	YES
+WITH_FREEWNN?=	NO
+WITH_CANNA?=	YES
+WITH_SJ3?=	NO
 
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if !defined(NO_X11)
@@ -42,30 +42,30 @@ USE_XLIB=	YES
 .else
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
-.if defined(USE_WNN6)
-.if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
+.if defined(WITH_WNN6)
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES")
 CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
 LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 .endif
 .endif
-.if defined(USE_FREEWNN)
-.if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
+.if defined(WITH_FREEWNN)
+.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
 CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
 .endif
-.if defined(USE_CANNA)
-.if (${USE_CANNA} == "yes" || ${USE_CANNA} == "YES")
+.if defined(WITH_CANNA)
+.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
 CONFIGURE_ARGS+=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
 			--with-canna-libraries=${LOCALBASE}/lib
 LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
 .endif
 .endif
-.if defined(USE_SJ3)
-.if (${USE_SJ3} == "yes" || ${USE_SJ3} == "YES")
+.if defined(WITH_SJ3)
+.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
 CONFIGURE_ARGS+=	--with-sj3
 BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3
 .endif
@@ -75,11 +75,9 @@ DOC_FILE=	DOC-EMCWS-${EMACS_VER}.1
 EMCWS_ELCS=	busyu.el \
 		can-n-egg.el \
 		canna.el \
-		canna.elc \
 		egg-jsymbol.el \
 		egg-keymap.el \
 		egg.el \
-		egg.elc \
 		eggrc-sj3 \
 		eggrc-v41 \
 		eggrc-wnn \
@@ -95,8 +93,34 @@ EMCWS_ELCS=	busyu.el \
 		sj3-client.el \
 		sj3-egg.el \
 		wnn-client.el \
-		wnn-egg.el \
+		wnn-egg.el
+
+.if defined(WITH_WNN6) || defined(WITH_FREEWNN)
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
+EMCWS_ELCS+=	egg.elc \
 		wnn-egg.elc
+PLIST_SUB+=	WITH_WNN=""
+.else
+PLIST_SUB+=	WITH_WNN="@comment "
+.endif
+.endif
+.if defined(WITH_CANNA)
+.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
+EMCWS_ELCS+=	canna.elc
+PLIST_SUB+=	WITH_CANNA=""
+.else
+PLIST_SUB+=	WITH_CANNA="@comment "
+.endif
+.endif
+.if defined(WITH_SJ3)
+.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
+EMCWS_ELCS+=	sj3-client.elc \
+		sj3-egg.elc
+PLIST_SUB+=	WITH_SJ3=""
+.else
+PLIST_SUB+=	WITH_SJ3="@comment "
+.endif
+.endif
 
 MULE_PATCHED_ELS=	help.el help.elc \
 			international/ccl.el international/mule-cmds.el \
diff --git a/japanese/emacs-emcws/pkg-plist b/japanese/emacs-emcws/pkg-plist
index 091318cf7f5c..aa09b8165e00 100644
--- a/japanese/emacs-emcws/pkg-plist
+++ b/japanese/emacs-emcws/pkg-plist
@@ -5,11 +5,11 @@ share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
 share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
+%%WITH_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg-jsymbol.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg-keymap.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
+%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
@@ -36,10 +36,12 @@ share/emacs/%%EMACS_VER%%-emcws/lisp/loaddefs.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/loadup.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
+%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
+%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-client.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
+%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
 share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
 @dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index fc43e9b50c0e..3b3091b752c9 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -30,10 +30,10 @@ USE_GMAKE=	YES
 EMACS_VER=	21.2
 
 # Change these as you like.
-USE_WNN6?=	YES
-USE_FREEWNN?=	NO
-USE_CANNA?=	YES
-USE_SJ3?=	NO
+WITH_WNN6?=	YES
+WITH_FREEWNN?=	NO
+WITH_CANNA?=	YES
+WITH_SJ3?=	NO
 
 CONFIGURE_TARGET=	${MACHINE_ARCH}--freebsd
 .if !defined(NO_X11)
@@ -42,30 +42,30 @@ USE_XLIB=	YES
 .else
 CONFIGURE_ARGS=	--with-x=no --with-pop
 .endif
-.if defined(USE_WNN6)
-.if (${USE_WNN6} == "yes" || ${USE_WNN6} == "YES")
+.if defined(WITH_WNN6)
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES")
 CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn6.so
 LIB_DEPENDS+=	wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
 .endif
 .endif
-.if defined(USE_FREEWNN)
-.if (${USE_FREEWNN} == "yes" || ${USE_FREEWNN} == "YES")
+.if defined(WITH_FREEWNN)
+.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
 CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
 		--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
 LIB_DEPENDS+=	wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
 .endif
 .endif
-.if defined(USE_CANNA)
-.if (${USE_CANNA} == "yes" || ${USE_CANNA} == "YES")
+.if defined(WITH_CANNA)
+.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
 CONFIGURE_ARGS+=	--with-canna \
 			--with-canna-includes=${LOCALBASE}/include \
 			--with-canna-libraries=${LOCALBASE}/lib
 LIB_DEPENDS+=		canna.1:${PORTSDIR}/japanese/Canna
 .endif
 .endif
-.if defined(USE_SJ3)
-.if (${USE_SJ3} == "yes" || ${USE_SJ3} == "YES")
+.if defined(WITH_SJ3)
+.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
 CONFIGURE_ARGS+=	--with-sj3
 BUILD_DEPENDS+=		sj3serv:${PORTSDIR}/japanese/sj3
 .endif
@@ -75,11 +75,9 @@ DOC_FILE=	DOC-EMCWS-${EMACS_VER}.1
 EMCWS_ELCS=	busyu.el \
 		can-n-egg.el \
 		canna.el \
-		canna.elc \
 		egg-jsymbol.el \
 		egg-keymap.el \
 		egg.el \
-		egg.elc \
 		eggrc-sj3 \
 		eggrc-v41 \
 		eggrc-wnn \
@@ -95,8 +93,34 @@ EMCWS_ELCS=	busyu.el \
 		sj3-client.el \
 		sj3-egg.el \
 		wnn-client.el \
-		wnn-egg.el \
+		wnn-egg.el
+
+.if defined(WITH_WNN6) || defined(WITH_FREEWNN)
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
+EMCWS_ELCS+=	egg.elc \
 		wnn-egg.elc
+PLIST_SUB+=	WITH_WNN=""
+.else
+PLIST_SUB+=	WITH_WNN="@comment "
+.endif
+.endif
+.if defined(WITH_CANNA)
+.if (${WITH_CANNA} == "yes" || ${WITH_CANNA} == "YES")
+EMCWS_ELCS+=	canna.elc
+PLIST_SUB+=	WITH_CANNA=""
+.else
+PLIST_SUB+=	WITH_CANNA="@comment "
+.endif
+.endif
+.if defined(WITH_SJ3)
+.if (${WITH_SJ3} == "yes" || ${WITH_SJ3} == "YES")
+EMCWS_ELCS+=	sj3-client.elc \
+		sj3-egg.elc
+PLIST_SUB+=	WITH_SJ3=""
+.else
+PLIST_SUB+=	WITH_SJ3="@comment "
+.endif
+.endif
 
 MULE_PATCHED_ELS=	help.el help.elc \
 			international/ccl.el international/mule-cmds.el \
diff --git a/japanese/emacs21-emcws/pkg-plist b/japanese/emacs21-emcws/pkg-plist
index 091318cf7f5c..aa09b8165e00 100644
--- a/japanese/emacs21-emcws/pkg-plist
+++ b/japanese/emacs21-emcws/pkg-plist
@@ -5,11 +5,11 @@ share/emacs/%%EMACS_VER%%-emcws/etc/%%DOC_FILE%%
 share/emacs/%%EMACS_VER%%-emcws/lisp/busyu.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/can-n-egg.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/canna.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
+%%WITH_CANNA%%share/emacs/%%EMACS_VER%%-emcws/lisp/canna.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg-jsymbol.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg-keymap.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
+%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/egg.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-sj3
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-v41
 share/emacs/%%EMACS_VER%%-emcws/lisp/eggrc-wnn
@@ -36,10 +36,12 @@ share/emacs/%%EMACS_VER%%-emcws/lisp/loaddefs.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/loadup.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/mule-inst.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.el
+%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-client.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.el
+%%WITH_SJ3%%share/emacs/%%EMACS_VER%%-emcws/lisp/sj3-egg.elc
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-client.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.el
-share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
+%%WITH_WNN%%share/emacs/%%EMACS_VER%%-emcws/lisp/wnn-egg.elc
 share/emacs/%%EMACS_VER%%-emcws/site-lisp/subdirs.el
 share/emacs/%%EMACS_VER%%-emcws/lisp/subdirs.el
 @dirrm share/emacs/%%EMACS_VER%%-emcws/lisp/its