cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Loads of changes, not quite finished yet.

Browse Source 
- format man pages using new jgroff, so that we can install a full set
of documentation.
- move INSTALL script into a separate script, so that adding a new user
need not be done at the time of INSTALL.
- add a few strlcpy to fix a few holes. This stuff is rather bad, though.
- use terminfo instead of termcap, for better keycap names, fixing quite
a few bugs that made it impossible to build that version along the way...
- move scripts into /usr/local/bin instead of /usr/local/bin/Wnn4.

- use @comment no checksum
in packing list, even though pkg_add does not support that yet.
Not quite completely ready, but getting there...
This commit is contained in:
espie 2000-04-16 21:53:26 +00:00
parent 46f238e655
commit e8c9eaf450
31 changed files with 1065 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
japanese/Wnn/Makefile
View File

@ -1,7 +1,7 @@
# From FreeBSD: Satoshi Taoka <taoka@infonets.hiroshima-u.ac.jp>
#
# $FreeBSD: Makefile,v 1.19 1997/09/23 02:17:58 max Exp $
# $OpenBSD: Makefile,v 1.16 2000/04/05 17:13:55 espie Exp $
# $OpenBSD: Makefile,v 1.17 2000/04/16 21:53:26 espie Exp $
DISTNAME= Wnn4.2
PKGNAME= ja-Wnn-4.2
@ -25,6 +25,9 @@ WRKDIST= ${WRKDIR}/Xsi
PORT_DOCDIR= ${PREFIX}/share/doc/ja-Wnn
DOC_FROM= ${WRKSRC}/Wnn
# Will turn into a RUN_DEPENDS when we install non-formatted manpages
BUILD_DEPENDS= jgroff::japanese/groff
do-distpatch:
cd ${WRKDIR} && tar zxf ${FULLDISTDIR}/Wnn4.2.patch.tar.gz
cd ${WRKSRC} && patch ${PATCH_DIST_ARGS} < ${WRKDIR}/Wnn4.2.patch
@ -32,15 +35,6 @@ do-distpatch:
do-configure:
cd ${WRKSRC}/config && ln -sf Project.tmpl X11.tmpl
# for PREFIX
pre-build:
for file in ${WRKSRC}/config/Project.tmpl \
${WRKSRC}/Contrib/dic/gerodic/Makefile; do \
mv $$file $$file.orig2; \
sed 's!^\([ ]*PREFIX = \).*$$!\1${PREFIX}!' \
$$file.orig2 > $$file; \
done
MAKE_FLAGS=IMAKE='imake -DPorts' WNNOWNER_INDIRECT=wnn
FAKE_FLAGS=DESTDIR=${WRKINST} WNNOWNER_INDIRECT=bin
@ -59,5 +53,6 @@ post-install:
@(cd ${DOC_FROM}; tar cf - manual manual.en | \
(cd ${PORT_DOCDIR}; tar xf -))
@chown -R ${SHAREOWN}.${SHAREGRP} ${PORT_DOCDIR}
@${INSTALL_SCRIPT} ${FILESDIR}/install-script ${PREFIX}/lib/wnn
.include <bsd.port.mk>

69
japanese/Wnn/files/install-script Executable file
View File

@ -0,0 +1,69 @@
#!/bin/sh
# installation script for Japanese Wnn 4.2
PKG_PREFIX=${PREFIX:-/usr/local}
yesno() {
local question answer
question=$1
while :; do
read answer?"${question} (y/n) [y]"
case "${answer}" in
[Nn]*) return 1;;
[Yy]*) return 0;;
"") return 0;;
esac
echo "Please answer yes or no."
done
}
create_wnn() {
local uname begin gid
uname='wnn'
begin=128
while [ X`id -u $begin 2>/dev/null` == X$begin ]
do
begin=`expr $begin + 1`
done
echo "Creating user wnn ($begin)"
gid=`id -g bin`
chpass -a "wnn:*:${begin}:${gid}::::Wnn server:/root:/sbin/nologin" || exit 1
}
echo ""
if id -u wnn >/dev/null 2>/dev/null
then
echo "So, user wnn already exists !"
else
echo "You need a user named wnn"
if yesno "Would you like to create it automatically now"; then
create_wnn
else
echo "You still need to run $PKG_PREFIX/lib/wnn/install-script"
echo "to finish ja-Wnn installation later"
exit 0
fi
fi
sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons"
usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr
wnntouch=${PKG_PREFIX}/bin/wnntouch
wnnserver=${PKG_PREFIX}/bin/jserver
wnnname=Wnn
for dir in $sys_dirs; do
$wnntouch $dir/*
done
for dir in $usr_dirs; do
if [ ! -d $dir ]; then
mkdir -p $dir
fi
chown wnn $dir
done
chmod -R u+w $dir
chown wnn $wnnserver
chmod u+s $wnnserver

5
japanese/Wnn/patches/patch-ae → japanese/Wnn/patches/patch-Contrib_dic_gerodic_Makefile
View File

@ -1,5 +1,6 @@
--- ./Contrib/dic/gerodic/Makefile.orig Sun Jun 27 00:09:13 1993
+++ ./Contrib/dic/gerodic/Makefile Tue Jul 29 12:06:28 1997
$OpenBSD: patch-Contrib_dic_gerodic_Makefile,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Contrib/dic/gerodic/Makefile.orig Sat Jun 26 17:09:13 1993
+++ Contrib/dic/gerodic/Makefile Thu Apr 13 20:41:39 2000
@@ -4,8 +4,9 @@
# Jun. 26th '93 Wnn Consortium
#

79
japanese/Wnn/patches/patch-Wnn_conv_cvt_read_c Normal file
View File

@ -0,0 +1,79 @@
$OpenBSD: patch-Wnn_conv_cvt_read_c,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/conv/cvt_read.c.orig Thu Apr 8 03:59:13 1993
+++ Wnn/conv/cvt_read.c Sun Apr 16 02:05:08 2000
@@ -72,6 +72,13 @@
#endif /* TERMINFO */
#include <term.h>
#endif
+#ifdef __OpenBSD__
+#ifdef TERMINFO
+#include <curses.h>
+#endif
+#include <term.h>
+#include <fcntl.h>
+#endif
#define ENTRY_LEN 10 /* コンバート表のエントリ名の最大長 */
@@ -437,6 +444,40 @@ int flg; /* verboseモードで起こすかのフ<E381AE>
keydef_key[i++] = stradd(&tdataptr, key_f29);
keydef_key[i++] = stradd(&tdataptr, key_f30);
keydef_key[i++] = stradd(&tdataptr, key_f31);
+#ifndef uniosu
+ keydef_key[i++] = stradd(&tdataptr, key_f32);
+ keydef_key[i++] = stradd(&tdataptr, key_f33);
+ keydef_key[i++] = stradd(&tdataptr, key_f34);
+ keydef_key[i++] = stradd(&tdataptr, key_f35);
+ keydef_key[i++] = stradd(&tdataptr, key_f36);
+ keydef_key[i++] = stradd(&tdataptr, key_f37);
+ keydef_key[i++] = stradd(&tdataptr, key_f38);
+ keydef_key[i++] = stradd(&tdataptr, key_f39);
+ keydef_key[i++] = stradd(&tdataptr, key_f40);
+ keydef_key[i++] = stradd(&tdataptr, key_f41);
+ keydef_key[i++] = stradd(&tdataptr, key_f42);
+ keydef_key[i++] = stradd(&tdataptr, key_f43);
+ keydef_key[i++] = stradd(&tdataptr, key_f44);
+ keydef_key[i++] = stradd(&tdataptr, key_f45);
+ keydef_key[i++] = stradd(&tdataptr, key_f46);
+ keydef_key[i++] = stradd(&tdataptr, key_f47);
+ keydef_key[i++] = stradd(&tdataptr, key_f48);
+ keydef_key[i++] = stradd(&tdataptr, key_f49);
+ keydef_key[i++] = stradd(&tdataptr, key_f50);
+ keydef_key[i++] = stradd(&tdataptr, key_f51);
+ keydef_key[i++] = stradd(&tdataptr, key_f52);
+ keydef_key[i++] = stradd(&tdataptr, key_f53);
+ keydef_key[i++] = stradd(&tdataptr, key_f54);
+ keydef_key[i++] = stradd(&tdataptr, key_f55);
+ keydef_key[i++] = stradd(&tdataptr, key_f56);
+ keydef_key[i++] = stradd(&tdataptr, key_f57);
+ keydef_key[i++] = stradd(&tdataptr, key_f58);
+ keydef_key[i++] = stradd(&tdataptr, key_f59);
+ keydef_key[i++] = stradd(&tdataptr, key_f60);
+ keydef_key[i++] = stradd(&tdataptr, key_f61);
+ keydef_key[i++] = stradd(&tdataptr, key_f62);
+ keydef_key[i++] = stradd(&tdataptr, key_f63);
+#endif
#endif /* SUPPORT_TWODIGIT_FUNCTIONS */
/* 以下順に
"kcuu1", "kcuf1", "kcub1", "kcud1", "khome",
@@ -505,14 +546,18 @@ int flg;
termname);
fd = open("/dev/null", O_WRONLY, 0);
setupterm(termname, fd, &rsl);
- close(fd);
+#ifndef __OpenBSD__
+ close(fd);
+#endif
if(rsl != 1){
errdsp2("Can't get terminfo entry", termname);
/* このときresetterm()は必要か？ */
return(1);
}
convert_getstrs(flg);
- resetterm();
+#ifndef __OpenBSD__
+ resetterm();
+#endif
return(0);
}
#endif

46
japanese/Wnn/patches/patch-Wnn_etc_bdic_c Normal file
View File

