20 files changed, 117 insertions, 103 deletions
diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr
index de52bb0bdb4e..1d41b8d72f83 100644
--- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr
+++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna, SJ3 and FreeWnn.  Egg key binding is
-avairable, if you run
+The port supports Canna, SJ3 and FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr
index e97c6d1903c2..54e8cefe3d88 100644
--- a/japanese/kinput2-canna+freewnn/pkg-descr
+++ b/japanese/kinput2-canna+freewnn/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna and FreeWnn.  Egg key binding is avairable, if
-you run
+The port supports Canna and FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr
index c936fc0bf0e7..45dcfd3e5d4d 100644
--- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr
+++ b/japanese/kinput2-canna+sj3+wnn6/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna, SJ3 and Wnn6.  Egg key binding is avairable,
-if you run
+The port supports Canna, SJ3 and Wnn6.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr
index b41e5c18b90b..3f7762536ed3 100644
--- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr
+++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr
@@ -1,15 +1,20 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna, SJ3 and Wnn7(temporary).  Egg key binding is avairable,
-if you run
+The port supports Canna, SJ3 and Wnn7(temporary).  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
+
+Note: 	Current wnn7 support on kinput2 is done by backward-compatibility
+	with wnn6, and you need to add following line to ${WNNENVRC}
+	file or /usr/local/lib/wnn7/ja_JP/wnnenvrc:
+
+	boin_kabusoku FALSE
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+sj3/pkg-descr b/japanese/kinput2-canna+sj3/pkg-descr
index b43e9b69c030..94507af3fc60 100644
--- a/japanese/kinput2-canna+sj3/pkg-descr
+++ b/japanese/kinput2-canna+sj3/pkg-descr
@@ -1,10 +1,11 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
-It supports Canna and SJ3.
+The port supports Canna and SJ3.
+
+-- S. Taoka
+<taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr
index 8f1a8a47474b..a146abeda772 100644
--- a/japanese/kinput2-canna+wnn6/pkg-descr
+++ b/japanese/kinput2-canna+wnn6/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna and Wnn6.  Egg key binding is avairable,
-if you run
+The port supports Canna and Wnn6.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr
index 91e40b474a47..7ba92820e636 100644
--- a/japanese/kinput2-canna+wnn7/pkg-descr
+++ b/japanese/kinput2-canna+wnn7/pkg-descr
@@ -1,15 +1,20 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Canna and Wnn7(temporary).  Egg key binding is avairable,
-if you run
+The port supports Canna and Wnn7(temporary).  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
+
+Note: 	Current wnn7 support on kinput2 is done by backward-compatibility
+	with wnn6, and you need to add following line to ${WNNENVRC}
+	file or /usr/local/lib/wnn7/ja_JP/wnnenvrc:
+
+	boin_kabusoku FALSE
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-canna/pkg-descr b/japanese/kinput2-canna/pkg-descr
index 4772ac539b60..4f4c0093aea8 100644
--- a/japanese/kinput2-canna/pkg-descr
+++ b/japanese/kinput2-canna/pkg-descr
@@ -1,10 +1,11 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port was done by NIIMI Satoshi (sa2c@and.or.jp).  It supports
-Canna.
+The port supports Canna.
+
+-- S. Taoka
+<taoka@FreeBSD.org>
diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr
index d8e15352a6fa..ca22c0552ccb 100644
--- a/japanese/kinput2-freewnn+sj3/pkg-descr
+++ b/japanese/kinput2-freewnn+sj3/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports SJ3 and FreeWnn.  Egg key binding is avairable, if
-you run
+The port supports SJ3 and FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 79c6fc68d8e1..e44bc1f475a5 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	kinput2
-PORTVERSION=	3.1.b2
+PORTVERSION=	3.1
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
-DISTNAME=	kinput2-v3.1-beta2
+DISTNAME=	kinput2-v3.1
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -53,9 +53,9 @@ KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn
 			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
 .elif defined(WNN7)
 INPUT_METHOD+=		wnn7
-LIB_INPUT_METHOD+=	wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
+LIB_INPUT_METHOD+=	wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
 KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \
-			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6_for_wnn7 -lcrypt"
+			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt"
 .endif
 #
 # Make a value of INPUT_METHOD
