1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
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/Wnn/uum/jhlp.c ./Wnn/uum/jhlp.c
*** ../Xsi.org/Wnn/uum/jhlp.c Fri Aug 19 10:32:12 1994
--- ./Wnn/uum/jhlp.c Wed Aug 21 20:19:26 1996
***************
*** 771,777 ****
#endif
int pid;
! if ((pid = wait3(&status, WNOHANG | WUNTRACED, NULL)) == child_id) {
if (WIFSTOPPED(status)) {
#ifdef SIGCONT
kill(pid, SIGCONT);
--- 771,782 ----
#endif
int pid;
! /*
! * 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);
***************
*** 1636,1642 ****
--- 1641,1656 ----
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
+ */
+ #ifdef __FreeBSD__
+ sprintf(b, "%s%1c%1c", pty, "pqrsPQRS"[(no >> 5)], ((no & 0x1f > 9)? 'a' : '0') + (no & 0x1f));
+ #else /* ! __FreeBSD__ */
sprintf(b, "%s%1c%1x", pty, 'p' + (no >> 4), no & 0x0f);
+ #endif /* ! __FreeBSD__ */
}
#endif /* !sgi */
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
+ SYS_LIBRARIES = -lcrypt /* For FreeBSD */
+
/*
* 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) @@\
***************
*** 1134,1150 ****
$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\
done
#ifndef BuildWnn
#define BuildWnn YES
#endif
#ifndef BuildCWnn
! #define BuildCWnn YES
#endif
#ifndef BuildKWnn
! #define BuildKWnn YES
#endif
#ifndef BuildXwnmo
! #define BuildXwnmo YES
#endif
#ifndef BuildJserver
--- 1145,1165 ----
$(WNNTOUCH) $(DESTDIR)dest/$$i); fi \ @@\
done
+ /*
+ * Only Japanese
+ * - Satoshi
+ */
#ifndef BuildWnn
#define BuildWnn YES
#endif
#ifndef BuildCWnn
! #define BuildCWnn NO
#endif
#ifndef BuildKWnn
! #define BuildKWnn NO
#endif
#ifndef BuildXwnmo
! #define BuildXwnmo NO
#endif
#ifndef BuildJserver
|