@ -0,0 +1,46 @@
$OpenBSD: patch-Wnn_etc_bdic_c,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/etc/bdic.c.orig Sat Apr 15 22:36:49 2000
+++ Wnn/etc/bdic.c Sat Apr 15 22:37:12 2000
@@ -291,7 +291,7 @@ register int n;
static
#endif
int
-getnstr(ifpter, n, st)
+priv_getnstr(ifpter, n, st)
register FILE *ifpter;
register int n;
register char *st;
@@ -672,13 +672,13 @@ struct wnn_file_head *hp;
char wnn_file_string[WNN_FILE_STRING_LEN + 1];
int err = 0;
- getnstr(ifpter, WNN_FILE_STRING_LEN, wnn_file_string);
+ priv_getnstr(ifpter, WNN_FILE_STRING_LEN, wnn_file_string);
if(strncmp(wnn_file_string, WNN_FILE_STRING, WNN_FILE_STRING_LEN))
err = -1;
if(getint((&hp->file_type), ifpter) == -1) err = -1;
if(input_file_uniq(&(hp->file_uniq), ifpter) == -1) err = -1;
if(input_file_uniq(&(hp->file_uniq_org), ifpter) == -1) err = -1;
- getnstr(ifpter, WNN_PASSWD_LEN, hp->file_passwd);
+ priv_getnstr(ifpter, WNN_PASSWD_LEN, hp->file_passwd);
getnull(ifpter, 36);
return(err);
}
@@ -725,7 +725,7 @@ FILE *ifpter;
getint(&(funiq->time), ifpter) == -1 ||
getint(&(funiq->dev), ifpter) == -1 ||
getint(&(funiq->inode), ifpter) == -1 ||
- getnstr(ifpter, WNN_HOSTLEN, funiq->createhost) == -1)
+ priv_getnstr(ifpter, WNN_HOSTLEN, funiq->createhost) == -1)
return(-1);
return(0);
}
@@ -1237,7 +1237,7 @@ struct JT *jt1;
getint(&jt1->maxtable , ifpter) == -1 ||
getint(&jt1->maxhontai , ifpter) == -1 ||
getint(&jt1->gosuu , ifpter) == -1 ||
- getnstr(ifpter, WNN_PASSWD_LEN, jt1->hpasswd) == -1 ||
+ priv_getnstr(ifpter, WNN_PASSWD_LEN, jt1->hpasswd) == -1 ||
getint(&jt1->total , ifpter) == -1 ||
getint(&jt1->maxri1[D_YOMI] , ifpter) == -1 ||
getint(&jt1->maxri1[D_KANJI] , ifpter) == -1 ||

16
japanese/Wnn/patches/patch-Wnn_include_commonhd_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-Wnn_include_commonhd_h,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/include/commonhd.h.orig Sat Apr 15 22:21:11 2000
+++ Wnn/include/commonhd.h Sat Apr 15 22:21:48 2000
@@ -153,6 +153,12 @@ typedef unsigned char UCHAR;
#endif /* sun */
#endif /* luna */
+#ifdef __OpenBSD__
+#undef TERMCAP
+#define TERMINFO
+#define SRAND48
+#endif
+
#if defined(SYSVR2) || defined(sun)
# define SRAND48
#endif

10
japanese/Wnn/patches/patch-Wnn_jd_libwnn_msg Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-Wnn_jd_libwnn_msg,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/jd/libwnn.msg.orig Sat Apr 15 23:39:57 2000
+++ Wnn/jd/libwnn.msg Sat Apr 15 23:40:07 2000
@@ -131,5 +131,5 @@
207 file \"%s\"が open できません。
208 ファイル \"%s\" で環境設定中に、エラーが発生したために、設定を中止します。\n
209 を作りました。
-210 directry
+210 directory
###

11
japanese/Wnn/patches/patch-aj → japanese/Wnn/patches/patch-Wnn_jlib_V3_Imakefile
View File