diff --git a/japanese/kinput2-freewnn/distinfo b/japanese/kinput2-freewnn/distinfo
index 73cbe5c75cff..06cd173c4727 100644
--- a/japanese/kinput2-freewnn/distinfo
+++ b/japanese/kinput2-freewnn/distinfo
@@ -1 +1 @@
-MD5 (kinput2-v3.1-beta2.tar.gz) = e327f8d3c86d98f359130cee79ab71a9
+MD5 (kinput2-v3.1.tar.gz) = 2de20576f150248d1fdfe66d7cc4e510
diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr
index 6d9cd7e404f0..431e87fb6c34 100644
--- a/japanese/kinput2-freewnn/pkg-descr
+++ b/japanese/kinput2-freewnn/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports FreeWnn.  Egg key binding is avairable, if you run
+The port supports FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
-
diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr
index 55dce61d0eae..1e9f736e0490 100644
--- a/japanese/kinput2-sj3+wnn6/pkg-descr
+++ b/japanese/kinput2-sj3+wnn6/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports SJ3 and Wnn6.  Egg key binding is avairable,
-if you run
+The port supports SJ3 and Wnn6.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr
index fc580f7d710d..472ed8a3085c 100644
--- a/japanese/kinput2-sj3+wnn7/pkg-descr
+++ b/japanese/kinput2-sj3+wnn7/pkg-descr
@@ -1,15 +1,20 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports SJ3 and Wnn7(temporary).  Egg key binding is avairable,
-if you run
+The port supports SJ3 and Wnn7(temporary).  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
+
+Note: 	Current wnn7 support on kinput2 is done by backward-compatibility
+	with wnn6, and you need to add following line to ${WNNENVRC}
+	file or /usr/local/lib/wnn7/ja_JP/wnnenvrc:
+
+	boin_kabusoku FALSE
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-sj3/pkg-descr b/japanese/kinput2-sj3/pkg-descr
index b101a6e1217f..1eb9fe8a7e3c 100644
--- a/japanese/kinput2-sj3/pkg-descr
+++ b/japanese/kinput2-sj3/pkg-descr
@@ -1,10 +1,11 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port was done by Hidekazu Kuroki (hidekazu@cs.titech.ac.jp).
-It supports SJ3.
+The port supports SJ3.
+
+-- S. Taoka
+<taoka@FreeBSD.org>
diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr
index 71c7ca2a09be..d9c1725ef34c 100644
--- a/japanese/kinput2-wnn6/pkg-descr
+++ b/japanese/kinput2-wnn6/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Wnn6.  Egg key binding is avairable,
-if you run
+The port supports Wnn6.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr
index 89938ea0fb3e..f1d157d88efc 100644
--- a/japanese/kinput2-wnn7/pkg-descr
+++ b/japanese/kinput2-wnn7/pkg-descr
@@ -1,15 +1,20 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports Wnn7(temporary).  Egg key binding is avairable,
-if you run
+The port supports FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
+
+Note: 	Current wnn7 support on kinput2 is done by backward-compatibility
+	with wnn6, and you need to add following line to ${WNNENVRC}
+	file or /usr/local/lib/wnn7/ja_JP/wnnenvrc:
+
+	boin_kabusoku FALSE
 
 -- S. Taoka
 <taoka@FreeBSD.org>
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 79c6fc68d8e1..e44bc1f475a5 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	kinput2
-PORTVERSION=	3.1.b2
+PORTVERSION=	3.1
 PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
-DISTNAME=	kinput2-v3.1-beta2
+DISTNAME=	kinput2-v3.1
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -53,9 +53,9 @@ KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn
 			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
 .elif defined(WNN7)
 INPUT_METHOD+=		wnn7
-LIB_INPUT_METHOD+=	wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
+LIB_INPUT_METHOD+=	wnn7.1:${PORTSDIR}/japanese/Wnn7-lib
 KINPUT2_DEF+=		-DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \
-			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6_for_wnn7 -lcrypt"
+			-Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt"
 .endif
 #
 # Make a value of INPUT_METHOD
diff --git a/japanese/kinput2/distinfo b/japanese/kinput2/distinfo
index 73cbe5c75cff..06cd173c4727 100644
--- a/japanese/kinput2/distinfo
+++ b/japanese/kinput2/distinfo
@@ -1 +1 @@
-MD5 (kinput2-v3.1-beta2.tar.gz) = e327f8d3c86d98f359130cee79ab71a9
+MD5 (kinput2-v3.1.tar.gz) = 2de20576f150248d1fdfe66d7cc4e510
diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr
index 6d9cd7e404f0..431e87fb6c34 100644
--- a/japanese/kinput2/pkg-descr
+++ b/japanese/kinput2/pkg-descr
@@ -1,15 +1,14 @@
-Kinput2 is an input server for X11 applications that want Japanese
-text input.
+Kinput2 is an Japanese text input server for X11 applications.
 
-A client that wants kana-kanji conversion service for Japanese text
+A client that require kana-kanji conversion service for Japanese text
 sends a request to kinput2.  Kinput2 receives the request, does
 kana-kanji conversion, and sends the converted text back to the
 client.
 
-The port supports FreeWnn.  Egg key binding is avairable, if you run
+The port supports FreeWnn.  Those looking for egg-key-binding
+other than default binding, try as follows:
 
-kinput2 -ccdef ccdef.kinput2.egg
+	% kinput2 -ccdef ccdef.kinput2.egg
 
 -- S. Taoka
 <taoka@FreeBSD.org>
-