diff options
68 files changed, 86 insertions, 1033 deletions
@@ -3622,3 +3622,18 @@ net/isc-dhcp3-relay|net/isc-dhcp30-relay|2008-10-13|Swap to multiple versions net/isc-dhcp3-client|net/isc-dhcp30-client|2008-10-13|Swap to multiple versions japanese/sj3|japanese/sj3-server|2008-10-26|Renamed for -server/-lib separation japanese/Canna|japanese/canna-server|2008-10-26|Renamed for -server/-lib separation +japanese/kinput2-canna|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+freewnn|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+freewnn+sj3|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+sj3|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+sj3+wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+sj3+wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-canna+wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-freewnn|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-freewnn+sj3|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-sj3|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-sj3+wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-sj3+wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-wnn6|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 +japanese/kinput2-wnn7|japanese/kinput2|2008-10-26|Integrated into japanese/kinput2 diff --git a/japanese/Makefile b/japanese/Makefile index fe3ce84ec785..72f8ac51dfcd 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -143,21 +143,7 @@ SUBDIR += kde3-i18n SUBDIR += kde4-l10n SUBDIR += kdrill - SUBDIR += kinput2-canna - SUBDIR += kinput2-canna+freewnn - SUBDIR += kinput2-canna+freewnn+sj3 - SUBDIR += kinput2-canna+sj3 - SUBDIR += kinput2-canna+sj3+wnn6 - SUBDIR += kinput2-canna+sj3+wnn7 - SUBDIR += kinput2-canna+wnn6 - SUBDIR += kinput2-canna+wnn7 - SUBDIR += kinput2-freewnn - SUBDIR += kinput2-freewnn+sj3 - SUBDIR += kinput2-sj3 - SUBDIR += kinput2-sj3+wnn6 - SUBDIR += kinput2-sj3+wnn7 - SUBDIR += kinput2-wnn6 - SUBDIR += kinput2-wnn7 + SUBDIR += kinput2 SUBDIR += kochi-ttfonts SUBDIR += koffice-i18n SUBDIR += kon2-14dot diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile deleted file mode 100644 index c067bc27326e..000000000000 --- a/japanese/kinput2-canna+freewnn+sj3/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: kinput2-canna+freewnn+sj3 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+FreeWnn+SJ3) - -CANNA= yes -SJ3= yes -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr deleted file mode 100644 index b41f3d63dfee..000000000000 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-plist b/japanese/kinput2-canna+freewnn+sj3/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile deleted file mode 100644 index 4da165aea453..000000000000 --- a/japanese/kinput2-canna+freewnn/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-canna+freewnn -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+FreeWnn) - -CANNA= yes -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr deleted file mode 100644 index cd4770a4b9b6..000000000000 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+freewnn/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+freewnn/pkg-plist b/japanese/kinput2-canna+freewnn/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-canna+freewnn/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile deleted file mode 100644 index b78948ea98a7..000000000000 --- a/japanese/kinput2-canna+sj3+wnn6/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: kinput2-canna+sj3+wnn6 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+SJ3+Wnn6) - -CANNA= yes -SJ3= yes -WNN6= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-descr b/japanese/kinput2-canna+sj3+wnn6/pkg-descr deleted file mode 100644 index 46f66c433fb8..000000000000 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn6/pkg-plist b/japanese/kinput2-canna+sj3+wnn6/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-canna+sj3+wnn6/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile deleted file mode 100644 index 9bed3653aef6..000000000000 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: kinput2-canna+sj3+wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+SJ3+Wnn7) - -CANNA= yes -SJ3= yes -WNN7= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr deleted file mode 100644 index dbacade34437..000000000000 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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). - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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} - file or /usr/local/lib/wnn7/ja_JP/wnnenvrc: - - boin_kabusoku FALSE - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-message b/japanese/kinput2-canna+sj3+wnn7/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-plist b/japanese/kinput2-canna+sj3+wnn7/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile deleted file mode 100644 index 3c620962f1ec..000000000000 --- a/japanese/kinput2-canna+sj3/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-canna+sj3 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+SJ3) - -CANNA= yes -SJ3= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3/pkg-descr b/japanese/kinput2-canna+sj3/pkg-descr deleted file mode 100644 index 94507af3fc60..000000000000 --- a/japanese/kinput2-canna+sj3/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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 SJ3. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+sj3/pkg-plist b/japanese/kinput2-canna+sj3/pkg-plist deleted file mode 100644 index fcf369c86424..000000000000 --- a/japanese/kinput2-canna+sj3/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile deleted file mode 100644 index 8a0f348434af..000000000000 --- a/japanese/kinput2-canna+wnn6/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-canna+wnn6 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+Wnn6) - -CANNA= yes -WNN6= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn6/pkg-descr b/japanese/kinput2-canna+wnn6/pkg-descr deleted file mode 100644 index 6a7d6f5251bf..000000000000 --- a/japanese/kinput2-canna+wnn6/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+wnn6/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+wnn6/pkg-plist b/japanese/kinput2-canna+wnn6/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-canna+wnn6/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile deleted file mode 100644 index e615bfa1b85b..000000000000 --- a/japanese/kinput2-canna+wnn7/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-canna+wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna+Wnn7) - -CANNA= yes -WNN7= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr deleted file mode 100644 index 0332b23ae2ff..000000000000 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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). - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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} - file or /usr/local/lib/wnn7/ja_JP/wnnenvrc: - - boin_kabusoku FALSE - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna+wnn7/pkg-message b/japanese/kinput2-canna+wnn7/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-canna+wnn7/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-canna+wnn7/pkg-plist b/japanese/kinput2-canna+wnn7/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-canna+wnn7/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile deleted file mode 100644 index d390bbad0bb2..000000000000 --- a/japanese/kinput2-canna/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: kinput2-canna -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Canna) - -CANNA= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna/pkg-descr b/japanese/kinput2-canna/pkg-descr deleted file mode 100644 index 4f4c0093aea8..000000000000 --- a/japanese/kinput2-canna/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-canna/pkg-plist b/japanese/kinput2-canna/pkg-plist deleted file mode 100644 index c59e2dbc395e..000000000000 --- a/japanese/kinput2-canna/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile deleted file mode 100644 index f4cced2d2ed3..000000000000 --- a/japanese/kinput2-freewnn+sj3/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-freewnn+sj3 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (FreeWnn+SJ3) - -SJ3= yes -FREEWNN= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr deleted file mode 100644 index 15822ed3229a..000000000000 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-freewnn+sj3/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-freewnn+sj3/pkg-plist b/japanese/kinput2-freewnn+sj3/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-freewnn+sj3/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile deleted file mode 100644 index 94a37933b61a..000000000000 --- a/japanese/kinput2-freewnn/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# New ports collection makefile for: kinput2-freewnn -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= kinput2 -PORTVERSION= 3.1 -PORTREVISION= 3 -PKGNAMESUFFIX= ${INPUT_METHOD} -CATEGORIES= japanese x11 -MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ -DISTNAME= kinput2-v3.1 - -MAINTAINER= ports@FreeBSD.org -COMMENT?= Input server of Japanese text (FreeWnn) - -LIB_DEPENDS= ${LIB_INPUT_METHOD} -BUILD_DEPENDS= ${BUILD_INPUT_METHOD} - -PATCHDIR= ${.CURDIR}/../kinput2-freewnn/files -FILESDIR= ${.CURDIR}/../kinput2-freewnn/files -USE_IMAKE= yes -MAN1= kinput2.1 - -.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) -# For this port -FREEWNN= yes -.endif -# -# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, -# LIB_DEPENDS, etc. -.if defined(CANNA) -INPUT_METHOD+= canna -LIB_INPUT_METHOD+= canna16.1:${PORTSDIR}/japanese/Canna -KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \ - -Dport_CANNALIB="-L${LOCALBASE}/lib -lcanna16" -.endif -.if defined(SJ3) -INPUT_METHOD+= sj3 -BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 -KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \ - -Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" -.endif -.if defined(FREEWNN) -INPUT_METHOD+= freewnn -LIB_INPUT_METHOD+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib -KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \ - -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt" -.elif defined(WNN6) -INPUT_METHOD+= wnn6 -LIB_INPUT_METHOD+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib -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+= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib -KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ - -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt" -.endif -# -# Make a value of INPUT_METHOD -.if defined(INPUT_METHOD) -INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' -.endif -# -# Redefine $(IMAKE_CMD) with $(PORT_IMAKE_DEFINES) in ${WRKSRC}/Kinput2.conf -MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}' - -pre-configure: - if [ -f ${WRKSRC}/Kinput2.conf ]; then \ - ${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org; \ - fi - ${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf - -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} - -post-install: -# For FreeWnn or Wnn6 - @if [ -e ${PKGMESSAGE} ]; then \ - ${CAT} ${PKGMESSAGE}; \ - fi - -.include <bsd.port.mk> diff --git a/japanese/kinput2-freewnn/distinfo b/japanese/kinput2-freewnn/distinfo deleted file mode 100644 index 6ce1e0959ef6..000000000000 --- a/japanese/kinput2-freewnn/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (kinput2-v3.1.tar.gz) = 2de20576f150248d1fdfe66d7cc4e510 -SHA256 (kinput2-v3.1.tar.gz) = 2815c35181f9e9b866fb6e7f3d9bb8814b98312aad703ce5c7560d449eb60a9a -SIZE (kinput2-v3.1.tar.gz) = 512177 diff --git a/japanese/kinput2-freewnn/files/Kinput2.conf b/japanese/kinput2-freewnn/files/Kinput2.conf deleted file mode 100644 index c7c714ad1dae..000000000000 --- a/japanese/kinput2-freewnn/files/Kinput2.conf +++ /dev/null @@ -1,22 +0,0 @@ -XCOMM Each parameter in this file is explained in the original -XCOMM Kinput2.conf (probably Kinput2.conf.org) - -XCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka) - -IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES) - -CCDEF_DIR = $(LIBDIR)/ccdef - -WNNSRC = port_WNNSRC -WNNINCDIR = port_WNNINCDIR -WNNLIB = port_WNNLIB - -CANNAINSTDIR = port_CANNAINSTDIR -CANNASRC = port_CANNASRC -CANNALIB = port_CANNALIB - -SJ3DEF_DIR = $(LIBDIR)/sj3def -SJ3SRC = port_SJ3SRC -SJ3LIB = port_SJ3LIB - -TRANSPORTDEFS = diff --git a/japanese/kinput2-freewnn/files/patch-kinput2.ad b/japanese/kinput2-freewnn/files/patch-kinput2.ad deleted file mode 100644 index ac578576b9fa..000000000000 --- a/japanese/kinput2-freewnn/files/patch-kinput2.ad +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/files/patch-lib::imlib::imconv.c b/japanese/kinput2-freewnn/files/patch-lib::imlib::imconv.c deleted file mode 100644 index bfe8aefa01ae..000000000000 --- a/japanese/kinput2-freewnn/files/patch-lib::imlib::imconv.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/imlib/imconv.c.orig Thu Oct 3 18:35:30 2002 -+++ lib/imlib/imconv.c Tue Jun 3 01:34:56 2003 -@@ -591,6 +591,9 @@ - } - } - IMFinishRequest(conn, offset); -+#ifdef STATUS_SYNC -+ IMFlush(conn); -+#endif /* STATUS_SYNC */ - } - - /*- preeditCaret: do actual preedit caret -*/ diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr deleted file mode 100644 index 79685f615bf3..000000000000 --- a/japanese/kinput2-freewnn/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-freewnn/pkg-message b/japanese/kinput2-freewnn/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-freewnn/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-freewnn/pkg-plist b/japanese/kinput2-freewnn/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-freewnn/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile deleted file mode 100644 index 4f750a646a21..000000000000 --- a/japanese/kinput2-sj3+wnn6/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-sj3+wnn6 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (SJ3+Wnn6) - -SJ3= yes -WNN6= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3+wnn6/pkg-descr b/japanese/kinput2-sj3+wnn6/pkg-descr deleted file mode 100644 index 88693fea9b94..000000000000 --- a/japanese/kinput2-sj3+wnn6/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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 deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-sj3+wnn6/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-sj3+wnn6/pkg-plist b/japanese/kinput2-sj3+wnn6/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-sj3+wnn6/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile deleted file mode 100644 index 29ab4215616b..000000000000 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: kinput2-sj3+wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (SJ3+Wnn7) - -SJ3= yes -WNN7= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr deleted file mode 100644 index e43f241ab5da..000000000000 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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). - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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} - file or /usr/local/lib/wnn7/ja_JP/wnnenvrc: - - boin_kabusoku FALSE - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-sj3+wnn7/pkg-message b/japanese/kinput2-sj3+wnn7/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-sj3+wnn7/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-sj3+wnn7/pkg-plist b/japanese/kinput2-sj3+wnn7/pkg-plist deleted file mode 100644 index 07c646e27094..000000000000 --- a/japanese/kinput2-sj3+wnn7/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile deleted file mode 100644 index b3da940db5d7..000000000000 --- a/japanese/kinput2-sj3/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: kinput2-sj3 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (SJ3) - -SJ3= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3/pkg-descr b/japanese/kinput2-sj3/pkg-descr deleted file mode 100644 index 1eb9fe8a7e3c..000000000000 --- a/japanese/kinput2-sj3/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-sj3/pkg-plist b/japanese/kinput2-sj3/pkg-plist deleted file mode 100644 index fcf369c86424..000000000000 --- a/japanese/kinput2-sj3/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/sj3def/sjhk -lib/X11/sj3def/sjrc -lib/X11/sj3def/sjrk -lib/X11/sj3def/sjsb -lib/X11/sj3def/sjzh -@dirrm lib/X11/sj3def diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile deleted file mode 100644 index 3e69d339e99a..000000000000 --- a/japanese/kinput2-wnn6/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: kinput2-wnn6 -# Date created: 19 Dec 1997 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Wnn6) - -WNN6= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn6/pkg-descr b/japanese/kinput2-wnn6/pkg-descr deleted file mode 100644 index e8850b307bca..000000000000 --- a/japanese/kinput2-wnn6/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-wnn6/pkg-message b/japanese/kinput2-wnn6/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-wnn6/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-wnn6/pkg-plist b/japanese/kinput2-wnn6/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-wnn6/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile deleted file mode 100644 index 1bd39bc180e2..000000000000 --- a/japanese/kinput2-wnn7/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: kinput2-wnn7 -# Date created: 01/07/18 -# Whom: Satoshi TAOKA <taoka@FreeBSD.org> -# -# $FreeBSD$ -# - -COMMENT= Input server of Japanese text (Wnn7) - -WNN7= yes - -MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ -PKGDIR= ${.CURDIR} - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr deleted file mode 100644 index 698a281997ab..000000000000 --- a/japanese/kinput2-wnn7/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Kinput2 is an Japanese text input server for X11 applications. - -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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/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} - file or /usr/local/lib/wnn7/ja_JP/wnnenvrc: - - boin_kabusoku FALSE - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2-wnn7/pkg-message b/japanese/kinput2-wnn7/pkg-message deleted file mode 100644 index bae202362e2d..000000000000 --- a/japanese/kinput2-wnn7/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -############################################################ -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. -############################################################" diff --git a/japanese/kinput2-wnn7/pkg-plist b/japanese/kinput2-wnn7/pkg-plist deleted file mode 100644 index 89a0c6be133d..000000000000 --- a/japanese/kinput2-wnn7/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/kinput2 -lib/X11/app-defaults/Kinput2 -lib/X11/ccdef/ccdef.kinput2 -lib/X11/ccdef/rule.eggfunc -lib/X11/ccdef/rule.func -lib/X11/ccdef/rule.greek -lib/X11/ccdef/rule.kana -lib/X11/ccdef/rule.kana2 -lib/X11/ccdef/rule.roma -lib/X11/ccdef/rule.wnnroma -lib/X11/ccdef/rule.zascii -lib/X11/ccdef/ccdef.kinput2.egg -lib/X11/ccdef/rule.hiragana.egg -lib/X11/ccdef/rule.katakana.egg -lib/X11/ccdef/rule.kigou.egg -@dirrm lib/X11/ccdef diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 94a37933b61a..379833b160b6 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-freewnn +# New ports collection makefile for: kinput2 # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -7,80 +7,67 @@ PORTNAME= kinput2 PORTVERSION= 3.1 -PORTREVISION= 3 -PKGNAMESUFFIX= ${INPUT_METHOD} +PORTREVISION= 4 CATEGORIES= japanese x11 -MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ -DISTNAME= kinput2-v3.1 +MASTER_SITES= ftp://ftp.sra.co.jp/pub/x11/kinput2/ +DISTNAME= ${PORTNAME}-v${PORTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT?= Input server of Japanese text (FreeWnn) +MAINTAINER= hrs@FreeBSD.org +COMMENT= A Japanese text input server for X11 applications -LIB_DEPENDS= ${LIB_INPUT_METHOD} -BUILD_DEPENDS= ${BUILD_INPUT_METHOD} - -PATCHDIR= ${.CURDIR}/../kinput2-freewnn/files -FILESDIR= ${.CURDIR}/../kinput2-freewnn/files USE_IMAKE= yes +SUB_FILES= Kinput2.conf + MAN1= kinput2.1 -.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) -# For this port -FREEWNN= yes -.endif -# -# Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, -# LIB_DEPENDS, etc. -.if defined(CANNA) -INPUT_METHOD+= canna -LIB_INPUT_METHOD+= canna16.1:${PORTSDIR}/japanese/Canna -KINPUT2_DEF+= -DUseCanna -Dport_CANNASRC=${LOCALBASE}/include \ - -Dport_CANNALIB="-L${LOCALBASE}/lib -lcanna16" -.endif -.if defined(SJ3) -INPUT_METHOD+= sj3 -BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 -KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \ - -Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" -.endif -.if defined(FREEWNN) -INPUT_METHOD+= freewnn -LIB_INPUT_METHOD+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib -KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn \ - -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt" -.elif defined(WNN6) -INPUT_METHOD+= wnn6 -LIB_INPUT_METHOD+= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib -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+= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib -KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ - -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt" -.endif -# -# Make a value of INPUT_METHOD -.if defined(INPUT_METHOD) -INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' -.endif -# -# Redefine $(IMAKE_CMD) with $(PORT_IMAKE_DEFINES) in ${WRKSRC}/Kinput2.conf -MAKE_ENV+= PORT_IMAKE_DEFINES='${KINPUT2_DEF}' +OPTIONS= CANNA "Canna support" on \ + FREEWNN "FreeWnn support " on \ + WNN6 "Wnn6 support" off \ + WNN7 "Wnn7 support" off \ + SJ3 "SJ3 support" on + +LIB_DEPENDS.CANNA= canna16.1:${PORTSDIR}/japanese/canna-lib +CONF.CANNA= '\#define UseCanna' \ + CANNASRC=${LOCALBASE}/include \ + CANNALIB="-L${LOCALBASE}/lib -lcanna16" + +LIB_DEPENDS.WNN6= wnn6.2:${PORTSDIR}/japanese/Wnn6-lib +CONF.WNN6= '\#define UseWnn' \ + '\#define UseWnn6' \ + WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \ + WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt" -pre-configure: - if [ -f ${WRKSRC}/Kinput2.conf ]; then \ - ${MV} -f ${WRKSRC}/Kinput2.conf ${WRKSRC}/Kinput2.conf.org; \ - fi - ${CP} ${FILESDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf +LIB_DEPENDS.WNN7= wnn7.1:${PORTSDIR}/japanese/Wnn7-lib +CONF.WNN7= '\#define UseWnn' \ + '\#define UseWnn6' \ + WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ + WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt" -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} +LIB_DEPENDS.FREEWNN= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +CONF.FREEWNN+= '\#define UseWnn' \ + WNNINCDIR=$(LOCALBASE)/include/wnn \ + WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt" +LIB_DEPENDS.SJ3= sj3lib.1:${PORTSDIR}/japanese/sj3-lib +CONF.SJ3+= '\#define UseSj3' \ + SJ3SRC=${LOCALBASE}/include \ + SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" \ + SJ3DEF_DIR=\$${LIBDIR}/ccdef + +.include <bsd.port.pre.mk> + +.for I in WITH_CANNA WITH_FREEWNN WITH_WNN6 WITH_WNN7 WITH_SJ3 +.if defined(${I}) +LIB_DEPENDS+= ${LIB_DEPENDS.${I:S/^WITH_//}} +BUILD_DEPENDS+= ${BUILD_DEPENDS.${I:S/^WITH_//}} +CONF+= ${CONF.${I:S/^WITH_//}} +PLIST_SUB+= ${I:S/^WITH_//}="" +.else +PLIST_SUB+= ${I:S/^WITH_//}="@comment " +.endif +.endfor -post-install: -# For FreeWnn or Wnn6 - @if [ -e ${PKGMESSAGE} ]; then \ - ${CAT} ${PKGMESSAGE}; \ - fi +pre-configure: apply-slist + ${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf + ${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/kinput2/files/Kinput2.conf b/japanese/kinput2/files/Kinput2.conf deleted file mode 100644 index c7c714ad1dae..000000000000 --- a/japanese/kinput2/files/Kinput2.conf +++ /dev/null @@ -1,22 +0,0 @@ -XCOMM Each parameter in this file is explained in the original -XCOMM Kinput2.conf (probably Kinput2.conf.org) - -XCOMM Redefine $(IMAKE_CMD) for FreeBSD ports (by S. Taoka) - -IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(PORT_IMAKE_DEFINES) - -CCDEF_DIR = $(LIBDIR)/ccdef - -WNNSRC = port_WNNSRC -WNNINCDIR = port_WNNINCDIR -WNNLIB = port_WNNLIB - -CANNAINSTDIR = port_CANNAINSTDIR -CANNASRC = port_CANNASRC -CANNALIB = port_CANNALIB - -SJ3DEF_DIR = $(LIBDIR)/sj3def -SJ3SRC = port_SJ3SRC -SJ3LIB = port_SJ3LIB - -TRANSPORTDEFS = diff --git a/japanese/kinput2/files/Kinput2.conf.in b/japanese/kinput2/files/Kinput2.conf.in new file mode 100644 index 000000000000..5090590e0f34 --- /dev/null +++ b/japanese/kinput2/files/Kinput2.conf.in @@ -0,0 +1,7 @@ +XCOMM $FreeBSD$ + +CCDEF_DIR = $(LIBDIR)/ccdef + +#include "Kinput2_im.conf" + +TRANSPORTDEFS = diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 79685f615bf3..6d6a0c81e38f 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -1,16 +1,5 @@ -Kinput2 is an Japanese text input server for X11 applications. - -A client that require kana-kanji conversion service for Japanese text +Kinput2 is an Japanese text input server for X11 applications. 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. - -(NOTICE) -Default key-binding is changed to "egg" key-binding by defining -*CcWnn.ccdef: ccdef.kinput2.egg -in ${LOCALBASE}/lib/X11/app-defaults/Kinput2. - --- S. Taoka -<taoka@FreeBSD.org> diff --git a/japanese/kinput2/pkg-plist b/japanese/kinput2/pkg-plist index 89a0c6be133d..87665a48dc1b 100644 --- a/japanese/kinput2/pkg-plist +++ b/japanese/kinput2/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/kinput2 lib/X11/app-defaults/Kinput2 lib/X11/ccdef/ccdef.kinput2 @@ -13,4 +14,9 @@ lib/X11/ccdef/ccdef.kinput2.egg lib/X11/ccdef/rule.hiragana.egg lib/X11/ccdef/rule.katakana.egg lib/X11/ccdef/rule.kigou.egg +%%SJ3%%lib/X11/ccdef/sjhk +%%SJ3%%lib/X11/ccdef/sjrc +%%SJ3%%lib/X11/ccdef/sjrk +%%SJ3%%lib/X11/ccdef/sjsb +%%SJ3%%lib/X11/ccdef/sjzh @dirrm lib/X11/ccdef |