diff options
| author | Satoshi Taoka <taoka@FreeBSD.org> | 2001-08-27 01:20:24 +0000 |
|---|---|---|
| committer | Satoshi Taoka <taoka@FreeBSD.org> | 2001-08-27 01:20:24 +0000 |
| commit | 7b117d21671d6f9038809eb4a27e9f198fb9bbf6 (patch) | |
| tree | 66c5fec50129c6628a27c1324ece64daf50596c9 | |
| parent | a16fefc81e5449a692a199a5d460b746bbb7d930 (diff) | |
| download | ports-7b117d21671d6f9038809eb4a27e9f198fb9bbf6.tar.gz ports-7b117d21671d6f9038809eb4a27e9f198fb9bbf6.zip | |
Notes
72 files changed, 688 insertions, 218 deletions
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile index 02b1b1583db1..a7918e74d257 100644 --- a/editors/mule-common/Makefile +++ b/editors/mule-common/Makefile @@ -7,6 +7,7 @@ PORTNAME= mule-common PORTVERSION= ${MULE_VERSION} +PORTREVISION= 1 CATEGORIES= editors japanese MASTER_SITES= ftp://etlport.etl.go.jp/pub/mule/ \ ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \ diff --git a/editors/mule-common/files/patch-mm b/editors/mule-common/files/patch-mm index f0b930462208..9a61745a872b 100644 --- a/editors/mule-common/files/patch-mm +++ b/editors/mule-common/files/patch-mm @@ -1,5 +1,5 @@ ---- configure.orig Fri Sep 8 14:13:47 2000 -+++ configure Fri Sep 8 14:15:09 2000 +--- configure.orig Wed Jul 18 16:03:57 2001 ++++ configure Wed Jul 18 16:37:11 2001 @@ -38,6 +38,10 @@ ac_help="$ac_help --with-wnn6 Use Wnn6 library to input Japanese or Chinese" @@ -33,7 +33,7 @@ archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}' docdir='${datadir}/${emacs_prefix}/${version}/etc' -@@ -671,9 +676,16 @@ +@@ -671,9 +676,20 @@ fi @@ -46,11 +46,15 @@ # Check whether --with-wnn6 or --without-wnn6 was given. if test "${with_wnn6+set}" = set; then withval="$with_wnn6" -+ wnnlib=-lwnn6 ++if test "${with_wnn6}" = yes; then ++ wnnlib=-lwnn6 ++else ++ wnnlib=$with_wnn6 ++fi with_wnn=${withval}; cat >> confdefs.h <<\EOF #define WNN6 1 EOF -@@ -3104,12 +3116,12 @@ +@@ -3104,12 +3120,12 @@ if test -n "${with_wnn_libraries}" ; then if test -d ${with_wnn_libraries} ; then LD_SWITCH_WNN="-L${with_wnn_libraries}" diff --git a/editors/mule-common/files/patch-oa b/editors/mule-common/files/patch-oa new file mode 100644 index 000000000000..dfcc9c9d2630 --- /dev/null +++ b/editors/mule-common/files/patch-oa @@ -0,0 +1,117 @@ +--- lisp/eggrc-wnn.orig Mon Jul 16 04:31:14 2001 ++++ lisp/eggrc-wnn Mon Jul 16 04:33:22 2001 +@@ -86,6 +86,99 @@ + + ) + ++(defun wnn7-jserver-setup () ++ (set-wnn-reverse nil) ++ (set-wnn-fuzokugo "system/kougo.fzk") ++ (add-wnn-fisys-dict "system/fisd" ++ (concat wnn-usr-dic-dir "/fisd.h") t) ++ (add-wnn-fiusr-dict (concat wnn-usr-dic-dir "/fiud") "" t nil) ++ (add-wnn-dict "system/kihon.dic" ++ (concat wnn-usr-dic-dir "/kihon.h") 6 nil t) ++ (add-wnn-dict "system/symbol.dic" ++ (concat wnn-usr-dic-dir "/symbol.h") 1 nil t) ++;; (add-wnn-dict "system/symbol_noat.dic" ++;; (concat wnn-usr-dic-dir "/symbol_noat.h") 1 nil t) ++ (add-wnn-dict "system/tel.dic" ++ (concat wnn-usr-dic-dir "/tel.h") 1 nil t) ++ (add-wnn-dict "system/zip.dic" ++ (concat wnn-usr-dic-dir "/zip.h") 1 nil t) ++ (add-wnn-dict "system/tankan.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankan2.dic" "" 1 nil nil) ++ (add-wnn-dict "system/ikeiji.dic" "" 1 nil nil) ++ (add-wnn-dict "system/rensou.dic" "" 1 nil nil) ++ (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t) ++ ++; (add-wnn-dict "option/jinmei.dic" ++; (concat wnn-usr-dic-dir "/jinmei.h") 1 nil t) ++; (add-wnn-dict "option/chimei.dic" ++; (concat wnn-usr-dic-dir "/chimei.h") 1 nil t) ++; (add-wnn-dict "option/address.dic" ++; (concat wnn-usr-dic-dir "/address.h") 1 nil t) ++; (add-wnn-dict "option/station.dic" ++; (concat wnn-usr-dic-dir "/station.h") 1 nil t) ++; (add-wnn-dict "option/kana_english.dic" ++; (concat wnn-usr-dic-dir "/kana_english.h") 1 nil t) ++; (add-wnn-dict "option/enterprise.dic" ++; (concat wnn-usr-dic-dir "/enterprise.h") 1 nil t) ++; (add-wnn-dict "option/airport.dic" ++; (concat wnn-usr-dic-dir "/airport.h") 1 nil t) ++; (add-wnn-dict "option/university.dic" ++; (concat wnn-usr-dic-dir "/university.h") 1 nil t) ++; (add-wnn-dict "option/zoo.dic" ++; (concat wnn-usr-dic-dir "/zoo.h") 1 nil t) ++; (add-wnn-dict "option/botanical_garden.dic" ++; (concat wnn-usr-dic-dir "/botanical_garden.h") 1 nil t) ++; (add-wnn-dict "option/aquarium.dic" ++; (concat wnn-usr-dic-dir "/aquarium.h") 1 nil t) ++; (add-wnn-dict "option/conveni.dic" ++; (concat wnn-usr-dic-dir "/conveni.h") 1 nil t) ++; (add-wnn-dict "option/amusement.dic" ++; (concat wnn-usr-dic-dir "/amusement.h") 1 nil t) ++ ++ (set-wnn-param 5 10 2 45 0 80 5 1 20 0 400 -100 400 80 200 2 200) ++ ++ (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t) ++ (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t) ++ ++ (set-last-is-first-mode t) ++ (set-complex-conv-mode nil) ++; (set-okuri-flag -1) ++ (set-prefix-flag 0) ++ ++ (set-okuri-learn-mode t) ++ (set-prefix-learn-mode t) ++ (set-suffix-learn-mode t) ++ (set-common-learn-mode t) ++ (set-yuragi-mode nil) ++ ++ (set-freq-func-mode 4) ++ ++; (set-numeric-mode -12) ++; (set-alphabet-mode -30) ++; (set-symbol-mode -40) ++ ++ (set-wnn-reverse t) ++ (set-wnn-fuzokugo "system/kougo.fzk") ++ (add-wnn-dict "system/kihonR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/telR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/zipR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankanR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankan2R.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/stationR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/kana_englishR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/enterpriseR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/airportR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/universityR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/zooR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/botanical_gardenR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/aquariumR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/conveniR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/amusementR.dic" "" 1 nil nil) ++ ++ (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t) ++ (set-wnn-param 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200) ++ ) ++ + + (defun wnn4-jserver-setup () + (set-wnn-reverse nil) +@@ -126,9 +219,11 @@ + ) + + (cond ((eq wnn-server-type 'jserver) +- (if (is-wnn6-server) +- (wnn6-jserver-setup) +- (wnn4-jserver-setup))) ++ (if (is-wnn7-server) ++ (wnn7-jserver-setup) ++ (if (is-wnn6-server) ++ (wnn6-jserver-setup) ++ (wnn4-jserver-setup)))) + ((eq wnn-server-type 'cserver) + (set-wnn-reverse nil) + (set-wnn-fuzokugo "sys/full.con") diff --git a/editors/mule-common/files/patch-ob b/editors/mule-common/files/patch-ob new file mode 100644 index 000000000000..9d512f97cc25 --- /dev/null +++ b/editors/mule-common/files/patch-ob @@ -0,0 +1,12 @@ +--- lisp/wnn-egg.el.bak Mon Jul 16 04:37:50 2001 ++++ lisp/wnn-egg.el Mon Jul 16 04:42:05 2001 +@@ -606,6 +606,9 @@ + (defun is-wnn6-server () + (= (wnn-server-version) 61697)) + ++(defun is-wnn7-server () ++ (= (wnn-server-version) 61698)) ++ + (defun add-wnn-dict (dfile hfile priority dmode hmode &optional dpaswd hpaswd) + ; (open-wnn-if-disconnected) + (if (null (wnn-server-dict-add diff --git a/editors/mule/Makefile b/editors/mule/Makefile index 525f9d0d25c4..a2bc624c9863 100644 --- a/editors/mule/Makefile +++ b/editors/mule/Makefile @@ -7,6 +7,8 @@ PORTNAME= mule PORTVERSION= ${MULE_VERSION} +PKGNAMESUFFIX= ${INPUT_METHOD} +PORTREVISION= 1 CATEGORIES+= editors MASTER_SITES= ftp://etlport.etl.go.jp/pub/mule/ \ ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \ @@ -57,33 +59,52 @@ STRIP= INSTALL_TARGET= install-arch-dep .if defined(CANNA) +INPUT_METHOD+= canna LIB_INPUT_METHOD+= canna.1:${PORTSDIR}/japanese/Canna WITH_INPUT_METHOD+= --with-canna --with-canna-libraries=${PREFIX}/lib \ --with-canna-includes=${PREFIX}/include .endif -.if defined(SJ3) -BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 -WITH_INPUT_METHOD+= --with-sj3 -.endif .if defined(FREEWNN) +INPUT_METHOD+= freewnn LIB_INPUT_METHOD+= wnn.0:${PORTSDIR}/japanese/FreeWnn-lib WITH_INPUT_METHOD+= --with-wnn4 --with-wnn-libraries=${LOCALBASE}/lib \ --with-wnn-includes=${LOCALBASE}/include/wnn .elif defined(CFREEWNN) +INPUT_METHOD+= freewnn LIB_INPUT_METHOD+= cwnn.0:${PORTSDIR}/chinese/FreeWnn-lib WITH_INPUT_METHOD+= --with-wnn4 --with-cwnn4 --with-wnn-libraries=${LOCALBASE}/lib \ --with-wnn-includes=${LOCALBASE}/include/cwnn .elif defined(KFREEWNN) +INPUT_METHOD+= freewnn LIB_INPUT_METHOD+= kwnn.0:${PORTSDIR}/korean/FreeWnn-lib WITH_INPUT_METHOD+= --with-wnn4 --with-kwnn4 --with-wnn-libraries=${LOCALBASE}/lib \ --with-wnn-includes=${LOCALBASE}/include/kwnn -.elif defined(WNN6) +.endif +.if defined(SJ3) +INPUT_METHOD+= sj3 +BUILD_INPUT_METHOD+= sj3serv:${PORTSDIR}/japanese/sj3 +WITH_INPUT_METHOD+= --with-sj3 +.endif +.if !defined(FREEWNN) && !defined(CFREEWNN) && !defined(KFREEWNN) +.if defined(WNN6) +INPUT_METHOD+= wnn6 LIB_INPUT_METHOD+= wnn6.1:${PORTSDIR}/japanese/Wnn6-lib WITH_INPUT_METHOD+= --with-wnn6 --with-wnn-libraries=${LOCALBASE}/lib \ --with-wnn-includes=${LOCALBASE}/include/wnn6/wnn +.elif defined(WNN7) +INPUT_METHOD+= wnn7 +LIB_INPUT_METHOD+= wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib +WITH_INPUT_METHOD+= --with-wnn6=-lwnn6_for_wnn7 --with-wnn-libraries=${LOCALBASE}/lib \ + --with-wnn-includes=${LOCALBASE}/include/wnn7/wnn +.endif .endif COMP_ELC= egg.elc wnn-egg.elc sj3-client.elc sj3-egg.elc canna.elc ELC_DIR= ../lisp +# Make a value of INPUT_METHOD +.if defined(INPUT_METHOD) +INPUT_METHOD!= ${ECHO} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' +.endif + WITH_DIALOGS= --with-x-toolkit diff --git a/editors/mule/pkg-descr b/editors/mule/pkg-descr index 579f0a8fba5e..cdd4ec27949f 100644 --- a/editors/mule/pkg-descr +++ b/editors/mule/pkg-descr @@ -1,24 +1,31 @@ -This is a package containing only the executables for mule-2.3, a -multilingual editor based on emacs-19.34. +This package contains only the executables for mule-2.3, a multilingual +editor based on emacs-19.34. -You should install a package, mule-common-2.3, containing emacs lisp +You should install the mule-common-2.3 package containing emacs lisp files, info pages, and so on (except executables) for mule-2.3. -This package is not built with any particular language support. If -you want a built-in input method, look into the mule ports in -language- specific directories. +It supports the following input methods: jeonkak, hangul for +Korean (Hanja), and quanjiao, zhuyin, erpin for Chinese (check out +${LOCALBASE}/lib/mule/site-lisp/site-start.el). -This package and the package, mule-common-2.3 are designed *not* to -clobber any existing emacs installation. In particular, the -executables and man pages of etags/ctags are not installed, and the -info pages that come with the original emacs don't get installed too. -The Japanese version is build to install everything, by the way. +This package and the package, mule-common-2.3, *will* clobber any +existing emacs installation. In particular, the executables and man +pages of etags/ctags are installed, and the info pages that come with +the original emacs get installed too. -A "dir" file is supplied in the -${PORTSDIR}/editors/mule-common/files/ subdirectory of the -ports package. Copy it into your /usr/local/info to read mule info -pages, but also make sure you also add everything that may have been -added to that file! +Although this shouldn't cause any problems to run both mule and emacs, +it may cause some confusion when one of them is pkg_delete'd. If +someone has a solution to this, please tell me. + +A info "dir" file is supplied in the ${PORTSDIR}/editors/mule-common/files/ +subdirectory of the ports package. Copy it into your /usr/local/info +to read mule info pages, but also make sure you also add everything +that may have been added to that file! + +[Notice] +Mr. Yoshio KATAYAMA <kate@pfu.co.jp> fixed many bugs for mule-2.3. +Patches for those are in 'mule-2.3-19.34.patch-YYMMDD.tar.gz' and are +applied in this port. - S. Taoka taoka@FreeBSD.org diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile index 2b4ac13c31db..0b1f2db13362 100644 --- a/japanese/Wnn7-lib/Makefile +++ b/japanese/Wnn7-lib/Makefile @@ -1,11 +1,11 @@ -# New ports collection makefile for: head files and libraries of Wnn6 -# Date created: 11 July 1997 +# New ports collection makefile for: head files and libraries of Wnn7 +# Date created: 01/07/16 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= Wnn6-lib +PORTNAME= Wnn7-lib PORTVERSION= 98.10.28 CATEGORIES= japanese MASTER_SITES= ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/ @@ -22,7 +22,7 @@ BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 .endif WRKSRC= ${WRKDIR}/src/contrib/im/Xsi -DOCDIR= ${PREFIX}/share/doc/ja-Wnn6-lib +DOCDIR= ${PREFIX}/share/doc/ja-Wnn7-lib INSTALLS_SHLIB= yes @@ -32,11 +32,11 @@ do-build: post-install: .if ${PORTOBJFORMAT} == "aout" - ${LN} -sf libwnn6.so.1.0 ${PREFIX}/lib/libwnn6.so + ${LN} -sf libwnn6_for_wnn7.so.1.0 ${PREFIX}/lib/libwnn6_for_wnn7.so .endif - ${LN} -sf libwnn6_fromsrc.a ${PREFIX}/lib/libwnn6.a - @${MKDIR} ${PREFIX}/include/wnn6/wnn - @${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn6/wnn + ${LN} -sf libwnn6_for_wnn7_fromsrc.a ${PREFIX}/lib/libwnn6_for_wnn7.a + @${MKDIR} ${PREFIX}/include/wnn7/wnn + @${INSTALL_DATA} ${WRKSRC}/Wnn/include/*.h ${PREFIX}/include/wnn7/wnn @${MKDIR} ${DOCDIR} @${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR} diff --git a/japanese/Wnn7-lib/files/patch-wnn7-aa b/japanese/Wnn7-lib/files/patch-wnn7-aa new file mode 100644 index 000000000000..bc2a5469d0fc --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-aa @@ -0,0 +1,15 @@ +--- Wnn/include/config.h.orig Wed Oct 28 13:36:24 1998 ++++ Wnn/include/config.h Wed Jul 18 17:03:05 2001 +@@ -140,7 +140,11 @@ + #define _CONFIG_H_ + + #ifndef LIBDIR +-#define LIBDIR "/usr/local/lib/wnn6" ++#define LIBDIR "/usr/lib/wnn7" ++#endif /* LIBDIR */ ++ ++#ifndef SHARDIR ++#define SHARDIR "/usr/share/wnn7" + #endif /* LIBDIR */ + + #ifdef TAIWANESE diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ab b/japanese/Wnn7-lib/files/patch-wnn7-ab new file mode 100644 index 000000000000..12ba70b5fb81 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ab @@ -0,0 +1,20 @@ +--- config/Project.tmpl.~1~ Wed Oct 28 13:36:36 1998 ++++ config/Project.tmpl Mon Jul 16 02:54:32 2001 +@@ -507,7 +507,7 @@ + #endif + + #ifndef WnnWnnDir +-#define WnnWnnDir /usr/local/lib/wnn6 ++#define WnnWnnDir /usr/lib/wnn7 + #endif + + +@@ -563,7 +563,7 @@ + WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir + WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) + WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a ++ WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a + WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a + + CWNNTOP = $(IMTOP)/cWnn diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ac b/japanese/Wnn7-lib/files/patch-wnn7-ac new file mode 100644 index 000000000000..63a197fbaa3f --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ac @@ -0,0 +1,20 @@ +--- config/X11.tmpl.~1~ Wed Oct 28 13:36:37 1998 ++++ config/X11.tmpl Mon Jul 16 02:54:53 2001 +@@ -507,7 +507,7 @@ + #endif + + #ifndef WnnWnnDir +-#define WnnWnnDir /usr/local/lib/wnn6 ++#define WnnWnnDir /usr/lib/wnn7 + #endif + + +@@ -563,7 +563,7 @@ + WNNCNVFILEDIR = $(WNNJDSRC)/cvtfileDir + WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC) + WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\" +- WNNJLIB = $(WNNJLIBSRC)/libwnn6_fromsrc.a ++ WNNJLIB = $(WNNJLIBSRC)/libwnn6_for_wnn7_fromsrc.a + WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a + + CWNNTOP = $(IMTOP)/cWnn diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ad b/japanese/Wnn7-lib/files/patch-wnn7-ad new file mode 100644 index 000000000000..3843e87fd0f1 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ad @@ -0,0 +1,39 @@ +--- Wnn/jlib/Imakefile.~1~ Mon Jul 16 02:58:38 2001 ++++ Wnn/jlib/Imakefile Mon Jul 16 03:04:20 2001 +@@ -74,9 +74,9 @@ + LibraryObjectRule() + + #if DoSharedLib +-AllTarget($(OBJS) libwnn6_fromsrc.a libwnn6.so.$(SOWNN6LIBREV)) ++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a libwnn6_for_wnn7.so.$(SOWNN6LIBREV)) + #else +-AllTarget($(OBJS) libwnn6_fromsrc.a) ++AllTarget($(OBJS) libwnn6_for_wnn7_fromsrc.a) + #endif + + +@@ -90,19 +90,19 @@ + + + #if DoSharedLib +-SharedLibraryTarget(wnn6,$(SOWNN6LIBREV),$(OBJS),.,.) ++SharedLibraryTarget(wnn6_for_wnn7,$(SOWNN6LIBREV),$(OBJS),.,.) + #endif + +-UnsharedLibraryTarget(wnn6_fromsrc,$(UNSHAREDOBJS),unshared,..) +-LintLibraryTarget(wnn6_fromsrc,$(SRCS)) ++UnsharedLibraryTarget(wnn6_for_wnn7_fromsrc,$(UNSHAREDOBJS),unshared,..) ++LintLibraryTarget(wnn6_for_wnn7_fromsrc,$(SRCS)) + + instlib:: install + + #if DoSharedLib +-InstallSharedLibrary(wnn6,$(SOWNN6LIBREV),$(WNNLIBDIR)) ++InstallSharedLibrary(wnn6_for_wnn7,$(SOWNN6LIBREV),$(WNNLIBDIR)) + #endif + +-InstallLibrary(wnn6_fromsrc,$(WNNLIBDIR)) ++InstallLibrary(wnn6_for_wnn7_fromsrc,$(WNNLIBDIR)) + + #if ProfileLibJlib + ProfiledLibraryTarget(wnn,$(OBJS)) diff --git a/japanese/Wnn7-lib/files/patch-wnn7-ae b/japanese/Wnn7-lib/files/patch-wnn7-ae new file mode 100644 index 000000000000..f253bc3d6694 --- /dev/null +++ b/japanese/Wnn7-lib/files/patch-wnn7-ae @@ -0,0 +1,14 @@ +--- Wnn/jlib/js.c.orig Wed Oct 28 13:36:31 1998 ++++ Wnn/jlib/js.c Wed Jul 18 17:14:31 2001 +@@ -953,8 +953,9 @@ + LockMutex(&msg_lock); + if (wnn_msg_cat == NULL){ + char nlspath[64]; +- strcpy(nlspath, LIBDIR); +- strcat(nlspath, "/%L/%N"); ++ strcpy(nlspath, SHARDIR); ++ strcat(nlspath, "/msg"); ++ strcat(nlspath, "/%N"); + wnn_msg_cat = msg_open("libwnn.msg", nlspath, lang, NULL); + if(wnn_msg_cat == NULL){ + fprintf(stderr, "libwnn: Can't open message file for libwnn.a\n"); diff --git a/japanese/Wnn7-lib/pkg-descr b/japanese/Wnn7-lib/pkg-descr index f77e390aeb2b..45db3ac4d6e3 100644 --- a/japanese/Wnn7-lib/pkg-descr +++ b/japanese/Wnn7-lib/pkg-descr @@ -1,14 +1,14 @@ This port has include files (e.g. wnn/commonhd.h) and a library file -(e.g. libwnn.a) to build Wnn6 clients. The files are compiled from +(e.g. libwnn.a) to build Wnn7 clients. The files are compiled from sources Wnn6-SDK-sources.tar.gz which you can get in WWW: http://www.omronsoft.co.jp The license of the sources is in -/usr/local/share/doc/ja-Wnn6-lib/README +/usr/local/share/doc/ja-Wnn7-lib/README -By the way, you must buy the server of Wnn6, whose name is jserver, +By the way, you must buy the server of Wnn7, whose name is jserver, from Omron Software Co., Ltd. +------------------------------------------+ @@ -18,8 +18,8 @@ from Omron Software Co., Ltd. | FAX: +81-44-246-6011 | +------------------------------------------+ -Wnn6 is one of Japanese input methods. 'Wnn6 for Linux/FreeBSD' is -supported an only Japanese method. However, Wnn4.2 which is free is +Wnn7 is one of Japanese input methods. 'Wnn7 for Linux/BSD' is +supported an only Japanese method. However, FreeWnn which is free is supported Chinese and Korean ones, too. - S. Taoka diff --git a/japanese/Wnn7-lib/pkg-plist b/japanese/Wnn7-lib/pkg-plist index c147ac847f29..e5a66b3a4d0e 100644 --- a/japanese/Wnn7-lib/pkg-plist +++ b/japanese/Wnn7-lib/pkg-plist @@ -1,30 +1,30 @@ -include/wnn6/wnn/commonhd.h -include/wnn6/wnn/config.h -include/wnn6/wnn/copyright.h -include/wnn6/wnn/cplib.h -include/wnn6/wnn/demcom.h -include/wnn6/wnn/dslib.h -include/wnn6/wnn/fi_jdata.h -include/wnn6/wnn/hinsi_file.h -include/wnn6/wnn/jd_sock.h -include/wnn6/wnn/jdata.h -include/wnn6/wnn/jh.h -include/wnn6/wnn/jlib.h -include/wnn6/wnn/jllib.h -include/wnn6/wnn/jslib.h -include/wnn6/wnn/msg.h -include/wnn6/wnn/mt_jlib.h -include/wnn6/wnn/mt_jserver.h -include/wnn6/wnn/rk_spclval.h -include/wnn6/wnn/serverdefs.h -include/wnn6/wnn/wnn_os.h -include/wnn6/wnn/wnn_string.h -include/wnn6/wnn/wnnerror.h -@dirrm include/wnn6/wnn -@dirrm include/wnn6 -lib/libwnn6_fromsrc.a -lib/libwnn6.a -lib/libwnn6.so -lib/libwnn6.so.1 -share/doc/ja-Wnn6-lib/README -@dirrm share/doc/ja-Wnn6-lib +include/wnn7/wnn/commonhd.h +include/wnn7/wnn/config.h +include/wnn7/wnn/copyright.h +include/wnn7/wnn/cplib.h +include/wnn7/wnn/demcom.h +include/wnn7/wnn/dslib.h +include/wnn7/wnn/fi_jdata.h +include/wnn7/wnn/hinsi_file.h +include/wnn7/wnn/jd_sock.h +include/wnn7/wnn/jdata.h +include/wnn7/wnn/jh.h +include/wnn7/wnn/jlib.h +include/wnn7/wnn/jllib.h +include/wnn7/wnn/jslib.h +include/wnn7/wnn/msg.h +include/wnn7/wnn/mt_jlib.h +include/wnn7/wnn/mt_jserver.h +include/wnn7/wnn/rk_spclval.h +include/wnn7/wnn/serverdefs.h +include/wnn7/wnn/wnn_os.h +include/wnn7/wnn/wnn_string.h +include/wnn7/wnn/wnnerror.h +@dirrm include/wnn7/wnn +@dirrm include/wnn7 +lib/libwnn6_for_wnn7_fromsrc.a +lib/libwnn6_for_wnn7.a +lib/libwnn6_for_wnn7.so +lib/libwnn6_for_wnn7.so.1 +share/doc/ja-Wnn7-lib/README +@dirrm share/doc/ja-Wnn7-lib diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile index 310b3a8cb447..40709391fad5 100644 --- a/japanese/jvim-canna+wnn7/Makefile +++ b/japanese/jvim-canna+wnn7/Makefile @@ -1,13 +1,12 @@ -# New ports collection makefile for: jvim for Canna and Wnn6 -# Date created: 5 Sep 1997 +# New ports collection makefile for: jvim for Canna and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+wnn6 CANNA= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../jvim PKGDIR= ${.CURDIR} diff --git a/japanese/jvim-canna+wnn7/pkg-comment b/japanese/jvim-canna+wnn7/pkg-comment index 20d54285eebf..d20c1a40ccc4 100644 --- a/japanese/jvim-canna+wnn7/pkg-comment +++ b/japanese/jvim-canna+wnn7/pkg-comment @@ -1 +1 @@ -Japanized Vim (with Canna and Wnn6) +Japanized Vim (with Canna and Wnn7) diff --git a/japanese/jvim-canna+wnn7/pkg-descr b/japanese/jvim-canna+wnn7/pkg-descr index c3fe6a38f78f..2894726bcdf9 100644 --- a/japanese/jvim-canna+wnn7/pkg-descr +++ b/japanese/jvim-canna+wnn7/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 Wnn6. +This package is built with Japanese support, using Canna and Wnn7. 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-wnn7/Makefile b/japanese/jvim-wnn7/Makefile index c351b2e8d27b..775335f2ceda 100644 --- a/japanese/jvim-wnn7/Makefile +++ b/japanese/jvim-wnn7/Makefile @@ -1,12 +1,11 @@ -# New ports collection makefile for: jvim for Wnn6 -# Date created: 5 Sep 1997 +# New ports collection makefile for: jvim for Wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -wnn6 -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../jvim PKGDIR= ${.CURDIR} diff --git a/japanese/jvim-wnn7/pkg-comment b/japanese/jvim-wnn7/pkg-comment index 3a3fb7a6fff5..fcd8e0c646f1 100644 --- a/japanese/jvim-wnn7/pkg-comment +++ b/japanese/jvim-wnn7/pkg-comment @@ -1 +1 @@ -Japanized Vim (with Wnn6) +Japanized Vim (with Wnn7) diff --git a/japanese/jvim-wnn7/pkg-descr b/japanese/jvim-wnn7/pkg-descr index 8b8705ac9626..12dfb2918242 100644 --- a/japanese/jvim-wnn7/pkg-descr +++ b/japanese/jvim-wnn7/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 Wnn6 as default. +This package is built with Japanese support, using Wnn7 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 0aa5d070e224..7c9e522314c3 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -7,6 +7,7 @@ PORTNAME= jvim PORTVERSION= 2.0r +PKGNAMESUFFIX= ${INPUT_METHOD} CATEGORIES= japanese editors MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Japan/onew/ \ ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/ @@ -40,6 +41,12 @@ 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 +.elif defined(WNN7) +INPUT_METHOD+= wnn7 +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib +RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} +JPDEF+= -DWNN_ISDIR +JPLIB+= -ljd -lcrypt .endif # # Make a value of INPUT_METHOD diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile index 3088260ab82f..c78cf80a6a26 100644 --- a/japanese/jvim3-canna+wnn7/Makefile +++ b/japanese/jvim3-canna+wnn7/Makefile @@ -1,12 +1,12 @@ -# New ports collection makefile for: jvim3 for Canna and Wnn6 -# Date created: 98/11/17 +# New ports collection makefile for: jvim3 for Canna and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # CANNA= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../jvim3 PKGDIR= ${.CURDIR} diff --git a/japanese/jvim3-canna+wnn7/pkg-comment b/japanese/jvim3-canna+wnn7/pkg-comment index 1f63536f57dd..f3028b3196c5 100644 --- a/japanese/jvim3-canna+wnn7/pkg-comment +++ b/japanese/jvim3-canna+wnn7/pkg-comment @@ -1 +1 @@ -Japanized Vim-3.0 (with Canna and Wnn6) +Japanized Vim-3.0 (with Canna and Wnn7) diff --git a/japanese/jvim3-canna+wnn7/pkg-descr b/japanese/jvim3-canna+wnn7/pkg-descr index 5218480ba193..337e71ee4321 100644 --- a/japanese/jvim3-canna+wnn7/pkg-descr +++ b/japanese/jvim3-canna+wnn7/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 Wnn6. +This package is built with Japanese support, using Canna and Wnn7. 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-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile index cbacb366dff3..2363104e8dd2 100644 --- a/japanese/jvim3-wnn7/Makefile +++ b/japanese/jvim3-wnn7/Makefile @@ -1,11 +1,11 @@ -# New ports collection makefile for: jvim3 for Wnn6 -# Date created: 98/11/17 +# New ports collection makefile for: jvim3 for Wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../jvim3 PKGDIR= ${.CURDIR} diff --git a/japanese/jvim3-wnn7/pkg-comment b/japanese/jvim3-wnn7/pkg-comment index 97595d0815e5..04cc70d1b793 100644 --- a/japanese/jvim3-wnn7/pkg-comment +++ b/japanese/jvim3-wnn7/pkg-comment @@ -1 +1 @@ -Japanized Vim-3.0 (with Wnn6) +Japanized Vim-3.0 (with Wnn7) diff --git a/japanese/jvim3-wnn7/pkg-descr b/japanese/jvim3-wnn7/pkg-descr index 355a336e2395..f979647a8df6 100644 --- a/japanese/jvim3-wnn7/pkg-descr +++ b/japanese/jvim3-wnn7/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 Wnn6. +This package is built with Japanese support, using Wnn7. 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 17ce58b1a505..f4a1b3a4181f 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -72,6 +72,11 @@ INPUT_METHOD+= wnn6 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${LOCALBASE}/lib -ljd -lcrypt +.elif defined(WNN7) +INPUT_METHOD+= wnn7 +LIB_DEPENDS+= jd.0:${PORTSDIR}/japanese/FreeWnn-lib +RUN_DEPENDS+= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA:${PORTSDIR}/japanese/onew${INPUT_METHOD} +FEPLIBS+= -L${LOCALBASE}/lib -ljd -lcrypt .endif .endif # DIRECT_CANNA # diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile index b0cedcde9944..3d8be98f5f8b 100644 --- a/japanese/kinput2-canna+sj3+wnn7/Makefile +++ b/japanese/kinput2-canna+sj3+wnn7/Makefile @@ -1,5 +1,5 @@ -# New ports collection makefile for: kinput2-canna+sj3+wnn6 -# Date created: 19 Dec 1997 +# New ports collection makefile for: kinput2-canna+sj3+wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ @@ -7,7 +7,7 @@ CANNA= yes SJ3= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR} diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-comment b/japanese/kinput2-canna+sj3+wnn7/pkg-comment index f446320b0e30..3a28ceadca77 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-comment +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Canna+SJ3+Wnn6) +Input server of Japanese text (Canna+SJ3+Wnn7) diff --git a/japanese/kinput2-canna+sj3+wnn7/pkg-descr b/japanese/kinput2-canna+sj3+wnn7/pkg-descr index c936fc0bf0e7..b41e5c18b90b 100644 --- a/japanese/kinput2-canna+sj3+wnn7/pkg-descr +++ b/japanese/kinput2-canna+sj3+wnn7/pkg-descr @@ -6,7 +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 Canna, SJ3 and Wnn6. Egg key binding is avairable, +The port supports Canna, SJ3 and Wnn7(temporary). Egg key binding is avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile index 83fa48e6d38f..4ae20ef7b853 100644 --- a/japanese/kinput2-canna+wnn7/Makefile +++ b/japanese/kinput2-canna+wnn7/Makefile @@ -1,12 +1,12 @@ -# New ports collection makefile for: kinput2-canna+wnn6 -# Date created: 19 Dec 1997 +# New ports collection makefile for: kinput2-canna+wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # CANNA= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR} diff --git a/japanese/kinput2-canna+wnn7/pkg-comment b/japanese/kinput2-canna+wnn7/pkg-comment index 6b24282e24fc..9985b86f16d6 100644 --- a/japanese/kinput2-canna+wnn7/pkg-comment +++ b/japanese/kinput2-canna+wnn7/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Canna+Wnn6) +Input server of Japanese text (Canna+Wnn7) diff --git a/japanese/kinput2-canna+wnn7/pkg-descr b/japanese/kinput2-canna+wnn7/pkg-descr index 8f1a8a47474b..91e40b474a47 100644 --- a/japanese/kinput2-canna+wnn7/pkg-descr +++ b/japanese/kinput2-canna+wnn7/pkg-descr @@ -6,7 +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 Canna and Wnn6. Egg key binding is avairable, +The port supports Canna and Wnn7(temporary). 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 e06705e38597..a6fc09d4659c 100644 --- a/japanese/kinput2-freewnn/Makefile +++ b/japanese/kinput2-freewnn/Makefile @@ -22,7 +22,7 @@ FILESDIR= ${.CURDIR}/../kinput2-freewnn/files USE_IMAKE= yes MAN1= kinput2.1 -.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) +.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) # For this port FREEWNN= yes .endif @@ -51,6 +51,11 @@ INPUT_METHOD+= wnn6 LIB_INPUT_METHOD+= wnn6.1:${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+= wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib +KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ + -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6_for_wnn7 -lcrypt" .endif # # Make a value of INPUT_METHOD diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile index beef5feb502c..bfc2de08411f 100644 --- a/japanese/kinput2-sj3+wnn7/Makefile +++ b/japanese/kinput2-sj3+wnn7/Makefile @@ -1,12 +1,12 @@ -# New ports collection makefile for: kinput2-sj3+wnn6 -# Date created: 19 Dec 1997 +# New ports collection makefile for: kinput2-sj3+wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # SJ3= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR} diff --git a/japanese/kinput2-sj3+wnn7/pkg-comment b/japanese/kinput2-sj3+wnn7/pkg-comment index 8420ac991ae4..97e3b54f1e60 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-comment +++ b/japanese/kinput2-sj3+wnn7/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (SJ3+Wnn6) +Input server of Japanese text (SJ3+Wnn7) diff --git a/japanese/kinput2-sj3+wnn7/pkg-descr b/japanese/kinput2-sj3+wnn7/pkg-descr index 55dce61d0eae..fc580f7d710d 100644 --- a/japanese/kinput2-sj3+wnn7/pkg-descr +++ b/japanese/kinput2-sj3+wnn7/pkg-descr @@ -6,7 +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 SJ3 and Wnn6. Egg key binding is avairable, +The port supports SJ3 and Wnn7(temporary). Egg key binding is avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile index e6c8263d21b7..21ffa2ce41b9 100644 --- a/japanese/kinput2-wnn7/Makefile +++ b/japanese/kinput2-wnn7/Makefile @@ -1,11 +1,11 @@ -# New ports collection makefile for: kinput2-wnn6 -# Date created: 19 Dec 1997 +# New ports collection makefile for: kinput2-wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../kinput2-freewnn/ PKGDIR= ${.CURDIR} diff --git a/japanese/kinput2-wnn7/pkg-comment b/japanese/kinput2-wnn7/pkg-comment index ab81784de0e9..4cca6e820991 100644 --- a/japanese/kinput2-wnn7/pkg-comment +++ b/japanese/kinput2-wnn7/pkg-comment @@ -1 +1 @@ -Input server of Japanese text (Wnn6) +Input server of Japanese text (Wnn7) diff --git a/japanese/kinput2-wnn7/pkg-descr b/japanese/kinput2-wnn7/pkg-descr index 71c7ca2a09be..89938ea0fb3e 100644 --- a/japanese/kinput2-wnn7/pkg-descr +++ b/japanese/kinput2-wnn7/pkg-descr @@ -6,7 +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 Wnn6. Egg key binding is avairable, +The port supports Wnn7(temporary). Egg key binding is avairable, if you run kinput2 -ccdef ccdef.kinput2.egg diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index e06705e38597..a6fc09d4659c 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -22,7 +22,7 @@ FILESDIR= ${.CURDIR}/../kinput2-freewnn/files USE_IMAKE= yes MAN1= kinput2.1 -.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) +.if !defined(CANNA) && !defined(SJ3) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) # For this port FREEWNN= yes .endif @@ -51,6 +51,11 @@ INPUT_METHOD+= wnn6 LIB_INPUT_METHOD+= wnn6.1:${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+= wnn6_for_wnn7.1:${PORTSDIR}/japanese/Wnn7-lib +KINPUT2_DEF+= -DUseWnn -DUseWnn6 -Dport_WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \ + -Dport_WNNLIB="-L$(LOCALBASE)/lib -lwnn6_for_wnn7 -lcrypt" .endif # # Make a value of INPUT_METHOD diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile index 8620e654f287..2dffa040cbfe 100644 --- a/japanese/mule-canna+sj3+wnn7/Makefile +++ b/japanese/mule-canna+sj3+wnn7/Makefile @@ -1,16 +1,14 @@ -# New ports collection makefile for: mule with Canna, sj3 and Wnn6 -# Date created: 7 July 1997 +# New ports collection makefile for: mule with Canna, sj3 and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+sj3+wnn6 CATEGORIES= japanese - CANNA= yes SJ3= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR} diff --git a/japanese/mule-canna+sj3+wnn7/pkg-comment b/japanese/mule-canna+sj3+wnn7/pkg-comment index 66813a9c7338..e31cc4f9b3e4 100644 --- a/japanese/mule-canna+sj3+wnn7/pkg-comment +++ b/japanese/mule-canna+sj3+wnn7/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Canna, sj3, Wnn4, and Wnn6 support built-in +A multilingual emacs, with Canna, sj3, FreeWnn, Wnn6 and Wnn7 support built-in diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile index 225171354406..cd00f7474e7b 100644 --- a/japanese/mule-canna+wnn7/Makefile +++ b/japanese/mule-canna+wnn7/Makefile @@ -1,17 +1,15 @@ -# New ports collection makefile for: mule with Canna and Wnn6 -# Date created: 7 July 1997 +# New ports collection makefile for: mule with Canna and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -canna+wnn6 CATEGORIES= japanese - CANNA= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR} -.include "${MASTERDIR}/Makefile" +.include "${MASTERDIR}/Makefile" diff --git a/japanese/mule-canna+wnn7/pkg-comment b/japanese/mule-canna+wnn7/pkg-comment index e67e75949ddd..b334c0e570c8 100644 --- a/japanese/mule-canna+wnn7/pkg-comment +++ b/japanese/mule-canna+wnn7/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Canna, Wnn4, and Wnn6 support built-in +A multilingual emacs, with Canna, FreeWnn, Wnn6 and Wnn7 support built-in diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile index 95fa0a2d81c3..b8795d9b3bd0 100644 --- a/japanese/mule-sj3+wnn7/Makefile +++ b/japanese/mule-sj3+wnn7/Makefile @@ -1,15 +1,13 @@ -# New ports collection makefile for: mule with sj3 and Wnn6 -# Date created: 7 July 1997 +# New ports collection makefile for: mule with sj3 and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -sj3+wnn6 CATEGORIES= japanese - SJ3= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR} diff --git a/japanese/mule-sj3+wnn7/pkg-comment b/japanese/mule-sj3+wnn7/pkg-comment index 1fe39129b64a..5929be414783 100644 --- a/japanese/mule-sj3+wnn7/pkg-comment +++ b/japanese/mule-sj3+wnn7/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with sj3, Wnn4, and Wnn6 support built-in +A multilingual emacs, with sj3, FreeWnn, Wnn6 and Wnn7 support built-in diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile index 98c1d7c63b16..eb526b4b986c 100644 --- a/japanese/mule-wnn7/Makefile +++ b/japanese/mule-wnn7/Makefile @@ -1,14 +1,12 @@ -# New ports collection makefile for: mule with Wnn6 -# Date created: 7 July 1997 -# Whom: Satoshi Taoka <taoka@FreeBSD.org> +# New ports collection makefile for: mule with Wnn7 +# Date created: 01/07/18 +# Whom: Satoshi Taoka <taoka@FreeBSD.org> # # $FreeBSD$ # -PKGNAMESUFFIX= -wnn6 CATEGORIES= japanese - -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../../editors/mule PKGDIR= ${.CURDIR} diff --git a/japanese/mule-wnn7/pkg-comment b/japanese/mule-wnn7/pkg-comment index 8bc93df1ae5d..5e9c8ba76c95 100644 --- a/japanese/mule-wnn7/pkg-comment +++ b/japanese/mule-wnn7/pkg-comment @@ -1 +1 @@ -Multilingual emacs, with Wnn4, and Wnn6 support built-in +A multilingual emacs, with FreeWnn, Wnn6 and Wnn7 support built-in diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile index a27515142150..d26338253485 100644 --- a/japanese/onew-canna+wnn7/Makefile +++ b/japanese/onew-canna+wnn7/Makefile @@ -1,12 +1,12 @@ -# New ports collection makefile for: ONEW for Canna and Wnn6 -# Date created: 5 Sep 1997 +# New ports collection makefile for: ONEW for Canna and Wnn7 +# Date created: 01/07/18 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # CANNA= yes -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR} diff --git a/japanese/onew-canna+wnn7/pkg-comment b/japanese/onew-canna+wnn7/pkg-comment index dd8191cadb81..6794bcee48f0 100644 --- a/japanese/onew-canna+wnn7/pkg-comment +++ b/japanese/onew-canna+wnn7/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method Canna and Wnn6 +A library for Japanese Input Methods: Canna and Wnn7 diff --git a/japanese/onew-canna+wnn7/pkg-descr b/japanese/onew-canna+wnn7/pkg-descr index 3f45748ed3a6..ea9cff4be92a 100644 --- a/japanese/onew-canna+wnn7/pkg-descr +++ b/japanese/onew-canna+wnn7/pkg-descr @@ -1,7 +1,7 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or -Wnn6. +ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, +Wnn6 or Wnn7. -This is for Canna and Wnn6. +This port supports Canna and Wnn7. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew-canna+wnn7/pkg-plist b/japanese/onew-canna+wnn7/pkg-plist index ce1c15f12796..1ba6f05e13c0 100644 --- a/japanese/onew-canna+wnn7/pkg-plist +++ b/japanese/onew-canna+wnn7/pkg-plist @@ -1,22 +1,22 @@ -lib/libonew-canna+wnn6.a -share/doc/ja-onew-canna+wnn6/README.ONEW -@dirrm share/doc/ja-onew-canna+wnn6 -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 +lib/libonew-canna+wnn7.a +share/doc/ja-onew-canna+wnn7/README.ONEW +@dirrm share/doc/ja-onew-canna+wnn7 +lib/wnn/ja_JP/rk.wnn7/1B_TOUPPER +lib/wnn/ja_JP/rk.wnn7/1B_ZENHIRA +lib/wnn/ja_JP/rk.wnn7/1B_ZENKATA +lib/wnn/ja_JP/rk.wnn7/1B_newTOUPPER +lib/wnn/ja_JP/rk.wnn7/2A_CTRL +lib/wnn/ja_JP/rk.wnn7/2B_DAKUTEN +lib/wnn/ja_JP/rk.wnn7/2B_JIS +lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA +lib/wnn/ja_JP/rk.wnn7/2_TCODE +lib/wnn/ja_JP/rk.wnn7/3B_HANKATA +lib/wnn/ja_JP/rk.wnn7/3B_KATAKANA +lib/wnn/ja_JP/rk.wnn7/3B_ZENKAKU +lib/wnn/ja_JP/rk.wnn7/autork +lib/wnn/ja_JP/rk.wnn7/mode +lib/wnn/ja_JP/rk.wnn7/mode.hankata +lib/wnn/ja_JP/rk.wnn7/mode.nohankata +@dirrm lib/wnn/ja_JP/rk.wnn7 @dirrm lib/wnn/ja_JP @dirrm lib/wnn diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile index 0a854f5c97a2..c7f3436bc536 100644 --- a/japanese/onew-freewnn/Makefile +++ b/japanese/onew-freewnn/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for FreeWnn +o# New ports collection makefile for: ONEW for FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} # A value 'all' must not be set to TARGET. ALL_TARGET= -.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) +.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) # For this port FREEWNN= yes .endif @@ -40,6 +40,13 @@ INPUT_METHOD+= wnn6 BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR +RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 +.elif defined(WNN7) +INPUT_METHOD+= wnn7 +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib +JPLIB+= -ljd -lcrypt +JPDEF+= -DWNN_ISDIR +RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 .endif # # Make a value of INPUT_METHOD @@ -64,18 +71,18 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR} .endif .endif -.if defined(WNN6) - ${MKDIR} ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 +.if defined(WNN6) || defined(WNN7) + ${MKDIR} ${RK_DIR} for file in 1B_TOUPPER 1B_ZENHIRA 1B_ZENKATA 1B_newTOUPPER \ 2A_CTRL 2B_DAKUTEN 2B_JIS 2B_ROMKANA 2_TCODE \ 3B_HANKATA 3B_KATAKANA 3B_ZENKAKU autork \ mode mode.hankata mode.nohankata; do \ ${INSTALL_DATA} ${LOCALBASE}/lib/wnn/ja_JP/rk/$${file} \ - ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6; \ + ${RK_DIR}; \ done @${ECHO} "############################################################" @${ECHO} "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/" - @${ECHO} " into new directory ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/" + @${ECHO} " into a new directory ${RK_DIR}" @${ECHO} "############################################################" .endif diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 new file mode 100644 index 000000000000..82a00e4bf650 --- /dev/null +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-canna+wnn7 @@ -0,0 +1,12 @@ +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.wnn7:%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 = '"system/%s.dic;usr/$$USER/%s.h"' +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 = $(WNNLIB) $(CANNALIB) +RKKOBJS = $(WNNOBJ) $(CANNAOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/files/ONEW_CONF-for-wnn7 b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn7 new file mode 100644 index 000000000000..a1ea6b4dbb25 --- /dev/null +++ b/japanese/onew-freewnn/files/ONEW_CONF-for-wnn7 @@ -0,0 +1,8 @@ +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.wnn7:%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 = '"system/%s.dic;usr/$$USER/%s.h"' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew-freewnn/pkg-comment b/japanese/onew-freewnn/pkg-comment index fde919fb212d..eaa92c5431fb 100644 --- a/japanese/onew-freewnn/pkg-comment +++ b/japanese/onew-freewnn/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method FreeWnn +A library for a Japanese Input Method: FreeWnn diff --git a/japanese/onew-freewnn/pkg-descr b/japanese/onew-freewnn/pkg-descr index ddd5d708242e..4b60b13e8488 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, FreeWnn, or -Wnn6. +ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, +Wnn6 or Wnn7. -This is for FreeWnn. +This port supports FreeWnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile index 1e07108d66c8..450238f285c9 100644 --- a/japanese/onew-wnn7/Makefile +++ b/japanese/onew-wnn7/Makefile @@ -1,11 +1,11 @@ -# New ports collection makefile for: ONEW for Wnn6 -# Date created: 5 Sep 1997 +# New ports collection makefile for: ONEW for Wnn7 +# Date created: 01/07/11 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # # $FreeBSD$ # -WNN6= yes +WNN7= yes MASTERDIR= ${.CURDIR}/../onew-freewnn PKGDIR= ${.CURDIR} diff --git a/japanese/onew-wnn7/pkg-comment b/japanese/onew-wnn7/pkg-comment index 5c1fc137335e..dfa95ccd5bc0 100644 --- a/japanese/onew-wnn7/pkg-comment +++ b/japanese/onew-wnn7/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method Wnn6 +A library for a Japanese Input Method: Wnn7 diff --git a/japanese/onew-wnn7/pkg-descr b/japanese/onew-wnn7/pkg-descr index 7cc4a052ac8a..7ebf71782454 100644 --- a/japanese/onew-wnn7/pkg-descr +++ b/japanese/onew-wnn7/pkg-descr @@ -1,7 +1,7 @@ -ONEW is a library for using Japanese Input Method Canna, Wnn4, or -Wnn6. +ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, +Wnn6 or Wnn7. -This is for Wnn6. +This port supports Wnn7. -- S. Taoka <taoka@FreeBSD.org> diff --git a/japanese/onew-wnn7/pkg-plist b/japanese/onew-wnn7/pkg-plist index 5cf89e7e5e9f..dfab19be832f 100644 --- a/japanese/onew-wnn7/pkg-plist +++ b/japanese/onew-wnn7/pkg-plist @@ -1,22 +1,22 @@ -lib/libonew-wnn6.a -share/doc/ja-onew-wnn6/README.ONEW -@dirrm share/doc/ja-onew-wnn6 -lib/wnn/ja_JP/rk.wnn6/1B_TOUPPER -lib/wnn/ja_JP/rk.wnn6/1B_ZENHIRA -lib/wnn/ja_JP/rk.wnn6/1B_ZENKATA -lib/wnn/ja_JP/rk.wnn6/1B_newTOUPPER -lib/wnn/ja_JP/rk.wnn6/2A_CTRL -lib/wnn/ja_JP/rk.wnn6/2B_DAKUTEN -lib/wnn/ja_JP/rk.wnn6/2B_JIS -lib/wnn/ja_JP/rk.wnn6/2B_ROMKANA -lib/wnn/ja_JP/rk.wnn6/2_TCODE -lib/wnn/ja_JP/rk.wnn6/3B_HANKATA -lib/wnn/ja_JP/rk.wnn6/3B_KATAKANA -lib/wnn/ja_JP/rk.wnn6/3B_ZENKAKU -lib/wnn/ja_JP/rk.wnn6/autork -lib/wnn/ja_JP/rk.wnn6/mode -lib/wnn/ja_JP/rk.wnn6/mode.hankata -lib/wnn/ja_JP/rk.wnn6/mode.nohankata -@dirrm lib/wnn/ja_JP/rk.wnn6 +lib/libonew-wnn7.a +share/doc/ja-onew-wnn7/README.ONEW +@dirrm share/doc/ja-onew-wnn7 +lib/wnn/ja_JP/rk.wnn7/1B_TOUPPER +lib/wnn/ja_JP/rk.wnn7/1B_ZENHIRA +lib/wnn/ja_JP/rk.wnn7/1B_ZENKATA +lib/wnn/ja_JP/rk.wnn7/1B_newTOUPPER +lib/wnn/ja_JP/rk.wnn7/2A_CTRL +lib/wnn/ja_JP/rk.wnn7/2B_DAKUTEN +lib/wnn/ja_JP/rk.wnn7/2B_JIS +lib/wnn/ja_JP/rk.wnn7/2B_ROMKANA +lib/wnn/ja_JP/rk.wnn7/2_TCODE +lib/wnn/ja_JP/rk.wnn7/3B_HANKATA +lib/wnn/ja_JP/rk.wnn7/3B_KATAKANA +lib/wnn/ja_JP/rk.wnn7/3B_ZENKAKU +lib/wnn/ja_JP/rk.wnn7/autork +lib/wnn/ja_JP/rk.wnn7/mode +lib/wnn/ja_JP/rk.wnn7/mode.hankata +lib/wnn/ja_JP/rk.wnn7/mode.nohankata +@dirrm lib/wnn/ja_JP/rk.wnn7 @dirrm lib/wnn/ja_JP @dirrm lib/wnn diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index 0a854f5c97a2..c7f3436bc536 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -1,4 +1,4 @@ -# New ports collection makefile for: ONEW for FreeWnn +o# New ports collection makefile for: ONEW for FreeWnn # Date created: 5 Sep 1997 # Whom: Satoshi TAOKA <taoka@FreeBSD.org> # @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} # A value 'all' must not be set to TARGET. ALL_TARGET= -.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) +.if !defined(CANNA) && !defined(FREEWNN) && !defined(WNN6) && !defined(WNN7) # For this port FREEWNN= yes .endif @@ -40,6 +40,13 @@ INPUT_METHOD+= wnn6 BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib JPLIB+= -ljd -lcrypt JPDEF+= -DWNN_ISDIR +RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 +.elif defined(WNN7) +INPUT_METHOD+= wnn7 +BUILD_DEPENDS+= ${LOCALBASE}/lib/libjd.a:${PORTSDIR}/japanese/FreeWnn-lib +JPLIB+= -ljd -lcrypt +JPDEF+= -DWNN_ISDIR +RK_DIR= ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn7 .endif # # Make a value of INPUT_METHOD @@ -64,18 +71,18 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README.ONEW ${PORT_DOCDIR} .endif .endif -.if defined(WNN6) - ${MKDIR} ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6 +.if defined(WNN6) || defined(WNN7) + ${MKDIR} ${RK_DIR} for file in 1B_TOUPPER 1B_ZENHIRA 1B_ZENKATA 1B_newTOUPPER \ 2A_CTRL 2B_DAKUTEN 2B_JIS 2B_ROMKANA 2_TCODE \ 3B_HANKATA 3B_KATAKANA 3B_ZENKAKU autork \ mode mode.hankata mode.nohankata; do \ ${INSTALL_DATA} ${LOCALBASE}/lib/wnn/ja_JP/rk/$${file} \ - ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6; \ + ${RK_DIR}; \ done @${ECHO} "############################################################" @${ECHO} "We install all files in ${LOCALBASE}/lib/wnn/ja_JP/rk/" - @${ECHO} " into new directory ${LOCALBASE}/lib/wnn/ja_JP/rk.wnn6/" + @${ECHO} " into a new directory ${RK_DIR}" @${ECHO} "############################################################" .endif diff --git a/japanese/onew/files/ONEW_CONF-for-canna+wnn7 b/japanese/onew/files/ONEW_CONF-for-canna+wnn7 new file mode 100644 index 000000000000..82a00e4bf650 --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-canna+wnn7 @@ -0,0 +1,12 @@ +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.wnn7:%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 = '"system/%s.dic;usr/$$USER/%s.h"' +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 = $(WNNLIB) $(CANNALIB) +RKKOBJS = $(WNNOBJ) $(CANNAOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/files/ONEW_CONF-for-wnn7 b/japanese/onew/files/ONEW_CONF-for-wnn7 new file mode 100644 index 000000000000..a1ea6b4dbb25 --- /dev/null +++ b/japanese/onew/files/ONEW_CONF-for-wnn7 @@ -0,0 +1,8 @@ +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.wnn7:%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 = '"system/%s.dic;usr/$$USER/%s.h"' +RKKLIBS = $(WNNLIB) +RKKOBJS = $(WNNOBJ) +MISCLIB = -lcrypt diff --git a/japanese/onew/pkg-comment b/japanese/onew/pkg-comment index fde919fb212d..eaa92c5431fb 100644 --- a/japanese/onew/pkg-comment +++ b/japanese/onew/pkg-comment @@ -1 +1 @@ -A library for Japanese Input Method FreeWnn +A library for a Japanese Input Method: FreeWnn diff --git a/japanese/onew/pkg-descr b/japanese/onew/pkg-descr index ddd5d708242e..4b60b13e8488 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, FreeWnn, or -Wnn6. +ONEW is a library for using Japanese Input Methods: Canna, FreeWnn, +Wnn6 or Wnn7. -This is for FreeWnn. +This port supports FreeWnn. -- S. Taoka <taoka@FreeBSD.org> diff --git a/textproc/coco/Makefile b/textproc/coco/Makefile index 02b1b1583db1..a7918e74d257 100644 --- a/textproc/coco/Makefile +++ b/textproc/coco/Makefile @@ -7,6 +7,7 @@ PORTNAME= mule-common PORTVERSION= ${MULE_VERSION} +PORTREVISION= 1 CATEGORIES= editors japanese MASTER_SITES= ftp://etlport.etl.go.jp/pub/mule/ \ ftp://ftp.mei.co.jp/archive/free/gnu/emacs/Mule/ \ diff --git a/textproc/coco/files/patch-mm b/textproc/coco/files/patch-mm index f0b930462208..9a61745a872b 100644 --- a/textproc/coco/files/patch-mm +++ b/textproc/coco/files/patch-mm @@ -1,5 +1,5 @@ ---- configure.orig Fri Sep 8 14:13:47 2000 -+++ configure Fri Sep 8 14:15:09 2000 +--- configure.orig Wed Jul 18 16:03:57 2001 ++++ configure Wed Jul 18 16:37:11 2001 @@ -38,6 +38,10 @@ ac_help="$ac_help --with-wnn6 Use Wnn6 library to input Japanese or Chinese" @@ -33,7 +33,7 @@ archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}' docdir='${datadir}/${emacs_prefix}/${version}/etc' -@@ -671,9 +676,16 @@ +@@ -671,9 +676,20 @@ fi @@ -46,11 +46,15 @@ # Check whether --with-wnn6 or --without-wnn6 was given. if test "${with_wnn6+set}" = set; then withval="$with_wnn6" -+ wnnlib=-lwnn6 ++if test "${with_wnn6}" = yes; then ++ wnnlib=-lwnn6 ++else ++ wnnlib=$with_wnn6 ++fi with_wnn=${withval}; cat >> confdefs.h <<\EOF #define WNN6 1 EOF -@@ -3104,12 +3116,12 @@ +@@ -3104,12 +3120,12 @@ if test -n "${with_wnn_libraries}" ; then if test -d ${with_wnn_libraries} ; then LD_SWITCH_WNN="-L${with_wnn_libraries}" diff --git a/textproc/coco/files/patch-oa b/textproc/coco/files/patch-oa new file mode 100644 index 000000000000..dfcc9c9d2630 --- /dev/null +++ b/textproc/coco/files/patch-oa @@ -0,0 +1,117 @@ +--- lisp/eggrc-wnn.orig Mon Jul 16 04:31:14 2001 ++++ lisp/eggrc-wnn Mon Jul 16 04:33:22 2001 +@@ -86,6 +86,99 @@ + + ) + ++(defun wnn7-jserver-setup () ++ (set-wnn-reverse nil) ++ (set-wnn-fuzokugo "system/kougo.fzk") ++ (add-wnn-fisys-dict "system/fisd" ++ (concat wnn-usr-dic-dir "/fisd.h") t) ++ (add-wnn-fiusr-dict (concat wnn-usr-dic-dir "/fiud") "" t nil) ++ (add-wnn-dict "system/kihon.dic" ++ (concat wnn-usr-dic-dir "/kihon.h") 6 nil t) ++ (add-wnn-dict "system/symbol.dic" ++ (concat wnn-usr-dic-dir "/symbol.h") 1 nil t) ++;; (add-wnn-dict "system/symbol_noat.dic" ++;; (concat wnn-usr-dic-dir "/symbol_noat.h") 1 nil t) ++ (add-wnn-dict "system/tel.dic" ++ (concat wnn-usr-dic-dir "/tel.h") 1 nil t) ++ (add-wnn-dict "system/zip.dic" ++ (concat wnn-usr-dic-dir "/zip.h") 1 nil t) ++ (add-wnn-dict "system/tankan.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankan2.dic" "" 1 nil nil) ++ (add-wnn-dict "system/ikeiji.dic" "" 1 nil nil) ++ (add-wnn-dict "system/rensou.dic" "" 1 nil nil) ++ (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t) ++ ++; (add-wnn-dict "option/jinmei.dic" ++; (concat wnn-usr-dic-dir "/jinmei.h") 1 nil t) ++; (add-wnn-dict "option/chimei.dic" ++; (concat wnn-usr-dic-dir "/chimei.h") 1 nil t) ++; (add-wnn-dict "option/address.dic" ++; (concat wnn-usr-dic-dir "/address.h") 1 nil t) ++; (add-wnn-dict "option/station.dic" ++; (concat wnn-usr-dic-dir "/station.h") 1 nil t) ++; (add-wnn-dict "option/kana_english.dic" ++; (concat wnn-usr-dic-dir "/kana_english.h") 1 nil t) ++; (add-wnn-dict "option/enterprise.dic" ++; (concat wnn-usr-dic-dir "/enterprise.h") 1 nil t) ++; (add-wnn-dict "option/airport.dic" ++; (concat wnn-usr-dic-dir "/airport.h") 1 nil t) ++; (add-wnn-dict "option/university.dic" ++; (concat wnn-usr-dic-dir "/university.h") 1 nil t) ++; (add-wnn-dict "option/zoo.dic" ++; (concat wnn-usr-dic-dir "/zoo.h") 1 nil t) ++; (add-wnn-dict "option/botanical_garden.dic" ++; (concat wnn-usr-dic-dir "/botanical_garden.h") 1 nil t) ++; (add-wnn-dict "option/aquarium.dic" ++; (concat wnn-usr-dic-dir "/aquarium.h") 1 nil t) ++; (add-wnn-dict "option/conveni.dic" ++; (concat wnn-usr-dic-dir "/conveni.h") 1 nil t) ++; (add-wnn-dict "option/amusement.dic" ++; (concat wnn-usr-dic-dir "/amusement.h") 1 nil t) ++ ++ (set-wnn-param 5 10 2 45 0 80 5 1 20 0 400 -100 400 80 200 2 200) ++ ++ (add-wnn-notrans-dict (concat wnn-usr-dic-dir "/katakana") 15 t) ++ (add-wnn-bmodify-dict (concat wnn-usr-dic-dir "/bunsetsu") 15 t) ++ ++ (set-last-is-first-mode t) ++ (set-complex-conv-mode nil) ++; (set-okuri-flag -1) ++ (set-prefix-flag 0) ++ ++ (set-okuri-learn-mode t) ++ (set-prefix-learn-mode t) ++ (set-suffix-learn-mode t) ++ (set-common-learn-mode t) ++ (set-yuragi-mode nil) ++ ++ (set-freq-func-mode 4) ++ ++; (set-numeric-mode -12) ++; (set-alphabet-mode -30) ++; (set-symbol-mode -40) ++ ++ (set-wnn-reverse t) ++ (set-wnn-fuzokugo "system/kougo.fzk") ++ (add-wnn-dict "system/kihonR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/telR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/zipR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankanR.dic" "" 1 nil nil) ++ (add-wnn-dict "system/tankan2R.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/stationR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/kana_englishR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/enterpriseR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/airportR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/universityR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/zooR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/botanical_gardenR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/aquariumR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/conveniR.dic" "" 1 nil nil) ++ ;;(add-wnn-dict "option/amusementR.dic" "" 1 nil nil) ++ ++ (add-wnn-dict (concat wnn-usr-dic-dir "/ud") "" 15 t t) ++ (set-wnn-param 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200) ++ ) ++ + + (defun wnn4-jserver-setup () + (set-wnn-reverse nil) +@@ -126,9 +219,11 @@ + ) + + (cond ((eq wnn-server-type 'jserver) +- (if (is-wnn6-server) +- (wnn6-jserver-setup) +- (wnn4-jserver-setup))) ++ (if (is-wnn7-server) ++ (wnn7-jserver-setup) ++ (if (is-wnn6-server) ++ (wnn6-jserver-setup) ++ (wnn4-jserver-setup)))) + ((eq wnn-server-type 'cserver) + (set-wnn-reverse nil) + (set-wnn-fuzokugo "sys/full.con") diff --git a/textproc/coco/files/patch-ob b/textproc/coco/files/patch-ob new file mode 100644 index 000000000000..9d512f97cc25 --- /dev/null +++ b/textproc/coco/files/patch-ob @@ -0,0 +1,12 @@ +--- lisp/wnn-egg.el.bak Mon Jul 16 04:37:50 2001 ++++ lisp/wnn-egg.el Mon Jul 16 04:42:05 2001 +@@ -606,6 +606,9 @@ + (defun is-wnn6-server () + (= (wnn-server-version) 61697)) + ++(defun is-wnn7-server () ++ (= (wnn-server-version) 61698)) ++ + (defun add-wnn-dict (dfile hfile priority dmode hmode &optional dpaswd hpaswd) + ; (open-wnn-if-disconnected) + (if (null (wnn-server-dict-add |