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
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
|
--- ../nas/nas-1.6.patch.orig Tue Mar 11 15:04:35 2003
+++ ../nas/nas-1.6.patch Tue Mar 11 15:29:52 2003
@@ -69,3 +69,298 @@
number : NUMBER { $$ = $1; }
;
+--- misc/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 14:56:14 2003
++++ misc/build/nas-1.6/clients/audio/auctl/auctl.c Tue Mar 11 15:01:04 2003
+@@ -23,7 +23,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "auctl.h"
+
+ char *ProgramName;
+--- misc/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 14:56:14 2003
++++ misc/build/nas-1.6/clients/audio/audemo/audemo.c Tue Mar 11 15:01:04 2003
+@@ -32,7 +32,7 @@
+ #include <stdlib.h>
+ #endif
+ #include <signal.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #if !defined(SYSV) || defined(WIN32)
+ #include <audio/Aos.h> /* for string and other os stuff */
+--- misc/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 14:56:14 2003
++++ misc/build/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:01:04 2003
+@@ -32,7 +32,7 @@
+ #if !defined(ISC40) && !defined(WIN32)
+ #include <sys/file.h>
+ #endif /* !ISC40 */
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #include <audio/Aos.h> /* for string and other os stuff */
+ #include <audio/Afuncs.h> /* for bcopy et. al. */
+--- misc/nas-1.6/clients/audio/auedit/auedit.c Tue Mar 11 14:56:14 2003
++++ misc/build/nas-1.6/clients/audio/auedit/auedit.c Tue Mar 11 15:01:04 2003
+@@ -37,7 +37,7 @@
+ #define access _access
+ #define R_OK 4
+ #endif /* WIN32 */
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <limits.h> /* for SHRT_MIN and SHRT_MAX */
+ #ifndef SYSV
+ #include <audio/Aos.h> /* for string and other os
+--- misc/nas-1.6/clients/audio/autool/audiotool.c Tue Mar 11 14:56:16 2003
++++ misc/build/nas-1.6/clients/audio/autool/audiotool.c Tue Mar 11 15:01:04 2003
+@@ -28,7 +28,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/audiolib.h>
+ #include <audio/soundlib.h>
+
+--- misc/nas-1.6/clients/audio/util/soundtoh.c Tue Mar 11 14:56:15 2003
++++ misc/build/nas-1.6/clients/audio/util/soundtoh.c Tue Mar 11 15:01:04 2003
+@@ -27,7 +27,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h> /* for string and other os stuff */
+ #include <audio/Afuncs.h> /* for bcopy et. al. */
+ #include <audio/audiolib.h>
+--- misc/nas-1.6/lib/audio/8svx.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/8svx.c Tue Mar 11 15:01:04 2003
+@@ -23,7 +23,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <math.h>
+ #include <audio/8svx.h>
+--- misc/nas-1.6/lib/audio/aiff.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/aiff.c Tue Mar 11 15:01:04 2003
+@@ -23,7 +23,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <math.h>
+ #include <audio/aiff.h>
+--- misc/nas-1.6/lib/audio/fileutil.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/fileutil.c Tue Mar 11 15:01:04 2003
+@@ -29,7 +29,7 @@
+ #include <stdio.h>
+ #include <audio/Aos.h>
+ #include <audio/fileutil.h>
+-#include <malloc.h>
++#include <stdlib.h>
+
+ #if NeedFunctionPrototypes
+ unsigned short FileSwapS (unsigned short us)
+--- misc/nas-1.6/lib/audio/snd.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/snd.c Tue Mar 11 15:01:04 2003
+@@ -23,7 +23,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <audio/snd.h>
+ #include <audio/fileutil.h>
+--- misc/nas-1.6/lib/audio/sound.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/sound.c Tue Mar 11 15:01:04 2003
+@@ -29,7 +29,7 @@
+ #define _SOUND_C_
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <audio/audio.h>
+ #include <audio/sound.h>
+--- misc/nas-1.6/lib/audio/voc.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/voc.c Tue Mar 11 15:01:04 2003
+@@ -23,7 +23,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <audio/voc.h>
+ #include <audio/fileutil.h>
+--- misc/nas-1.6/lib/audio/wave.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/lib/audio/wave.c Tue Mar 11 15:01:04 2003
+@@ -27,7 +27,7 @@
+ */
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <audio/Aos.h>
+ #include <audio/wave.h>
+ #include <audio/fileutil.h>
+--- misc/nas-1.6/server/os/utils.c Tue Mar 11 14:56:13 2003
++++ misc/build/nas-1.6/server/os/utils.c Tue Mar 11 15:01:04 2003
+@@ -454,7 +454,7 @@
+ }
+
+ #ifdef CAHILL_MALLOC
+-#include <malloc.h>
++#include <stdlib.h>
+
+ void *
+ debug_Xalloc (char *file, int line, unsigned long amount)
+--- misc/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:19:40 2003
++++ misc/build/nas-1.6/clients/audio/audial/audial.c Tue Mar 11 15:20:51 2003
+@@ -84,6 +84,7 @@
+ */
+ static void
+ usleep(usecs)
++#if !defined(__FreeBSD__) || (__FreeBSD__ < 3)
+ unsigned int usecs;
+ {
+ double s1;
+@@ -150,6 +151,7 @@
+ pause();
+ }
+
++#endif
+ #endif /* SYSV else not */
+ #endif /* VMS else not */
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.6/clients/audio/auedit/Graph.c Tue Mar 11 15:19:40 2003
++++ misc/build/nas-1.6/clients/audio/auedit/Graph.c Tue Mar 11 15:25:21 2003
+@@ -28,7 +28,7 @@
+ */
+
+ #ifndef WIN32
+-# ifdef __NetBSD__
++# if defined(__NetBSD__) || defined(__FreeBSD__)
+ # include <limits.h>
+ # define MAXSHORT SHRT_MAX
+ # define MINSHORT SHRT_MIN
+--- misc/nas-1.6/config/NetAudio.def Tue Mar 11 15:19:40 2003
++++ misc/build/nas-1.6/config/NetAudio.def Tue Mar 11 15:26:55 2003
+@@ -8,6 +8,6 @@
+
+ XCOMM Directory where NAS will look for it's config file(s)
+ #ifndef NasConfigSearchPath
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
+
+--- misc/nas-1.6/lib/audio/Imakefile Tue Mar 11 15:19:38 2003
++++ misc/build/nas-1.6/lib/audio/Imakefile Tue Mar 11 15:26:26 2003
+@@ -36,6 +36,10 @@
+ #endif
+ #endif /* ProjectX < 5 */
+
++#if HasBSD44Sockets
++ SOCK_DEFINES = -DBSD44SOCKETS
++#endif
++
+ #ifndef NormalLibAudio
+ #define NormalLibAudio NormalLibX
+ #endif
+@@ -79,7 +83,7 @@
+ EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
+
+ DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
+- CONN_DEFINES = ConnectionFlags
++ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
+
+ HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
+ voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h \
+--- misc/nas-1.6/server/Imakefile Tue Mar 11 15:19:40 2003
++++ misc/build/nas-1.6/server/Imakefile Tue Mar 11 15:27:38 2003
+@@ -105,6 +105,9 @@
+ # if defined(LinuxArchitecture)
+ RCMANDIR = $(FILEMANDIR)
+ RCMANSUFFIX = 5nas
++# elif defined(FreeBSDArchitecture)
++ RCMANDIR = $(FILEMANDIR)
++ RCMANSUFFIX = $(FILEMANSUFFIX)
+ # else
+ RCMANDIR = $(MANDIR)
+ RCMANSUFFIX = 5x
+--- misc/nas-1.6/server/dda/voxware/auvoxware.c Tue Mar 11 15:19:39 2003
++++ misc/build/nas-1.6/server/dda/voxware/auvoxware.c Tue Mar 11 15:24:32 2003
+@@ -133,7 +133,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifndef SVR4
++#if !defined(SVR4) && !defined(__FreeBSD__)
+ #include <getopt.h>
+ #endif
+ #include <sys/types.h>
+@@ -171,16 +171,11 @@
+ #include <sys/param.h>
+ #include <assert.h>
+
+-#ifdef __FreeBSD__
+-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
++#ifdef __NetBSD__
++# include <sys/ioctl.h>
++# include <soundcard.h>
+ #else
+-# ifdef __NetBSD__
+-# include <sys/ioctl.h>
+-# include <soundcard.h>
+-# else
+-# include <sys/soundcard.h>
+-# endif
++# include <sys/soundcard.h>
+ #endif
+
+ #include <audio/audio.h>
+@@ -659,7 +654,11 @@
+ if(sndStatOut.fd == -1)
+ {
+ while ((sndStatOut.fd = open(sndStatOut.device,
++#if defined(__FreeBSD__)
++ sndStatOut.howToOpen|extramode,
++#else
+ sndStatOut.howToOpen|O_SYNC|extramode,
++#endif
+ 0666)) == -1 && wait)
+ {
+ osLogMsg("openDevice: waiting on output device\n");
+@@ -1310,6 +1309,11 @@
+ /*
+ * Setup soundcard at maximum audio quality.
+ */
++
++#if defined(__FreeBSD__)
++#define NO_16_BIT_SAMPLING
++#endif
++
+ static void setupSoundcard(sndStatPtr)
+ SndStat* sndStatPtr;
+ {
+@@ -1472,7 +1476,11 @@
+ sndStatOut.device, sndStatOut.howToOpen);
+
+ if ((fd = open(sndStatOut.device,
++#if defined(__FreeBSD__)
++ sndStatOut.howToOpen|extramode, 0)) == -1)
++#else
+ sndStatOut.howToOpen|O_SYNC|extramode, 0)) == -1)
++#endif
+ {
+ UNIDENTMSG;
+ return AuFalse;
|
