diff options
30 files changed, 134 insertions, 104 deletions
diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr index 1d41b8d72f83..4651007d9da4 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna, SJ3 and FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-message b/japanese/kinput2-canna+freewnn+sj3/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-message +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr index 54e8cefe3d88..a5b04b4e2743 100644 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ b/japanese/kinput2-canna+freewnn/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna and FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+freewnn/pkg-message b/japanese/kinput2-canna+freewnn/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+freewnn/pkg-message +++ b/japanese/kinput2-canna+freewnn/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr index 45dcfd3e5d4d..8bd834355fba 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna, SJ3 and Wnn6. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-message b/japanese/kinput2-canna+sj3+wnn6/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn6/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr index 3f7762536ed3..1e594b091714 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr @@ -5,10 +5,12 @@ 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). Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna, SJ3 and Wnn7(temporary). - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-message b/japanese/kinput2-canna+sj3+wnn7/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-message +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr index a146abeda772..85e48e72e1bc 100644 --- a/japanese/kinput2-canna+wnn6/pkg-descr +++ b/japanese/kinput2-canna+wnn6/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna and Wnn6. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+wnn6/pkg-message b/japanese/kinput2-canna+wnn6/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+wnn6/pkg-message +++ b/japanese/kinput2-canna+wnn6/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr index 7ba92820e636..f28abfbf3fd3 100644 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ b/japanese/kinput2-canna+wnn7/pkg-descr @@ -5,10 +5,12 @@ 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). Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Canna and Wnn7(temporary). - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-canna+wnn7/pkg-message b/japanese/kinput2-canna+wnn7/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-canna+wnn7/pkg-message +++ b/japanese/kinput2-canna+wnn7/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr index ca22c0552ccb..4c220b044cb9 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ b/japanese/kinput2-freewnn+sj3/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports SJ3 and FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn+sj3/pkg-message b/japanese/kinput2-freewnn+sj3/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-message +++ b/japanese/kinput2-freewnn+sj3/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile index 4d6e69987024..75d795f105c6 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -7,6 +7,7 @@ PORTNAME= kinput2 PORTVERSION= 3.1 +PORTREVISION= 1 PKGNAMESUFFIX= ${INPUT_METHOD} CATEGORIES= japanese x11 MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ diff --git a/japanese/kinput2-freewnn/files/patch-kinput2.ad b/japanese/kinput2-freewnn/files/patch-kinput2.ad new file mode 100644 index 000000000000..ac578576b9fa --- /dev/null +++ b/japanese/kinput2-freewnn/files/patch-kinput2.ad @@ -0,0 +1,14 @@ +--- cmd/Kinput2.ad.orig Tue May 20 14:13:43 2003 ++++ cmd/Kinput2.ad Tue May 20 14:14:46 2003 +@@ -34,7 +34,10 @@ + !! + !*CcWnn.Jserver: "primary-jserver-host" + !*CcWnn.jserver2nd: "secondary-jserver-host-if-any" +-*CcWnn.ccdef: ccdef.kinput2 ++!!! Uncomment below if you like legacy key bindings ++!*CcWnn.ccdef: ccdef.kinput2 ++!!! Anc comment below if you like legacy key bindings ++*CcWnn.ccdef: ccdef.kinput2.egg + !*CcWnn.wnnEnvrc4: "wnenvrc-file-for-Wnn4" + !*CcWnn.wnnEnvrc6: "wnenvrc-file-for-Wnn6" + !! diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr index 431e87fb6c34..854c74764bbe 100644 --- a/japanese/kinput2-freewnn/pkg-descr +++ b/japanese/kinput2-freewnn/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn/pkg-message b/japanese/kinput2-freewnn/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-freewnn/pkg-message +++ b/japanese/kinput2-freewnn/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr index 1e9f736e0490..faf88acc108c 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-descr +++ b/japanese/kinput2-sj3+wnn6/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports SJ3 and Wnn6. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-sj3+wnn6/pkg-message b/japanese/kinput2-sj3+wnn6/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-sj3+wnn6/pkg-message +++ b/japanese/kinput2-sj3+wnn6/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr index 472ed8a3085c..5d8ace8f9f06 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ b/japanese/kinput2-sj3+wnn7/pkg-descr @@ -5,10 +5,12 @@ 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). Those looking for egg-key-binding -other than default binding, try as follows: +The port supports SJ3 and Wnn7(temporary). - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-sj3+wnn7/pkg-message b/japanese/kinput2-sj3+wnn7/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-message +++ b/japanese/kinput2-sj3+wnn7/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr index d9c1725ef34c..8792ae535f27 100644 --- a/japanese/kinput2-wnn6/pkg-descr +++ b/japanese/kinput2-wnn6/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports Wnn6. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2-wnn6/pkg-message b/japanese/kinput2-wnn6/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-wnn6/pkg-message +++ b/japanese/kinput2-wnn6/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr index f1d157d88efc..9d4883276e17 100644 --- a/japanese/kinput2-wnn7/pkg-descr +++ b/japanese/kinput2-wnn7/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. Note: Current wnn7 support on kinput2 is done by backward-compatibility with wnn6, and you need to add following line to ${WNNENVRC} diff --git a/japanese/kinput2-wnn7/pkg-message b/japanese/kinput2-wnn7/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2-wnn7/pkg-message +++ b/japanese/kinput2-wnn7/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 4d6e69987024..75d795f105c6 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -7,6 +7,7 @@ PORTNAME= kinput2 PORTVERSION= 3.1 +PORTREVISION= 1 PKGNAMESUFFIX= ${INPUT_METHOD} CATEGORIES= japanese x11 MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ diff --git a/japanese/kinput2/files/patch-kinput2.ad b/japanese/kinput2/files/patch-kinput2.ad new file mode 100644 index 000000000000..ac578576b9fa --- /dev/null +++ b/japanese/kinput2/files/patch-kinput2.ad @@ -0,0 +1,14 @@ +--- cmd/Kinput2.ad.orig Tue May 20 14:13:43 2003 ++++ cmd/Kinput2.ad Tue May 20 14:14:46 2003 +@@ -34,7 +34,10 @@ + !! + !*CcWnn.Jserver: "primary-jserver-host" + !*CcWnn.jserver2nd: "secondary-jserver-host-if-any" +-*CcWnn.ccdef: ccdef.kinput2 ++!!! Uncomment below if you like legacy key bindings ++!*CcWnn.ccdef: ccdef.kinput2 ++!!! Anc comment below if you like legacy key bindings ++*CcWnn.ccdef: ccdef.kinput2.egg + !*CcWnn.wnnEnvrc4: "wnenvrc-file-for-Wnn4" + !*CcWnn.wnnEnvrc6: "wnenvrc-file-for-Wnn6" + !! diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 431e87fb6c34..854c74764bbe 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -5,10 +5,12 @@ 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. Those looking for egg-key-binding -other than default binding, try as follows: +The port supports FreeWnn. - % kinput2 -ccdef ccdef.kinput2.egg +(NOTICE) +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/kinput2/pkg-message b/japanese/kinput2/pkg-message index 97668d99055e..9c2af0932879 100644 --- a/japanese/kinput2/pkg-message +++ b/japanese/kinput2/pkg-message @@ -1,7 +1,5 @@ ############################################################ -If you want to use Egg key binding on kinput2, then -you should run - -kinput2 -ccdef ccdef.kinput2.egg - +Default key-binding is changed to "egg" key-binding by defining +*CcWnn.ccdef: ccdef.kinput2.egg +in ${X11BASE}/lib/X11/app-defaults/Kinput2. ############################################################" |