diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2005-12-07 10:46:20 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2005-12-07 10:46:20 +0000 |
| commit | fcd17611d6b375d48b45c9050eee38d1e4641648 (patch) | |
| tree | f6e34e6fe82960a4a1d9d916db87da356b8ec1e3 /japanese | |
| parent | af88454ee247a028bee170241b5794bf9ec6f09d (diff) | |
| download | ports-fcd17611d6b375d48b45c9050eee38d1e4641648.tar.gz ports-fcd17611d6b375d48b45c9050eee38d1e4641648.zip | |
Notes
Diffstat (limited to 'japanese')
41 files changed, 278 insertions, 1510 deletions
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index c2b359302fb7..ede59fccafc2 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -6,34 +6,36 @@ # PORTNAME= FreeWnn -PORTVERSION= ${WMMVERSION:S/-/./} -#PORTREVISION= 1 +PORTVERSION= 1.1.1.a021 +PORTREVISION= 0 CATEGORIES?= japanese -MASTER_SITES= ftp://ftp.freewnn.org/pub/FreeWnn/alpha/ +MASTER_SITES= ftp://ftp.freewnn.org/pub/%SUBDIR%/ \ + ${MASTER_SITE_SOURCEFORGE_JP} +MASTER_SITE_SUBDIR= FreeWnn/alpha \ + freewnn/17724 PKGNAMESUFFIX?= -lib -DISTNAME= ${PORTNAME}-${WMMVERSION} +DISTNAME= ${PORTNAME}-1.1.1-a021 MAINTAINER= ports@FreeBSD.org COMMENT?= A Japanese/Chinese/Korean input method (Japanese client libraries) -WRKSRC= ${WRKDIR}/FreeWnn-1.10-pl020 -ALL_TARGET= includes all -INSTALL_TARGET= install install.man +USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:213 libtool:15 -MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}" +USE_AUTOTOOLS= autoconf:253 libtool:15 INSTALLS_SHLIB= yes -USE_BZIP2= yes - -WMMVERSION= 1.1.1-a020 +MAKE_ARGS= CDEBUGFLAGS="${CFLAGS}" +ALL_TARGET= includes all +INSTALL_TARGET= install install.man WNN?= Wnn .if (${PKGNAMESUFFIX} == -lib) CONFIGURE_ARGS= --enable-server=no -## I must use MLINKS, but .... -NOMANCOMPRESS= yes .else CONFIGURE_ARGS= --enable-libraries=no +USE_RC_SUBR= yes +SUB_FILES= pkg-install +SUB_LIST= RC_SUBR=${RC_SUBR} +PKGINSTALL= ${WRKDIR}/pkg-install .endif .if (${WNN} == Wnn) @@ -41,45 +43,167 @@ CONFIGURE_ARGS+= --enable-cWnn=no --enable-kWnn=no MANLANG= ja CONFIGURE_ARGS+= --mandir=${PREFIX}/man/ja .if (${PKGNAMESUFFIX} == -lib) -MAN3= jl_bun_suu.3 jl_c_zenkouho.3 jl_close.3 jl_connect.3 jl_connect_lang.3 \ - jl_dai_top.3 jl_dic_add.3 jl_dic_add_e.3 jl_dic_comment_set.3 \ - jl_dic_comment_set_e.3 jl_dic_delete.3 jl_dic_delete_e.3 jl_dic_list.3 \ - jl_dic_list_e.3 jl_dic_save.3 jl_dic_save_all.3 jl_dic_save_all_e.3 \ - jl_dic_save_e.3 jl_dic_use.3 jl_dic_use_e.3 jl_disconnect.3 jl_env.3 \ - jl_env_get.3 jl_env_set.3 jl_env_sticky.3 jl_env_sticky_e.3 \ - jl_env_un_sticky.3 jl_env_un_sticky_e.3 jl_fuzokugo_get.3 \ - jl_fuzokugo_get_e.3 jl_fuzokugo_set.3 jl_fuzokugo_set_e.3 jl_get_kanji.3 \ - jl_get_yomi.3 jl_get_zenkouho_kanji.3 jl_hinsi_dicts.3 jl_hinsi_dicts_e.3 \ - jl_hinsi_list.3 jl_hinsi_list_e.3 jl_hinsi_name.3 jl_hinsi_name_e.3 \ - jl_hinsi_number.3 jl_hinsi_number_e.3 jl_inspect.3 jl_isconnect.3 \ - jl_isconnect_e.3 jl_jiri_len.3 jl_kanji_len.3 jl_kill.3 jl_next.3 \ - jl_next_dai.3 jl_nobi_conv.3 jl_open.3 jl_open_lang.3 jl_param_get.3 \ - jl_param_get_e.3 jl_param_set.3 jl_param_set_e.3 jl_previous.3 \ - jl_previous_dai.3 jl_ren_conv.3 jl_set_env_wnnrc.3 jl_set_jikouho.3 \ - jl_set_jikouho_dai.3 jl_tan_conv.3 jl_update_hindo.3 jl_word_add.3 \ - jl_word_add_e.3 jl_word_comment_set.3 jl_word_comment_set_e.3 \ - jl_word_delete.3 jl_word_delete_e.3 jl_word_info.3 jl_word_info_e.3 \ - jl_word_search.3 jl_word_search_by_env.3 jl_word_search_by_env_e.3 \ - jl_word_search_e.3 jl_word_use.3 jl_word_use_e.3 jl_yomi_len.3 \ - jl_zenkouho.3 jl_zenkouho_bun.3 jl_zenkouho_dai.3 jl_zenkouho_daip.3 \ - jl_zenkouho_suu.3 js_access.3 js_close.3 js_connect.3 js_dic_add.3 \ - js_dic_delete.3 js_dic_file_create.3 js_dic_file_create_client.3 \ - js_dic_info.3 js_dic_list.3 js_dic_list_all.3 js_dic_use.3 js_disconnect.3 \ - js_env_exist.3 js_env_list.3 js_env_sticky.3 js_env_un_sticky.3 \ - js_file_comment_set.3 js_file_discard.3 js_file_info.3 js_file_list.3 \ - js_file_list_all.3 js_file_loaded.3 js_file_loaded_local.3 \ - js_file_password_set.3 js_file_read.3 js_file_receive.3 js_file_remove.3 \ - js_file_remove_client.3 js_file_send.3 js_file_stat.3 js_file_write.3 \ - js_fuzokugo_get.3 js_fuzokugo_set.3 js_get_lang.3 js_hindo_file_create.3 \ - js_hindo_file_create_client.3 js_hindo_set.3 js_hinsi_dicts.3 \ - js_hinsi_list.3 js_hinsi_name.3 js_hinsi_number.3 js_hinsi_table_set.3 \ - js_isconnect.3 js_kanren.3 js_kantan_dai.3 js_kantan_sho.3 \ - js_kanzen_dai.3 js_kanzen_sho.3 js_kill.3 js_mkdir.3 js_open.3 \ - js_open_lang.3 js_param_get.3 js_param_set.3 js_set_lang.3 \ - js_version.3 js_who.3 js_word_add.3 js_word_comment_set.3 \ - js_word_delete.3 js_word_info.3 js_word_search.3 js_word_search_by_env.3 \ - msg_close.3 msg_get.3 msg_open.3 romkan_clear.3 romkan_dispmode.3 \ - romkan_getc.3 romkan_init.3 romkan_next.3 romkan_ungetc.3 +MAN3+= \ + jl_bun_suu.3 \ + jl_c_zenkouho.3 \ + jl_close.3 \ + jl_connect.3 \ + jl_connect_lang.3 \ + jl_dai_top.3 \ + jl_dic_add.3 \ + jl_dic_comment_set.3 \ + jl_dic_delete.3 \ + jl_dic_list.3 \ + jl_dic_save.3 \ + jl_dic_use.3 \ + jl_disconnect.3 \ + jl_env.3 \ + jl_env_get.3 \ + jl_env_sticky.3 \ + jl_fuzokugo_get.3 \ + jl_fuzokugo_set.3 \ + jl_get_kanji.3 \ + jl_get_zenkouho_kanji.3 \ + jl_hinsi_dicts.3 \ + jl_hinsi_list.3 \ + jl_hinsi_name.3 \ + jl_hinsi_number.3 \ + jl_inspect.3 \ + jl_isconnect.3 \ + jl_jiri_len.3 \ + jl_kanji_len.3 \ + jl_kill.3 \ + jl_next.3 \ + jl_nobi_conv.3 \ + jl_open.3 \ + jl_open_lang.3 \ + jl_param_get.3 \ + jl_ren_conv.3 \ + jl_set_env_wnnrc.3 \ + jl_set_jikouho.3 \ + jl_tan_conv.3 \ + jl_update_hindo.3 \ + jl_word_add.3 \ + jl_word_comment_set.3 \ + jl_word_delete.3 \ + jl_word_info.3 \ + jl_word_search.3 \ + jl_word_use.3 \ + jl_zenkouho.3 \ + jl_zenkouho_bun.3 \ + jl_zenkouho_dai.3 \ + jl_zenkouho_daip.3 \ + jl_zenkouho_suu.3 \ + js_access.3 \ + js_close.3 \ + js_connect.3 \ + js_dic_add.3 \ + js_dic_delete.3 \ + js_dic_file_create.3 \ + js_dic_file_create_client.3 \ + js_dic_info.3 \ + js_dic_list.3 \ + js_dic_list_all.3 \ + js_dic_use.3 \ + js_disconnect.3 \ + js_env_exist.3 \ + js_env_list.3 \ + js_env_sticky.3 \ + js_file_comment_set.3 \ + js_file_discard.3 \ + js_file_info.3 \ + js_file_list.3 \ + js_file_list_all.3 \ + js_file_loaded.3 \ + js_file_loaded_local.3 \ + js_file_password_set.3 \ + js_file_read.3 \ + js_file_receive.3 \ + js_file_remove.3 \ + js_file_remove_client.3 \ + js_file_send.3 \ + js_file_stat.3 \ + js_file_write.3 \ + js_fuzokugo_get.3 \ + js_fuzokugo_set.3 \ + js_hindo_file_create.3 \ + js_hindo_file_create_client.3 \ + js_hindo_set.3 \ + js_hinsi_dicts.3 \ + js_hinsi_list.3 \ + js_hinsi_name.3 \ + js_hinsi_number.3 \ + js_hinsi_table_set.3 \ + js_isconnect.3 \ + js_kanren.3 \ + js_kantan_dai.3 \ + js_kantan_sho.3 \ + js_kanzen_dai.3 \ + js_kanzen_sho.3 \ + js_kill.3 \ + js_mkdir.3 \ + js_open.3 \ + js_open_lang.3 \ + js_param_get.3 \ + js_set_lang.3 \ + js_version.3 \ + js_who.3 \ + js_word_add.3 \ + js_word_comment_set.3 \ + js_word_delete.3 \ + js_word_info.3 \ + js_word_search.3 \ + msg_close.3 \ + msg_get.3 \ + msg_open.3 \ + romkan_clear.3 \ + romkan_dispmode.3 \ + romkan_getc.3 \ + romkan_init.3 \ + romkan_next.3 \ + romkan_ungetc.3 + +MLINKS= \ + jl_dic_add.3 jl_dic_add_e.3 \ + jl_dic_comment_set.3 jl_dic_comment_set_e.3 \ + jl_dic_delete.3 jl_dic_delete_e.3 \ + jl_dic_list.3 jl_dic_list_e.3 \ + jl_dic_save.3 jl_dic_save_all.3 \ + jl_dic_save.3 jl_dic_save_all_e.3 \ + jl_dic_save.3 jl_dic_save_e.3 \ + jl_dic_use.3 jl_dic_use_e.3 \ + jl_env_get.3 jl_env_set.3 \ + jl_env_sticky.3 jl_env_sticky_e.3 \ + jl_env_sticky.3 jl_env_un_sticky.3 \ + jl_env_sticky.3 jl_env_un_sticky_e.3 \ + jl_fuzokugo_get.3 jl_fuzokugo_get_e.3 \ + jl_fuzokugo_set.3 jl_fuzokugo_set_e.3 \ + jl_get_kanji.3 jl_get_yomi.3 \ + jl_hinsi_dicts.3 jl_hinsi_dicts_e.3 \ + jl_hinsi_list.3 jl_hinsi_list_e.3 \ + jl_hinsi_name.3 jl_hinsi_name_e.3 \ + jl_hinsi_number.3 jl_hinsi_number_e.3 \ + jl_isconnect.3 jl_isconnect_e.3 \ + jl_next.3 jl_next_dai.3 \ + jl_param_get.3 jl_param_get_e.3 \ + jl_param_get.3 jl_param_set.3 \ + jl_param_get.3 jl_param_set_e.3 \ + jl_next.3 jl_previous.3 \ + jl_next.3 jl_previous_dai.3 \ + jl_set_jikouho.3 jl_set_jikouho_dai.3 \ + jl_word_add.3 jl_word_add_e.3 \ + jl_word_comment_set.3 jl_word_comment_set_e.3 \ + jl_word_delete.3 jl_word_delete_e.3 \ + jl_word_info.3 jl_word_info_e.3 \ + jl_word_search.3 jl_word_search_by_env.3 \ + jl_word_search.3 jl_word_search_by_env_e.3 \ + jl_word_search.3 jl_word_search_e.3 \ + jl_word_use.3 jl_word_use_e.3 \ + jl_kanji_len.3 jl_yomi_len.3 \ + js_env_sticky.3 js_env_un_sticky.3 \ + js_set_lang.3 js_get_lang.3 \ + js_param_get.3 js_param_set.3 \ + js_word_search.3 js_word_search_by_env.3 .else #BUILD_DEPENDS= ${LOCALBASE}/lib/libwnn.a:${PORTSDIR}/japanese/FreeWnn-lib #RUN_DEPENDS= ${LOCALBASE}/lib/wnn/ja_JP/jserverrc:${PORTSDIR}/japanese/FreeWnn-lib diff --git a/japanese/FreeWnn-lib/distinfo b/japanese/FreeWnn-lib/distinfo index 77e7df8a0e9e..00c692250120 100644 --- a/japanese/FreeWnn-lib/distinfo +++ b/japanese/FreeWnn-lib/distinfo @@ -1,3 +1,3 @@ -MD5 (FreeWnn-1.1.1-a020.tar.bz2) = c00549415cdb08c1f35240dccf8dab20 -SHA256 (FreeWnn-1.1.1-a020.tar.bz2) = 6c63933d5bc0edaf59df3ef528f03ab8f362471a60289c1955aa8078babd73bc -SIZE (FreeWnn-1.1.1-a020.tar.bz2) = 3015928 +MD5 (FreeWnn-1.1.1-a021.tar.bz2) = 7e15ab385932d58e3743400d303a05e6 +SHA256 (FreeWnn-1.1.1-a021.tar.bz2) = df9523b2eea7cbc94d9d01c19a01394abe3b648c5ec3f1259adac06fc8ecbb86 +SIZE (FreeWnn-1.1.1-a021.tar.bz2) = 3108905 diff --git a/japanese/FreeWnn-server/pkg-install b/japanese/FreeWnn-lib/files/pkg-install.in index 05e26c3c6c44..7fe5d4e67a6a 100644 --- a/japanese/FreeWnn-server/pkg-install +++ b/japanese/FreeWnn-lib/files/pkg-install.in @@ -1,4 +1,5 @@ #!/bin/sh +# $FreeBSD$ # an installation script for Wnn4.2 check_pw() @@ -49,33 +50,41 @@ yesno() { } mk_startup_script() { - echo "Installing ${startup_script} startup file."; - cat << EOF > ${startup_script} + _wnnname=$1 + _wnnserver=$2 + _wnn_socket=$3 + _scriptfile=${PKG_PREFIX}/etc/rc.d/${_wnnname}.sh + + echo "Installing ${_scriptfile} startup file."; + cat << EOF > ${_scriptfile} #!/bin/sh -wnnserver=${wnnserver} -case "\$1" in -start) - if [ -x $wnnserver ]; then - ${wnnstat} -L ${wnn_lang} localhost > /dev/null 2>&1 - if [ \$? = 255 ]; then - rm -f ${wnn_socket} - echo -n ' ${wnnname}' - $wnnserver > /dev/null - fi - fi - ;; -stop) - ${wnnkill} -L ${wnn_lang} localhost - ;; -*) - echo "Usage: \`basename \$0\` {start|stop}" >&2 - exit 64 - ;; -esac +# +# PROVIDE: ${_wnnname} +# REQUIRE: LOGIN +# + +. %%RC_SUBR%% -exit 0 +name=${_wnnname} +rcvar=\`set_rcvar\` +command=${_wnnserver} +procname=${_wnnserver} + +load_rc_config \${name} + +start_precmd() +{ + rm -f ${_wnn_socket} +} +stop_postcmd() +{ + rm -f ${_wnn_socket} +} + +run_rc_command "\$1" EOF + chmod 0555 ${_scriptfile} } @@ -135,9 +144,10 @@ POST-INSTALL) wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch wnnstat=${PKG_PREFIX}/bin/Wnn4/wnnstat wnnkill=${PKG_PREFIX}/bin/Wnn4/wnnkill - wnnname=Wnn + wnnname=wnn wnn_socket=/tmp/jd_sockV4 wnn_lang=ja_JP + mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket} ;; zh-FreeWnn-*) sys_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/sys ${PKG_PREFIX}/lib/wnn/zh_TW/dic/sys" @@ -146,9 +156,16 @@ POST-INSTALL) wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch wnnstat=${PKG_PREFIX}/bin/cWnn4/cwnnstat wnnkill=${PKG_PREFIX}/bin/cWnn4/cwnnkill - wnnname=cWnn + wnnname=cwnn wnn_socket=/tmp/cd_sockV4 wnn_lang=zh_CN + mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket} + + wnnserver2=${PKG_PREFIX}/bin/cWnn4/tserver + wnn_lang2=zh_TW + wnnname2=twnn + wnn_socket2=/tmp/td_sockV4 + mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket} ;; ko-FreeWnn-*) sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys" @@ -157,9 +174,10 @@ POST-INSTALL) wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch wnnstat=${PKG_PREFIX}/bin/kWnn4/kwnnstat wnnkill=${PKG_PREFIX}/bin/kWnn4/kwnnkill - wnnname=kWnn + wnnname=kwnn wnn_socket=/tmp/kd_sockV4 wnn_lang=ko_KR + mk_startup_script ${wnnname} ${wnnserver} ${wnn_socket} ;; esac @@ -173,25 +191,5 @@ POST-INSTALL) fi chown wnn $dir done - - ## create a startup script ## - startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh - if [ ! -f ${startup_script} ]; then - mk_startup_script - chmod 755 ${startup_script}; - chown bin:bin ${startup_script}; - case "$1" in - zh-FreeWnn-*) - wnnname=tWnn - startup_script=${PKG_PREFIX}/etc/rc.d/${wnnname}.sh - wnnserver=${PKG_PREFIX}/bin/cWnn4/tserver - wnn_lang=zh_TW - wnn_socket=/tmp/td_sockV4 - mk_startup_script - chmod 755 ${startup_script}; - chown bin:bin ${startup_script}; - ;; - esac - fi - ;; + ;; esac diff --git a/japanese/FreeWnn-lib/pkg-descr b/japanese/FreeWnn-lib/pkg-descr index 8e5aae407982..ef935bbd0ab1 100644 --- a/japanese/FreeWnn-lib/pkg-descr +++ b/japanese/FreeWnn-lib/pkg-descr @@ -1,13 +1,10 @@ FreeWnn is a Japanese/Chinese/Korean input method. -WWW: http://www.freewnn.org/ - -This port has only libraries for a Japanese imput method. The -libraries containes a archive file (libwnn.a), header files and files -which are used to a client. +This port installs only libraries for the Japanese imput method. +They include an static library (libwnn.a), header files, +and files used on the client side. -Note that you must set a environment variable JSERVER if you use a -client of Wnn. +Note that you have to set a environment variable JSERVER before +you use an Wnn client. --- S. Taoka -<taoka@FreeBSD.org> +WWW: http://www.freewnn.org/ diff --git a/japanese/FreeWnn-lib/pkg-plist b/japanese/FreeWnn-lib/pkg-plist index 6dd7181fb7ed..40fbe8cf99d0 100644 --- a/japanese/FreeWnn-lib/pkg-plist +++ b/japanese/FreeWnn-lib/pkg-plist @@ -80,7 +80,7 @@ lib/libwnn.so lib/libwnn.so.0 @dirrm lib/wnn/ja_JP/rk @dirrm lib/wnn/ja_JP/rk.vi -@dirrm lib/wnn/ja_JP +@unexec rmdir %D/lib/wnn/ja_JP 2> /dev/null || true @dirrm lib/wnn/lt_LN/rk @dirrm lib/wnn/lt_LN -@dirrm lib/wnn +@unexec rmdir %D/lib/wnn 2> /dev/null || true diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index b645821ef1ee..27cf0bfaa28a 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -10,5 +10,6 @@ COMMENT= A Japanese/Chinese/Korean input method (Japanese server) MASTERDIR= ${.CURDIR}/../FreeWnn-lib PKGDIR= ${.CURDIR} +PATCHDIR= ${.CURDIR}/files .include "${MASTERDIR}/Makefile" diff --git a/japanese/FreeWnn-server/files/patch-Wnn-jserver-initjserv.c b/japanese/FreeWnn-server/files/patch-Wnn-jserver-initjserv.c new file mode 100644 index 000000000000..6fb5a53487a8 --- /dev/null +++ b/japanese/FreeWnn-server/files/patch-Wnn-jserver-initjserv.c @@ -0,0 +1,22 @@ +--- Wnn/jserver/initjserv.c.orig Wed Dec 7 18:33:51 2005 ++++ Wnn/jserver/initjserv.c Wed Dec 7 18:34:43 2005 +@@ -305,7 +305,9 @@ + } + fclose (fp); + ++ /* + printf ("Finished Reading Files\n"); ++ */ + + return (0); + } +@@ -340,7 +342,9 @@ + + files[fid].localf = LOCAL; + strcpy (files[fid].name, buffer); ++ /* + printf ("Reading %s\t Fid = %d\n", buffer, fid); ++ */ + if (read_file (&files[fid]) == -1) + { + printf ("Error reading %s\n", buffer); diff --git a/japanese/FreeWnn-server/files/patch-ab b/japanese/FreeWnn-server/files/patch-ab deleted file mode 100644 index c811c85af5e8..000000000000 --- a/japanese/FreeWnn-server/files/patch-ab +++ /dev/null @@ -1,64 +0,0 @@ ---- Wnn/jserver/de.c~ Fri Aug 19 10:31:23 1994 -+++ Wnn/jserver/de.c Fri Mar 10 00:44:42 2000 -@@ -65,6 +65,9 @@ - - #include <sys/ioctl.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #ifdef SYSVR2 - #include <sys/param.h> - #ifndef SIGCHLD -@@ -264,7 +267,16 @@ - fclose(stdin); - fclose(stdout); - if(!noisy){ -+#if !(defined(BSD) && (BSD >= 199306)) /* !4.4BSD-Lite by Taoka */ - fclose(stderr); -+#else /* 4.4BSD-Lite */ -+ int fd = open("/dev/null", O_WRONLY); -+ if (fd < 0) { -+ xerror("Cannot open /dev/null\n"); -+ } -+ dup2(fd, 2); -+ close(fd); -+#endif /* 4.4BSD-Lite */ - } - - #if defined(hpux) || defined(SOLARIS) -@@ -542,10 +554,14 @@ - - /** **/ - void --gets_cur(cp) -+gets_cur(cp, len) - register char *cp; -+int len; - { -- while((*cp++ = getc_cur()) != '\0'); -+ int i; -+ -+ for (i = 0; i < len; i++) -+ if ((*(cp + i) = getc_cur()) == '\0') break; - } - - /** **/ -@@ -648,6 +664,17 @@ - { - register int c; - while(c= *p++) putc_cur(c); -+ putc_cur(0); -+} -+ -+/** **/ -+void -+puts_n_cur(p,n) -+char *p; -+int n; -+{ -+ register int c; -+ while((c = *p++) && --n >= 0) putc_cur(c); - putc_cur(0); - } - diff --git a/japanese/FreeWnn-server/files/patch-ae b/japanese/FreeWnn-server/files/patch-ae deleted file mode 100644 index 7ea048b9903a..000000000000 --- a/japanese/FreeWnn-server/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- ./Contrib/dic/gerodic/Makefile.orig Sun Jun 27 00:09:13 1993 -+++ ./Contrib/dic/gerodic/Makefile Tue Jul 29 12:06:28 1997 -@@ -4,8 +4,9 @@ - # Jun. 26th '93 Wnn Consortium - # - --WNNBINDIR=/usr/local/bin/Wnn4 --WNNWNNDIR=/usr/local/lib/wnn -+PREFIX = /usr/local -+WNNBINDIR=${PREFIX}/bin/Wnn4 -+WNNWNNDIR=${PREFIX}/lib/wnn - - WNNOWNER=wnn - diff --git a/japanese/FreeWnn-server/files/patch-af b/japanese/FreeWnn-server/files/patch-af deleted file mode 100644 index 577c5210fb5f..000000000000 --- a/japanese/FreeWnn-server/files/patch-af +++ /dev/null @@ -1,45 +0,0 @@ ---- Wnn/jutil/wnnstat.c.orig Tue Jul 29 01:21:32 1997 -+++ Wnn/jutil/wnnstat.c Tue Jul 29 01:41:42 1997 -@@ -69,7 +69,7 @@ - #define W_DIC_ALL 5 - #define W_VERSION 6 - --#ifdef JAPANSE -+#ifdef JAPANESE - extern int eujis_to_jis8(), eujis_to_sjis(); - #endif - #ifdef CHINESE -@@ -129,13 +129,13 @@ - strcpy(lang, WNN_DEFAULT_LANG); - - #ifdef JAPANESE -- while ((c = getopt(argc,argv,"EewdDfFUSJVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUSJVL:")) != EOF) { - #endif - #ifdef CHINESE -- while ((c = getopt(argc,argv,"EewdDfFUBCVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUBCVL:")) != EOF) { - #endif - # ifdef KOREAN -- while ((c = getopt(argc,argv,"EewdDfFUVL:K")) != EOF) { -+ while ((c = getopt(argc,argv,"weEdDfFUKVL:")) != EOF) { - #endif - switch(c){ - case 'w': -@@ -317,13 +317,13 @@ - usage() - { - #ifdef JAPANESE -- fprintf(stderr, "wnnstat [-weEdDfFKSUJ] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "wnnstat [-weEdDfFUSJV] [-L lang_name] [server_name]\n"); - #endif /* JAPANESE */ - #ifdef CHINESE -- fprintf(stderr, "wnnstat [-weEdDfFSUJBC] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "cwnnstat [-weEdDfFUBCV] [-L lang_name] [server_name]\n"); - #endif /* CHINESE */ - #ifdef KOREAN -- fprintf(stderr, "kwnnstat [-weEdDfFKU] [-L lang_name] [server_name]\n"); -+ fprintf(stderr, "kwnnstat [-weEdDfFUKV] [-L lang_name] [server_name]\n"); - #endif /* KOREAN */ - exit(-1); - } diff --git a/japanese/FreeWnn-server/files/patch-ag b/japanese/FreeWnn-server/files/patch-ag deleted file mode 100644 index d11ee32a427b..000000000000 --- a/japanese/FreeWnn-server/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kWnn/kd/uumrc.orig Tue Jun 28 11:29:51 1994 -+++ ./kWnn/kd/uumrc Sat Jul 19 02:48:17 1997 -@@ -8,7 +8,7 @@ - setconvenv @LIBDIR/@LANG/wnnenvrc - setkankanaenv @LIBDIR/@LANG/wnnenvrc_R - --setjishopath @LIBDIR/@LANG/dic/pubdic/ -+setjishopath @LIBDIR/@LANG/dic/sys/ - sethindopath @LIBDIR/@LANG/dic/usr/@USR/ - - setuumkey @LIBDIR/@LANG/uumkey diff --git a/japanese/FreeWnn-server/files/patch-ah b/japanese/FreeWnn-server/files/patch-ah deleted file mode 100644 index fb8ec376e5df..000000000000 --- a/japanese/FreeWnn-server/files/patch-ah +++ /dev/null @@ -1,39 +0,0 @@ ---- ./kWnn/etc/Imakefile.orig Wed Aug 17 10:11:33 1994 -+++ ./kWnn/etc/Imakefile Sat Jul 19 23:53:01 1997 -@@ -3,4 +3,6 @@ - XCOMM -+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1 -+XCOMM -- S. Taoka - #define DoNormalLib YES - - #include <Library.tmpl> -@@ -19,6 +21,9 @@ - xutoj.c \ - dic_atojis.c \ - msg.c \ -+ yincoding.c \ -+ py_table.c \ -+ zy_table.c \ - server_env.c - - OBJS= strings.o \ -@@ -32,6 +37,9 @@ - xutoj.o \ - dic_atojis.o \ - msg.o \ -+ yincoding.o \ -+ py_table.o \ -+ zy_table.o \ - server_env.o - - LibraryObjectRule() -@@ -51,6 +59,9 @@ - LinkSourceFile(xutoj.c,$(WNNETCSRC)) - LinkSourceFile(dic_atojis.c,$(WNNETCSRC)) - LinkSourceFile(msg.c,$(WNNETCSRC)) -+LinkSourceFile(yincoding.c,$(WNNETCSRC)) -+LinkSourceFile(py_table.c,$(WNNETCSRC)) -+LinkSourceFile(zy_table.c,$(WNNETCSRC)) - LinkSourceFile(server_env.c,$(WNNETCSRC)) - - DependTarget() diff --git a/japanese/FreeWnn-server/files/patch-ai b/japanese/FreeWnn-server/files/patch-ai deleted file mode 100644 index 87fae7aaadb3..000000000000 --- a/japanese/FreeWnn-server/files/patch-ai +++ /dev/null @@ -1,105 +0,0 @@ ---- kWnn/jlib/Imakefile.orig Wed Aug 17 10:11:40 1994 -+++ kWnn/jlib/Imakefile Tue Jan 5 23:06:15 1999 -@@ -3,5 +3,9 @@ - XCOMM -+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1 -+XCOMM -- S. Taoka -+XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - -@@ -10,7 +14,9 @@ - LINKS = getopt.c jl.c js.c wnnerrmsg.c - JLIBDEFINES = -DWRITE_CHECK - INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP) -- DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(JLIBDEFINES) -+ DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(CWNNLANGDEF) $(JLIBDEFINES) -+XCOMM # for Mule -+XCOMM # -- S. Taoka - INSTALLFLAGS = $(INSTBINFLAGS) - LINTLIBS = - -@@ -28,6 +34,15 @@ - OBJ4= strings.o - SRC5= $(KWNNETCSRC)/bcopy.c - OBJ5= bcopy.o -+SRC6= $(KWNNETCSRC)/yincoding.c -+XCOMM for Mule -+XCOMM -- S. Taoka -+OBJ6= yincoding.o -+SRC7= $(KWNNETCSRC)/py_table.c -+OBJ7= py_table.o -+SRC8= $(KWNNETCSRC)/zy_table.c -+OBJ8= zy_table.o -+ - LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \ - $(KWNNROMKANSRC)/rk_main.c \ - $(KWNNROMKANSRC)/rk_modread.c \ -@@ -40,13 +55,26 @@ - $(KWNNROMKANSRC)/rk_read.o \ - $(KWNNROMKANSRC)/rk_vars.o - --LOCAL_ETCSRCS = $(SRC4) $(SRC5) --LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) -+UNSHARED_LOCAL_RKOBJS= $(KWNNROMKANSRC)/unshared/rk_bltinfn.o \ -+ $(KWNNROMKANSRC)/unshared/rk_main.o \ -+ $(KWNNROMKANSRC)/unshared/rk_modread.o \ -+ $(KWNNROMKANSRC)/unshared/rk_read.o \ -+ $(KWNNROMKANSRC)/unshared/rk_vars.o -+ -+LOCAL_ETCSRCS = $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8) -+LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) - SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS) - OBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) -+UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS) -+ -+SOKWNN4LIBREV=1.0 - - LibraryObjectRule() -+#if DoSharedLib -+AllTarget($(OBJS) libkwnn.a libkwnn4.so.$(SOKWNN4LIBREV)) -+#else - AllTarget($(OBJS) libkwnn.a) -+#endif - - includes:: $(LINKS) - -@@ -65,11 +93,19 @@ - - NormalLintTarget($(SRC2)) - --NormalLibraryTarget(kwnn,$(OBJS)) -+#if DoSharedLib -+SharedLibraryTarget(kwnn4,$(SOKWNN4LIBREV),$(OBJS),.,.) -+#endif -+ -+UnsharedLibraryTarget(kwnn,$(UNSHAREDOBJS),unshared,..) - LintLibraryTarget(kwnn,$(SRCS)) - - instlib:: install - -+#if DoSharedLib -+InstallSharedLibrary(kwnn4,$(SOKWNN4LIBREV),$(WNNLIBDIR)) -+#endif -+ - InstallLibrary(kwnn,$(WNNLIBDIR)) - - #if ProfileLibJlib -@@ -77,9 +113,12 @@ - InstallLibrary(kwnn_p,$(WNNLIBDIR)) - #endif - --WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),) --WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),) --WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(KWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(KWNNETCSRC),) - - $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ diff --git a/japanese/FreeWnn-server/files/patch-aj b/japanese/FreeWnn-server/files/patch-aj deleted file mode 100644 index 53e082d82d66..000000000000 --- a/japanese/FreeWnn-server/files/patch-aj +++ /dev/null @@ -1,28 +0,0 @@ ---- ./Wnn/jlib.V3/Imakefile.orig Wed Aug 17 10:10:13 1994 -+++ ./Wnn/jlib.V3/Imakefile Fri Aug 1 14:11:09 1997 -@@ -19,6 +19,10 @@ - OBJ3= sstrings.o - SRCS= $(SRC1) $(SRC2) $(SRC3) - OBJS= $(OBJ1) $(OBJ2) $(OBJ3) -+SRC4= $(WNNETCSRC)/xutoj.c -+OBJ4= xutoj.o -+SRCS= $(SRC1) $(SRC2) $(SRC3) $(SRC4) -+OBJS= $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) - - LibraryObjectRule() - -@@ -31,7 +35,7 @@ - - LintLibraryTarget(jd,$(SRCS)) - InstallLibrary(jd,$(WNNLIBDIR)) --InstallNonExecFile($(WNNINCLUDESRC)/jlib.h,$(JWNNINCDIR)) -+InstallNonExecFile(jlib.h,$(JWNNINCDIR)) - - #if DebugLibJd - DebuggedLibraryTarget(jd,$(OBJS)) -@@ -42,4 +46,5 @@ - - WnnSpecialObjectRule($(OBJ2),$(SRC2),$(WNNETCSRC),) - WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),) -+WnnSpecialObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),) - DependTarget() diff --git a/japanese/FreeWnn-server/files/patch-ak b/japanese/FreeWnn-server/files/patch-ak deleted file mode 100644 index 407a45f207c7..000000000000 --- a/japanese/FreeWnn-server/files/patch-ak +++ /dev/null @@ -1,160 +0,0 @@ ---- Wnn/uum/jhlp.c.orig Thu Mar 9 16:34:56 2000 -+++ Wnn/uum/jhlp.c Thu Mar 9 16:44:26 2000 -@@ -80,6 +80,9 @@ - - jmp_buf kk_env; - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif - #ifdef SYSVR2 - # include <sys/param.h> - #endif /* SYSVR2 */ -@@ -168,12 +171,14 @@ - - strcpy(username, getpwuid(getuid())->pw_name); - if((name = getenv(WNN_USERNAME_ENV)) != NULL){ -- strcpy(username, name); -+ strncpy(username, name, PATHNAMELEN - 1); -+ username[PATHNAMELEN - 1] = '\0'; - } - for (i = 1; i < argc;) { - if (!strcmp(argv[i++], "-L")) { - if (i >= argc || argv[i][0] == '-') default_usage(); -- strcpy(lang_dir, argv[i++]); -+ strncpy(lang_dir, argv[i++], 31); -+ lang_dir[31] = '\0'; - for (;i < argc; i++) { - argv[i - 2] = argv[i]; - } -@@ -233,8 +238,9 @@ - server_env = WNN_DEF_SERVER_ENV; - } - if(name = getenv(server_env)) { -- strcpy(def_servername, name); -- strcpy(def_reverse_servername, name); -+ strncpy(def_servername, name, PATHNAMELEN - 1); -+ def_servername[PATHNAMELEN - 1] = '\0'; -+ strcpy(def_reverse_servername, def_servername); - } - } - -@@ -263,9 +269,11 @@ - - - #if defined(BSD42) && !defined(DGUX) -+#if !(defined(BSD) && (BSD >= 199306)) - if (saveutmp() < 0) { - puts("Can't save utmp\n"); - } -+#endif - #endif /* BSD42 */ - - -@@ -492,7 +500,8 @@ - - static int do_k_opt() - { -- strcpy(uumkey_name_in_uumrc, optarg); -+ strncpy(uumkey_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ uumkey_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*uumkey_name_in_uumrc == '\0') { - return -1; - } -@@ -502,7 +511,8 @@ - - static int do_c_opt() - { -- strcpy(convkey_name_in_uumrc, optarg); -+ strncpy(convkey_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ convkey_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*convkey_name_in_uumrc == '\0') { - return -1; - } -@@ -512,7 +522,8 @@ - - static int do_r_opt() - { -- strcpy(rkfile_name_in_uumrc, optarg); -+ strncpy(rkfile_name_in_uumrc, optarg, PATHNAMELEN - 1); -+ rkfile_name_in_uumrc[PATHNAMELEN - 1] = '\0'; - if (*rkfile_name_in_uumrc == '\0') { - return -1; - } -@@ -528,8 +539,9 @@ - - static int do_D_opt() - { -- strcpy(def_servername, optarg); -- strcpy(def_reverse_servername, optarg); -+ strncpy(def_servername, optarg, PATHNAMELEN - 1); -+ def_servername[PATHNAMELEN - 1] = '\0'; -+ strcpy(def_reverse_servername, def_servername); - if (*def_servername == '\0') { - return -1; - } -@@ -538,7 +550,8 @@ - - static int do_n_opt() - { -- strcpy(username, optarg); -+ strncpy(username, optarg, PATHNAMELEN - 1); -+ username[PATHNAMELEN - 1] = '\0'; - if (*username == '\0') { - return -1; - } -@@ -771,7 +784,12 @@ - #endif - int pid; - -- if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { -+/* -+ * Remove warning. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+/* if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) { */ -+ if ((pid = wait3((int *)&status, WNOHANG | WUNTRACED, NULL)) == child_id) { - if (WIFSTOPPED(status)) { - #ifdef SIGCONT - kill(pid, SIGCONT); -@@ -1140,9 +1158,11 @@ - setpgrp(0, pid); - #endif /* BSD42 */ - -+#if !(defined(BSD) && (BSD >= 199306)) - if (setutmp(ttypfd) == ERROR) { - puts("Can't set utmp."); - } -+#endif - - #ifdef linux - setsid(); -@@ -1562,9 +1582,11 @@ - perror(prog); - } - -+#if !(defined(BSD) && (BSD >= 199306)) - if (resetutmp(ttypfd) == ERROR) { - printf("Can't reset utmp."); - } -+#endif - #ifdef TIOCSSIZE - pty_rowcol.ts_lines = 0; - pty_rowcol.ts_cols = 0; -@@ -1636,7 +1658,16 @@ - char *b, *pty; - int no; - { -+/* -+ * Change pseudo-devices. -+ * Because FreeBSD's master pseudo-devices are pty[p-sP-S][0-9a-v]. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+#if (defined(BSD) && (BSD >= 199306)) /* 4.4BSD-Lite by Taoka */ -+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f)); -+#else /* ! 4.4BSD-Lite */ - sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f); -+#endif /* ! 4.4BSD-Lite */ - } - #endif /* !sgi */ - diff --git a/japanese/FreeWnn-server/files/patch-al b/japanese/FreeWnn-server/files/patch-al deleted file mode 100644 index d4423556f7af..000000000000 --- a/japanese/FreeWnn-server/files/patch-al +++ /dev/null @@ -1,20 +0,0 @@ ---- ./Wnn/jlib.V3/jlib.h.orig Tue Sep 17 06:30:30 1991 -+++ ./Wnn/jlib.V3/jlib.h Fri Sep 5 21:37:24 1997 -@@ -51,12 +51,14 @@ - /* - Nihongo Henkan Library Header File - */ --/* - #include <setjmp.h> --*/ -- - - #define w_char unsigned short -+#ifndef WCHAR_T -+#define wchar_t w_char -+#define wchar w_char -+#define WCHAR_T -+#endif - - #define JLIB - diff --git a/japanese/FreeWnn-server/files/patch-an b/japanese/FreeWnn-server/files/patch-an deleted file mode 100644 index 3d1848c7f010..000000000000 --- a/japanese/FreeWnn-server/files/patch-an +++ /dev/null @@ -1,55 +0,0 @@ ---- Xwnmo/xwnmo/client.c.~1~ Mon Aug 23 11:06:16 1993 -+++ Xwnmo/xwnmo/client.c Fri Feb 6 06:44:03 1998 -@@ -53,7 +53,7 @@ - { - char *p; - char ret = '\0'; -- extern char *index(); -+/* extern char *index();*/ - - if ((p = romkan_dispmode()) == NULL) return(ret); - if ((p = (char*)index(p, ':')) == NULL) return(ret); ---- Xwnmo/xwnmo/screen.c.~1~ Tue Dec 1 15:10:57 1992 -+++ Xwnmo/xwnmo/screen.c Fri Feb 6 06:48:15 1998 -@@ -361,7 +361,7 @@ - get_rk_modes() - { - char *p; -- extern char *index(); -+/* extern char *index();*/ - - strcpy(rk_modes, (NULL == (p = romkan_dispmode()) ? "[ ]" : p)); - if ((p = (char*)index(rk_modes, ':')) != NULL && *(p + 1)) { ---- Xwnmo/xwnmo/jhlp.c.~1~ Thu Aug 4 16:10:14 1994 -+++ Xwnmo/xwnmo/jhlp.c Fri Feb 6 06:50:24 1998 -@@ -415,7 +415,7 @@ - XLCd xlc; - #endif /* X11R5 */ - extern char *get_server_env(); -- extern char *index(); -+/* extern char *index(); */ - - prgname = argv[0]; - if (create_arg_string(argv, argc) == -1) exit(1); ---- Xwnmo/xjutil/init_w.c.~1~ Thu Aug 4 16:10:10 1994 -+++ Xwnmo/xjutil/init_w.c Fri Feb 6 07:54:48 1998 -@@ -76,7 +76,7 @@ - char *p; - char ret = '\0'; - #ifndef SYSVR2 -- extern char *index(); -+/* extern char *index(); */ - #else - extern char *strchr(); - #endif ---- Xwnmo/xjutil/kensaku.c.~1~ Tue Dec 1 14:59:48 1992 -+++ Xwnmo/xjutil/kensaku.c Fri Feb 6 07:58:54 1998 -@@ -154,7 +154,7 @@ - static char message4[2048]; - int ret; - char *table_t[6]; -- extern int qsort(); -+/* extern int qsort();*/ - - if (get_env() == -1) return(NULL); - diff --git a/japanese/FreeWnn-server/files/patch-ao b/japanese/FreeWnn-server/files/patch-ao deleted file mode 100644 index c3aa020ff065..000000000000 --- a/japanese/FreeWnn-server/files/patch-ao +++ /dev/null @@ -1,81 +0,0 @@ -diff -ru Wnn.org/jd/jserverrc Wnn/jd/jserverrc ---- Wnn.org/jd/jserverrc Mon Sep 6 10:47:31 1993 -+++ Wnn/jd/jserverrc Tue Feb 10 07:58:43 1998 -@@ -20,7 +20,9 @@ - ;readfile wnncons/tankan3.dic - - ; n nbun hindo len jiri flag jisho sbn dbn_len sbn_cnt suji kana eisuu kigou toji fuzoku kai --def_param 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;def_param 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+def_param 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 - - ;set_giji_eisuu '-' '_' 0x20 \x5c ^M '変' 1234 012 \o12 - set_giji_eisuu '-' '_' 0x20 '―' '＿' '￣' '!' '?' '.' ',' ':' ';' '：' '；' '？' '！' '，' '．' '・' -diff -ru Wnn.org/jd/wnnenvrc.omr Wnn/jd/wnnenvrc.omr ---- Wnn.org/jd/wnnenvrc.omr Mon Sep 6 10:47:34 1993 -+++ Wnn/jd/wnnenvrc.omr Tue Feb 10 07:58:56 1998 -@@ -19,4 +19,7 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -+ -diff -ru Wnn.org/jd/wnnenvrc.rem Wnn/jd/wnnenvrc.rem ---- Wnn.org/jd/wnnenvrc.rem Mon Sep 6 10:47:36 1993 -+++ Wnn/jd/wnnenvrc.rem Tue Feb 10 07:59:06 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc.rev Wnn/jd/wnnenvrc.rev ---- Wnn.org/jd/wnnenvrc.rev Mon Sep 6 10:47:37 1993 -+++ Wnn/jd/wnnenvrc.rev Tue Feb 10 07:59:15 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic !@WNN_DIC_DIR/wnncons/tankan3.frq 1 1 1 - - 0 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+;setparam 2 10 2 40 100 200 20 1 40 -40 40 -100 40 80 40 100 40 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.omr Wnn/jd/wnnenvrc_R.omr ---- Wnn.org/jd/wnnenvrc_R.omr Wed Aug 25 15:11:40 1993 -+++ Wnn/jd/wnnenvrc_R.omr Tue Feb 10 07:59:24 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.rem Wnn/jd/wnnenvrc_R.rem ---- Wnn.org/jd/wnnenvrc_R.rem Wed Aug 25 15:11:48 1993 -+++ Wnn/jd/wnnenvrc_R.rem Tue Feb 10 07:59:34 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 -diff -ru Wnn.org/jd/wnnenvrc_R.rev Wnn/jd/wnnenvrc_R.rev ---- Wnn.org/jd/wnnenvrc_R.rev Wed Aug 25 15:11:54 1993 -+++ Wnn/jd/wnnenvrc_R.rev Tue Feb 10 07:59:42 1998 -@@ -19,4 +19,6 @@ - ;setdic wnncons/tankan3.dic - 1 1 1 - - 1 - - ;; N nsho hindo len jiri flag jisho sbn dbn_len sbn_cnt suuji kana eisuu kigou toji_kakko fuzokogo kaikakko --setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+;setparam 2 10 2 45 1 80 5 1 50 -20 400 -10 100 -100 200 0 200 -+; New Parameter -+setparam 2 10 2 45 100 200 5 1 40 -100 200 -100 200 80 200 200 200 diff --git a/japanese/FreeWnn-server/files/patch-ap b/japanese/FreeWnn-server/files/patch-ap deleted file mode 100644 index 17495e11a56e..000000000000 --- a/japanese/FreeWnn-server/files/patch-ap +++ /dev/null @@ -1,25 +0,0 @@ ---- Imakefile.~1~ Tue Oct 4 08:18:46 1994 -+++ Imakefile Tue Feb 10 11:29:58 1998 -@@ -4,7 +4,7 @@ - #define IHaveSubdirs - #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - --#if BuildWnn || BuildXwnmo -+#if BuildWnn - WNNDIR = Wnn - #endif - #if BuildCWnn ---- ./Xwnmo/jd/ximconf.~1~ Thu Feb 12 10:20:17 1998 -+++ ./Xwnmo/jd/ximconf Thu Feb 12 10:32:59 1998 -@@ -18,8 +18,8 @@ - zh_TW zh_TW.ucns 2,1,2 True Yincoding - zh_CN.eucCN|zh_CN.ugb \ - zh_CN zh_CN.ugb 2,1,2 True Yincoding --ja|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \ -- ja_JP ja_JP.ujis 2,1,2 True Normal -+ja|ja_JP.EUC|ja_JP.eucJP|ja_JP.ujis|ja_JP.mscode|ja_JP.SJIS|ja_JP.jis8|ja_JP.jis7|ja_JP.pjis \ -+ ja_JP ja_JP.EUC 2,1,2 True Normal - --setdefaultlocale ja_JP.ujis -+setdefaultlocale ja_JP.EUC - setworldlocale wr_WR.ct diff --git a/japanese/FreeWnn-server/files/patch-aq b/japanese/FreeWnn-server/files/patch-aq deleted file mode 100644 index d476242347bd..000000000000 --- a/japanese/FreeWnn-server/files/patch-aq +++ /dev/null @@ -1,26 +0,0 @@ ---- Xwnmo/xwnmo/localalloc.c.~1~ Tue Dec 1 15:10:40 1992 -+++ Xwnmo/xwnmo/localalloc.c Thu Jun 25 12:11:29 1998 -@@ -112,6 +112,7 @@ - { - char *ptr; - if (size == 0) return(NULL); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if ((ptr = malloc(size)) == NULL) { - #ifdef ALLOC_DEBUG - print_out1("alloc failed with size = %d", size); -@@ -134,6 +135,7 @@ - unsigned size; - { - if (size == 0) return(ptr); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if (ptr == NULL) return(Malloc(size)); - #ifdef ALLOC_DEBUG - unregister_debug(ptr); -@@ -153,6 +155,7 @@ - { - char *ptr; - if (size == 0) return(NULL); -+ size += (sizeof(char *)-(size%sizeof(char *))); - if ((ptr = calloc(num, size)) == NULL) { - return(NULL); - } diff --git a/japanese/FreeWnn-server/files/patch-ba b/japanese/FreeWnn-server/files/patch-ba deleted file mode 100644 index 3b92501b6212..000000000000 --- a/japanese/FreeWnn-server/files/patch-ba +++ /dev/null @@ -1,75 +0,0 @@ ---- ../Wnn-4.2-patched/cWnn/cdic/Imakefile Tue Aug 23 11:26:22 1994 -+++ cWnn/cdic/Imakefile Mon Nov 2 18:44:39 1998 -@@ -55,6 +55,12 @@ - instserver:: install - - WnnMakeDirectories(install,$(CWNNDICDIR)) -+/* -+ * Bugfix. -+ * Because "NO" is same to "YES"!! -+ * And some additional bugfix. -+ */ -+#if (WnnInstallDicForcibly == YES) - InstallMultiple($(ALLTGT),$(CWNNSYSDICDIR)) - - install:: -@@ -62,6 +68,9 @@ - do \ - $(WNNTOUCH) $(DESTDIR)$(CWNNSYSDICDIR)/$$i ;\ - done -+#else -+WnnInstallDicMultiple($(ALLTGT),$(CWNNSYSDICDIR)) -+#endif - - depend:: - @echo "skipping make in my dir" ---- ../Wnn-4.2-patched/cWnn/tdic/Imakefile Tue Aug 23 11:26:41 1994 -+++ cWnn/tdic/Imakefile Mon Nov 2 18:46:56 1998 -@@ -45,6 +45,12 @@ - instserver:: install - - WnnMakeDirectories(install,$(TWNNDICDIR)) -+/* -+ * Bugfix. -+ * Because "NO" is same to "YES"!! -+ * And some additional bugfix. -+ */ -+#if (WnnInstallDicForcibly == YES) - InstallMultiple($(ALLTGT),$(TWNNSYSDICDIR)) - - install:: -@@ -52,6 +58,9 @@ - do \ - $(WNNTOUCH) $(DESTDIR)$(TWNNSYSDICDIR)/$$i ;\ - done -+#else -+WnnInstallDicMultiple($(ALLTGT),$(TWNNSYSDICDIR)) -+#endif - - depend:: - @echo "skipping make in my dir" ---- ../Wnn-4.2-patched/kWnn/kdic/Imakefile Tue Aug 23 11:25:31 1994 -+++ kWnn/kdic/Imakefile Mon Nov 2 18:49:05 1998 -@@ -41,6 +41,12 @@ - instserver:: install - - WnnMakeDirectories(install,$(KWNNDICDIR)) -+/* -+ * Bugfix. -+ * Because "NO" is same to "YES"!! -+ * And some additional bugfix. -+ */ -+#if (WnnInstallDicForcibly == YES) - InstallMultiple($(ALLTGT),$(KWNNSYSDICDIR)) - - install:: -@@ -48,6 +54,9 @@ - do \ - $(WNNTOUCH) $(DESTDIR)$(KWNNSYSDICDIR)/$$i ;\ - done -+#else -+WnnInstallDicMultiple($(ALLTGT),$(KWNNSYSDICDIR)) -+#endif - - depend:: - @echo "skipping make in my dir" diff --git a/japanese/FreeWnn-server/files/patch-bb b/japanese/FreeWnn-server/files/patch-bb deleted file mode 100644 index 1722ecbc2600..000000000000 --- a/japanese/FreeWnn-server/files/patch-bb +++ /dev/null @@ -1,132 +0,0 @@ ---- config/Project.tmpl.orig Wed Jan 6 00:32:36 1999 -+++ config/Project.tmpl Wed Jan 6 02:36:03 1999 -@@ -389,6 +389,8 @@ - XCOMM ----------------------------------------------------------------------- - XCOMM X Window System make variables; these need to be coordinated with rules - -+ SYS_LIBRARIES = -lcrypt /* For FreeBSD */ -+ - /* - * This list must be reflected in the DIRS_TO_BUILD list in the top-level - * Makefile. -@@ -413,6 +415,9 @@ - XAPPLOADDIR = XAppLoadDir /* application default resource dir */ - FONTCFLAGS = FontCompilerFlags - -+ INSTINCFLAGS = InstIncFlags -c /* XXX - dirty hack by */ -+ INSTDATFLAGS = InstDatFlags -c /* XXX - Satoshi */ -+ INSTBINFLAGS = InstBinFlags -c /* XXX - Asami */ - INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ - - #ifdef UseInstalled -@@ -465,6 +470,7 @@ - #define ProfileLibX11 NO /* profiled X library */ - #endif - XLIBSRC = $(LIBSRC)/X11 -+#ifndef XFree86Version - #if SharedLibX11 - #ifndef SharedX11Rev - #define SharedX11Rev 6.0 -@@ -481,6 +487,16 @@ - UnsharedLibReferences(XONLY,X11,$(XLIBSRC)) - #endif - #endif -+#else -+#if SharedLibX11 -+#ifndef SharedX11Rev -+#define SharedX11Rev 6.0 -+#endif -+SharedLibReferences(XONLY,X11,$(XLIBSRC),SOXLIBREV,SharedX11Rev) -+#else -+UnsharedLibReferences(XONLY,X11,$(XLIBSRC)) -+#endif -+#endif - XLIBONLY = $(XONLYLIB) - - #ifndef SharedLibXext -@@ -1097,6 +1113,13 @@ - obj : depends @@\ - $(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c @@\ - -+#define WnnSpecialSharedObjectRule(obj, depends, direct, define) @@\ -+obj : depends @@\ -+ (cd unshared ; \ @@\ -+ $(CC) -c $(CFLAGS) define direct/`basename $@ .o`.c) @@\ -+ $(CC) -c $(CFLAGS) define $(SHLIBDEF) $(SHAREDCODEDEF) \ @@\ -+ $(PICFLAGS) direct/`basename $@ .o`.c @@\ -+ - #ifdef WnnMakeDirectories - #undef WnnMakeDirectories - #endif -@@ -1117,10 +1140,16 @@ - #undef ImakeSubCmdHelper - #endif - -+/* -+ * Change a variavle's name from "$imakeprefix" to "$(IMAKEPREFIX)". -+ * Because it caused a error on XFree86 3.1.2S and 3.1.2E. -+ * The Imake rule of XFree86 3.1.2S and 3.1.2E FreeBSD was changed. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ - #ifdef UseInstalled --#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$$imakeprefix$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES) -+#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES) - #else --#define ImakeSubCmdHelper $$imakeprefix$(IMAKE) -I$$imakeprefix$(IMIRULESRC) -I$$imakeprefix$(IRULESRC) $(IMAKE_DEFINES) -+#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES) - #endif - - #define WnnInstallDicMultiple(list,dest) @@\ -@@ -1135,16 +1164,16 @@ - done - - #ifndef BuildWnn --#define BuildWnn YES -+#define BuildWnn %%BuildWnn%% - #endif - #ifndef BuildCWnn --#define BuildCWnn YES -+#define BuildCWnn %%BuildCWnn%% - #endif - #ifndef BuildKWnn --#define BuildKWnn YES -+#define BuildKWnn %%BuildKWnn%% - #endif - #ifndef BuildXwnmo --#define BuildXwnmo YES -+#define BuildXwnmo %%BuildXwnmo%% - #endif - - #ifndef BuildJserver -@@ -1169,7 +1198,7 @@ - #define BuildWnnMan YES - #endif - #ifndef BuildJlibV3 --#define BuildJlibV3 NO -+#define BuildJlibV3 %%BuildJlibV3%% - #endif - #if BuildPubdic || BuildWnnConsDic - #define BuildWnnDicUtilForCompile YES -@@ -1236,8 +1265,9 @@ - #else - IMTOP = $(CONTRIBSRC)/programs/Xsi - #endif -- WNNWNNDIR = /usr/local/lib/wnn -- WNNBINDIR = /usr/local/bin -+ PREFIX = /usr/local -+ WNNWNNDIR = ${PREFIX}/lib/wnn -+ WNNBINDIR = ${PREFIX}/bin - WNNINCDIR = $(INCROOT) - WNNLIBDIR = $(USRLIBDIR) - WNNTERM_LIB = termLibrary -@@ -1352,6 +1382,10 @@ - XWNMOINCLUDES = -I$(XWNMOROMKANMSRC) -I$(WNNINCLUDESRC) $(XWNMOXLIBINC) - XWNMOJLIB = $(XWNMOJLIBSRC)/libwnn_m.a - XWNMOLIBRARIES = $(XWNMOJLIB) -+ -+XCOMM for FreeBSD port -+XCOMM -+MANPATH= /usr/X11R6/man/%%LOCAL_MAN_LANG%% - - XWNMODEF = -DBC_X11R5 - diff --git a/japanese/FreeWnn-server/files/patch-bc b/japanese/FreeWnn-server/files/patch-bc deleted file mode 100644 index 986584ab0e2b..000000000000 --- a/japanese/FreeWnn-server/files/patch-bc +++ /dev/null @@ -1,77 +0,0 @@ ---- Wnn/jlib/Imakefile.orig Wed Aug 17 10:10:03 1994 -+++ Wnn/jlib/Imakefile Wed Nov 18 01:17:23 1998 -@@ -3,5 +3,6 @@ - XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - -@@ -45,13 +46,26 @@ - $(WNNROMKANSRC)/rk_read.o \ - $(WNNROMKANSRC)/rk_vars.o - -+UNSHARED_LOCAL_RKOBJS= $(WNNROMKANSRC)/unshared/rk_bltinfn.o \ -+ $(WNNROMKANSRC)/unshared/rk_main.o \ -+ $(WNNROMKANSRC)/unshared/rk_modread.o \ -+ $(WNNROMKANSRC)/unshared/rk_read.o \ -+ $(WNNROMKANSRC)/unshared/rk_vars.o -+ - LOCAL_ETCSRCS = $(SRC3) $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8) - LOCAL_ETCOBJS = $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) - SRCS= $(SRC1) $(LOCAL_ETCSRCS) - OBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) -+UNSHAREDOBJS= $(OBJ1) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS) - -+SOWNN4LIBREV=1.0 -+ - LibraryObjectRule() -+#if DoSharedLib -+AllTarget($(OBJS) libwnn.a libwnn4.so.$(SOWNN4LIBREV)) -+#else - AllTarget($(OBJS) libwnn.a) -+#endif - - NormalLibraryTarget(getopt,$(OBJ2)) - LintLibraryTarget(getopt,$(SRC2)) -@@ -65,11 +79,20 @@ - - SingleProgramTarget(kankana,kankana.o,$(WNNJLIB),) - --NormalLibraryTarget(wnn,$(OBJS)) -+ -+#if DoSharedLib -+SharedLibraryTarget(wnn4,$(SOWNN4LIBREV),$(OBJS),.,.) -+#endif -+ -+UnsharedLibraryTarget(wnn,$(UNSHAREDOBJS),unshared,..) - LintLibraryTarget(wnn,$(SRCS)) - - instlib:: install - -+#if DoSharedLib -+InstallSharedLibrary(wnn4,$(SOWNN4LIBREV),$(WNNLIBDIR)) -+#endif -+ - InstallLibrary(wnn,$(WNNLIBDIR)) - - #if ProfileLibJlib -@@ -77,12 +100,12 @@ - InstallLibrary(wnn_p,$(WNNLIBDIR)) - #endif - --WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),) --WnnSpecialObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),) --WnnSpecialObjectRule($(OBJ5),$(SRC5),$(WNNETCSRC),) --WnnSpecialObjectRule($(OBJ6),$(SRC6),$(WNNETCSRC),) --WnnSpecialObjectRule($(OBJ7),$(SRC7),$(WNNETCSRC),) --WnnSpecialObjectRule($(OBJ8),$(SRC8),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(WNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(WNNETCSRC),) - - $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ diff --git a/japanese/FreeWnn-server/files/patch-bd b/japanese/FreeWnn-server/files/patch-bd deleted file mode 100644 index 877e47f31744..000000000000 --- a/japanese/FreeWnn-server/files/patch-bd +++ /dev/null @@ -1,9 +0,0 @@ ---- Wnn/romkan/Imakefile.orig Wed Aug 17 10:10:21 1994 -+++ Wnn/romkan/Imakefile Wed Nov 18 00:08:23 1998 -@@ -3,5 +3,6 @@ - XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - diff --git a/japanese/FreeWnn-server/files/patch-be b/japanese/FreeWnn-server/files/patch-be deleted file mode 100644 index 6d7e402faae7..000000000000 --- a/japanese/FreeWnn-server/files/patch-be +++ /dev/null @@ -1,7 +0,0 @@ ---- cWnn/jserver/Imakefile.ORG Tue Aug 23 11:22:25 1994 -+++ cWnn/jserver/Imakefile Fri Apr 14 23:47:57 1995 -@@ -148,3 +148,3 @@ - LinkDiffNameFile($(TSRC0),$(SRC0),.) --LinkDiffNameFile($(TSRCGETHINSI),$(SRCGETHINSI),$(CWNNETCSRC)) -+LinkDiffNameFile($(TSRCGETHINSI),$(SRCGETHINSI),) - diff --git a/japanese/FreeWnn-server/files/patch-bf b/japanese/FreeWnn-server/files/patch-bf deleted file mode 100644 index 199c82d59145..000000000000 --- a/japanese/FreeWnn-server/files/patch-bf +++ /dev/null @@ -1,78 +0,0 @@ ---- ../../../work/Xsi/cWnn/jlib/Imakefile.~1~ Wed Aug 17 10:11:04 1994 -+++ cWnn/jlib/Imakefile Tue Jan 5 22:43:30 1999 -@@ -3,5 +3,6 @@ - XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - -@@ -46,13 +47,26 @@ - $(CWNNROMKANSRC)/rk_read.o \ - $(CWNNROMKANSRC)/rk_vars.o - -+UNSHARED_LOCAL_RKOBJS= $(CWNNROMKANSRC)/unshared/rk_bltinfn.o \ -+ $(CWNNROMKANSRC)/unshared/rk_main.o \ -+ $(CWNNROMKANSRC)/unshared/rk_modread.o \ -+ $(CWNNROMKANSRC)/unshared/rk_read.o \ -+ $(CWNNROMKANSRC)/unshared/rk_vars.o -+ - LOCAL_ETCSRCS = $(SRC4) $(SRC5) $(SRC6) $(SRC7) $(SRC8) - LOCAL_ETCOBJS = $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) - SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS) - OBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS) -+UNSHAREDOBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(UNSHARED_LOCAL_RKOBJS) -+ -+SOCWNN4LIBREV=1.0 - - LibraryObjectRule() -+#if DoSharedLib -+AllTarget($(OBJS) libcwnn.a libcwnn4.so.$(SOCWNN4LIBREV)) -+#else - AllTarget($(OBJS) libcwnn.a) -+#endif - - includes:: $(LINKS) - -@@ -74,11 +88,19 @@ - - SingleProgramTarget(kankana,kankana.o,$(CWNNJLIB),) - --NormalLibraryTarget(cwnn,$(OBJS)) -+#if DoSharedLib -+SharedLibraryTarget(cwnn4,$(SOCWNN4LIBREV),$(OBJS),.,.) -+#endif -+ -+UnsharedLibraryTarget(cwnn,$(UNSHAREDOBJS),unshared,..) - LintLibraryTarget(cwnn,$(SRCS)) - - instlib:: install - -+#if DoSharedLib -+InstallSharedLibrary(cwnn4,$(SOCWNN4LIBREV),$(WNNLIBDIR)) -+#endif -+ - InstallLibrary(cwnn,$(WNNLIBDIR)) - - #if ProfileLibJlib -@@ -86,13 +108,13 @@ - InstallLibrary(cwnn_p,$(WNNLIBDIR)) - #endif - --WnnSpecialObjectRule($(OBJ3),$(SRC3),$(CWNNETCSRC),) --WnnSpecialObjectRule($(OBJ4),$(SRC4),$(CWNNETCSRC),) --WnnSpecialObjectRule($(OBJ5),$(SRC5),$(CWNNETCSRC),) --WnnSpecialObjectRule($(OBJ6),$(SRC6),$(CWNNETCSRC),) --WnnSpecialObjectRule($(OBJ7),$(SRC7),$(CWNNETCSRC),) --WnnSpecialObjectRule($(OBJ8),$(SRC8),$(CWNNETCSRC),) -- -+WnnSpecialSharedObjectRule($(OBJ3),$(SRC3),$(CWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ4),$(SRC4),$(CWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ5),$(SRC5),$(CWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ6),$(SRC6),$(CWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ7),$(SRC7),$(CWNNETCSRC),) -+WnnSpecialSharedObjectRule($(OBJ8),$(SRC8),$(CWNNETCSRC),) -+ - $(LOCAL_RKOBJS) : $(LOCAL_RKSRCS) - @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ - cd $(CWNNROMKANSRC); echo "making all in $(CWNNROMKANSRC)"; \ diff --git a/japanese/FreeWnn-server/files/patch-bg b/japanese/FreeWnn-server/files/patch-bg deleted file mode 100644 index 3fcc2ecbe8d0..000000000000 --- a/japanese/FreeWnn-server/files/patch-bg +++ /dev/null @@ -1,9 +0,0 @@ ---- ../../../work/Xsi/cWnn/romkan/Imakefile Wed Aug 17 10:10:58 1994 -+++ cWnn/romkan/Imakefile Tue Jan 5 22:23:33 1999 -@@ -3,5 +3,6 @@ - XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - diff --git a/japanese/FreeWnn-server/files/patch-bi b/japanese/FreeWnn-server/files/patch-bi deleted file mode 100644 index 82abfa01d233..000000000000 --- a/japanese/FreeWnn-server/files/patch-bi +++ /dev/null @@ -1,9 +0,0 @@ ---- ../../../work/Xsi/kWnn/romkan/Imakefile Wed Aug 17 10:11:47 1994 -+++ kWnn/romkan/Imakefile Tue Jan 5 22:57:27 1999 -@@ -3,5 +3,6 @@ - XCOMM - #define DoNormalLib YES -+#define DoSharedLib YES - - #include <Library.tmpl> - diff --git a/japanese/FreeWnn-server/files/patch-bj b/japanese/FreeWnn-server/files/patch-bj deleted file mode 100644 index 6a171a63576c..000000000000 --- a/japanese/FreeWnn-server/files/patch-bj +++ /dev/null @@ -1,43 +0,0 @@ ---- Wnn/pubdic/Imakefile.orig Tue Aug 23 11:21:30 1994 -+++ Wnn/pubdic/Imakefile Thu Jan 7 13:41:56 1999 -@@ -96,11 +96,17 @@ - instserver:: install - - WnnMakeDirectories(install,$(JWNNDICDIR)) --#if WnnInstallDicForcibly -+/* -+ * Bugfix. -+ * Because "NO" is same to "YES"!! -+ * And some additional bugfix. -+ * Patched by Hidekazu Kuroki(hidekazu@cs.titech.ac.jp) 1996/8/20 -+ */ -+#if (WnnInstallDicForcibly == YES) - InstallMultiple($(DIC),$(JWNNPUBDICDIR)) - - install:: -- @for i in $(DICS); \ -+ @for i in $(DIC); \ - do \ - $(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\ - done -@@ -108,7 +114,20 @@ - #else - WnnInstallDicMultiple($(DIC),$(JWNNPUBDICDIR)) - #endif -+ -+#if (WnnInstallDicForcibly == YES) - InstallMultiple($(FZKDATA),$(JWNNPUBDICDIR)) -+ -+install:: -+ @for i in $(FZKDATA); \ -+ do \ -+ $(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\ -+ done -+ -+#else -+WnnInstallDicMultiple($(FZKDATA),$(JWNNPUBDICDIR)) -+#endif -+ - InstallMultiple($(FZK_SRC),$(JWNNFZKSRCDIR)) - - depend:: diff --git a/japanese/FreeWnn-server/files/patch-bk b/japanese/FreeWnn-server/files/patch-bk deleted file mode 100644 index 2c89d581df34..000000000000 --- a/japanese/FreeWnn-server/files/patch-bk +++ /dev/null @@ -1,21 +0,0 @@ -By KATAYAMA Yoshio <kate@pfu.co.jp> - ---- Wnn/etc/pwd.c.ORG Tue Sep 22 13:29:26 1992 -+++ Wnn/etc/pwd.c Mon Jan 25 13:14:27 1999 -@@ -68,7 +68,7 @@ - char *src, *encd; - { - int i, x,c; -- char xx[2]; -+ char xx[3]; - char *cr; - - if(encd == NULL)encd = src; -@@ -76,6 +76,7 @@ - x = time(NULL); - xx[0] = x & 0x3f; - xx[1] = (x & 0x3f00) >> 8; -+ xx[2] = '\0'; /* for MD5 (that requires terminator) */ - for (i = 0; i < 2; i++) { - c = xx[i] + '.'; - if (c > '9') diff --git a/japanese/FreeWnn-server/files/patch-bl b/japanese/FreeWnn-server/files/patch-bl deleted file mode 100644 index 63e65b164585..000000000000 --- a/japanese/FreeWnn-server/files/patch-bl +++ /dev/null @@ -1,27 +0,0 @@ -By KATAYAMA Yoshio <kate@pfu.co.jp> - ---- Wnn/jserver/de_header.h.ORG Tue Jun 28 11:06:53 1994 -+++ Wnn/jserver/de_header.h Sun Jan 24 14:45:58 1999 -@@ -240,6 +240,7 @@ - extern int get4_cur(); - extern int getc_cur(); - extern void puts_cur(); -+extern void puts_n_cur(); - extern void putws_cur(); - extern void putnws_cur(); - extern void put2_cur(); ---- Wnn/jserver/do_dic_no.c.ORG Tue Sep 22 13:49:03 1992 -+++ Wnn/jserver/do_dic_no.c Sun Jan 24 14:45:03 1999 -@@ -119,9 +119,9 @@ - puts_cur(files[fid].name); - if(hfid >= 0) puts_cur(files[hfid].name); - else puts_cur(""); -- puts_cur(files[fid].passwd); -- if(hfid >= 0) puts_cur(files[hfid].passwd); -- else puts_cur(jtl->hpasswd); -+ puts_n_cur(files[fid].passwd, WNN_PASSWD_LEN); -+ if(hfid >= 0) puts_n_cur(files[hfid].passwd, WNN_PASSWD_LEN); -+ else puts_n_cur(jtl->hpasswd, WNN_PASSWD_LEN); - put4_cur(jtl->syurui); - put4_cur(jtl->gosuu); - put4_cur(files[fid].localf); diff --git a/japanese/FreeWnn-server/files/patch-ca b/japanese/FreeWnn-server/files/patch-ca index 80b8abd422ec..1d6ed255d53e 100644 --- a/japanese/FreeWnn-server/files/patch-ca +++ b/japanese/FreeWnn-server/files/patch-ca @@ -1,10 +1,11 @@ ---- Xwnmo/xwnmo/do_socket.c.orig Tue Aug 23 17:11:30 1994 -+++ Xwnmo/xwnmo/do_socket.c Sun Apr 11 19:19:15 1999 -@@ -116,8 +116,6 @@ - #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) - #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) +--- Xwnmo/xwnmo/do_socket.c.orig Fri Jun 15 03:16:14 2001 ++++ Xwnmo/xwnmo/do_socket.c Wed Dec 7 18:53:42 2005 +@@ -118,8 +118,6 @@ + #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) + #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) --extern int read(), write(); +-extern int read (), write (); - - #define _Read(fd, data, size) read((fd), (data), (size)) - #define _Write(fd, data, size) write((fd), (data), (size)) + #define _Read(fd, data, size) read((fd), (data), (size)) + #define _Write(fd, data, size) write((fd), (data), (size)) + diff --git a/japanese/FreeWnn-server/files/patch-cb b/japanese/FreeWnn-server/files/patch-cb index 43a32d4d8828..28f8910982c8 100644 --- a/japanese/FreeWnn-server/files/patch-cb +++ b/japanese/FreeWnn-server/files/patch-cb @@ -1,10 +1,10 @@ ---- Xwnmo/xwnmo/do_xjpdrct.c.orig Mon Aug 22 14:04:23 1994 -+++ Xwnmo/xwnmo/do_xjpdrct.c Sun Apr 11 19:29:19 1999 -@@ -87,8 +87,6 @@ - #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) - #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) +--- Xwnmo/xwnmo/do_xjpdrct.c.orig Wed Dec 7 18:55:11 2005 ++++ Xwnmo/xwnmo/do_xjpdrct.c Wed Dec 7 18:55:19 2005 +@@ -89,8 +89,6 @@ + #define sock_clr(array,pos) (array[pos/BINTSIZE] &= ~(1<<(pos%BINTSIZE))) + #define sock_tst(array,pos) (array[pos/BINTSIZE] & (1<<(pos%BINTSIZE))) --extern int read(), write(); +-extern int read (), write (); - extern XJpClientRec *xjp_clients; extern XJpClientRec *xjp_cur_client; diff --git a/japanese/FreeWnn-server/files/patch-cc b/japanese/FreeWnn-server/files/patch-cc deleted file mode 100644 index 75a3f53e8cc2..000000000000 --- a/japanese/FreeWnn-server/files/patch-cc +++ /dev/null @@ -1,13 +0,0 @@ ---- Xwnmo/xjutil/jutil.c.orig Thu Jan 21 17:05:44 1993 -+++ Xwnmo/xjutil/jutil.c Sun Apr 11 19:32:58 1999 -@@ -664,10 +664,8 @@ - extern int srand(); - extern long rand(); - #else -- extern int srandom(); - extern long random(); - #endif -- extern long time(); - - if(pwd_file == NULL || *pwd_file == 0) return(0); - if(access(pwd_file, F_OK) != -1) return(0); diff --git a/japanese/FreeWnn-server/files/patch-cd b/japanese/FreeWnn-server/files/patch-cd deleted file mode 100644 index 492f3fe1806c..000000000000 --- a/japanese/FreeWnn-server/files/patch-cd +++ /dev/null @@ -1,14 +0,0 @@ ---- Wnn/jlib/js.c~ Thu Mar 9 16:34:55 2000 -+++ Wnn/jlib/js.c Thu Mar 9 16:49:51 2000 -@@ -325,7 +325,10 @@ - char *pserver; - { - register char *p; -- strcpy(pserver, server); -+ /* Workaround for pserver buffer overrun : Nov 11,1999 by T.Aono */ -+ /* assumes pserver[64]. variable length string is not supported. */ -+ strncpy(pserver, server, 64 - 1); -+ pserver[64 - 1] = '\0'; - p = pserver; - for( ; *p && *p != ':'; p++) ; - if (!*p) return(0); /* does not have a colon */ diff --git a/japanese/FreeWnn-server/files/patch-ce b/japanese/FreeWnn-server/files/patch-ce deleted file mode 100644 index 7264669e5628..000000000000 --- a/japanese/FreeWnn-server/files/patch-ce +++ /dev/null @@ -1,33 +0,0 @@ ---- Wnn/jserver/do_env.c~ Wed Apr 28 09:25:54 1993 -+++ Wnn/jserver/do_env.c Fri Mar 10 00:25:57 2000 -@@ -79,10 +79,10 @@ - char tmp_buf[256]; - - version = get4_cur(); -- gets_cur(tmp_buf); -+ gets_cur(tmp_buf, 256); - tmp_buf[WNN_HOSTLEN-1] = '\0'; /* truncate by WNN_HOSTLEN */ - strcpy(c_c->host_name, tmp_buf); -- gets_cur(tmp_buf); -+ gets_cur(tmp_buf, 256); - tmp_buf[WNN_ENVNAME_LEN-1] = '\0'; /* truncate by WNN_ENVNAME_LEN */ - strcpy(c_c->user_name, tmp_buf); - error1("Inet user=%s@%s\n",c_c -> user_name,c_c->host_name); -@@ -125,7 +125,7 @@ - js_connect() - {char n[256]; - register int x; -- gets_cur(n); -+ gets_cur(n, 256); - x=conn1(n); - if(x==-1){error_ret(); return;} - put4_cur(x); -@@ -184,7 +184,7 @@ - { - char n[256]; - -- gets_cur(n); -+ gets_cur(n, 256); - if(find_env_by_name(n) != -1){ /* exist */ - put4_cur(1); - }else{ diff --git a/japanese/FreeWnn-server/files/patch-cf b/japanese/FreeWnn-server/files/patch-cf deleted file mode 100644 index e9eb93a1ffb6..000000000000 --- a/japanese/FreeWnn-server/files/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ ---- Wnn/jserver/do_dic_env.c~ Wed Sep 30 14:25:06 1992 -+++ Wnn/jserver/do_dic_env.c Fri Mar 10 00:25:25 2000 -@@ -78,8 +78,8 @@ - nice=get4_cur(); - rw=get4_cur(); - hrw=get4_cur(); -- gets_cur(pw); -- gets_cur(pw1); -+ gets_cur(pw, WNN_PASSWD_LEN); -+ gets_cur(pw1, WNN_PASSWD_LEN); - rev=get4_cur(); /* rev is to add it as reverse dict */ - - error1("dic_add: eid=%d,fid=%d,hfid=%d",eid,fid,hfid); diff --git a/japanese/FreeWnn-server/files/patch-cg b/japanese/FreeWnn-server/files/patch-cg deleted file mode 100644 index a89d717ef51d..000000000000 --- a/japanese/FreeWnn-server/files/patch-cg +++ /dev/null @@ -1,16 +0,0 @@ ---- Wnn/jserver/dispatch.c~ Tue Sep 22 13:49:00 1992 -+++ Wnn/jserver/dispatch.c Fri Mar 10 00:24:44 2000 -@@ -308,9 +308,11 @@ - */ - - void --get_file_name(p) register char *p; -+get_file_name(p, len) -+register char *p; -+int len; - { -- gets_cur(p); -+ gets_cur(p, len); - if(p[0] == 0){ - return; - } diff --git a/japanese/FreeWnn-server/files/patch-ch b/japanese/FreeWnn-server/files/patch-ch deleted file mode 100644 index 3f0d73e0805d..000000000000 --- a/japanese/FreeWnn-server/files/patch-ch +++ /dev/null @@ -1,122 +0,0 @@ ---- Wnn/jserver/do_filecom.c~ Thu May 27 13:42:53 1993 -+++ Wnn/jserver/do_filecom.c Fri Mar 10 00:29:09 2000 -@@ -92,7 +92,7 @@ - {char path[FILENAME]; int x; - int err = 0; - err = envhandle(); -- get_file_name(path); -+ get_file_name(path, FILENAME); - - if(err == -1){ error_ret(); return;} - x=mkdir(path , MODE ); -@@ -117,7 +117,7 @@ - int eid; - - eid = envhandle(); -- get_file_name(path); -+ get_file_name(path, FILENAME); - if(eid == -1) {error_ret(); return;} - - if((fd = open(path , O_RDONLY)) >= 0){ -@@ -142,7 +142,7 @@ - int amode; - envhandle(); - amode=get4_cur(); -- get_file_name(path); -+ get_file_name(path, FILENAME); - - #ifdef WRITE_CHECK - check_backup(path); -@@ -222,7 +222,7 @@ - char n[FILENAME]; - - get4_cur(); /* env_id */ -- get_file_name(n); -+ get_file_name(n, FILENAME); - - put4_cur(file_stat(n)); - putc_purge(); -@@ -349,9 +349,9 @@ - - env_id=get4_cur(); /* env_id */ - fid=get4_cur(); -- get_file_name(fn); -+ get_file_name(fn, FILE_NAME_L); - getws_cur(com); -- gets_cur(hpasswd); -+ gets_cur(hpasswd, WNN_PASSWD_LEN); - if(find_fid_in_env(env_id,fid)==-1){ /* valid */ - wnn_errorno=WNN_FID_ERROR; - error_ret(); putc_purge(); return; -@@ -410,10 +410,10 @@ - w_char com[1024]; - char passwd[WNN_PASSWD_LEN], hpasswd[WNN_PASSWD_LEN]; - get4_cur(); /* env_id */ -- get_file_name(fn); -+ get_file_name(fn, FILE_NAME_L); - getws_cur(com); -- gets_cur(passwd); -- gets_cur(hpasswd); -+ gets_cur(passwd, WNN_PASSWD_LEN); -+ gets_cur(hpasswd, WNN_PASSWD_LEN); - type = get4_cur(); - - if(type != WNN_REV_DICT && -@@ -546,7 +546,7 @@ - int x; - - /* get4_cur(); env_id */ -- get_file_name(n); -+ get_file_name(n, FILE_NAME_L); - - if((x=file_loaded(n)) < 0) put4_cur(-1); - else put4_cur(x); -@@ -650,7 +650,7 @@ - - put4_cur(1); putc_purge(); - -- gets_cur(n); -+ gets_cur(n, FILE_NAME_L); - - /* read file */ - files[fid].localf= REMOTE; -@@ -674,7 +674,7 @@ - int env_id,fid; - - env_id=get4_cur(); /* env_id */ -- get_file_name(n); -+ get_file_name(n, FILE_NAME_L); - - fid = file_loaded(n); - if(fid == -1){ -@@ -742,7 +742,7 @@ - char n[FILE_NAME_L]; - env_id=get4_cur(); /* env_id */ - fid=get4_cur(); -- get_file_name(n); -+ get_file_name(n, FILE_NAME_L); - - if(find_fid_in_env(env_id,fid)==-1){ /* valid */ - wnn_errorno=WNN_FID_ERROR; -@@ -895,8 +895,8 @@ - char passwd[WNN_PASSWD_LEN]; - int x; - -- get_file_name(n); -- gets_cur(passwd); -+ get_file_name(n, FILE_NAME_L); -+ gets_cur(passwd, WNN_PASSWD_LEN); - - x = file_remove(n, passwd); - if(x == -1){ -@@ -958,8 +958,8 @@ - envi = get4_cur(); /* env_id */ - fid = get4_cur(); - which = get4_cur(); -- gets_cur(old); -- gets_cur(new); -+ gets_cur(old, WNN_PASSWD_LEN); -+ gets_cur(new, WNN_PASSWD_LEN); - - if(find_fid_in_env(envi,fid) == -1){ - wnn_errorno=WNN_FID_ERROR; diff --git a/japanese/FreeWnn-server/pkg-descr b/japanese/FreeWnn-server/pkg-descr index 3b31954d9566..ee85631be981 100644 --- a/japanese/FreeWnn-server/pkg-descr +++ b/japanese/FreeWnn-server/pkg-descr @@ -1,9 +1,6 @@ FreeWnn is a Japanese/Chinese/Korean input method. -WWW: http://www.freewnn.org/ - -This port has only the server and dictionaries used for the Japanese -input method. +This port installs only the server and dictionaries for +the Japanese imput method. --- S. Taoka -<taoka@FreeBSD.org> +WWW: http://www.freewnn.org/ diff --git a/japanese/FreeWnn-server/pkg-plist b/japanese/FreeWnn-server/pkg-plist index 30704aff3ff8..466e5f902212 100644 --- a/japanese/FreeWnn-server/pkg-plist +++ b/japanese/FreeWnn-server/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/Wnn4/atod bin/Wnn4/atof bin/Wnn4/dtoa @@ -9,7 +10,7 @@ bin/Wnn4/wnnkill bin/Wnn4/wnnstat bin/Wnn4/wnntouch @dirrm bin/Wnn4 -etc/rc.d/Wnn.sh +etc/rc.d/wnn.sh lib/wnn/ja_JP/dic/gerodic/g-jinmei.dic lib/wnn/ja_JP/dic/pubdic/bio.dic lib/wnn/ja_JP/dic/pubdic/chimei.dic @@ -36,8 +37,6 @@ lib/wnn/ja_JP/dic/wnncons/tankan3.dic @dirrm lib/wnn/ja_JP/dic/gerodic @dirrm lib/wnn/ja_JP/dic/pubdic @dirrm lib/wnn/ja_JP/dic/src -@dirrm lib/wnn/ja_JP/dic/usr @dirrm lib/wnn/ja_JP/dic/wnncons -@dirrm lib/wnn/ja_JP/dic -@dirrm lib/wnn/ja_JP -@dirrm lib/wnn +@unexec rmdir %D/lib/wnn/ja_JP/dic/usr 2> /dev/null || true +@unexec rmdir %D/lib/wnn/ja_JP/dic 2> /dev/null || true |