diff options
Diffstat (limited to '')
| -rw-r--r-- | editors/mule-common/Makefile | 1 | ||||
| -rw-r--r-- | editors/mule-common/files/patch-mm | 14 | ||||
| -rw-r--r-- | editors/mule-common/files/patch-oa | 117 | ||||
| -rw-r--r-- | editors/mule-common/files/patch-ob | 12 | ||||
| -rw-r--r-- | editors/mule/Makefile | 31 | ||||
| -rw-r--r-- | editors/mule/pkg-descr | 39 |
6 files changed, 188 insertions, 26 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 |