diff options
110 files changed, 276 insertions, 243 deletions
diff --git a/chinese/Makefile b/chinese/Makefile index ddebaf0..6fdc99f 100644 --- a/chinese/Makefile +++ b/chinese/Makefile @@ -3,7 +3,8 @@ SUBDIR += xmms SUBDIR += CJK - SUBDIR += Wnn + SUBDIR += FreeWnn-lib + SUBDIR += FreeWnn-server SUBDIR += acroread-chsfont SUBDIR += acroread-chtfont SUBDIR += arphicttf @@ -24,7 +25,7 @@ SUBDIR += libtabe SUBDIR += lunar SUBDIR += moettf - SUBDIR += mule-wnn4 + SUBDIR += mule-freewnn SUBDIR += muni SUBDIR += mutt SUBDIR += nvi-big5 diff --git a/chinese/mule-freewnn/Makefile b/chinese/mule-freewnn/Makefile index 85c74a0..9bec815 100644 --- a/chinese/mule-freewnn/Makefile +++ b/chinese/mule-freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Wnn4 +# New ports collection makefile for: mule with FreeWnn # Date created: 20 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # @@ -6,11 +6,11 @@ # CATEGORIES= chinese -PKGNAMESUFFIX= -wnn4 +PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg -CWNN4= yes +CFREEWNN= yes .include "${MASTERDIR}/Makefile" diff --git a/chinese/mule-freewnn/pkg-comment b/chinese/mule-freewnn/pkg-comment index 3720f05..4363986 100644 --- a/chinese/mule-freewnn/pkg-comment +++ b/chinese/mule-freewnn/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Wnn4 support built in (Only the executables) +Multilingual emacs, with FreeWnn support built in (Only the executables) diff --git a/chinese/mule-freewnn/pkg-descr b/chinese/mule-freewnn/pkg-descr index c6c030a..c626ff4 100644 --- a/chinese/mule-freewnn/pkg-descr +++ b/chinese/mule-freewnn/pkg-descr @@ -4,10 +4,10 @@ multilingual editor based on emacs-19.34. You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is built with Chinese support, using Wnn4 as default. It -is supported input methods, jeonkak, hangul for Korean(Hanja), and -quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +This package is built with Chinese support, using FreeWnn as +default. It is supported input methods, jeonkak, hangul for +Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man diff --git a/editors/xemacs21-mule-common/Makefile b/editors/xemacs21-mule-common/Makefile index 41ebaba..46e0354 100644 --- a/editors/xemacs21-mule-common/Makefile +++ b/editors/xemacs21-mule-common/Makefile @@ -25,9 +25,9 @@ XEMACS_MAJOR_VER= 21 .for dir in \ editors/xemacs${XEMACS_MAJOR_VER}-mule \ japanese/xemacs${XEMACS_MAJOR_VER}-canna \ - japanese/xemacs${XEMACS_MAJOR_VER}-canna+wnn4 \ + japanese/xemacs${XEMACS_MAJOR_VER}-canna+freewnn \ japanese/xemacs${XEMACS_MAJOR_VER}-canna+wnn6 \ - japanese/xemacs${XEMACS_MAJOR_VER}-wnn4 \ + japanese/xemacs${XEMACS_MAJOR_VER}-freewnn \ japanese/xemacs${XEMACS_MAJOR_VER}-wnn6 .if exists(${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work/.install_done) WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/../../${dir}/work diff --git a/editors/xemacs21-mule-common/files/DESCR.tmpl b/editors/xemacs21-mule-common/files/DESCR.tmpl index 10f90be..01c98a9 100644 --- a/editors/xemacs21-mule-common/files/DESCR.tmpl +++ b/editors/xemacs21-mule-common/files/DESCR.tmpl @@ -2,7 +2,7 @@ This is XEmacs lisp files, info pages, and so on (except executables) for XEmacs with Mule(version %%XEMACS_VER%%), the next generation of Emacs. You must install one of packages, xemacs-mule-%%XEMACS_VER%%, -ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+wnn4-%%XEMACS_VER%%, etc.), +ja-xemacs-*-%%XEMACS_VER%% (ja-xemacs-canna-%%XEMACS_VER%%, ja-xemacs-canna+freewnn-%%XEMACS_VER%%, etc.), each of which contains only the executables for XEmacs with Mule(vresion %%XEMACS_VER%%). This package and the above package of the executables *will* clobber any diff --git a/editors/xemacs21-mule-common/pkg-descr b/editors/xemacs21-mule-common/pkg-descr index aec26fc..eab6315 100644 --- a/editors/xemacs21-mule-common/pkg-descr +++ b/editors/xemacs21-mule-common/pkg-descr @@ -2,7 +2,7 @@ This is XEmacs lisp files, info pages, and so on (except executables) for XEmacs with Mule(version 21.1.12), the next generation of Emacs. You must install one of packages, xemacs-mule-21.1.12, -ja-xemacs-*-21.1.12 (ja-xemacs-canna-21.1.12, ja-xemacs-canna+wnn4-21.1.12, etc.), +ja-xemacs-*-21.1.12 (ja-xemacs-canna-21.1.12, ja-xemacs-canna+freewnn-21.1.12, etc.), each of which contains only the executables for XEmacs with Mule(vresion 21.1.12). This package and the above package of the executables *will* clobber any diff --git a/editors/xemacs21-mule/files/DESCR.tmpl b/editors/xemacs21-mule/files/DESCR.tmpl index 29eb7e5..8ab19f8 100644 --- a/editors/xemacs21-mule/files/DESCR.tmpl +++ b/editors/xemacs21-mule/files/DESCR.tmpl @@ -8,7 +8,7 @@ XEmacs with Mule(version %%XEMACS_VER%%). This package is not built with any particular language support except for already built-in Imput Method - SKK and SJ3. If you want other built-in input method, look into the xemacs ports in language- specific directories. -Currently only Japanese (Canna,Wnn4 and Wnn6) is available. +Currently only Japanese (Canna, FreeWnn and Wnn6) is available. This package and the package, xemacs-common-%%XEMACS_VER%% are designed *not* to clobber any existing emacs installation. In particular, the diff --git a/editors/xemacs21-mule/pkg-descr b/editors/xemacs21-mule/pkg-descr index c970736..26b29cd 100644 --- a/editors/xemacs21-mule/pkg-descr +++ b/editors/xemacs21-mule/pkg-descr @@ -8,7 +8,7 @@ XEmacs with Mule(version 21.1.12). This package is not built with any particular language support except for already built-in Imput Method - SKK and SJ3. If you want other built-in input method, look into the xemacs ports in language- specific directories. -Currently only Japanese (Canna,Wnn4 and Wnn6) is available. +Currently only Japanese (Canna, FreeWnn and Wnn6) is available. This package and the package, xemacs-common-21.1.12 are designed *not* to clobber any existing emacs installation. In particular, the diff --git a/editors/xemacs21-sumo/pkg-descr b/editors/xemacs21-sumo/pkg-descr index fad3a4c..4e5dc8d 100644 --- a/editors/xemacs21-sumo/pkg-descr +++ b/editors/xemacs21-sumo/pkg-descr @@ -5,16 +5,16 @@ xemacs-mule-packages in addition). Each package except for xemacs21-sumo is built with Multilingual Imput Methods. Especially, Japanese input is supported by using SKK, SJ3, Canna, -Wnn4 or Wnn6 as an external input engine . Each input method would be +FreeWnn or Wnn6 as an external input engine . Each input method would be supported in following ports respectively: - editors/xemacs21-sumo ............... No input method supports - editors/xemacs21-mule-sumo .......... SKK, SJ3 - japanese/xemacs21-sumo-canna ........ SKK, SJ3, Canna - japanese/xemacs21-sumo-canna+wnn4 ... SKK, SJ3, Canna, Wnn4 - japanese/xemacs21-sumo-canna+wnn6 ... SKK, SJ3, Canna, Wnn6 - japanese/xemacs21-sumo-wnn4 ......... SKK, SJ3, Wnn4 - japanese/xemacs21-sumo-wnn6 ......... SKK, SJ3, Wnn6 + editors/xemacs21-sumo ................. No input method supports + editors/xemacs21-mule-sumo ............ SKK, SJ3 + japanese/xemacs21-sumo-canna .......... SKK, SJ3, Canna + japanese/xemacs21-sumo-canna+freewnn .. SKK, SJ3, Canna, FreeWnn + japanese/xemacs21-sumo-canna+wnn6 ..... SKK, SJ3, Canna, Wnn6 + japanese/xemacs21-sumo-freewnn ........ SKK, SJ3, FreeWnn + japanese/xemacs21-sumo-wnn6 ........... SKK, SJ3, Wnn6 If you use with SJ3 or SKK, you should be installed sj3serv or skkserv in advance. SKK is supported as already builtin. Also it will diff --git a/japanese/Makefile b/japanese/Makefile index 70399f2..4e84fd4 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -2,8 +2,9 @@ # SUBDIR += Canna + SUBDIR += FreeWnn-lib + SUBDIR += FreeWnn-server SUBDIR += VTPSfont - SUBDIR += Wnn SUBDIR += Wnn6 SUBDIR += Wnn6-lib SUBDIR += a2ps @@ -82,16 +83,16 @@ SUBDIR += jtex209-ntt SUBDIR += jvim SUBDIR += jvim-canna - SUBDIR += jvim-canna+wnn4 + SUBDIR += jvim-canna+freewnn SUBDIR += jvim-canna+wnn6 - SUBDIR += jvim-wnn4 + SUBDIR += jvim-freewnn SUBDIR += jvim-wnn6 SUBDIR += jvim3 SUBDIR += jvim3-canna - SUBDIR += jvim3-canna+wnn4 + SUBDIR += jvim3-canna+freewnn SUBDIR += jvim3-canna+wnn6 SUBDIR += jvim3-direct_canna - SUBDIR += jvim3-wnn4 + SUBDIR += jvim3-freewnn SUBDIR += jvim3-wnn6 SUBDIR += k10 SUBDIR += k12 @@ -103,15 +104,15 @@ SUBDIR += kcc SUBDIR += kebook-i18n SUBDIR += kinput2-canna + SUBDIR += kinput2-canna+freewnn + SUBDIR += kinput2-canna+freewnn+sj3 SUBDIR += kinput2-canna+sj3 - SUBDIR += kinput2-canna+sj3+wnn4 SUBDIR += kinput2-canna+sj3+wnn6 - SUBDIR += kinput2-canna+wnn4 SUBDIR += kinput2-canna+wnn6 + SUBDIR += kinput2-freewnn + SUBDIR += kinput2-freewnn+sj3 SUBDIR += kinput2-sj3 - SUBDIR += kinput2-sj3+wnn4 SUBDIR += kinput2-sj3+wnn6 - SUBDIR += kinput2-wnn4 SUBDIR += kinput2-wnn6 SUBDIR += kon2-14dot SUBDIR += kon2-16dot @@ -152,15 +153,15 @@ SUBDIR += mtools SUBDIR += muggy SUBDIR += mule-canna + SUBDIR += mule-canna+freewnn + SUBDIR += mule-canna+freewnn+sj3 SUBDIR += mule-canna+sj3 - SUBDIR += mule-canna+sj3+wnn4 SUBDIR += mule-canna+sj3+wnn6 - SUBDIR += mule-canna+wnn4 SUBDIR += mule-canna+wnn6 + SUBDIR += mule-freewnn + SUBDIR += mule-freewnn+sj3 SUBDIR += mule-sj3 - SUBDIR += mule-sj3+wnn4 SUBDIR += mule-sj3+wnn6 - SUBDIR += mule-wnn4 SUBDIR += mule-wnn6 SUBDIR += mutt SUBDIR += mypaedia-fpw @@ -187,9 +188,9 @@ SUBDIR += okphone SUBDIR += oleo SUBDIR += onew-canna - SUBDIR += onew-canna+wnn4 + SUBDIR += onew-canna+freewnn SUBDIR += onew-canna+wnn6 - SUBDIR += onew-wnn4 + SUBDIR += onew-freewnn SUBDIR += onew-wnn6 SUBDIR += p5-Jcode SUBDIR += p5-jcode.pl diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile index a144668..5f57766 100644 --- a/japanese/jvim-canna+freewnn/Makefile +++ b/japanese/jvim-canna+freewnn/Makefile @@ -1,13 +1,13 @@ -# New ports collection makefile for: jvim for Canna and Wnn4 +# New ports collection makefile for: jvim for Canna and FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+wnn4 +PKGNAMESUFFIX= -canna+freewnn CANNA= yes -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/jvim-canna+freewnn/pkg-comment b/japanese/jvim-canna+freewnn/pkg-comment index e68db23..e2d682e 100644 --- a/japanese/jvim-canna+freewnn/pkg-comment +++ b/japanese/jvim-canna+freewnn/pkg-comment @@ -1 +1 @@ -Japanized Vim (with Canna and Wnn4) +Japanized Vim (with Canna and FreeWnn) diff --git a/japanese/jvim-canna+freewnn/pkg-descr b/japanese/jvim-canna+freewnn/pkg-descr index ae9f199..eae122b 100644 --- a/japanese/jvim-canna+freewnn/pkg-descr +++ b/japanese/jvim-canna+freewnn/pkg-descr @@ -2,7 +2,7 @@ JVim is a text editor that is upwards compatible to vi. It can be used to edit any ASCII and Japanese(EUC or JIS) text. It is especially useful for editing programs. -This package is built with Japanese support, using Canna and Wnn4. +This package is built with Japanese support, using Canna and FreeWnn. There are a lot of enhancements above vi: multi level undo, command line editing, filename completion, on line help, quoting, etc.. Read diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile index 87b53d1..a799e2d 100644 --- a/japanese/jvim-freewnn/Makefile +++ b/japanese/jvim-freewnn/Makefile @@ -1,12 +1,12 @@ -# New ports collection makefile for: jvim for Wnn4 +# New ports collection makefile for: jvim for FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -wnn4 -WNN4= yes +PKGNAMESUFFIX= -freewnn +FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/jvim-freewnn/pkg-comment b/japanese/jvim-freewnn/pkg-comment index 2271817..44cfb44 100644 --- a/japanese/jvim-freewnn/pkg-comment +++ b/japanese/jvim-freewnn/pkg-comment @@ -1 +1 @@ -Japanized Vim (with Wnn4) +Japanized Vim (with FreeWnn) diff --git a/japanese/jvim-freewnn/pkg-descr b/japanese/jvim-freewnn/pkg-descr index 385bfaf..34be58a 100644 --- a/japanese/jvim-freewnn/pkg-descr +++ b/japanese/jvim-freewnn/pkg-descr @@ -2,7 +2,7 @@ JVim is a text editor that is upwards compatible to vi. It can be used to edit any ASCII and Japanese(EUC or JIS) text. It is especially useful for editing programs. -This package is built with Japanese support, using Wnn4 as default. +This package is built with Japanese support, using FreeWnn as default. There are a lot of enhancements above vi: multi level undo, command line editing, filename completion, on line help, quoting, etc.. Read diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 2339d2b..66b515f 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -28,15 +28,15 @@ INPUT_METHOD+= canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna JPLIB+= -lcanna .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn -RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/Wnn +.if defined(FREEWNN) +INPUT_METHOD+= freewnn +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib +RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/FreeWnn-lib JPDEF+= -DWNN_ISDIR JPLIB+= -ljd -lcrypt .elif defined(WNN6) INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} JPDEF+= -DWNN_ISDIR JPLIB+= -ljd -lcrypt diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile index 0fa642b..7318a13f 100644 --- a/japanese/jvim3-canna+freewnn/Makefile +++ b/japanese/jvim3-canna+freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: jvim3 for Canna and Wnn4 +# New ports collection makefile for: jvim3 for Canna and FreeWnn # Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -6,7 +6,7 @@ # CANNA= yes -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/jvim3-canna+freewnn/pkg-comment b/japanese/jvim3-canna+freewnn/pkg-comment index 2b0febe..a1d1481 100644 --- a/japanese/jvim3-canna+freewnn/pkg-comment +++ b/japanese/jvim3-canna+freewnn/pkg-comment @@ -1 +1 @@ -Japanized Vim-3.0 (with Canna and Wnn4) +Japanized Vim-3.0 (with Canna and FreeWnn) diff --git a/japanese/jvim3-canna+freewnn/pkg-descr b/japanese/jvim3-canna+freewnn/pkg-descr index 5797f92..5a2a830 100644 --- a/japanese/jvim3-canna+freewnn/pkg-descr +++ b/japanese/jvim3-canna+freewnn/pkg-descr @@ -2,7 +2,7 @@ JVim 3.0 is a text editor that is upwards compatible to vi. It can be used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is especially useful for editing programs. -This package is built with Japanese support, using Canna and Wnn4. +This package is built with Japanese support, using Canna and FreeWnn. There are a lot of enhancements above vi: multi level undo, command line editing, filename completion, on line help, quoting, etc.. Read diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile index 51b60f0..fbe0bec 100644 --- a/japanese/jvim3-freewnn/Makefile +++ b/japanese/jvim3-freewnn/Makefile @@ -1,11 +1,11 @@ -# New ports collection makefile for: jvim3 for Wnn4 +# New ports collection makefile for: jvim3 for FreeWnn # Date created: 98/11/17 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../jvim3 PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/jvim3-freewnn/pkg-comment b/japanese/jvim3-freewnn/pkg-comment index 0d85af7..1c4dc25 100644 --- a/japanese/jvim3-freewnn/pkg-comment +++ b/japanese/jvim3-freewnn/pkg-comment @@ -1 +1 @@ -Japanized Vim-3.0 (with Wnn4) +Japanized Vim-3.0 (with FreeWnn) diff --git a/japanese/jvim3-freewnn/pkg-descr b/japanese/jvim3-freewnn/pkg-descr index ddb49a8..086db4c 100644 --- a/japanese/jvim3-freewnn/pkg-descr +++ b/japanese/jvim3-freewnn/pkg-descr @@ -2,7 +2,7 @@ JVim 3.0 is a text editor that is upwards compatible to vi. It can be used to edit any ASCII and Japanese(SJIS/JIS/EUC/Unicode) text. It is especially useful for editing programs. -This package is built with Japanese support, using Wnn4. +This package is built with Japanese support, using FreeWnn. There are a lot of enhancements above vi: multi level undo, command line editing, filename completion, on line help, quoting, etc.. Read diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index e532e7f..c4d2784 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -27,6 +27,8 @@ WRKSRC= ${WRKDIR}/vim MAKEFILE= makjunix.mak MAN1= jvim3.1 +.include <bsd.port.pre.mk> + JPATCH= jvim.2.1beta.tar.gz PLIST_SUB= VERSION=${PORTVERSION} PORT_DOCDIR= ${PREFIX}/share/doc/ja-jvim-${PORTVERSION} @@ -55,16 +57,15 @@ INPUT_METHOD+= canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna FEPLIBS+= -lcanna .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn -RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk/2B_ROMKANA:${PORTSDIR}/japanese/Wnn -FEPLIBS+= -L${X11BASE}/lib -ljd -lcrypt +.if defined(FREEWNN) +INPUT_METHOD+= freewnn +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib +FEPLIBS+= -L${LOCALBASE}/lib -ljd -lcrypt .elif defined(WNN6) INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} -FEPLIBS+= -L${X11BASE}/lib -ljd -lcrypt +FEPLIBS+= -L${LOCALBASE}/lib -ljd -lcrypt .endif .endif # DIRECT_CANNA # @@ -117,4 +118,4 @@ do-install: .endif .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile index 34e72c1..6586f84 100644 --- a/japanese/kinput2-canna+freewnn+sj3/Makefile +++ b/japanese/kinput2-canna+freewnn+sj3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-canna+sj3+wnn4 +# New ports collection makefile for: kinput2-canna+freewnn+sj3 # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -7,9 +7,9 @@ CANNA= yes SJ3= yes -WNN4= yes +FREEWNN= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-comment b/japanese/kinput2-canna+freewnn+sj3/pkg-comment index 336b51f..167f6cb 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-comment +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Canna+SJ3+Wnn4) +Input server of Japanese text (Canna+FreeWnn+SJ3) diff --git a/japanese/kinput2-canna+freewnn+sj3/pkg-descr b/japanese/kinput2-canna+freewnn+sj3/pkg-descr index 9f92477..de52bb0 100644 --- a/japanese/kinput2-canna+freewnn+sj3/pkg-descr +++ b/japanese/kinput2-canna+freewnn+sj3/pkg-descr @@ -6,8 +6,8 @@ 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 Wnn4. Egg key binding is avairable, -if you run +The port supports Canna, SJ3 and FreeWnn. Egg key binding is +avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile index d3b0592..f4d91b9 100644 --- a/japanese/kinput2-canna+freewnn/Makefile +++ b/japanese/kinput2-canna+freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-canna+wnn4 +# New ports collection makefile for: kinput2-canna+freewnn # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -6,9 +6,9 @@ # CANNA= yes -WNN4= yes +FREEWNN= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+freewnn/pkg-comment b/japanese/kinput2-canna+freewnn/pkg-comment index b327db2..fd3113e 100644 --- a/japanese/kinput2-canna+freewnn/pkg-comment +++ b/japanese/kinput2-canna+freewnn/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Canna+Wnn4) +Input server of Japanese text (Canna+FreeWnn) diff --git a/japanese/kinput2-canna+freewnn/pkg-descr b/japanese/kinput2-canna+freewnn/pkg-descr index f44aa55..e97c6d1 100644 --- a/japanese/kinput2-canna+freewnn/pkg-descr +++ b/japanese/kinput2-canna+freewnn/pkg-descr @@ -6,8 +6,8 @@ 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 Wnn4. Egg key binding is avairable, -if you run +The port supports Canna and FreeWnn. Egg key binding is avairable, if +you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile index b7735a8..97f33a7 100644 --- a/japanese/kinput2-canna+sj3+wnn6/Makefile +++ b/japanese/kinput2-canna+sj3+wnn6/Makefile @@ -9,7 +9,7 @@ CANNA= yes SJ3= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile index b7735a8..97f33a7 100644 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ b/japanese/kinput2-canna+sj3+wnn7/Makefile @@ -9,7 +9,7 @@ CANNA= yes SJ3= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile index 1817973..2d39683 100644 --- a/japanese/kinput2-canna+sj3/Makefile +++ b/japanese/kinput2-canna+sj3/Makefile @@ -8,7 +8,7 @@ CANNA= yes SJ3= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile index 9a59110..9409f5e 100644 --- a/japanese/kinput2-canna+wnn6/Makefile +++ b/japanese/kinput2-canna+wnn6/Makefile @@ -8,7 +8,7 @@ CANNA= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile index 9a59110..9409f5e 100644 --- a/japanese/kinput2-canna+wnn7/Makefile +++ b/japanese/kinput2-canna+wnn7/Makefile @@ -8,7 +8,7 @@ CANNA= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile index bb220a0..47eec32 100644 --- a/japanese/kinput2-canna/Makefile +++ b/japanese/kinput2-canna/Makefile @@ -7,7 +7,7 @@ CANNA= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile index 0864768..69c6085 100644 --- a/japanese/kinput2-freewnn+sj3/Makefile +++ b/japanese/kinput2-freewnn+sj3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-sj3+wnn4 +# New ports collection makefile for: kinput2-freewnn+sj3 # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -6,9 +6,9 @@ # SJ3= yes -WNN4= yes +FREEWNN= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-freewnn+sj3/pkg-comment b/japanese/kinput2-freewnn+sj3/pkg-comment index 82a96d2..ccb495e 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-comment +++ b/japanese/kinput2-freewnn+sj3/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (SJ3+Wnn4) +Input server of Japanese text (FreeWnn+SJ3) diff --git a/japanese/kinput2-freewnn+sj3/pkg-descr b/japanese/kinput2-freewnn+sj3/pkg-descr index 3823370..d8e1535 100644 --- a/japanese/kinput2-freewnn+sj3/pkg-descr +++ b/japanese/kinput2-freewnn+sj3/pkg-descr @@ -6,8 +6,8 @@ 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 Wnn4. Egg key binding is avairable, -if you run +The port supports SJ3 and FreeWnn. Egg key binding is avairable, if +you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile index 94a30f9..fbaef97 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-wnn4 +# New ports collection makefile for: kinput2-freewnn # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -17,13 +17,13 @@ MAINTAINER= taoka@FreeBSD.org LIB_DEPENDS= ${LIB_INPUT_METHOD} BUILD_DEPENDS= ${BUILD_INPUT_METHOD} -PATCHDIR= ${.CURDIR}/../kinput2-wnn4/patches -FILESDIR= ${.CURDIR}/../kinput2-wnn4/files +PATCHDIR= ${.CURDIR}/../kinput2-freewnn/patches +FILESDIR= ${.CURDIR}/../kinput2-freewnn/files USE_IMAKE= yes -.if !defined(CANNA) && !defined(SJ3) && !defined(WNN4) && !defined(WNN6) +.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) # For this port -WNN4= yes +FREEWNN= yes .endif # # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, @@ -40,11 +40,11 @@ BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \ -Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_INPUT_METHOD+= ${X11BASE}/lib/libwnn.a:${PORTSDIR}/japanese/Wnn -KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(X11BASE)/include/wnn \ - -Dport_WNNLIB="-L$(X11BASE)/lib -lwnn -lcrypt" +.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.1:${PORTSDIR}/japanese/Wnn6-lib @@ -70,7 +70,7 @@ do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} post-install: -# For Wnn4 or Wnn6 +# For FreeWnn or Wnn6 @if [ -e ${PKGDIR}/MESSAGE ]; then \ ${CAT} ${PKGDIR}/MESSAGE; \ fi diff --git a/japanese/kinput2-freewnn/pkg-comment b/japanese/kinput2-freewnn/pkg-comment index 9c81bc5..d474e4f 100644 --- a/japanese/kinput2-freewnn/pkg-comment +++ b/japanese/kinput2-freewnn/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Wnn4) +Input server of Japanese text (FreeWnn) diff --git a/japanese/kinput2-freewnn/pkg-descr b/japanese/kinput2-freewnn/pkg-descr index 3fe8cd6..6d9cd7e 100644 --- a/japanese/kinput2-freewnn/pkg-descr +++ b/japanese/kinput2-freewnn/pkg-descr @@ -6,8 +6,7 @@ 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 Wnn4. Egg key binding is avairable, -if you run +The port supports FreeWnn. Egg key binding is avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile index 1f4ec8f..0619283 100644 --- a/japanese/kinput2-sj3+wnn6/Makefile +++ b/japanese/kinput2-sj3+wnn6/Makefile @@ -8,7 +8,7 @@ SJ3= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile index 1f4ec8f..0619283 100644 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ b/japanese/kinput2-sj3+wnn7/Makefile @@ -8,7 +8,7 @@ SJ3= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile index ee68ce5..e0c7d9d 100644 --- a/japanese/kinput2-sj3/Makefile +++ b/japanese/kinput2-sj3/Makefile @@ -7,7 +7,7 @@ SJ3= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile index 8c83d2b7..1b83328 100644 --- a/japanese/kinput2-wnn6/Makefile +++ b/japanese/kinput2-wnn6/Makefile @@ -7,7 +7,7 @@ WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile index 8c83d2b7..1b83328 100644 --- a/japanese/kinput2-wnn7/Makefile +++ b/japanese/kinput2-wnn7/Makefile @@ -7,7 +7,7 @@ WNN6= yes -MASTERDIR= ${.CURDIR}/../kinput2-wnn4/ +MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 94a30f9..fbaef97 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: kinput2-wnn4 +# New ports collection makefile for: kinput2-freewnn # Date created: 19 Dec 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -17,13 +17,13 @@ MAINTAINER= taoka@FreeBSD.org LIB_DEPENDS= ${LIB_INPUT_METHOD} BUILD_DEPENDS= ${BUILD_INPUT_METHOD} -PATCHDIR= ${.CURDIR}/../kinput2-wnn4/patches -FILESDIR= ${.CURDIR}/../kinput2-wnn4/files +PATCHDIR= ${.CURDIR}/../kinput2-freewnn/patches +FILESDIR= ${.CURDIR}/../kinput2-freewnn/files USE_IMAKE= yes -.if !defined(CANNA) && !defined(SJ3) && !defined(WNN4) && !defined(WNN6) +.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) # For this port -WNN4= yes +FREEWNN= yes .endif # # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, @@ -40,11 +40,11 @@ BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 KINPUT2_DEF+= -DUseSj3 -Dport_SJ3SRC=${LOCALBASE}/include \ -Dport_SJ3LIB="-L${LOCALBASE}/lib -lsj3lib" .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_INPUT_METHOD+= ${X11BASE}/lib/libwnn.a:${PORTSDIR}/japanese/Wnn -KINPUT2_DEF+= -DUseWnn -Dport_WNNINCDIR=$(X11BASE)/include/wnn \ - -Dport_WNNLIB="-L$(X11BASE)/lib -lwnn -lcrypt" +.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.1:${PORTSDIR}/japanese/Wnn6-lib @@ -70,7 +70,7 @@ do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} post-install: -# For Wnn4 or Wnn6 +# For FreeWnn or Wnn6 @if [ -e ${PKGDIR}/MESSAGE ]; then \ ${CAT} ${PKGDIR}/MESSAGE; \ fi diff --git a/japanese/kinput2/pkg-comment b/japanese/kinput2/pkg-comment index 9c81bc5..d474e4f 100644 --- a/japanese/kinput2/pkg-comment +++ b/japanese/kinput2/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Wnn4) +Input server of Japanese text (FreeWnn) diff --git a/japanese/kinput2/pkg-descr b/japanese/kinput2/pkg-descr index 3fe8cd6..6d9cd7e 100644 --- a/japanese/kinput2/pkg-descr +++ b/japanese/kinput2/pkg-descr @@ -6,8 +6,7 @@ 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 Wnn4. Egg key binding is avairable, -if you run +The port supports FreeWnn. Egg key binding is avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile index 8abf8ac..84f3d9c 100644 --- a/japanese/mule-canna+freewnn+sj3/Makefile +++ b/japanese/mule-canna+freewnn+sj3/Makefile @@ -1,16 +1,16 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna, sj3 and Wnn4 +# New ports collection makefile for: mule with Canna, sj3 and FreeWnn # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+sj3+wnn4 +PKGNAMESUFFIX= -canna+freewnn+sj3 CATEGORIES= japanese CANNA= yes SJ3= yes -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/mule-canna+freewnn+sj3/pkg-comment b/japanese/mule-canna+freewnn+sj3/pkg-comment index 502235c..0b34f88 100644 --- a/japanese/mule-canna+freewnn+sj3/pkg-comment +++ b/japanese/mule-canna+freewnn+sj3/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Canna, sj3, and Wnn4 support built-in +Multilingual emacs, with Canna, sj3, and FreeWnn support built-in diff --git a/japanese/mule-canna+freewnn+sj3/pkg-descr b/japanese/mule-canna+freewnn+sj3/pkg-descr index edf38eb..bb60893 100644 --- a/japanese/mule-canna+freewnn+sj3/pkg-descr +++ b/japanese/mule-canna+freewnn+sj3/pkg-descr @@ -5,9 +5,9 @@ You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. This package is built with Japanese support, using Canna, sj3(*1) or -Wnn4. It is supported input methods, jeonkak, hangul for +FreeWnn. It is supported input methods, jeonkak, hangul for Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile index 7d7a738..9c5a745 100644 --- a/japanese/mule-canna+freewnn/Makefile +++ b/japanese/mule-canna+freewnn/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna and Wnn4 +# New ports collection makefile for: mule with Canna and FreeWnn # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+wnn4 +PKGNAMESUFFIX= -canna+freewnn CATEGORIES= japanese CANNA= yes -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/mule-canna+freewnn/pkg-comment b/japanese/mule-canna+freewnn/pkg-comment index 856e056..d83b571 100644 --- a/japanese/mule-canna+freewnn/pkg-comment +++ b/japanese/mule-canna+freewnn/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Canna and Wnn4 support built-in +Multilingual emacs, with Canna and FreeWnn support built-in diff --git a/japanese/mule-canna+freewnn/pkg-descr b/japanese/mule-canna+freewnn/pkg-descr index 9c71681..dfbe557 100644 --- a/japanese/mule-canna+freewnn/pkg-descr +++ b/japanese/mule-canna+freewnn/pkg-descr @@ -4,10 +4,10 @@ multilingual editor based on emacs-19.34. You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is built with Japanese support, using Canna or Wnn4. It -is supported input methods, jeonkak, hangul for Korean(Hanja), and -quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +This package is built with Japanese support, using Canna or +FreeWnn. It is supported input methods, jeonkak, hangul for +Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile index 96a18c0..9a584c6 100644 --- a/japanese/mule-canna+sj3+wnn6/Makefile +++ b/japanese/mule-canna+sj3+wnn6/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna, sj3 and Wnn6 +# New ports collection makefile for: mule with Canna, sj3 and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile index 96a18c0..9a584c6 100644 --- a/japanese/mule-canna+sj3+wnn7/Makefile +++ b/japanese/mule-canna+sj3+wnn7/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna, sj3 and Wnn6 +# New ports collection makefile for: mule with Canna, sj3 and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile index 409ef4d..7f72d3f 100644 --- a/japanese/mule-canna+sj3/Makefile +++ b/japanese/mule-canna+sj3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna and sj3 +# New ports collection makefile for: mule with Canna and sj3 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile index 9662c4c..f78195f 100644 --- a/japanese/mule-canna+wnn6/Makefile +++ b/japanese/mule-canna+wnn6/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna and Wnn6 +# New ports collection makefile for: mule with Canna and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile index 9662c4c..f78195f 100644 --- a/japanese/mule-canna+wnn7/Makefile +++ b/japanese/mule-canna+wnn7/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna and Wnn6 +# New ports collection makefile for: mule with Canna and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile index a018e01..a5edfd6 100644 --- a/japanese/mule-canna/Makefile +++ b/japanese/mule-canna/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Canna +# New ports collection makefile for: mule with Canna # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile index 01b58e5..0fa3618 100644 --- a/japanese/mule-freewnn+sj3/Makefile +++ b/japanese/mule-freewnn+sj3/Makefile @@ -1,15 +1,15 @@ -# New ports collection makefile for: mule 2.3@19.34 with sj3 and Wnn4 +# New ports collection makefile for: mule with sj3 and FreeWnn # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -sj3+wnn4 +PKGNAMESUFFIX= -freewnn+sj3 CATEGORIES= japanese SJ3= yes -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/mule-freewnn+sj3/pkg-comment b/japanese/mule-freewnn+sj3/pkg-comment index b5d2b48..aa1b766 100644 --- a/japanese/mule-freewnn+sj3/pkg-comment +++ b/japanese/mule-freewnn+sj3/pkg-comment @@ -1 +1 @@ -A multilingual emacs, with sj3 and Wnn4 support built in (Only the executables) +A multilingual emacs, with sj3 and FreeWnn support built in (Only the executables) diff --git a/japanese/mule-freewnn+sj3/pkg-descr b/japanese/mule-freewnn+sj3/pkg-descr index f0bd357..8c5c074 100644 --- a/japanese/mule-freewnn+sj3/pkg-descr +++ b/japanese/mule-freewnn+sj3/pkg-descr @@ -4,10 +4,10 @@ multilingual editor based on emacs-19.34. You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is built with Japanese support, using sj3(*1) or Wnn4. It -is supported input methods, jeonkak, hangul for Korean(Hanja), and -quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +This package is built with Japanese support, using sj3(*1) or +FreeWnn. It is supported input methods, jeonkak, hangul for +Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile index 382769b..97d2cf2 100644 --- a/japanese/mule-freewnn/Makefile +++ b/japanese/mule-freewnn/Makefile @@ -1,14 +1,14 @@ -# New ports collection makefile for: mule 2.3@19.34 with Wnn4 +# New ports collection makefile for: mule with FreeWnn # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -wnn4 +PKGNAMESUFFIX= -freewnn CATEGORIES= japanese -WNN4= yes +FREEWNN= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg diff --git a/japanese/mule-freewnn/pkg-comment b/japanese/mule-freewnn/pkg-comment index b29b02d..db3f36c 100644 --- a/japanese/mule-freewnn/pkg-comment +++ b/japanese/mule-freewnn/pkg-comment @@ -1 +1 @@ -A multilingual emacs, with Wnn4 support built in (Only the executables) +A multilingual emacs, with FreeWnn support built in (Only the executables) diff --git a/japanese/mule-freewnn/pkg-descr b/japanese/mule-freewnn/pkg-descr index f08bf6a..dfbb99e 100644 --- a/japanese/mule-freewnn/pkg-descr +++ b/japanese/mule-freewnn/pkg-descr @@ -4,10 +4,10 @@ multilingual editor based on emacs-19.34. You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is built with Japanese support, using Wnn4 as default. It +This package is built with Japanese support, using FreeWnn as default. It is supported input methods, jeonkak, hangul for Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile index 499628a..0233ed7 100644 --- a/japanese/mule-sj3+wnn6/Makefile +++ b/japanese/mule-sj3+wnn6/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with sj3 and Wnn6 +# New ports collection makefile for: mule with sj3 and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile index 499628a..0233ed7 100644 --- a/japanese/mule-sj3+wnn7/Makefile +++ b/japanese/mule-sj3+wnn7/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with sj3 and Wnn6 +# New ports collection makefile for: mule with sj3 and Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile index abba2ca..5be8f36 100644 --- a/japanese/mule-sj3/Makefile +++ b/japanese/mule-sj3/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with sj3 +# New ports collection makefile for: mule with sj3 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile index adf299b..bba36ac 100644 --- a/japanese/mule-wnn6/Makefile +++ b/japanese/mule-wnn6/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Wnn6 +# New ports collection makefile for: mule with Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile index adf299b..bba36ac 100644 --- a/japanese/mule-wnn7/Makefile +++ b/japanese/mule-wnn7/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: mule 2.3@19.34 with Wnn6 +# New ports collection makefile for: mule with Wnn6 # Date created: 7 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile index add244d..9ae32ac 100644 --- a/japanese/onew-canna+freewnn/Makefile +++ b/japanese/onew-canna+freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for Canna and Wnn4 +# New ports collection makefile for: ONEW for Canna and FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -6,9 +6,9 @@ # CANNA= yes -WNN4= yes +FREEWNN= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+freewnn/pkg-comment b/japanese/onew-canna+freewnn/pkg-comment index 4e68327..9b3e49b 100644 --- a/japanese/onew-canna+freewnn/pkg-comment +++ b/japanese/onew-canna+freewnn/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method Canna and Wnn4 +A library for Japanese Input Method Canna and FreeWnn diff --git a/japanese/onew-canna+freewnn/pkg-descr b/japanese/onew-canna+freewnn/pkg-descr index f4040b3..39acef7 100644 --- a/japanese/onew-canna+freewnn/pkg-descr +++ b/japanese/onew-canna+freewnn/pkg-descr @@ -1,7 +1,7 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or +ONEW is a library for using Japanese Input Method Canna, FreeWnn or Wnn6. -This is for Canna and Wnn4. +This is for Canna and FreeWnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew-canna+freewnn/pkg-plist b/japanese/onew-canna+freewnn/pkg-plist index f751292..df96553 100644 --- a/japanese/onew-canna+freewnn/pkg-plist +++ b/japanese/onew-canna+freewnn/pkg-plist @@ -1,3 +1,3 @@ -lib/libonew-canna+wnn4.a -share/doc/ja-onew-canna+wnn4/README.ONEW -@dirrm share/doc/ja-onew-canna+wnn4 +lib/libonew-canna+freewnn.a +share/doc/ja-onew-canna+freewnn/README.ONEW +@dirrm share/doc/ja-onew-canna+freewnn diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile index 55107d9..9b1afea 100644 --- a/japanese/onew-canna+wnn6/Makefile +++ b/japanese/onew-canna+wnn6/Makefile @@ -8,7 +8,7 @@ CANNA= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile index 55107d9..9b1afea 100644 --- a/japanese/onew-canna+wnn7/Makefile +++ b/japanese/onew-canna+wnn7/Makefile @@ -8,7 +8,7 @@ CANNA= yes WNN6= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile index 7e7e4f6..74ac138e 100644 --- a/japanese/onew-canna/Makefile +++ b/japanese/onew-canna/Makefile @@ -7,7 +7,7 @@ CANNA= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile index e12d801..0a854f5 100644 --- a/japanese/onew-freewnn/Makefile +++ b/japanese/onew-freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for Wnn4 +# New ports collection makefile for: ONEW for FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -19,9 +19,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} # A value 'all' must not be set to TARGET. ALL_TARGET= -.if !defined(CANNA) && !defined(WNN4) && !defined(WNN6) +.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) # For this port -WNN4= yes +FREEWNN= yes .endif # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, # LIB_DEPENDS, etc. @@ -30,14 +30,14 @@ INPUT_METHOD+= canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna JPLIB+= -lcanna .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +.if defined(FREEWNN) +INPUT_METHOD+= freewnn +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR .elif defined(WNN6) INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR .endif diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn new file mode 100644 index 0000000..e26feda --- /dev/null +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+freewnn @@ -0,0 +1,10 @@ +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +CANNAINC = -I%LOCALBASE%/include +CANNAOBJ = Canna.o CannaRk.o +CANNALIB = -L%LOCALBASE%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' +RKKLIBS = $(CANNALIB) $(WNNLIB) +RKKOBJS = $(CANNAOBJ) $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 index 0cbb7a5..60ee738 100644 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn6 @@ -1,5 +1,5 @@ -WNNINC = -I%X11BASE%/include/wnn -WNNLIB = -L%X11BASE%/lib -ljd +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn b/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn new file mode 100644 index 0000000..ee9b45c --- /dev/null +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-freewnn @@ -0,0 +1,6 @@ +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 index c335244..0d02ec1 100644 --- a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn6 @@ -1,5 +1,5 @@ -WNNINC = -I%X11BASE%/include/wnn -WNNLIB = -L%X11BASE%/lib -ljd +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' diff --git a/japanese/onew-freewnn/pkg-comment b/japanese/onew-freewnn/pkg-comment index 6228d35..fde919f 100644 --- a/japanese/onew-freewnn/pkg-comment +++ b/japanese/onew-freewnn/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method Wnn4 +A library for Japanese Input Method FreeWnn diff --git a/japanese/onew-freewnn/pkg-descr b/japanese/onew-freewnn/pkg-descr index a4cf8e5..ddd5d70 100644 --- a/japanese/onew-freewnn/pkg-descr +++ b/japanese/onew-freewnn/pkg-descr @@ -1,7 +1,7 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or +ONEW is a library for using Japanese Input Method Canna, FreeWnn, or Wnn6. -This is for Wnn4. +This is for FreeWnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew-freewnn/pkg-plist b/japanese/onew-freewnn/pkg-plist index d82a393..230a020 100644 --- a/japanese/onew-freewnn/pkg-plist +++ b/japanese/onew-freewnn/pkg-plist @@ -1,3 +1,3 @@ -lib/libonew-wnn4.a -share/doc/ja-onew-wnn4/README.ONEW -@dirrm share/doc/ja-onew-wnn4 +lib/libonew-freewnn.a +share/doc/ja-onew-freewnn/README.ONEW +@dirrm share/doc/ja-onew-freewnn diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile index df73471..b97f6a9 100644 --- a/japanese/onew-wnn6/Makefile +++ b/japanese/onew-wnn6/Makefile @@ -7,7 +7,7 @@ WNN6= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile index df73471..b97f6a9 100644 --- a/japanese/onew-wnn7/Makefile +++ b/japanese/onew-wnn7/Makefile @@ -7,7 +7,7 @@ WNN6= yes -MASTERDIR= ${.CURDIR}/../onew-wnn4 +MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR}/pkg .include "${MASTERDIR}/Makefile" diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index e12d801..0a854f5 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for Wnn4 +# New ports collection makefile for: ONEW for FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -19,9 +19,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME} # A value 'all' must not be set to TARGET. ALL_TARGET= -.if !defined(CANNA) && !defined(WNN4) && !defined(WNN6) +.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) # For this port -WNN4= yes +FREEWNN= yes .endif # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS, # LIB_DEPENDS, etc. @@ -30,14 +30,14 @@ INPUT_METHOD+= canna LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/Canna JPLIB+= -lcanna .endif -.if defined(WNN4) -INPUT_METHOD+= wnn4 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +.if defined(FREEWNN) +INPUT_METHOD+= freewnn +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR .elif defined(WNN6) INPUT_METHOD+= wnn6 -BUILD_DEPENDS+= ${X11BASE}/lib/libjd.a:${PORTSDIR}/japanese/Wnn +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR .endif diff --git a/japanese/onew/files/ONEW_CONF-for-canna+freewnn b/japanese/onew/files/ONEW_CONF-for-canna+freewnn new file mode 100644 index 0000000..e26feda --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-canna+freewnn @@ -0,0 +1,10 @@ +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +CANNAINC = -I%LOCALBASE%/include +CANNAOBJ = Canna.o CannaRk.o +CANNALIB = -L%LOCALBASE%/lib -lcanna +CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"' +RKKLIBS = $(CANNALIB) $(WNNLIB) +RKKOBJS = $(CANNAOBJ) $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 b/japanese/onew/files/ONEW_CONF-for-canna+wnn6 index 0cbb7a5..60ee738 100644 --- a/japanese/onew/files/ONEW_CONF-for-canna+wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-canna+wnn6 @@ -1,5 +1,5 @@ -WNNINC = -I%X11BASE%/include/wnn -WNNLIB = -L%X11BASE%/lib -ljd +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' diff --git a/japanese/onew/files/ONEW_CONF-for-freewnn b/japanese/onew/files/ONEW_CONF-for-freewnn new file mode 100644 index 0000000..ee9b45c --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-freewnn @@ -0,0 +1,6 @@ +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd +WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn6 b/japanese/onew/files/ONEW_CONF-for-wnn6 index c335244..0d02ec1 100644 --- a/japanese/onew/files/ONEW_CONF-for-wnn6 +++ b/japanese/onew/files/ONEW_CONF-for-wnn6 @@ -1,5 +1,5 @@ -WNNINC = -I%X11BASE%/include/wnn -WNNLIB = -L%X11BASE%/lib -ljd +WNNINC = -I%LOCALBASE%/include/wnn +WNNLIB = -L%LOCALBASE%/lib -ljd WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk.wnn6:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"' WNN_DICLIST = '"kihon tankan zip symbol tankan2 tel usr/$$USER/ud=10 usr/$$USER/private=10"' WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"' diff --git a/japanese/onew/pkg-comment b/japanese/onew/pkg-comment index 6228d35..fde919f 100644 --- a/japanese/onew/pkg-comment +++ b/japanese/onew/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method Wnn4 +A library for Japanese Input Method FreeWnn diff --git a/japanese/onew/pkg-descr b/japanese/onew/pkg-descr index a4cf8e5..ddd5d70 100644 --- a/japanese/onew/pkg-descr +++ b/japanese/onew/pkg-descr @@ -1,7 +1,7 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or +ONEW is a library for using Japanese Input Method Canna, FreeWnn, or Wnn6. -This is for Wnn4. +This is for FreeWnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew/pkg-plist b/japanese/onew/pkg-plist index d82a393..230a020 100644 --- a/japanese/onew/pkg-plist +++ b/japanese/onew/pkg-plist @@ -1,3 +1,3 @@ -lib/libonew-wnn4.a -share/doc/ja-onew-wnn4/README.ONEW -@dirrm share/doc/ja-onew-wnn4 +lib/libonew-freewnn.a +share/doc/ja-onew-freewnn/README.ONEW +@dirrm share/doc/ja-onew-freewnn diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile index 3aed7741..825c686 100644 --- a/japanese/xemacs21-canna+freewnn/Makefile +++ b/japanese/xemacs21-canna+freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: XEmacs with Canna and Wnn4 +# New ports collection makefile for: XEmacs with Canna and FreeWnn # Date created: 5 Dec 1997 # Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp> # @@ -9,6 +9,6 @@ COMMENT= ${.CURDIR}/pkg/COMMENT XEMACS_MAJOR_VER= 21 CANNA= yes -WNN4= yes +FREEWNN= yes .include "${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/Makefile" diff --git a/japanese/xemacs21-canna+freewnn/pkg-comment b/japanese/xemacs21-canna+freewnn/pkg-comment index 5f0a430..3dab065 100644 --- a/japanese/xemacs21-canna+freewnn/pkg-comment +++ b/japanese/xemacs21-canna+freewnn/pkg-comment @@ -1 +1 @@ -XEmacs(version 21) text editor, with SJ3, SKK, Canna and Wnn4 support +XEmacs(version 21) text editor, with SJ3, SKK, Canna and FreeWnn support diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile index d73451a..07e8740 100644 --- a/japanese/xemacs21-canna/Makefile +++ b/japanese/xemacs21-canna/Makefile @@ -29,27 +29,25 @@ DESCR= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg/DESCR XEMACS_MAJOR_VER?= 21 DESCR_TMPL= ${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/files/DESCR.tmpl -.if defined(CANNA) && defined(WNN4) -PKGNAMESUFFIX= -canna+wnn4 -SITE_INCLUDES= ${X11BASE}/include -SITE_LIBRARIES= ${X11BASE}/lib +.if defined(CANNA) && defined(FREEWNN) +PKGNAMESUFFIX= -canna+freewnn +SITE_INCLUDES= ${LOCALBASE}/include/wnn WITH_INPUT_METHOD= --with-canna --with-wnn --with-wnn6=no -LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna -BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn -COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn4 support +LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna \ + wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and FreeWnn support .elif defined(CANNA) && defined(WNN6) PKGNAMESUFFIX= -canna+wnn6 WITH_INPUT_METHOD= --with-canna --with-wnn6 LIB_INPUT_METHOD= canna.1:${PORTSDIR}/japanese/Canna BUILD_INPUT_METHOD= ${PREFIX}/include/wnn/jlib.h:${PORTSDIR}/japanese/Wnn6-lib COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK, Canna and Wnn6 support -.elif defined(WNN4) -PKGNAMESUFFIX= -wnn4 -SITE_INCLUDES= ${X11BASE}/include -SITE_LIBRARIES= ${X11BASE}/lib +.elif defined(FREEWNN) +PKGNAMESUFFIX= -freewnn +SITE_INCLUDES= ${LOCALBASE}/include/wnn WITH_INPUT_METHOD= --with-wnn --with-canna=no --with-wnn6=no -BUILD_INPUT_METHOD= ${PREFIX}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn -COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and Wnn4 support +LIB_INPUT_METHOD= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib +COMMENT_TEXT= XEmacs(version ${XEMACS_MAJOR_VER}) text editor, with SJ3, SKK and FreeWnn support .elif defined(WNN6) PKGNAMESUFFIX= -wnn6 WITH_INPUT_METHOD= --with-wnn6 --with-canna=no diff --git a/japanese/xemacs21-freewnn/Makefile b/japanese/xemacs21-freewnn/Makefile index 5274918..20d0221 100644 --- a/japanese/xemacs21-freewnn/Makefile +++ b/japanese/xemacs21-freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: XEmacs with Wnn4 +# New ports collection makefile for: XEmacs with FreeWnn # Date created: 25 January 1998 # Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp> # @@ -8,6 +8,6 @@ COMMENT= ${.CURDIR}/pkg/COMMENT XEMACS_MAJOR_VER= 21 -WNN4= yes +FREEWNN= yes .include "${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/Makefile" diff --git a/japanese/xemacs21-freewnn/pkg-comment b/japanese/xemacs21-freewnn/pkg-comment index d2feece..0b80869 100644 --- a/japanese/xemacs21-freewnn/pkg-comment +++ b/japanese/xemacs21-freewnn/pkg-comment @@ -1 +1 @@ -XEmacs(version 21) text editor, with SJ3, SKK and Wnn4 support +XEmacs(version 21) text editor, with SJ3, SKK and FreeWnn support diff --git a/japanese/xemacs21-sumo-canna+freewnn/Makefile b/japanese/xemacs21-sumo-canna+freewnn/Makefile index a0c647b..ad5d60a 100644 --- a/japanese/xemacs21-sumo-canna+freewnn/Makefile +++ b/japanese/xemacs21-sumo-canna+freewnn/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese XEMACS_MAJOR_VER= 21 -PKGNAMESUFFIX= -canna+wnn4 +PKGNAMESUFFIX= -canna+freewnn MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo diff --git a/japanese/xemacs21-sumo-freewnn/Makefile b/japanese/xemacs21-sumo-freewnn/Makefile index 488a767..cd913c0 100644 --- a/japanese/xemacs21-sumo-freewnn/Makefile +++ b/japanese/xemacs21-sumo-freewnn/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese XEMACS_MAJOR_VER= 21 -PKGNAMESUFFIX= -wnn4 +PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/xemacs${XEMACS_MAJOR_VER}-sumo diff --git a/korean/Makefile b/korean/Makefile index 5c48261..d9daf2c 100644 --- a/korean/Makefile +++ b/korean/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ # - SUBDIR += Wnn + SUBDIR += FreeWnn-lib + SUBDIR += FreeWnn-server SUBDIR += acroread-korfont SUBDIR += ami SUBDIR += baekmukfonts-bdf @@ -46,7 +47,7 @@ SUBDIR += linuxdoc-sgml SUBDIR += linux_locale SUBDIR += mizifont - SUBDIR += mule-wnn4 + SUBDIR += mule-freewnn SUBDIR += munhwafonts-cid SUBDIR += netscape3 SUBDIR += netscape4-communicator diff --git a/korean/mule-freewnn/Makefile b/korean/mule-freewnn/Makefile index e5319df..3a05074 100644 --- a/korean/mule-freewnn/Makefile +++ b/korean/mule-freewnn/Makefile @@ -1,15 +1,16 @@ -# New ports collection makefile for: mule 2.3@19.34 with Wnn4 +# New ports collection makefile for: mule with FreeWnn # Date created: 20 July 1997 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -wnn4 CATEGORIES= korean -KWNN4= yes +PKGNAMESUFFIX= -freewnn MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR}/pkg +KFREEWNN= yes + .include "${MASTERDIR}/Makefile" diff --git a/korean/mule-freewnn/pkg-comment b/korean/mule-freewnn/pkg-comment index b29b02d..db3f36c 100644 --- a/korean/mule-freewnn/pkg-comment +++ b/korean/mule-freewnn/pkg-comment @@ -1 +1 @@ -A multilingual emacs, with Wnn4 support built in (Only the executables) +A multilingual emacs, with FreeWnn support built in (Only the executables) diff --git a/korean/mule-freewnn/pkg-descr b/korean/mule-freewnn/pkg-descr index 56030d0..476b556 100644 --- a/korean/mule-freewnn/pkg-descr +++ b/korean/mule-freewnn/pkg-descr @@ -4,10 +4,10 @@ multilingual editor based on emacs-19.34. You should install a package, mule-common-2.3, containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is built with Korean(Hanja) support, using Wnn4 as +This package is built with Korean(Hanja) support, using FreeWnn as default. It is supported input methods, jeonkak, hangul for Korean(Hanja), and quanjiao, zhuyin, erpin for Chinese (check out -lib/mule/site-lisp/site-start.el), using Wnn4, too. +lib/mule/site-lisp/site-start.el), using FreeWnn, too. This package and the package, mule-common-2.3, *will* clobber any existing emacs installation. In particular, the executables and man |
