summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--japanese/emacs-emcws/Makefile13
-rw-r--r--japanese/emacs-emcws/files/emcws-message3
-rw-r--r--japanese/emacs21-emcws/Makefile13
-rw-r--r--japanese/emacs21-emcws/files/emcws-message3
4 files changed, 24 insertions, 8 deletions
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index e3eb6a20fa46..e38af331ee5d 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emcws
PORTVERSION= 21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -31,7 +31,8 @@ USE_GMAKE= YES
EMACS_VER= 21.2
# Change these as you like.
-WITH_WNN6?= YES
+WITH_WNN6?= NO
+WITH_WNN7?= YES
WITH_FREEWNN?= NO
WITH_CANNA?= YES
WITH_SJ3?= NO
@@ -51,6 +52,12 @@ CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
LIB_DEPENDS+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.endif
+.if (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES")
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn7/wnn \
+ --with-wnn-libraries=${LOCALBASE}/lib/libwnn7.so
+LIB_DEPENDS+= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
+.endif
+
.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
@@ -93,7 +100,7 @@ EMCWS_ELCS= busyu.el \
wnn-client.el \
wnn-egg.el
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
EMCWS_ELCS+= egg.elc \
wnn-egg.elc
PLIST_SUB+= WITH_WNN=""
diff --git a/japanese/emacs-emcws/files/emcws-message b/japanese/emacs-emcws/files/emcws-message
index 01d8c23960e3..68c78f22f1e4 100644
--- a/japanese/emacs-emcws/files/emcws-message
+++ b/japanese/emacs-emcws/files/emcws-message
@@ -4,11 +4,12 @@
You can define which input method you use with following variables.
WITH_WNN6 to use Wnn6
+ WITH_WNN7 to use Wnn7
WITH_FREEWNN to use FreeWnn
WITH_CANNA to use Canna
WITH_SJ3 to use sj3
- In default, WITH_WNN6 and WITH_CANNA are set.
+ In default, WITH_WNN7 and WITH_CANNA are set.
If you want to use Emcws with Canna and FreeWnn, run
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index e3eb6a20fa46..e38af331ee5d 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -7,7 +7,7 @@
PORTNAME= emcws
PORTVERSION= 21.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -31,7 +31,8 @@ USE_GMAKE= YES
EMACS_VER= 21.2
# Change these as you like.
-WITH_WNN6?= YES
+WITH_WNN6?= NO
+WITH_WNN7?= YES
WITH_FREEWNN?= NO
WITH_CANNA?= YES
WITH_SJ3?= NO
@@ -51,6 +52,12 @@ CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn \
LIB_DEPENDS+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.endif
+.if (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES")
+CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn7/wnn \
+ --with-wnn-libraries=${LOCALBASE}/lib/libwnn7.so
+LIB_DEPENDS+= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
+.endif
+
.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
CONFIGURE_ARGS+=--with-wnn --with-wnn-includes=${LOCALBASE}/include/wnn \
--with-wnn-libraries=${LOCALBASE}/lib/libwnn.so
@@ -93,7 +100,7 @@ EMCWS_ELCS= busyu.el \
wnn-client.el \
wnn-egg.el
-.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
+.if (${WITH_WNN6} == "yes" || ${WITH_WNN6} == "YES") || (${WITH_WNN7} == "yes" || ${WITH_WNN7} == "YES") || (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
EMCWS_ELCS+= egg.elc \
wnn-egg.elc
PLIST_SUB+= WITH_WNN=""
diff --git a/japanese/emacs21-emcws/files/emcws-message b/japanese/emacs21-emcws/files/emcws-message
index 01d8c23960e3..68c78f22f1e4 100644
--- a/japanese/emacs21-emcws/files/emcws-message
+++ b/japanese/emacs21-emcws/files/emcws-message
@@ -4,11 +4,12 @@
You can define which input method you use with following variables.
WITH_WNN6 to use Wnn6
+ WITH_WNN7 to use Wnn7
WITH_FREEWNN to use FreeWnn
WITH_CANNA to use Canna
WITH_SJ3 to use sj3
- In default, WITH_WNN6 and WITH_CANNA are set.
+ In default, WITH_WNN7 and WITH_CANNA are set.
If you want to use Emcws with Canna and FreeWnn, run