@ -1,6 +1,7 @@
--- ./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 @@
$OpenBSD: patch-Wnn_jlib_V3_Imakefile,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/jlib.V3/Imakefile.orig Wed Aug 17 03:10:13 1994
+++ Wnn/jlib.V3/Imakefile Thu Apr 13 20:41:39 2000
@@ -19,6 +19,10 @@ SRC3= $(WNNETCSRC)/sstrings.c
OBJ3= sstrings.o
SRCS= $(SRC1) $(SRC2) $(SRC3)
OBJS= $(OBJ1) $(OBJ2) $(OBJ3)
@ -11,7 +12,7 @@
LibraryObjectRule()
@@ -31,7 +35,7 @@
@@ -31,7 +35,7 @@ libjd.a: $(OBJS) $(WNNJLIB)
LintLibraryTarget(jd,$(SRCS))
InstallLibrary(jd,$(WNNLIBDIR))
@ -20,7 +21,7 @@
#if DebugLibJd
DebuggedLibraryTarget(jd,$(OBJS))
@@ -42,4 +46,5 @@
@@ -42,4 +46,5 @@ NamedMakeSubdirs($(WNNJLIB),$(WNNJLIBSRC
WnnSpecialObjectRule($(OBJ2),$(SRC2),$(WNNETCSRC),)
WnnSpecialObjectRule($(OBJ3),$(SRC3),$(WNNETCSRC),)

5
japanese/Wnn/patches/patch-al → japanese/Wnn/patches/patch-Wnn_jlib_V3_jlib_h
View File

@ -1,5 +1,6 @@
--- ./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
$OpenBSD: patch-Wnn_jlib_V3_jlib_h,v 1.1 2000/04/16 21:53:30 espie Exp $
--- Wnn/jlib.V3/jlib.h.orig Mon Sep 16 23:30:30 1991
+++ Wnn/jlib.V3/jlib.h Thu Apr 13 20:41:40 2000
@@ -51,12 +51,14 @@
/*
Nihongo Henkan Library Header File

12
japanese/Wnn/patches/patch-Wnn_jlib_js_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Wnn_jlib_js_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/jlib/js.c.orig Fri Aug 19 03:30:48 1994
+++ Wnn/jlib/js.c Thu Apr 13 20:41:38 2000
@@ -221,7 +221,7 @@ register char *lang;
#endif
return -1;
}
- if (connect(sd,(caddr_t)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) {
+ if (connect(sd,(caddr_t)&saddr,SUN_LEN(&saddr)) == ERROR) {
#if DEBUG
xerror("jslib:Can't connect socket.\n");

13
japanese/Wnn/patches/patch-ad → japanese/Wnn/patches/patch-Wnn_jserver_b_index_c
View File

@ -1,6 +1,7 @@
--- ./Wnn/jserver/b_index.c.orig Tue Jun 28 11:06:49 1994
+++ ./Wnn/jserver/b_index.c Sat Jul 19 00:45:21 1997
@@ -99,8 +99,8 @@
$OpenBSD: patch-Wnn_jserver_b_index_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/jserver/b_index.c.orig Tue Jun 28 04:06:49 1994
+++ Wnn/jserver/b_index.c Thu Apr 13 20:41:39 2000
@@ -99,8 +99,8 @@ struct JT *jt;
/** For each tuple in ri1[0] create b_nodes */
for (i=0; i<jt->maxri1[0]; i++){
@ -11,7 +12,7 @@
b_index_add(jt, yomi, serial);
}
return(b_cnt);
@@ -133,7 +133,7 @@
@@ -133,7 +133,7 @@ struct JT *jt;
int serial;
{
w_char *yomi;
@ -20,7 +21,7 @@
delete_b_node(jt, yomi, 0, 0 );
}
@@ -160,7 +160,7 @@
@@ -160,7 +160,7 @@ int p_node;
tmp_node = jt->bind[tmp_node].pter_son;
}
yo_kanji = KANJI_str(
@ -29,7 +30,7 @@
if ( yomi[level] > yo_kanji[level] ) {
buf_node1 = buf_node2;
buf_node2 = jt->bind[buf_node2].pter_next ;
@@ -216,7 +216,7 @@
@@ -216,7 +216,7 @@ int p_node; /* cureent b_node */
tmp_node = jt->bind[tmp_node].pter_son;
}
yo_kanji = KANJI_str(

9
japanese/Wnn/patches/patch-ab → japanese/Wnn/patches/patch-Wnn_jserver_de_c
View File

@ -1,6 +1,7 @@
--- ./Wnn/jserver/de.c.orig Fri Aug 19 10:31:23 1994
+++ ./Wnn/jserver/de.c Fri Aug 1 18:54:55 1997
@@ -65,6 +65,9 @@
$OpenBSD: patch-Wnn_jserver_de_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/jserver/de.c.orig Fri Aug 19 03:31:23 1994
+++ Wnn/jserver/de.c Thu Apr 13 20:41:38 2000
@@ -65,6 +65,9 @@ extern int errno; /* Pure BSD */
#include <sys/ioctl.h>
@ -10,7 +11,7 @@
#ifdef SYSVR2
#include <sys/param.h>
#ifndef SIGCHLD
@@ -264,7 +267,16 @@
@@ -264,7 +267,16 @@ char **argv;
fclose(stdin);
fclose(stdout);
if(!noisy){

11
japanese/Wnn/patches/patch-Wnn_jserver_readfile_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-Wnn_jserver_readfile_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/jserver/readfile.c.orig Fri Sep 25 00:35:47 1992
+++ Wnn/jserver/readfile.c Thu Apr 13 20:41:39 2000
@@ -423,6 +423,7 @@ struct JT *jt2;
jt2 = (struct JT *)malloc(sizeof(struct JT));
*jt2 = *jt1;
+ jt2->node = 0;
if(alloc_dict(jt2) == -1){
free(jt2);

11
japanese/Wnn/patches/patch-af → japanese/Wnn/patches/patch-Wnn_jutil_wnnstat_c
View File

@ -1,6 +1,7 @@
--- 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 @@
$OpenBSD: patch-Wnn_jutil_wnnstat_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/jutil/wnnstat.c.orig Thu Apr 13 20:41:34 2000
+++ Wnn/jutil/wnnstat.c Thu Apr 13 20:41:39 2000
@@ -69,7 +69,7 @@ struct wnn_ret_buf rb = {0, NULL};
#define W_DIC_ALL 5
#define W_VERSION 6
@ -9,7 +10,7 @@
extern int eujis_to_jis8(), eujis_to_sjis();
#endif
#ifdef CHINESE
@@ -129,13 +129,13 @@
@@ -129,13 +129,13 @@ char **argv;
strcpy(lang, WNN_DEFAULT_LANG);
#ifdef JAPANESE
@ -26,7 +27,7 @@
#endif
switch(c){
case 'w':
@@ -317,13 +317,13 @@
@@ -317,13 +317,13 @@ static void
usage()
{
#ifdef JAPANESE

44
japanese/Wnn/patches/patch-Wnn_pubdic_Imakefile Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-Wnn_pubdic_Imakefile,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/pubdic/Imakefile.orig Tue Aug 23 04:21:30 1994
+++ Wnn/pubdic/Imakefile Thu Apr 13 20:41:38 2000
@@ -96,11 +96,17 @@ LinkSourceFile(tankan.u,$(PUBDICSRC))
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 @@ install::
#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::

189
japanese/Wnn/patches/patch-Wnn_uum_jhlp_c Normal file
View File

@ -0,0 +1,189 @@
$OpenBSD: patch-Wnn_uum_jhlp_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/uum/jhlp.c.orig Sat Apr 15 21:09:13 2000
+++ Wnn/uum/jhlp.c Sat Apr 15 21:38:38 2000
@@ -80,6 +80,9 @@ struct passwd *getpwuid();
jmp_buf kk_env;
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
#ifdef SYSVR2
# include <sys/param.h>
#endif /* SYSVR2 */
@@ -166,14 +169,14 @@ char **argv;
flow_control = FLOW_CONTROL;
code_trans = default_code_trans;
- strcpy(username, getpwuid(getuid())->pw_name);
+ strlcpy(username, getpwuid(getuid())->pw_name, PATHNAMELEN);
if((name = getenv(WNN_USERNAME_ENV)) != NULL){
- strcpy(username, name);
+ strlcpy(username, name, PATHNAMELEN);
}
for (i = 1; i < argc;) {
if (!strcmp(argv[i++], "-L")) {
if (i >= argc || argv[i][0] == '-') default_usage();
- strcpy(lang_dir, argv[i++]);
+ strlcpy(lang_dir, argv[i++], 32);
for (;i < argc; i++) {
argv[i - 2] = argv[i];
}
@@ -185,12 +188,7 @@ char **argv;
if(*lang_dir == '\0') {
if ((p = getenv("LANG")) != NULL) {
- if (strlen(p) >= 4) {
- strncpy(lang_dir, p, 5);
- lang_dir[5] = '\0';
- } else {
- strcpy(lang_dir, p);
- }
+ strlcpy(lang_dir, p, 5);
}
}
for (f = function_db; *lang_dir && f && f->lang; f++) {
@@ -233,8 +231,8 @@ char **argv;
server_env = WNN_DEF_SERVER_ENV;
}
if(name = getenv(server_env)) {
- strcpy(def_servername, name);
- strcpy(def_reverse_servername, name);
+ strlcpy(def_servername, name, PATHNAMELEN);
+ strlcpy(def_reverse_servername, name, PATHNAMELEN);
}
}
@@ -263,9 +261,11 @@ char **argv;
#if defined(BSD42) && !defined(DGUX)
+#if !(defined(BSD) && (BSD >= 199306))
if (saveutmp() < 0) {
puts("Can't save utmp\n");
}
+#endif
#endif /* BSD42 */
@@ -492,7 +492,7 @@ static int do_X_opt()
static int do_k_opt()
{
- strcpy(uumkey_name_in_uumrc, optarg);
+ strlcpy(uumkey_name_in_uumrc, optarg, PATHNAMELEN);
if (*uumkey_name_in_uumrc == '\0') {
return -1;
}
@@ -502,7 +502,7 @@ static int do_k_opt()
static int do_c_opt()
{
- strcpy(convkey_name_in_uumrc, optarg);
+ strlcpy(convkey_name_in_uumrc, optarg, PATHNAMELEN);
if (*convkey_name_in_uumrc == '\0') {
return -1;
}
@@ -512,7 +512,7 @@ static int do_c_opt()
static int do_r_opt()
{
- strcpy(rkfile_name_in_uumrc, optarg);
+ strlcpy(rkfile_name_in_uumrc, optarg, PATHNAMELEN);
if (*rkfile_name_in_uumrc == '\0') {
return -1;
}
@@ -528,8 +528,8 @@ static int do_l_opt()
static int do_D_opt()
{
- strcpy(def_servername, optarg);
- strcpy(def_reverse_servername, optarg);
+ strlcpy(def_servername, optarg, PATHNAMELEN);
+ strlcpy(def_reverse_servername, optarg, PATHNAMELEN);
if (*def_servername == '\0') {
return -1;
}
@@ -538,7 +538,7 @@ static int do_D_opt()
static int do_n_opt()
{
- strcpy(username, optarg);
+ strlcpy(username, optarg, PATHNAMELEN);
if (*username == '\0') {
return -1;
}
@@ -581,14 +581,14 @@ char **argv;
#endif /* SYSVR2 */
extern char *index();
- strcpy(ostr, default_getoptstr);
- strcat(ostr, lang_db->getoptstr);
+ strlcpy(ostr, default_getoptstr, sizeof(ostr));
+ strlcat(ostr, lang_db->getoptstr, sizeof(ostr));
while ((c = getopt(argc, argv, ostr)) != EOF) {
if (!(p = index(default_ostr, c)) || (*do_opt[p - default_ostr])() < 0) {
if (!(p = index(lang_db->ostr, c)) ||
(*lang_db->do_opt[p - lang_db->ostr])() < 0) {
- strcpy(ostr, default_ostr);
- strcat(ostr, lang_db->ostr);
+ strlcpy(ostr, default_ostr, sizeof(ostr));
+ strlcat(ostr, lang_db->ostr, sizeof(ostr));
usage(ostr);
}
}
@@ -771,7 +771,12 @@ chld_handler()
#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 +1145,11 @@ char **argv;
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 +1569,11 @@ do_end()
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 +1645,16 @@ ptyname(b, pty, no)
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 */

20
japanese/Wnn/patches/patch-Wnn_uum_key_bind_c Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-Wnn_uum_key_bind_c,v 1.1 2000/04/16 21:53:31 espie Exp $
--- Wnn/uum/key_bind.c.orig Sat Apr 15 21:35:46 2000
+++ Wnn/uum/key_bind.c Sat Apr 15 21:36:19 2000
@@ -265,11 +265,11 @@ init_key_table()
/* uumrcĽŐĽĄĽ¤Ľë¤Ť¤éĄŁ*/
if (uumkey_name_in_uumrc[0] != '\0') {
- strcpy(file_name, uumkey_name_in_uumrc);
- }else if(strcpy(file_name, LIBDIR),
- strcat(file_name, "/"),
- strcat(file_name, lang_dir),
- strcat(file_name, CPFILE),
+ strlcpy(file_name, uumkey_name_in_uumrc, sizeof file_name);
+ }else if(strlcpy(file_name, LIBDIR, sizeof file_name),
+ strlcat(file_name, "/", sizeof file_name),
+ strlcat(file_name, lang_dir, sizeof file_name),
+ strlcat(file_name, CPFILE, sizeof file_name),
(fp = fopen(file_name , "r")) != NULL){
/* default */
fclose(fp);

36
japanese/Wnn/patches/patch-Wnn_uum_prologue_c Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-Wnn_uum_prologue_c,v 1.1 2000/04/16 21:53:32 espie Exp $
--- Wnn/uum/prologue.c.orig Sat Apr 15 21:33:07 2000
+++ Wnn/uum/prologue.c Sat Apr 15 21:35:31 2000
@@ -87,7 +87,7 @@ open_romkan()
romkan_set_lang(lang_dir);
if (*rkfile_name_in_uumrc != '\0') {
- strcpy(name, rkfile_name_in_uumrc);
+ strlcpy(name, rkfile_name_in_uumrc, sizeof name);
}else {
strcpy(name , LIBDIR);
strcat(name , RKFILE);
@@ -280,8 +280,8 @@ int first;
for (p = normal_env; p; p = p->next) {
cur_normal_env = p;
get_envrc_name(uumrc_name);
- strcpy(environment, username);
- strcat(environment, p->env_name_str);
+ strlcpy(environment, username, sizeof environment);
+ strlcat(environment, p->env_name_str, sizeof environment);
if (servername == NULL && def_servername && *def_servername) {
servername = malloc(strlen(def_servername)+1);
strcpy(servername, def_servername);
@@ -321,9 +321,9 @@ int first;
for (p = reverse_env; p; p = p->next) {
cur_reverse_env = p;
if (get_envrc_name_reverse(uumrc_name) > 0) {
- strcpy(environment, username);
- strcat(environment, p->env_name_str);
- strcat(environment, "R");
+ strlcpy(environment, username, sizeof environment);
+ strlcat(environment, p->env_name_str, sizeof environment);
+ strlcat(environment, "R", sizeof environment);
if (reverse_servername == NULL && def_reverse_servername
&& *def_reverse_servername) {
reverse_servername =

29
japanese/Wnn/patches/patch-Wnn_uum_termcap_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Wnn_uum_termcap_c,v 1.1 2000/04/16 21:53:32 espie Exp $
--- Wnn/uum/termcap.c.orig Fri Mar 26 08:07:38 1993
+++ Wnn/uum/termcap.c Sat Apr 15 21:32:53 2000
@@ -50,6 +50,7 @@
*/
#include <stdio.h>
#include <ctype.h>
+#include <sys/ioctl.h>
#include <sys/errno.h>
#include "commonhd.h"
@@ -142,7 +143,7 @@ getTermData()
fprintf(stderr, "Cannot get terminal information.\n");
return(-1);
}
- strcpy(Term_Name,name);
+ strlcpy(Term_Name,name, 128);
pter = TermDataArea;
Term_ResetScreen = tgetstr("rs" , &pter);
@@ -196,7 +197,7 @@ getTermData()
keypad_fun = 0;
}
/* and needs more precise check of Terminal status. */
-#ifdef DGUX /* copied from JLS5.4.2 */
+#if defined(DGUX) || defined(BSD43) /* copied from JLS5.4.2 */
{
struct winsize ws;
if ((ioctl(0, TIOCGWINSZ, &ws) == 0) &&

26
japanese/Wnn/patches/patch-Wnn_uum_termio_c Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-Wnn_uum_termio_c,v 1.1 2000/04/16 21:53:32 espie Exp $
--- Wnn/uum/termio.c.orig Thu Jul 1 01:33:10 1993
+++ Wnn/uum/termio.c Sun Apr 16 00:24:11 2000
@@ -93,7 +93,7 @@ openTermData()
fprintf(stderr, "Cannot get terminal name.");
return(-1);
}
- strcpy(Term_Name, cp);
+ strlcpy(Term_Name, cp, 128);
if ((strlen(Term_Name) > 2) && (strcmp(Term_Name + (strlen(Term_Name) - 2),"-j") == 0)) {
fprintf(stderr, MSG_GET(4));
@@ -102,11 +102,13 @@ openTermData()
*/
return(-1);
}
+#ifndef __OpenBSD__
setupterm(0,1,&status);
reset_shell_mode();
if (status != 1){
return(-1);
}
+#endif
#if defined(uniosu)
if(jterm < 2) { /* kanji terminal */
fprintf(stderr, "Not kanji terminal. Goodbye !\n");

32
japanese/Wnn/patches/patch-Wnn_uum_wnnrc_op_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-Wnn_uum_wnnrc_op_c,v 1.1 2000/04/16 21:53:32 espie Exp $
--- Wnn/uum/wnnrc_op.c.orig Sat Apr 15 21:28:33 2000
+++ Wnn/uum/wnnrc_op.c Sat Apr 15 21:31:43 2000
@@ -148,7 +148,7 @@ char *s;
#endif /* defined(SYSVR2) && !defined(AIXV3) */
if(*s != '~' && *s != '@') {
- strcpy(tmp, s);
+ strlcpy(tmp, s, sizeof(tmp));
*s = '\0';
noerr = 1;
}else{
@@ -160,7 +160,7 @@ char *s;
#else
if(NULL != (p = strchr(++s1, '/'))){
#endif
- strcpy(tmp, p);
+ strlcpy(tmp, p, sizeof(tmp));
*p = '\0';
} else *tmp = '\0';
/* ここまでは準備。s…先頭、s1…２文字目、p…最初の'/'のあったところ
@@ -581,8 +581,8 @@ open_uumrc()
}
strcpy(buf, LIBDIR);
strcat(buf, "/");
- strcat(buf, lang_dir);
- strcat(buf, RCFILE);
+ strlcat(buf, lang_dir, sizeof buf);
+ strlcat(buf, RCFILE, sizeof buf);
if((fp = fopen(buf, "r")) != NULL){
if(verbose_option) fprintf(stderr, "uumrc: using uumrc %s\r\n", buf);
return fp;

152
japanese/Wnn/patches/patch-aa
View File

@ -1,152 +0,0 @@
diff -arcN ../Xsi.org/Wnn/jlib/js.c ./Wnn/jlib/js.c
*** ../Xsi.org/Wnn/jlib/js.c Fri Aug 19 10:30:48 1994
--- ./Wnn/jlib/js.c Tue Aug 20 21:39:15 1996
***************
*** 221,227 ****
#endif
return -1;
}
! if (connect(sd,(caddr_t)&saddr,strlen(saddr.sun_path)+sizeof(saddr.sun_family)) == ERROR) {
#if DEBUG
xerror("jslib:Can't connect socket.\n");
--- 221,227 ----
#endif
return -1;
}
! if (connect(sd,(caddr_t)&saddr,SUN_LEN(&saddr)) == ERROR) {
#if DEBUG
xerror("jslib:Can't connect socket.\n");
diff -arcN ../Xsi.org/Wnn/pubdic/Imakefile ./Wnn/pubdic/Imakefile
*** ../Xsi.org/Wnn/pubdic/Imakefile Tue Aug 23 11:21:30 1994
--- ./Wnn/pubdic/Imakefile Wed Aug 21 20:13:36 1996
***************
*** 96,106 ****
instserver:: install
WnnMakeDirectories(install,$(JWNNDICDIR))
! #if WnnInstallDicForcibly
InstallMultiple($(DIC),$(JWNNPUBDICDIR))
install::
! @for i in $(DICS); \
do \
$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
done
--- 96,112 ----
instserver:: install
WnnMakeDirectories(install,$(JWNNDICDIR))
! /*
! * 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 $(DIC); \
do \
$(WNNTOUCH) $(DESTDIR)$(JWNNPUBDICDIR)/$$i ;\
done
***************
*** 108,114 ****
--- 114,133 ----
#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 -arcN ../Xsi.org/config/Project.tmpl ./config/Project.tmpl
*** ../Xsi.org/config/Project.tmpl Mon Aug 29 17:40:17 1994
--- ./config/Project.tmpl Wed Aug 21 20:07:05 1996
***************
*** 389,394 ****
--- 389,396 ----
XCOMM -----------------------------------------------------------------------
XCOMM X Window System make variables; these need to be coordinated with rules
+ XCOMM SYS_LIBRARIES = -lcrypt /* For FreeBSD, not OpenBSD */
+
/*
* This list must be reflected in the DIRS_TO_BUILD list in the top-level
* Makefile.
***************
*** 413,418 ****
--- 415,423 ----
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
***************
*** 1117,1126 ****
#undef ImakeSubCmdHelper
#endif
#ifdef UseInstalled
! #define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$$imakeprefix$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
#else
! #define ImakeSubCmdHelper $$imakeprefix$(IMAKE) -I$$imakeprefix$(IMIRULESRC) -I$$imakeprefix$(IRULESRC) $(IMAKE_DEFINES)
#endif
#define WnnInstallDicMultiple(list,dest) @@\
--- 1122,1137 ----
#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)
#else
! #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IMIRULESRC) -I$(IMAKEPREFIX)$(IRULESRC) $(IMAKE_DEFINES)
#endif
#define WnnInstallDicMultiple(list,dest) @@\
***************
*** 1236,1243 ****
#else
IMTOP = $(CONTRIBSRC)/programs/Xsi
#endif
! WNNWNNDIR = /usr/local/lib/wnn
! WNNBINDIR = /usr/local/bin
WNNINCDIR = $(INCROOT)
WNNLIBDIR = $(USRLIBDIR)
WNNTERM_LIB = termLibrary
--- 1251,1259 ----
#else
IMTOP = $(CONTRIBSRC)/programs/Xsi
#endif
! PREFIX = /usr/local
! WNNWNNDIR = ${PREFIX}/lib/wnn
! WNNBINDIR = ${PREFIX}/bin
WNNINCDIR = $(INCROOT)
WNNLIBDIR = $(USRLIBDIR)
WNNTERM_LIB = termLibrary

10
japanese/Wnn/patches/patch-ac
View File

@ -1,10 +0,0 @@
--- ./Wnn/jserver/readfile.c.org Thu Sep 24 15:35:47 1992
+++ ./Wnn/jserver/readfile.c Fri Feb 28 01:13:46 1997
@@ -423,6 +423,7 @@
jt2 = (struct JT *)malloc(sizeof(struct JT));
*jt2 = *jt1;
+ jt2->node = 0;
if(alloc_dict(jt2) == -1){
free(jt2);

79
japanese/Wnn/patches/patch-ak
View File

@ -1,79 +0,0 @@
--- ../Xsi.orig/Wnn/uum/jhlp.c Fri Aug 19 10:32:12 1994
+++ ./Wnn/uum/jhlp.c Fri Aug 1 18:54:18 1997
@@ -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 */
@@ -263,9 +266,11 @@
#if defined(BSD42) && !defined(DGUX)
+#if !(defined(BSD) && (BSD >= 199306))
if (saveutmp() < 0) {
puts("Can't save utmp\n");
}
+#endif
#endif /* BSD42 */
@@ -771,7 +776,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 +1150,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 +1574,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 +1650,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 */

144
japanese/Wnn/patches/patch-config_Project_tmpl Normal file
View File

@ -0,0 +1,144 @@
$OpenBSD: patch-config_Project_tmpl,v 1.1 2000/04/16 21:53:37 espie Exp $
--- config/Project.tmpl.orig Mon Aug 29 10:40:17 1994
+++ config/Project.tmpl Sun Apr 16 02:10:53 2000
@@ -14,6 +14,20 @@ XCOMM $XConsortium: Project.tmpl,v 1.242
* *
***************************************************************************/
+#define JNeqnCmd jneqn -Tnippon
+#define JNroffCmd jnroff -Tnippon
+#define JEqnCmd jeqn -Tnippon -Tps
+#define JTroffCmd jgroff -Tnippon -Tps
+#define JColCmd cat
+#define JTblCmd jtbl -Tnippon
+
+ JTROFF = JTroffCmd
+ JNROFF = JNroffCmd
+ JTBL = JTblCmd
+ JEQN = JEqnCmd
+ JNEQN = JNeqnCmd
+ JCOL = JColCmd
+
#define ProjectX 6 /* do *not* change this line */
/* The following project-specific rules are defined at the end of this file:
@@ -1085,13 +1099,8 @@ clean:: @@\
/* */# OMRON INPUT MATHOD MAKE ENV
/* */#
-#if defined(uniosu) || (defined(SVR4) && !defined(DGUX)) || defined(hpux)
#define termLibrary -lcurses
#define cvtfileDir ./sysV
-#else
-#define termLibrary -ltermcap
-#define cvtfileDir ./bsd
-#endif
#define WnnSpecialObjectRule(obj, depends, direct, define) @@\
obj : depends @@\
@@ -1100,7 +1109,7 @@ obj : depends @@\
#ifdef WnnMakeDirectories
#undef WnnMakeDirectories
#endif
-#define WnnMakeDirectories(step,dir) @@\
+#define WnnMakeDirectories(step,dirs) @@\
step:: @@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
@@ -1134,17 +1143,21 @@ install:: list @@\
$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\
done
+/*
+ * Only Japanese
+ * - Satoshi
+ */
#ifndef BuildWnn
#define BuildWnn YES
#endif
#ifndef BuildCWnn
-#define BuildCWnn YES
+#define BuildCWnn NO
#endif
#ifndef BuildKWnn
-#define BuildKWnn YES
+#define BuildKWnn NO
#endif
#ifndef BuildXwnmo
-#define BuildXwnmo YES
+#define BuildXwnmo NO
#endif
#ifndef BuildJserver
@@ -1169,7 +1182,7 @@ install:: list @@\
#define BuildWnnMan YES
#endif
#ifndef BuildJlibV3
-#define BuildJlibV3 NO
+#define BuildJlibV3 YES
#endif
#if BuildPubdic || BuildWnnConsDic
#define BuildWnnDicUtilForCompile YES
@@ -1230,7 +1243,7 @@ install:: list @@\
* as YES. Default is that dictionary isn't installed if it exist already.
*/
- WNNOWNER = wnn
+ WNNOWNER = $(WNNOWNER_INDIRECT)
#ifdef UseInstalled
IMTOP = $(TOP)
#else
@@ -1248,7 +1261,7 @@ install:: list @@\
WNNTOP = $(IMTOP)/Wnn
JWNNLANG = ja_JP
JWNNWNNDIR = $(WNNWNNDIR)/$(JWNNLANG)
- JWNNBINDIR = $(WNNBINDIR)/Wnn4
+ JWNNBINDIR = $(WNNBINDIR)
JWNNINCDIR = $(WNNINCDIR)/wnn
JWNNDICDIR = $(JWNNWNNDIR)/dic
JWNNPUBDICDIR = $(JWNNDICDIR)/pubdic
@@ -1363,3 +1376,44 @@ XWNMOROMKANMSRC = $(XWNMOTOP)/romkan_m
#else
IMAKE_CMD = $(IMAKE) -I$(IMIRULESRC) -I$(IRULESRC) $(IMAKE_DEFINES)
#endif
+
+/* InstallJManPageLong: specific rules for japanese language manpages */
+#define InstallJManPageLong(file,destdir,dest) @@\
+all:: file.0 @@\
+ @@\
+file.0:: file.man @@\
+ @if [ -f file.man ]; \ @@\
+ then \ @@\
+ tmp=`mktemp /tmp/man.XXXXXXXX` || exit 2 ; \ @@\
+ cat file.man | $(JNEQN) | $(JTBL) | $(JNROFF) $(MANMACROS) | $(JCOL) > $$tmp; \ @@\
+ cp $$tmp file.0; \ @@\
+ $(RM) $$tmp; \ @@\
+ fi @@\
+ @@\
+install.man:: @@\
+ MakeDir($(DESTDIR)destdir) @@\
+ -@if [ -f file.0 ]; \ @@\
+ then \ @@\
+ $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
+ fi @@\
+ @@\
+clean:: @@\
+ RemoveFile(file.0)
+
+/*
+ * InstallJManPage - generate rules to install the indicated manual page.
+ */
+#ifndef InstallJManPage
+#define InstallJManPage(file,destdir) @@\
+InstallJManPageLong(file,destdir,file)
+#endif /* InstallJManPage */
+
+
+/*
+ * XXX override default rules, since Wnn only has japanese manpages.
+ */
+#undef InstallManPage
+#define InstallManPage InstallJManPage
+#undef InstallManPageLong
+#define InstallManPageLong InstallJManPageLong
+ MANPATH := $(MANPATH)/ja_JP.EUC

54
japanese/Wnn/patches/patch-for-japanese
View File

@ -1,54 +0,0 @@
--- config/Project.tmpl.orig Wed Apr 5 17:30:58 2000
+++ config/Project.tmpl Wed Apr 5 17:32:56 2000
@@ -1105,7 +1105,7 @@ obj : depends @@\
#ifdef WnnMakeDirectories
#undef WnnMakeDirectories
#endif
-#define WnnMakeDirectories(step,dir) @@\
+#define WnnMakeDirectories(step,dirs) @@\
step:: @@\
@case '${MFLAGS}' in *[i]*) set +e;; esac; @@\
DirFailPrefix@for i in dirs; do if [ -d $(DESTDIR)$$i ]; then \ @@\
@@ -1145,17 +1145,21 @@ install:: list @@\
$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\
done
+/*
+ * Only Japanese
+ * - Satoshi
+ */
#ifndef BuildWnn
#define BuildWnn YES
#endif
#ifndef BuildCWnn
-#define BuildCWnn YES
+#define BuildCWnn NO
#endif
#ifndef BuildKWnn
-#define BuildKWnn YES
+#define BuildKWnn NO
#endif
#ifndef BuildXwnmo
-#define BuildXwnmo YES
+#define BuildXwnmo NO
#endif
#ifndef BuildJserver
@@ -1180,7 +1184,7 @@ install:: list @@\
#define BuildWnnMan YES
#endif
#ifndef BuildJlibV3
-#define BuildJlibV3 NO
+#define BuildJlibV3 YES
#endif
#if BuildPubdic || BuildWnnConsDic
#define BuildWnnDicUtilForCompile YES
@@ -1241,7 +1245,7 @@ install:: list @@\
* as YES. Default is that dictionary isn't installed if it exist already.
*/
- WNNOWNER = wnn
+ WNNOWNER = $(WNNOWNER_INDIRECT)
#ifdef UseInstalled
IMTOP = $(TOP)
#else

13
japanese/Wnn/patches/patch-ah → japanese/Wnn/patches/patch-kWnn_etc_Imakefile
View File

@ -1,15 +1,16 @@
--- ./kWnn/etc/Imakefile.orig Wed Aug 17 10:11:33 1994
+++ ./kWnn/etc/Imakefile Sat Jul 19 23:53:01 1997
$OpenBSD: patch-kWnn_etc_Imakefile,v 1.1 2000/04/16 21:53:38 espie Exp $
--- kWnn/etc/Imakefile.orig Wed Aug 17 03:11:33 1994
+++ kWnn/etc/Imakefile Thu Apr 13 20:41:39 2000
@@ -1,6 +1,8 @@
XCOMM
XCOMM $Id: patch-ah,v 1.1 1998/07/29 01:31:20 espie Exp $
XCOMM $Id: patch-kWnn_etc_Imakefile,v 1.1 2000/04/16 21:53:38 espie Exp $
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 @@
@@ -19,6 +21,9 @@ SRCS= strings.c \
xutoj.c \
dic_atojis.c \
msg.c \
@ -19,7 +20,7 @@
server_env.c
OBJS= strings.o \
@@ -32,6 +37,9 @@
@@ -32,6 +37,9 @@ OBJS= strings.o \
xutoj.o \
dic_atojis.o \
msg.o \
@ -29,7 +30,7 @@
server_env.o
LibraryObjectRule()
@@ -51,6 +59,9 @@
@@ -51,6 +59,9 @@ LinkSourceFile(bcopy.c,$(WNNETCSRC))
LinkSourceFile(xutoj.c,$(WNNETCSRC))
LinkSourceFile(dic_atojis.c,$(WNNETCSRC))
LinkSourceFile(msg.c,$(WNNETCSRC))

15
japanese/Wnn/patches/patch-ai → japanese/Wnn/patches/patch-kWnn_jlib_Imakefile
View File

@ -1,8 +1,9 @@
--- ./kWnn/jlib/Imakefile.orig Wed Aug 17 10:11:40 1994
+++ ./kWnn/jlib/Imakefile Sat Jul 19 23:55:17 1997
$OpenBSD: patch-kWnn_jlib_Imakefile,v 1.1 2000/04/16 21:53:38 espie Exp $
--- kWnn/jlib/Imakefile.orig Wed Aug 17 03:11:40 1994
+++ kWnn/jlib/Imakefile Thu Apr 13 20:41:39 2000
@@ -1,6 +1,9 @@
XCOMM
XCOMM $Id: patch-ai,v 1.1 1998/07/29 01:31:20 espie Exp $
XCOMM $Id: patch-kWnn_jlib_Imakefile,v 1.1 2000/04/16 21:53:38 espie Exp $
XCOMM
+XCOMM For Mule, add sources (yincoding.c py_table.c zy_table.c) 1
+XCOMM -- S. Taoka
@ -10,7 +11,7 @@
#define DoNormalLib YES
#include <Library.tmpl>
@@ -10,7 +13,9 @@
@@ -10,7 +13,9 @@ XCOMM
LINKS = getopt.c jl.c js.c wnnerrmsg.c
JLIBDEFINES = -DWRITE_CHECK
INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP)
@ -21,7 +22,7 @@
INSTALLFLAGS = $(INSTBINFLAGS)
LINTLIBS =
@@ -28,6 +33,15 @@
@@ -28,6 +33,15 @@ SRC4= $(KWNNETCSRC)/strings.c
OBJ4= strings.o
SRC5= $(KWNNETCSRC)/bcopy.c
OBJ5= bcopy.o
@ -37,7 +38,7 @@
LOCAL_RKSRCS= $(KWNNROMKANSRC)/rk_bltinfn.c \
$(KWNNROMKANSRC)/rk_main.c \
$(KWNNROMKANSRC)/rk_modread.c \
@@ -40,8 +54,8 @@
@@ -40,8 +54,8 @@ LOCAL_RKOBJS= $(KWNNROMKANSRC)/rk_bltinf
$(KWNNROMKANSRC)/rk_read.o \
$(KWNNROMKANSRC)/rk_vars.o
@ -48,7 +49,7 @@
SRCS= $(SRC1) $(SRC3) $(LOCAL_ETCSRCS)
OBJS= $(OBJ1) $(OBJ3) $(LOCAL_ETCOBJS) $(LOCAL_RKOBJS)
@@ -80,6 +94,10 @@
@@ -80,6 +94,10 @@ InstallLibrary(kwnn_p,$(WNNLIBDIR))
WnnSpecialObjectRule($(OBJ3),$(SRC3),$(KWNNETCSRC),)
WnnSpecialObjectRule($(OBJ4),$(SRC4),$(KWNNETCSRC),)
WnnSpecialObjectRule($(OBJ5),$(SRC5),$(KWNNETCSRC),)

5
japanese/Wnn/patches/patch-ag → japanese/Wnn/patches/patch-kWnn_kd_uumrc
View File

@ -1,5 +1,6 @@
--- ./kWnn/kd/uumrc.orig Tue Jun 28 11:29:51 1994
+++ ./kWnn/kd/uumrc Sat Jul 19 02:48:17 1997
$OpenBSD: patch-kWnn_kd_uumrc,v 1.1 2000/04/16 21:53:38 espie Exp $
--- kWnn/kd/uumrc.orig Tue Jun 28 04:29:51 1994
+++ kWnn/kd/uumrc Thu Apr 13 20:41:39 2000
@@ -8,7 +8,7 @@
setconvenv @LIBDIR/@LANG/wnnenvrc
setkankanaenv @LIBDIR/@LANG/wnnenvrc_R

106
japanese/Wnn/pkg/INSTALL
View File

@ -1,106 +0,0 @@
#!/bin/sh
# an installation script for Wnn4.2
ask() {
local question default answer
question=$1
default=$2
if [ -z "${PACKAGE_BUILDING}" ]; then
read "${question} (y/n) [${default}]? " answer
fi
if [ x${answer} = x ]; then
answer=${default}
fi
echo ${answer}
}
yesno() {
local dflt question answer
question=$1
dflt=$2
while :; do
answer=$(ask "${question}" "${dflt}")
case "${answer}" in
[Yy]*) return 0;;
[Nn]*) return 1;;
esac
echo "Please answer yes or no."
done
}
case $2 in
PRE-INSTALL)
## Hack /etc/master.passwd ##
# check
id_69=`id -u 69 2> /dev/null`
id_wnn=`id -u wnn 2> /dev/null`
if [ X"$id_wnn" != X ];then
exit 0
elif [ X"$id_69" != X ]; then
cat <<EOF
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
This system already has an account whose name is not 'wnn' and ID
number is 69.
'`id 69`'
For Wnn4.2 in this port or package, ID number of 'wnn' has to be 69.
Please try again after you delete the account.
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
EOF
exit 1
fi
# add an account 'wnn' to this system
echo ""
echo "You need an account 'wnn' whose ID number is 69"
if yesno "Would you like to create it automatically?" y; then
gid=`id -g bin`
chpass -a "wnn:*:69:${gid}::::Wnn server:/root:/sbin/nologin"
else
echo "Please create it, and try again."
exit 1
fi
;;
POST-INSTALL)
case $1 in
ja-Wnn-4.2)
sys_dirs="${PKG_PREFIX}/lib/wnn/ja_JP/dic/pubdic ${PKG_PREFIX}/lib/wnn/ja_JP/dic/wnncons"
usr_dirs=${PKG_PREFIX}/lib/wnn/ja_JP/dic/usr
wnntouch=${PKG_PREFIX}/bin/Wnn4/wnntouch
wnnserver=${PKG_PREFIX}/bin/Wnn4/jserver
wnnname=Wnn
;;
zh-Wnn-4.2)
sys_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/sys ${PKG_PREFIX}/lib/wnn/zh_TW/dic/sys"
usr_dirs="${PKG_PREFIX}/lib/wnn/zh_CN/dic/usr ${PKG_PREFIX}/lib/wnn/zh_TW/dic/usr"
wnntouch=${PKG_PREFIX}/bin/cWnn4/cwnntouch
wnnserver=${PKG_PREFIX}/bin/cWnn4/cserver
wnnname=cWnn
;;
ko-Wnn-4.2)
sys_dirs="${PKG_PREFIX}/lib/wnn/ko_KR/dic/sys"
usr_dirs=${PKG_PREFIX}/lib/wnn/ko_KR/dic/usr
wnntouch=${PKG_PREFIX}/bin/kWnn4/kwnntouch
wnnserver=${PKG_PREFIX}/bin/kWnn4/kserver
wnnname=kWnn
;;
esac
for dir in $sys_dirs; do
$wnntouch $dir/*
done
for dir in $usr_dirs; do
if [ ! -d $dir ]; then
mkdir -p $dir
fi
chown wnn $dir
done
;;
esac

477
japanese/Wnn/pkg/PLIST
View File

@ -1,13 +1,19 @@
bin/Wnn4/atod
bin/Wnn4/atof
bin/Wnn4/dtoa
bin/Wnn4/oldatonewa
bin/Wnn4/uum
bin/Wnn4/wddel
bin/Wnn4/wdreg
bin/Wnn4/wnnkill
bin/Wnn4/wnnstat
bin/Wnn4/wnntouch
@comment $OpenBSD: PLIST,v 1.5 2000/04/16 21:53:40 espie Exp $
bin/atod
bin/atof
bin/dtoa
bin/jserver
bin/oldatonewa
@owner root
@mode u+s
bin/uum
@owner
@mode
bin/wddel
bin/wdreg
bin/wnnkill
bin/wnnstat
bin/wnntouch
include/wnn/commonhd.h
include/wnn/config.h
include/wnn/cplib.h
@ -26,6 +32,43 @@ lib/wnn/cvt_key_tbl.gm
lib/wnn/cvt_key_tbl.kt
lib/wnn/cvt_key_tbl.mv
lib/wnn/cvt_key_tbl.vt
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/bio.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/chimei.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/computer.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/full.fzk
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/jinmei.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/kihon.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/kougo.fzk
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/koyuu.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/setsuji.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/special.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/std.fzk
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/symbol.dic
@comment no checksum
lib/wnn/ja_JP/dic/pubdic/tankan.dic
lib/wnn/ja_JP/dic/src/fzk.attr
lib/wnn/ja_JP/dic/src/fzk.con
lib/wnn/ja_JP/dic/src/fzk.fzkattr
lib/wnn/ja_JP/dic/src/fzk.jirattr
lib/wnn/ja_JP/dic/src/fzk.jircon
lib/wnn/ja_JP/dic/src/fzk.master
lib/wnn/ja_JP/dic/src/fzk.shuutan
@comment no checksum
lib/wnn/ja_JP/dic/wnncons/tankan2.dic
@comment no checksum
lib/wnn/ja_JP/dic/wnncons/tankan3.dic
lib/wnn/ja_JP/hinsi.data
lib/wnn/ja_JP/jserverrc
lib/wnn/ja_JP/libwnn.msg
@ -82,190 +125,190 @@ lib/wnn/lt_LN/uumkey
lib/wnn/lt_LN/uumkey_e
lib/wnn/lt_LN/uumrc
lib/wnn/serverdefs
man/cat1/atod.0
man/cat1/atof.0
man/cat1/dtoa.0
man/cat1/jserver.0
man/cat1/oldatonewa.0
man/cat1/uum.0
man/cat1/wddel.0
man/cat1/wdreg.0
man/cat1/wnnkill.0
man/cat1/wnnstat.0
man/cat1/wnntouch.0
man/cat3/jl_bun_suu.0
man/cat3/jl_c_zenkouho.0
man/cat3/jl_close.0
man/cat3/jl_connect.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.0
man/cat3/jl_dic_comment_set_e.0
man/cat3/jl_dic_delete.0
man/cat3/jl_dic_delete_e.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_all.0
man/cat3/jl_dic_save_all_e.0
man/cat3/jl_dic_save_e.0
man/cat3/jl_dic_use.0
man/cat3/jl_dic_use_e.0
man/cat3/jl_disconnect.0
man/cat3/jl_env.0
man/cat3/jl_env_get.0
man/cat3/jl_env_set.0
man/cat3/jl_env_sticky.0
man/cat3/jl_env_sticky_e.0
man/cat3/jl_env_un_sticky.0
man/cat3/jl_env_un_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_get_zenkouho_kanji.0
man/cat3/jl_hinsi_dicts.0
man/cat3/jl_hinsi_dicts_e.0
man/cat3/jl_hinsi_list.0
man/cat3/jl_hinsi_list_e.0
man/cat3/jl_hinsi_name.0
man/cat3/jl_hinsi_name_e.0
man/cat3/jl_hinsi_number.0
man/cat3/jl_hinsi_number_e.0
man/cat3/jl_inspect.0
man/cat3/jl_isconnect.0
man/cat3/jl_isconnect_e.0
man/cat3/jl_jiri_len.0
man/cat3/jl_kanji_len.0
man/cat3/jl_kill.0
man/cat3/jl_next.0
man/cat3/jl_next_dai.0
man/cat3/jl_nobi_conv.0
man/cat3/jl_open.0
man/cat3/jl_open_lang.0
man/cat3/jl_param_get.0
man/cat3/jl_param_get_e.0
man/cat3/jl_param_set.0
man/cat3/jl_param_set_e.0
man/cat3/jl_previous.0
man/cat3/jl_previous_dai.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_add.0
man/cat3/jl_word_add_e.0
man/cat3/jl_word_comment_set.0
man/cat3/jl_word_comment_set_e.0
man/cat3/jl_word_delete.0
man/cat3/jl_word_delete_e.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_by_env.0
man/cat3/jl_word_search_by_env_e.0
man/cat3/jl_word_search_e.0
man/cat3/jl_word_use.0
man/cat3/jl_word_use_e.0
man/cat3/jl_yomi_len.0
man/cat3/jl_zenkouho.0
man/cat3/jl_zenkouho_bun.0
man/cat3/jl_zenkouho_dai.0
man/cat3/jl_zenkouho_daip.0
man/cat3/jl_zenkouho_suu.0
man/cat3/js_access.0
man/cat3/js_close.0
man/cat3/js_connect.0
man/cat3/js_dic_add.0
man/cat3/js_dic_delete.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_list_all.0
man/cat3/js_dic_use.0
man/cat3/js_disconnect.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_discard.0
man/cat3/js_file_info.0
man/cat3/js_file_list.0
man/cat3/js_file_list_all.0
man/cat3/js_file_loaded.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_receive.0
man/cat3/js_file_remove.0
man/cat3/js_file_remove_client.0
man/cat3/js_file_send.0
man/cat3/js_file_stat.0
man/cat3/js_file_write.0
man/cat3/js_fuzokugo_get.0
man/cat3/js_fuzokugo_set.0
man/cat3/js_get_lang.0
man/cat3/js_hindo_file_create.0
man/cat3/js_hindo_file_create_client.0
man/cat3/js_hindo_set.0
man/cat3/js_hinsi_dicts.0
man/cat3/js_hinsi_list.0
man/cat3/js_hinsi_name.0
man/cat3/js_hinsi_number.0
man/cat3/js_hinsi_table_set.0
man/cat3/js_isconnect.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_open.0
man/cat3/js_open_lang.0
man/cat3/js_param_get.0
man/cat3/js_param_set.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/msg_close.0
man/cat3/msg_get.0
man/cat3/msg_open.0
man/cat3/romkan_clear.0
man/cat3/romkan_dispmode.0
man/cat3/romkan_getc.0
man/cat3/romkan_init.0
man/cat3/romkan_next.0
man/cat3/romkan_ungetc.0
man/cat4/2a_ctrl.0
man/cat4/2b_romkana.0
man/cat4/cvt_key_tbl.0
man/cat4/fzk.data.0
man/cat4/fzk.u.0
man/cat4/hinsi_data.0
man/cat4/jserverrc.0
man/cat4/mode.0
man/cat4/serverdefs.0
man/cat4/ujis_dic.0
man/cat4/uumkey.0
man/cat4/uumrc.0
man/cat4/wnnenvrc.0
man/cat5/pubdic.0
man/cat5/usr_dic.0
man/ja_JP.EUC/cat1/atod.0
man/ja_JP.EUC/cat1/atof.0
man/ja_JP.EUC/cat1/dtoa.0
man/ja_JP.EUC/cat1/jserver.0
man/ja_JP.EUC/cat1/oldatonewa.0
man/ja_JP.EUC/cat1/uum.0
man/ja_JP.EUC/cat1/wddel.0
man/ja_JP.EUC/cat1/wdreg.0
man/ja_JP.EUC/cat1/wnnkill.0
man/ja_JP.EUC/cat1/wnnstat.0
man/ja_JP.EUC/cat1/wnntouch.0
man/ja_JP.EUC/cat3/jl_bun_suu.0
man/ja_JP.EUC/cat3/jl_c_zenkouho.0
man/ja_JP.EUC/cat3/jl_close.0
man/ja_JP.EUC/cat3/jl_connect.0
man/ja_JP.EUC/cat3/jl_connect_lang.0
man/ja_JP.EUC/cat3/jl_dai_top.0
man/ja_JP.EUC/cat3/jl_dic_add.0
man/ja_JP.EUC/cat3/jl_dic_add_e.0
man/ja_JP.EUC/cat3/jl_dic_comment_set.0
man/ja_JP.EUC/cat3/jl_dic_comment_set_e.0
man/ja_JP.EUC/cat3/jl_dic_delete.0
man/ja_JP.EUC/cat3/jl_dic_delete_e.0
man/ja_JP.EUC/cat3/jl_dic_list.0
man/ja_JP.EUC/cat3/jl_dic_list_e.0
man/ja_JP.EUC/cat3/jl_dic_save.0
man/ja_JP.EUC/cat3/jl_dic_save_all.0
man/ja_JP.EUC/cat3/jl_dic_save_all_e.0
man/ja_JP.EUC/cat3/jl_dic_save_e.0
man/ja_JP.EUC/cat3/jl_dic_use.0
man/ja_JP.EUC/cat3/jl_dic_use_e.0
man/ja_JP.EUC/cat3/jl_disconnect.0
man/ja_JP.EUC/cat3/jl_env.0
man/ja_JP.EUC/cat3/jl_env_get.0
man/ja_JP.EUC/cat3/jl_env_set.0
man/ja_JP.EUC/cat3/jl_env_sticky.0
man/ja_JP.EUC/cat3/jl_env_sticky_e.0
man/ja_JP.EUC/cat3/jl_env_un_sticky.0
man/ja_JP.EUC/cat3/jl_env_un_sticky_e.0
man/ja_JP.EUC/cat3/jl_fuzokugo_get.0
man/ja_JP.EUC/cat3/jl_fuzokugo_get_e.0
man/ja_JP.EUC/cat3/jl_fuzokugo_set.0
man/ja_JP.EUC/cat3/jl_fuzokugo_set_e.0
man/ja_JP.EUC/cat3/jl_get_kanji.0
man/ja_JP.EUC/cat3/jl_get_yomi.0
man/ja_JP.EUC/cat3/jl_get_zenkouho_kanji.0
man/ja_JP.EUC/cat3/jl_hinsi_dicts.0
man/ja_JP.EUC/cat3/jl_hinsi_dicts_e.0
man/ja_JP.EUC/cat3/jl_hinsi_list.0
man/ja_JP.EUC/cat3/jl_hinsi_list_e.0
man/ja_JP.EUC/cat3/jl_hinsi_name.0
man/ja_JP.EUC/cat3/jl_hinsi_name_e.0
man/ja_JP.EUC/cat3/jl_hinsi_number.0
man/ja_JP.EUC/cat3/jl_hinsi_number_e.0
man/ja_JP.EUC/cat3/jl_inspect.0
man/ja_JP.EUC/cat3/jl_isconnect.0
man/ja_JP.EUC/cat3/jl_isconnect_e.0
man/ja_JP.EUC/cat3/jl_jiri_len.0
man/ja_JP.EUC/cat3/jl_kanji_len.0
man/ja_JP.EUC/cat3/jl_kill.0
man/ja_JP.EUC/cat3/jl_next.0
man/ja_JP.EUC/cat3/jl_next_dai.0
man/ja_JP.EUC/cat3/jl_nobi_conv.0
man/ja_JP.EUC/cat3/jl_open.0
man/ja_JP.EUC/cat3/jl_open_lang.0
man/ja_JP.EUC/cat3/jl_param_get.0
man/ja_JP.EUC/cat3/jl_param_get_e.0
man/ja_JP.EUC/cat3/jl_param_set.0
man/ja_JP.EUC/cat3/jl_param_set_e.0
man/ja_JP.EUC/cat3/jl_previous.0
man/ja_JP.EUC/cat3/jl_previous_dai.0
man/ja_JP.EUC/cat3/jl_ren_conv.0
man/ja_JP.EUC/cat3/jl_set_env_wnnrc.0
man/ja_JP.EUC/cat3/jl_set_jikouho.0
man/ja_JP.EUC/cat3/jl_set_jikouho_dai.0
man/ja_JP.EUC/cat3/jl_tan_conv.0
man/ja_JP.EUC/cat3/jl_update_hindo.0
man/ja_JP.EUC/cat3/jl_word_add.0
man/ja_JP.EUC/cat3/jl_word_add_e.0
man/ja_JP.EUC/cat3/jl_word_comment_set.0
man/ja_JP.EUC/cat3/jl_word_comment_set_e.0
man/ja_JP.EUC/cat3/jl_word_delete.0
man/ja_JP.EUC/cat3/jl_word_delete_e.0
man/ja_JP.EUC/cat3/jl_word_info.0
man/ja_JP.EUC/cat3/jl_word_info_e.0
man/ja_JP.EUC/cat3/jl_word_search.0
man/ja_JP.EUC/cat3/jl_word_search_by_env.0
man/ja_JP.EUC/cat3/jl_word_search_by_env_e.0
man/ja_JP.EUC/cat3/jl_word_search_e.0
man/ja_JP.EUC/cat3/jl_word_use.0
man/ja_JP.EUC/cat3/jl_word_use_e.0
man/ja_JP.EUC/cat3/jl_yomi_len.0
man/ja_JP.EUC/cat3/jl_zenkouho.0
man/ja_JP.EUC/cat3/jl_zenkouho_bun.0
man/ja_JP.EUC/cat3/jl_zenkouho_dai.0
man/ja_JP.EUC/cat3/jl_zenkouho_daip.0
man/ja_JP.EUC/cat3/jl_zenkouho_suu.0
man/ja_JP.EUC/cat3/js_access.0
man/ja_JP.EUC/cat3/js_close.0
man/ja_JP.EUC/cat3/js_connect.0
man/ja_JP.EUC/cat3/js_dic_add.0
man/ja_JP.EUC/cat3/js_dic_delete.0
man/ja_JP.EUC/cat3/js_dic_file_create.0
man/ja_JP.EUC/cat3/js_dic_file_create_client.0
man/ja_JP.EUC/cat3/js_dic_info.0
man/ja_JP.EUC/cat3/js_dic_list.0
man/ja_JP.EUC/cat3/js_dic_list_all.0
man/ja_JP.EUC/cat3/js_dic_use.0
man/ja_JP.EUC/cat3/js_disconnect.0
man/ja_JP.EUC/cat3/js_env_exist.0
man/ja_JP.EUC/cat3/js_env_list.0
man/ja_JP.EUC/cat3/js_env_sticky.0
man/ja_JP.EUC/cat3/js_env_un_sticky.0
man/ja_JP.EUC/cat3/js_file_comment_set.0
man/ja_JP.EUC/cat3/js_file_discard.0
man/ja_JP.EUC/cat3/js_file_info.0
man/ja_JP.EUC/cat3/js_file_list.0
man/ja_JP.EUC/cat3/js_file_list_all.0
man/ja_JP.EUC/cat3/js_file_loaded.0
man/ja_JP.EUC/cat3/js_file_loaded_local.0
man/ja_JP.EUC/cat3/js_file_password_set.0
man/ja_JP.EUC/cat3/js_file_read.0
man/ja_JP.EUC/cat3/js_file_receive.0
man/ja_JP.EUC/cat3/js_file_remove.0
man/ja_JP.EUC/cat3/js_file_remove_client.0
man/ja_JP.EUC/cat3/js_file_send.0
man/ja_JP.EUC/cat3/js_file_stat.0
man/ja_JP.EUC/cat3/js_file_write.0
man/ja_JP.EUC/cat3/js_fuzokugo_get.0
man/ja_JP.EUC/cat3/js_fuzokugo_set.0
man/ja_JP.EUC/cat3/js_get_lang.0
man/ja_JP.EUC/cat3/js_hindo_file_create.0
man/ja_JP.EUC/cat3/js_hindo_file_create_client.0
man/ja_JP.EUC/cat3/js_hindo_set.0
man/ja_JP.EUC/cat3/js_hinsi_dicts.0
man/ja_JP.EUC/cat3/js_hinsi_list.0
man/ja_JP.EUC/cat3/js_hinsi_name.0
man/ja_JP.EUC/cat3/js_hinsi_number.0
man/ja_JP.EUC/cat3/js_hinsi_table_set.0
man/ja_JP.EUC/cat3/js_isconnect.0
man/ja_JP.EUC/cat3/js_kanren.0
man/ja_JP.EUC/cat3/js_kantan_dai.0
man/ja_JP.EUC/cat3/js_kantan_sho.0
man/ja_JP.EUC/cat3/js_kanzen_dai.0
man/ja_JP.EUC/cat3/js_kanzen_sho.0
man/ja_JP.EUC/cat3/js_kill.0
man/ja_JP.EUC/cat3/js_mkdir.0
man/ja_JP.EUC/cat3/js_open.0
man/ja_JP.EUC/cat3/js_open_lang.0
man/ja_JP.EUC/cat3/js_param_get.0
man/ja_JP.EUC/cat3/js_param_set.0
man/ja_JP.EUC/cat3/js_set_lang.0
man/ja_JP.EUC/cat3/js_version.0
man/ja_JP.EUC/cat3/js_who.0
man/ja_JP.EUC/cat3/js_word_add.0
man/ja_JP.EUC/cat3/js_word_comment_set.0
man/ja_JP.EUC/cat3/js_word_delete.0
man/ja_JP.EUC/cat3/js_word_info.0
man/ja_JP.EUC/cat3/js_word_search.0
man/ja_JP.EUC/cat3/js_word_search_by_env.0
man/ja_JP.EUC/cat3/msg_close.0
man/ja_JP.EUC/cat3/msg_get.0
man/ja_JP.EUC/cat3/msg_open.0
man/ja_JP.EUC/cat3/romkan_clear.0
man/ja_JP.EUC/cat3/romkan_dispmode.0
man/ja_JP.EUC/cat3/romkan_getc.0
man/ja_JP.EUC/cat3/romkan_init.0
man/ja_JP.EUC/cat3/romkan_next.0
man/ja_JP.EUC/cat3/romkan_ungetc.0
man/ja_JP.EUC/cat4/2a_ctrl.0
man/ja_JP.EUC/cat4/2b_romkana.0
man/ja_JP.EUC/cat4/cvt_key_tbl.0
man/ja_JP.EUC/cat4/fzk.data.0
man/ja_JP.EUC/cat4/fzk.u.0
man/ja_JP.EUC/cat4/hinsi_data.0
man/ja_JP.EUC/cat4/jserverrc.0
man/ja_JP.EUC/cat4/mode.0
man/ja_JP.EUC/cat4/serverdefs.0
man/ja_JP.EUC/cat4/ujis_dic.0
man/ja_JP.EUC/cat4/uumkey.0
man/ja_JP.EUC/cat4/uumrc.0
man/ja_JP.EUC/cat4/wnnenvrc.0
man/ja_JP.EUC/cat5/pubdic.0
man/ja_JP.EUC/cat5/usr_dic.0
share/doc/ja-Wnn/manual.en/2.env/wnn/2a_ctrl
share/doc/ja-Wnn/manual.en/2.env/wnn/2b_romkana
share/doc/ja-Wnn/manual.en/2.env/wnn/full.fzk
@ -494,34 +537,8 @@ share/doc/ja-Wnn/manual/6.jutil/wnntouch
share/doc/ja-Wnn/manual/7.Protocol/KKTP
share/doc/ja-Wnn/manual/intro
share/doc/ja-Wnn/manual/v3tov4/v3tov4
@owner wnn
lib/wnn/ja_JP/dic/pubdic/bio.dic
lib/wnn/ja_JP/dic/pubdic/chimei.dic
lib/wnn/ja_JP/dic/pubdic/computer.dic
lib/wnn/ja_JP/dic/pubdic/jinmei.dic
lib/wnn/ja_JP/dic/pubdic/kihon.dic
lib/wnn/ja_JP/dic/pubdic/koyuu.dic
lib/wnn/ja_JP/dic/pubdic/setsuji.dic
lib/wnn/ja_JP/dic/pubdic/special.dic
lib/wnn/ja_JP/dic/pubdic/symbol.dic
lib/wnn/ja_JP/dic/pubdic/tankan.dic
lib/wnn/ja_JP/dic/pubdic/full.fzk
lib/wnn/ja_JP/dic/pubdic/kougo.fzk
lib/wnn/ja_JP/dic/pubdic/std.fzk
lib/wnn/ja_JP/dic/src/fzk.master
lib/wnn/ja_JP/dic/src/fzk.attr
lib/wnn/ja_JP/dic/src/fzk.jirattr
lib/wnn/ja_JP/dic/src/fzk.fzkattr
lib/wnn/ja_JP/dic/src/fzk.jircon
lib/wnn/ja_JP/dic/src/fzk.con
lib/wnn/ja_JP/dic/src/fzk.shuutan
lib/wnn/ja_JP/dic/wnncons/tankan2.dic
lib/wnn/ja_JP/dic/wnncons/tankan3.dic
@exec chmod 0755 %D/lib/wnn/ja_JP/dic
@comment seems to have problem giving correct rights to directories...
@exec chown -R wnn %D/lib/wnn/ja_JP/dic
@mode u+s
bin/Wnn4/jserver
lib/wnn/install-script
@exec PREFIX=%D %D/%F
@dirrm share/doc/ja-Wnn/manual/v3tov4
@dirrm share/doc/ja-Wnn/manual/7.Protocol
@dirrm share/doc/ja-Wnn/manual/6.jutil
@ -540,8 +557,16 @@ bin/Wnn4/jserver
@dirrm share/doc/ja-Wnn/manual.en/6.jutil
@dirrm share/doc/ja-Wnn/manual.en/5.op
@dirrm share/doc/ja-Wnn/manual.en/4.cmd
@exec mkdir -p %D/share/doc/ja-Wnn/manual.en/3.libwnn
@dirrm share/doc/ja-Wnn/manual.en/3.libwnn
@dirrm share/doc/ja-Wnn/manual.en/2.env/wnn
@exec mkdir -p %D/share/doc/ja-Wnn/manual.en/2.env/dic
@dirrm share/doc/ja-Wnn/manual.en/2.env/dic
@dirrm share/doc/ja-Wnn/manual.en/2.env
@exec mkdir -p %D/share/doc/ja-Wnn/manual.en/1.intro
@dirrm share/doc/ja-Wnn/manual.en/1.intro
@exec mkdir -p %D/share/doc/ja-Wnn/manual.en/0
@dirrm share/doc/ja-Wnn/manual.en/0
@dirrm share/doc/ja-Wnn/manual.en
@dirrm share/doc/ja-Wnn/manual
@dirrm share/doc/ja-Wnn
@ -549,11 +574,7 @@ bin/Wnn4/jserver
@dirrm lib/wnn/lt_LN
@dirrm lib/wnn/ja_JP/rk.vi
@dirrm lib/wnn/ja_JP/rk
@dirrm lib/wnn/ja_JP/dic/wnncons
@dirrm lib/wnn/ja_JP/dic/src
@dirrm lib/wnn/ja_JP/dic/pubdic
@dirrm lib/wnn/ja_JP/dic
@dirrm lib/wnn/ja_JP
@dirrm lib/wnn
@dirrm include/wnn
@dirrm bin/Wnn4
@unexec echo "Don't forget to remove user wnn"
@unexec echo " and directory %D/lib/wnn manually"