remove a few looked over FreeBSD-isms.

This commit is contained in:
espie 1998-11-22 00:13:44 +00:00
parent dbf6f53bca
commit ca432a999a
14 changed files with 204 additions and 220 deletions

View File

@ -84,7 +84,7 @@ diff -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
XCOMM -----------------------------------------------------------------------
XCOMM X Window System make variables; these need to be coordinated with rules
+ SYS_LIBRARIES = -lcrypt /* For FreeBSD */
+ XCOMM SYS_LIBRARIES = -lcrypt /* For FreeBSD, not OpenBSD */
+
/*
* This list must be reflected in the DIRS_TO_BUILD list in the top-level

View File

@ -1 +1 @@
A Japanese/Chinese/Korean input method (only Japanese built)
Japanese/Chinese/Korean input method (built only Japanese)

View File

@ -7,7 +7,7 @@ ask() {
question=$1
default=$2
if [ -z "${PACKAGE_BUILDING}" ]; then
read -p "${question} (y/n) [${default}]? " answer
read "${question} (y/n) [${default}]? " answer
fi
if [ x${answer} = x ]; then
answer=${default}
@ -59,8 +59,8 @@ EOF
echo ""
echo "You need an account 'wnn' whose ID number is 69"
if yesno "Would you like to create it automatically?" y; then
adduser -noconfig -uid 69 -group bin -shell /sbin/nologin \
-home /root -batch wnn bin
gid=`id -g bin`
chpass -a "wnn:*:69:${gid}::::Wnn server:/root:/sbin/nologin"
else
echo "Please create it, and try again."
exit 1
@ -102,19 +102,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
echo "Installing ${startup_script} startup file.";
echo '#!/bin/sh' > ${startup_script};
echo "wnn=${wnnserver}" >> ${startup_script};
echo 'if [ -f $wnn ]; then' >> ${startup_script};
echo " echo -n ' ${wnnname}'" >> ${startup_script};
echo ' $wnn' >> ${startup_script};
echo "fi" >> ${startup_script};
chmod 755 ${startup_script};
chown bin.bin ${startup_script};
fi
;;
esac

View File

@ -1,5 +1,4 @@
@cwd /usr/local
etc/rc.d/Wnn.sh
lib/wnn/ja_JP/dic/pubdic/bio.dic
lib/wnn/ja_JP/dic/pubdic/chimei.dic
lib/wnn/ja_JP/dic/pubdic/computer.dic
@ -376,187 +375,187 @@ include/wnn/cplib.h
include/wnn/config.h
include/wnn/msg.h
@dirrm include/wnn
man/man1/uum.1.gz
man/man1/jserver.1.gz
man/man1/wnnkill.1.gz
man/man1/wnnstat.1.gz
man/man1/atod.1.gz
man/man1/atof.1.gz
man/man1/dtoa.1.gz
man/man1/wddel.1.gz
man/man1/wdreg.1.gz
man/man1/wnntouch.1.gz
man/man1/oldatonewa.1.gz
man/man3/jl_bun_suu.3.gz
man/man3/jl_c_zenkouho.3.gz
man/man3/jl_connect.3.gz
man/man3/jl_close.3.gz
man/man3/jl_connect_lang.3.gz
man/man3/jl_dai_top.3.gz
man/man3/jl_dic_add.3.gz
man/man3/jl_dic_add_e.3.gz
man/man3/jl_dic_comment_set_e.3.gz
man/man3/jl_dic_delete.3.gz
man/man3/jl_dic_comment_set.3.gz
man/man3/jl_dic_delete_e.3.gz
man/man3/jl_dic_save_all_e.3.gz
man/man3/jl_dic_save_all.3.gz
man/man3/jl_dic_list.3.gz
man/man3/jl_dic_list_e.3.gz
man/man3/jl_dic_save.3.gz
man/man3/jl_dic_save_e.3.gz
man/man3/jl_dic_use_e.3.gz
man/man3/jl_dic_use.3.gz
man/man3/jl_disconnect.3.gz
man/man3/jl_env.3.gz
man/man3/jl_env_un_sticky.3.gz
man/man3/jl_env_un_sticky_e.3.gz
man/man3/jl_env_set.3.gz
man/man3/jl_env_get.3.gz
man/man3/jl_env_sticky.3.gz
man/man3/jl_env_sticky_e.3.gz
man/man3/jl_fuzokugo_get.3.gz
man/man3/jl_fuzokugo_get_e.3.gz
man/man3/jl_fuzokugo_set.3.gz
man/man3/jl_fuzokugo_set_e.3.gz
man/man3/jl_get_kanji.3.gz
man/man3/jl_get_yomi.3.gz
man/man3/jl_hinsi_dicts.3.gz
man/man3/jl_hinsi_dicts_e.3.gz
man/man3/jl_get_zenkouho_kanji.3.gz
man/man3/jl_hinsi_name.3.gz
man/man3/jl_hinsi_list_e.3.gz
man/man3/jl_hinsi_name_e.3.gz
man/man3/jl_hinsi_list.3.gz
man/man3/jl_hinsi_number_e.3.gz
man/man3/jl_hinsi_number.3.gz
man/man3/jl_isconnect_e.3.gz
man/man3/jl_inspect.3.gz
man/man3/jl_isconnect.3.gz
man/man3/jl_kanji_len.3.gz
man/man3/jl_yomi_len.3.gz
man/man3/jl_jiri_len.3.gz
man/man3/jl_kill.3.gz
man/man3/jl_previous_dai.3.gz
man/man3/jl_next.3.gz
man/man3/jl_previous.3.gz
man/man3/jl_next_dai.3.gz
man/man3/jl_open.3.gz
man/man3/jl_nobi_conv.3.gz
man/man3/jl_param_set.3.gz
man/man3/jl_param_get.3.gz
man/man3/jl_param_get_e.3.gz
man/man3/jl_param_set_e.3.gz
man/man3/jl_open_lang.3.gz
man/man3/jl_ren_conv.3.gz
man/man3/jl_set_env_wnnrc.3.gz
man/man3/jl_set_jikouho.3.gz
man/man3/jl_set_jikouho_dai.3.gz
man/man3/jl_tan_conv.3.gz
man/man3/jl_update_hindo.3.gz
man/man3/jl_word_comment_set_e.3.gz
man/man3/jl_word_add_e.3.gz
man/man3/jl_word_add.3.gz
man/man3/jl_word_comment_set.3.gz
man/man3/jl_word_delete.3.gz
man/man3/jl_word_delete_e.3.gz
man/man3/jl_word_search_by_env.3.gz
man/man3/jl_word_info.3.gz
man/man3/jl_word_info_e.3.gz
man/man3/jl_word_search.3.gz
man/man3/jl_word_search_e.3.gz
man/man3/jl_word_search_by_env_e.3.gz
man/man3/jl_word_use.3.gz
man/man3/jl_word_use_e.3.gz
man/man3/jl_zenkouho_bun.3.gz
man/man3/jl_zenkouho.3.gz
man/man3/jl_zenkouho_daip.3.gz
man/man3/jl_zenkouho_suu.3.gz
man/man3/jl_zenkouho_dai.3.gz
man/man3/js_access.3.gz
man/man3/js_connect.3.gz
man/man3/js_close.3.gz
man/man3/js_dic_add.3.gz
man/man3/js_dic_file_create.3.gz
man/man3/js_dic_file_create_client.3.gz
man/man3/js_dic_info.3.gz
man/man3/js_dic_list.3.gz
man/man3/js_dic_delete.3.gz
man/man3/js_disconnect.3.gz
man/man3/js_dic_use.3.gz
man/man3/js_dic_list_all.3.gz
man/man3/js_env_exist.3.gz
man/man3/js_env_list.3.gz
man/man3/js_env_sticky.3.gz
man/man3/js_env_un_sticky.3.gz
man/man3/js_file_comment_set.3.gz
man/man3/js_file_info.3.gz
man/man3/js_file_discard.3.gz
man/man3/js_file_list.3.gz
man/man3/js_file_loaded.3.gz
man/man3/js_file_list_all.3.gz
man/man3/js_file_loaded_local.3.gz
man/man3/js_file_password_set.3.gz
man/man3/js_file_read.3.gz
man/man3/js_file_remove.3.gz
man/man3/js_file_receive.3.gz
man/man3/js_file_remove_client.3.gz
man/man3/js_file_write.3.gz
man/man3/js_file_stat.3.gz
man/man3/js_file_send.3.gz
man/man3/js_fuzokugo_get.3.gz
man/man3/js_fuzokugo_set.3.gz
man/man3/js_hindo_file_create.3.gz
man/man3/js_hindo_set.3.gz
man/man3/js_hindo_file_create_client.3.gz
man/man3/js_hinsi_dicts.3.gz
man/man3/js_hinsi_name.3.gz
man/man3/js_hinsi_list.3.gz
man/man3/js_isconnect.3.gz
man/man3/js_hinsi_number.3.gz
man/man3/js_hinsi_table_set.3.gz
man/man3/js_kanren.3.gz
man/man3/js_kantan_dai.3.gz
man/man3/js_kantan_sho.3.gz
man/man3/js_kanzen_dai.3.gz
man/man3/js_kanzen_sho.3.gz
man/man3/js_kill.3.gz
man/man3/js_mkdir.3.gz
man/man3/js_param_get.3.gz
man/man3/js_open.3.gz
man/man3/js_open_lang.3.gz
man/man3/js_param_set.3.gz
man/man3/js_get_lang.3.gz
man/man3/js_set_lang.3.gz
man/man3/js_version.3.gz
man/man3/js_who.3.gz
man/man3/js_word_add.3.gz
man/man3/js_word_comment_set.3.gz
man/man3/js_word_delete.3.gz
man/man3/js_word_info.3.gz
man/man3/js_word_search.3.gz
man/man3/js_word_search_by_env.3.gz
man/man3/romkan_clear.3.gz
man/man3/romkan_getc.3.gz
man/man3/romkan_dispmode.3.gz
man/man3/romkan_init.3.gz
man/man3/romkan_next.3.gz
man/man3/romkan_ungetc.3.gz
man/man3/msg_open.3.gz
man/man3/msg_get.3.gz
man/man3/msg_close.3.gz
man/man4/fzk.data.4.gz
man/man4/2a_ctrl.4.gz
man/man4/fzk.u.4.gz
man/man4/jserverrc.4.gz
man/man4/mode.4.gz
man/man4/uumrc.4.gz
man/man4/uumkey.4.gz
man/man4/wnnenvrc.4.gz
man/man4/ujis_dic.4.gz
man/man4/2b_romkana.4.gz
man/man4/cvt_key_tbl.4.gz
man/man4/hinsi_data.4.gz
man/man4/serverdefs.4.gz
man/man5/pubdic.5.gz
man/man5/usr_dic.5.gz
man/cat1/uum.0
man/cat1/jserver.0
man/cat1/wnnkill.0
man/cat1/wnnstat.0
man/cat1/atod.0
man/cat1/atof.0
man/cat1/dtoa.0
man/cat1/wddel.0
man/cat1/wdreg.0
man/cat1/wnntouch.0
man/cat1/oldatonewa.0
man/cat3/jl_bun_suu.0
man/cat3/jl_c_zenkouho.0
man/cat3/jl_connect.0
man/cat3/jl_close.0
man/cat3/jl_connect_lang.0
man/cat3/jl_dai_top.0
man/cat3/jl_dic_add.0
man/cat3/jl_dic_add_e.0
man/cat3/jl_dic_comment_set_e.0
man/cat3/jl_dic_delete.0
man/cat3/jl_dic_comment_set.0
man/cat3/jl_dic_delete_e.0
man/cat3/jl_dic_save_all_e.0
man/cat3/jl_dic_save_all.0
man/cat3/jl_dic_list.0
man/cat3/jl_dic_list_e.0
man/cat3/jl_dic_save.0
man/cat3/jl_dic_save_e.0
man/cat3/jl_dic_use_e.0
man/cat3/jl_dic_use.0
man/cat3/jl_disconnect.0
man/cat3/jl_env.0
man/cat3/jl_env_un_sticky.0
man/cat3/jl_env_un_sticky_e.0
man/cat3/jl_env_set.0
man/cat3/jl_env_get.0
man/cat3/jl_env_sticky.0
man/cat3/jl_env_sticky_e.0
man/cat3/jl_fuzokugo_get.0
man/cat3/jl_fuzokugo_get_e.0
man/cat3/jl_fuzokugo_set.0
man/cat3/jl_fuzokugo_set_e.0
man/cat3/jl_get_kanji.0
man/cat3/jl_get_yomi.0
man/cat3/jl_hinsi_dicts.0
man/cat3/jl_hinsi_dicts_e.0
man/cat3/jl_get_zenkouho_kanji.0
man/cat3/jl_hinsi_name.0
man/cat3/jl_hinsi_list_e.0
man/cat3/jl_hinsi_name_e.0
man/cat3/jl_hinsi_list.0
man/cat3/jl_hinsi_number_e.0
man/cat3/jl_hinsi_number.0
man/cat3/jl_isconnect_e.0
man/cat3/jl_inspect.0
man/cat3/jl_isconnect.0
man/cat3/jl_kanji_len.0
man/cat3/jl_yomi_len.0
man/cat3/jl_jiri_len.0
man/cat3/jl_kill.0
man/cat3/jl_previous_dai.0
man/cat3/jl_next.0
man/cat3/jl_previous.0
man/cat3/jl_next_dai.0
man/cat3/jl_open.0
man/cat3/jl_nobi_conv.0
man/cat3/jl_param_set.0
man/cat3/jl_param_get.0
man/cat3/jl_param_get_e.0
man/cat3/jl_param_set_e.0
man/cat3/jl_open_lang.0
man/cat3/jl_ren_conv.0
man/cat3/jl_set_env_wnnrc.0
man/cat3/jl_set_jikouho.0
man/cat3/jl_set_jikouho_dai.0
man/cat3/jl_tan_conv.0
man/cat3/jl_update_hindo.0
man/cat3/jl_word_comment_set_e.0
man/cat3/jl_word_add_e.0
man/cat3/jl_word_add.0
man/cat3/jl_word_comment_set.0
man/cat3/jl_word_delete.0
man/cat3/jl_word_delete_e.0
man/cat3/jl_word_search_by_env.0
man/cat3/jl_word_info.0
man/cat3/jl_word_info_e.0
man/cat3/jl_word_search.0
man/cat3/jl_word_search_e.0
man/cat3/jl_word_search_by_env_e.0
man/cat3/jl_word_use.0
man/cat3/jl_word_use_e.0
man/cat3/jl_zenkouho_bun.0
man/cat3/jl_zenkouho.0
man/cat3/jl_zenkouho_daip.0
man/cat3/jl_zenkouho_suu.0
man/cat3/jl_zenkouho_dai.0
man/cat3/js_access.0
man/cat3/js_connect.0
man/cat3/js_close.0
man/cat3/js_dic_add.0
man/cat3/js_dic_file_create.0
man/cat3/js_dic_file_create_client.0
man/cat3/js_dic_info.0
man/cat3/js_dic_list.0
man/cat3/js_dic_delete.0
man/cat3/js_disconnect.0
man/cat3/js_dic_use.0
man/cat3/js_dic_list_all.0
man/cat3/js_env_exist.0
man/cat3/js_env_list.0
man/cat3/js_env_sticky.0
man/cat3/js_env_un_sticky.0
man/cat3/js_file_comment_set.0
man/cat3/js_file_info.0
man/cat3/js_file_discard.0
man/cat3/js_file_list.0
man/cat3/js_file_loaded.0
man/cat3/js_file_list_all.0
man/cat3/js_file_loaded_local.0
man/cat3/js_file_password_set.0
man/cat3/js_file_read.0
man/cat3/js_file_remove.0
man/cat3/js_file_receive.0
man/cat3/js_file_remove_client.0
man/cat3/js_file_write.0
man/cat3/js_file_stat.0
man/cat3/js_file_send.0
man/cat3/js_fuzokugo_get.0
man/cat3/js_fuzokugo_set.0
man/cat3/js_hindo_file_create.0
man/cat3/js_hindo_set.0
man/cat3/js_hindo_file_create_client.0
man/cat3/js_hinsi_dicts.0
man/cat3/js_hinsi_name.0
man/cat3/js_hinsi_list.0
man/cat3/js_isconnect.0
man/cat3/js_hinsi_number.0
man/cat3/js_hinsi_table_set.0
man/cat3/js_kanren.0
man/cat3/js_kantan_dai.0
man/cat3/js_kantan_sho.0
man/cat3/js_kanzen_dai.0
man/cat3/js_kanzen_sho.0
man/cat3/js_kill.0
man/cat3/js_mkdir.0
man/cat3/js_param_get.0
man/cat3/js_open.0
man/cat3/js_open_lang.0
man/cat3/js_param_set.0
man/cat3/js_get_lang.0
man/cat3/js_set_lang.0
man/cat3/js_version.0
man/cat3/js_who.0
man/cat3/js_word_add.0
man/cat3/js_word_comment_set.0
man/cat3/js_word_delete.0
man/cat3/js_word_info.0
man/cat3/js_word_search.0
man/cat3/js_word_search_by_env.0
man/cat3/romkan_clear.0
man/cat3/romkan_getc.0
man/cat3/romkan_dispmode.0
man/cat3/romkan_init.0
man/cat3/romkan_next.0
man/cat3/romkan_ungetc.0
man/cat3/msg_open.0
man/cat3/msg_get.0
man/cat3/msg_close.0
man/cat4/fzk.data.0
man/cat4/2a_ctrl.0
man/cat4/fzk.u.0
man/cat4/jserverrc.0
man/cat4/mode.0
man/cat4/uumrc.0
man/cat4/uumkey.0
man/cat4/wnnenvrc.0
man/cat4/ujis_dic.0
man/cat4/2b_romkana.0
man/cat4/cvt_key_tbl.0
man/cat4/hinsi_data.0
man/cat4/serverdefs.0
man/cat5/pubdic.0
man/cat5/usr_dic.0

View File

@ -10,3 +10,4 @@ difference.doc for a summary of the differences between vi and Vim.
-- S. Taoka
<taoka@infonets.hiroshima-u.ac.jp>

View File

@ -22,7 +22,7 @@ BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
PATCHDIR= ${.CURDIR}/../jvim/patches
FILESDIR= ${.CURDIR}/../jvim/files
PLIST= ${.CURDIR}/../jvim/pkg/PLIST
MANLANG= ja
MANLANG= ja_JP.EUC
MAN1= jcat.1 jfold.1 jgrep.1 jvim.1
WRKSRC= ${WRKDIR}/jvim2.0r
@ -37,7 +37,7 @@ JPLIB+= -lcanna
INPUT_METHOD+= wnn4
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
JPDEF+= -DWNN_ISDIR
JPLIB+= -ljd -lcrypt
JPLIB+= -ljd
.elif defined(WNN6)
INPUT_METHOD+= wnn6
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
@ -63,6 +63,7 @@ pre-build:
cd ${WRKSRC}/src; \
${SED} -e 's,%LOCALBASE%,${LOCALBASE},g' \
-e 's,%X11BASE%,${X11BASE},g' \
-e 's,%MANLANG%,${MANLANG},g' \
./makefile.junx > Makefile; \
do-build:
@ -75,5 +76,6 @@ post-install:
for file in jcat jgrep jfold jvim; do \
strip ${LOCALBASE}/bin/$$file; \
done
@echo "You may have to add man/ja_JP.EUC to _default in /etc/man.conf manually"
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
--- src/makefile.junx.orig Sun Jul 2 22:54:33 1995
+++ src/makefile.junx Wed Jul 29 02:17:33 1998
+++ src/makefile.junx Sun Nov 22 00:14:56 1998
@@ -15,12 +15,12 @@
#
#>>>>> choose Japanese Kanji code
@ -64,7 +64,7 @@
### Location of man page
-MANDIR = $(PREFIX)/man
+MANDIR = $(PREFIX)/man/ja
+MANDIR = $(PREFIX)/man/%MANLANG%
MANLOC = $(MANDIR)/man1
### Location of help file

View File

@ -4,7 +4,7 @@ bin/jfold
bin/jvim
bin/jview
lib/jvim.hlp
man/ja/man1/jcat.1.gz
man/ja/man1/jgrep.1.gz
man/ja/man1/jfold.1.gz
man/ja/man1/jvim.1.gz
man/ja_JP.EUC/man1/jcat.1
man/ja_JP.EUC/man1/jgrep.1
man/ja_JP.EUC/man1/jfold.1
man/ja_JP.EUC/man1/jvim.1

View File

@ -4,7 +4,7 @@
before starting, so with large input files it starts up
faster than text editors like vi (1).
This enhanced less support ISO 2022 code extension techniqes and
This enhanced less support ISO 2022 code extension techniques and
Japanese codes(EUC Japanese, SJIS) and compressed(or gzipped) file
viewing. The author of this patch is jam@pobox.com. See
http://www.pobox.com/~jam/less/

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.2 1998/10/18 05:02:08 marc Exp $
# $OpenBSD: Makefile,v 1.3 1998/11/22 00:13:46 espie Exp $
#
DISTNAME= jvim2.0r+onew2.2.10
@ -33,12 +33,12 @@ JPLIB+= -lcanna
INPUT_METHOD+= wnn4
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
JPDEF+= -DWNN_ISDIR
JPLIB+= -ljd -lcrypt
JPLIB+= -ljd
.elif defined(WNN6)
INPUT_METHOD+= wnn6
BUILD_INPUT_METHOD+= ${LOCALBASE}/bin/Wnn4/jserver:${PORTSDIR}/japanese/Wnn
JPDEF+= -DWNN_ISDIR
JPLIB+= -ljd -lcrypt
JPLIB+= -ljd
.endif
#
# Make a value of INPUT_METHOD

View File

@ -7,4 +7,3 @@ CANNALIB = -L%LOCALBASE%/lib -lcanna
CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"'
RKKLIBS = $(CANNALIB) $(WNNLIB)
RKKOBJS = $(CANNAOBJ) $(WNNOBJ)
MISCLIB = -lcrypt

View File

@ -9,4 +9,3 @@ CANNALIB = -L%LOCALBASE%/lib -lcanna
CANNA_RKPATH = '".:$$HOME:%LOCALBASE%/lib/canna/dic:/tmp/onew_rktabs/canna"'
RKKLIBS = $(WNNLIB) $(CANNALIB)
RKKOBJS = $(WNNOBJ) $(CANNAOBJ)
MISCLIB = -lcrypt

View File

@ -3,4 +3,3 @@ WNNLIB = -L%X11BASE%/lib -ljd
WNN_RKPATH = '"./rk:$$ONEW_WNN_ROMKAND:$$ONEW_ROMKAND:$$HOME/.rk:%LOCALBASE%/lib/wnn/ja_JP/rk:/tmp/onew_rktabs/wnn"'
RKKLIBS = $(WNNLIB)
RKKOBJS = $(WNNOBJ)
MISCLIB = -lcrypt

View File

@ -5,4 +5,3 @@ WNN_DICLIST = '"kihon tankan tankan3 zip ikeiji symbol tankan2 tel usr/$$USER/ud
WNN_DICDIRS = '"iwanami/%s.dic;usr/$$USER/%s.h"'
RKKLIBS = $(WNNLIB)
RKKOBJS = $(WNNOBJ)
MISCLIB = -lcrypt