summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/mule/Makefile8
-rw-r--r--editors/xemacs-devel-mule/Makefile7
-rw-r--r--japanese/emacs-emcws/Makefile3
-rw-r--r--japanese/emacs20-dl-wnn6/Makefile3
-rw-r--r--japanese/emacs20-emcws/Makefile4
-rw-r--r--japanese/emacs21-emcws/Makefile3
-rw-r--r--japanese/xemacs21-canna/Makefile7
7 files changed, 22 insertions, 13 deletions
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 8d2f031f547c..34217491897d 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mule
PORTVERSION= ${MULE_VERSION}
PKGNAMESUFFIX= ${INPUT_METHOD}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= editors
MASTER_SITES= ftp://ftp.m17n.org/pub/mule/ \
ftp://ftp.jaist.ac.jp/pub/GNU/mule/ \
@@ -80,15 +80,15 @@ WITH_INPUT_METHOD+= --with-sj3
.if !defined(FREEWNN) && !defined(CFREEWNN) && !defined(KFREEWNN)
.if defined(WNN6)
INPUT_METHOD+= wnn6
-LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
WITH_INPUT_METHOD+= --with-wnn6 --with-wnn-libraries=${LOCALBASE}/lib \
--with-wnn-includes=${LOCALBASE}/include/wnn6/wnn
.elif defined(WNN7)
# mule 2.3 cannot use Wnn7SDK (Wnn7-lib)
-# so it uses Wnn6SDK (Wnn6-lib) instead of Wnn7SDK.
+# so it should use Wnn6SDK (Wnn6-lib) instead of Wnn7SDK.
# But it can partly support Wnn7 by ${PREFIX}/share/mule/19.34/lisp/eggrc-wnn
INPUT_METHOD+= wnn7
-LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
WITH_INPUT_METHOD+= --with-wnn6=-lwnn6 --with-wnn-libraries=${LOCALBASE}/lib \
--with-wnn-includes=${LOCALBASE}/include/wnn6/wnn
.endif
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index eb2e77a67c77..8214e3aacba4 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -7,6 +7,9 @@
PORTNAME= xemacs-devel-mule
PORTVERSION= ${XEMACS_VER}
+.if defined(WNN6)
+PORTREVISION= 1
+.endif
CATEGORIES+= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@@ -140,7 +143,7 @@ PKGNAMESUFFIX= -canna+wnn6
SITE_INCLUDES= ${LOCALBASE}/include/wnn6
WITH_INPUT_METHOD= --with-canna --with-wnn6
LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna \
- wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+ wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.elif defined(FREEWNN)
PKGNAMESUFFIX= -freewnn
WITH_INPUT_METHOD= --with-wnn --with-canna=no --with-wnn6=no
@@ -149,7 +152,7 @@ LIB_INPUT_METHOD= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib
PKGNAMESUFFIX= -wnn6
SITE_INCLUDES= ${LOCALBASE}/include/wnn6
WITH_INPUT_METHOD= --with-wnn6 --with-canna=no
-LIB_INPUT_METHOD= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.elif defined(CANNA)
PKGNAMESUFFIX= -canna
WITH_INPUT_METHOD= --with-canna --with-wnn=no --with-wnn6=no
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 3bad004c6767..c720bb75114e 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emcws
PORTVERSION= 21.2
+PORTREVISION= 1
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -47,7 +48,7 @@ CONFIGURE_ARGS= --with-x=no --with-pop
.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
+LIB_DEPENDS+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.endif
.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 959b377c55b1..a2e6359b5913 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -7,13 +7,14 @@
PORTNAME= emacs20-dl-wnn6
PORTVERSION= 0.3.6
+PORTREVISION= 1
CATEGORIES= japanese editors
MASTER_SITES= http://tokuda-www.cs.titech.ac.jp/~katsuya/emacs/
DISTNAME= dl-wnn-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
-LIB_DEPENDS= wnn6.1:${.CURDIR}/../../japanese/Wnn6-lib
+LIB_DEPENDS= wnn6.2:${.CURDIR}/../../japanese/Wnn6-lib
BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
autoconf:${PORTSDIR}/devel/autoconf \
${NONEXISTENT}:${EMACSDL_DIR}:configure
diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile
index 4bfc685d95cd..5f5295bed3d7 100644
--- a/japanese/emacs20-emcws/Makefile
+++ b/japanese/emacs20-emcws/Makefile
@@ -8,7 +8,7 @@
PORTNAME= emcws
PORTVERSION= 20.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -49,7 +49,7 @@ CONFIGURE_ARGS= --with-x=no --with-pop
.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
+LIB_DEPENDS+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.endif
.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile
index 3bad004c6767..c720bb75114e 100644
--- a/japanese/emacs21-emcws/Makefile
+++ b/japanese/emacs21-emcws/Makefile
@@ -7,6 +7,7 @@
PORTNAME= emcws
PORTVERSION= 21.2
+PORTREVISION= 1
CATEGORIES= japanese editors ipv6
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
@@ -47,7 +48,7 @@ CONFIGURE_ARGS= --with-x=no --with-pop
.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
+LIB_DEPENDS+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
.endif
.if (${WITH_FREEWNN} == "yes" || ${WITH_FREEWNN} == "YES")
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index a48e004a3abb..777c380c7514 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -20,6 +20,9 @@
# BUILD_INPUT_METHOD: BUILD_DEPENDS list of Input Methods
# WITH_XIM : X Input Method(configure arguments), xlib or motif
+.if defined(WNN6)
+PORTREVISION= 1
+.endif
CATEGORIES= japanese
MANLANG= ja
@@ -40,7 +43,7 @@ PKGNAMESUFFIX= -canna+wnn6
SITE_INCLUDES= ${LOCALBASE}/include/wnn6
WITH_INPUT_METHOD= --with-canna --with-wnn6
LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna \
- wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+ wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support
.elif defined(FREEWNN)
PKGNAMESUFFIX= -freewnn
@@ -51,7 +54,7 @@ COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK an
PKGNAMESUFFIX= -wnn6
SITE_INCLUDES= ${LOCALBASE}/include/wnn6
WITH_INPUT_METHOD= --with-wnn6 --with-canna=no
-LIB_INPUT_METHOD= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib
+LIB_INPUT_METHOD= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib
COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn6 support
.else
PKGNAMESUFFIX= -canna