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
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
|
*** cmd/stubfe/Makefile.orig Tue Aug 4 02:37:20 1998
--- cmd/stubfe/Makefile Tue Aug 4 11:29:40 1998
***************
*** 548,553 ****
--- 548,559 ----
endif
########################################
+ # NetBSD
+ ifeq ($(OS_ARCH),NetBSD)
+ OTHER_LIBS = -lm $(OS_LIBS)
+ endif
+
+ ########################################
# BSDI
ifeq ($(OS_ARCH),BSD_OS)
OTHER_LIBS = -lm $(OS_LIBS)
*** cmd/xfe/Microline3.0/XmL/Grid.c.orig Tue Jul 28 06:48:32 1998
--- cmd/xfe/Microline3.0/XmL/Grid.c Tue Aug 4 02:37:18 1998
***************
*** 30,35 ****
--- 30,38 ----
#include <Xm/Text.h>
#include <Xm/DrawnB.h>
#include <Xm/CutPaste.h>
+ #ifndef MOTIF11
+ #include <Xm/DropSMgr.h>
+ #endif
#include <X11/StringDefs.h>
#include <X11/cursorfont.h>
#include <stdio.h>
*** cmd/xfe/src/HTMLView.cpp.orig Tue Jul 28 06:48:55 1998
--- cmd/xfe/src/HTMLView.cpp Tue Aug 4 02:37:17 1998
***************
*** 350,356 ****
scroller = fe_MakeScrolledWindow (m_contextData, pane, "scroller");
XtVaSetValues (CONTEXT_DATA (m_contextData)->scrolled,
XmNborderWidth, 0,
! #if defined(__FreeBSD__)||defined(BSDI)||defined(LINUX)||defined(IRIX)
// Allow for resolutions > 1000 pixels.
// This causes the vertical scrollbar not to show
// up on Solaris 2.4, bug in Motif (77998).
--- 350,356 ----
scroller = fe_MakeScrolledWindow (m_contextData, pane, "scroller");
XtVaSetValues (CONTEXT_DATA (m_contextData)->scrolled,
XmNborderWidth, 0,
! #if defined(__FreeBSD__)||defined(BSDI)||defined(LINUX)||defined(IRIX)||defined(__NetBSD__)
// Allow for resolutions > 1000 pixels.
// This causes the vertical scrollbar not to show
// up on Solaris 2.4, bug in Motif (77998).
*** cmd/xfe/src/context_funcs.cpp.orig Tue Jul 28 06:49:11 1998
--- cmd/xfe/src/context_funcs.cpp Tue Aug 4 02:37:17 1998
***************
*** 76,81 ****
--- 76,83 ----
#define STATFS statfs
#elif defined(BSDI)
#include <sys/mount.h> /* for statfs() */
+ #elif defined(NETBSD)
+ #include <sys/mount.h> /* for statfs() */
#define STATFS statfs
#else
#include <sys/statfs.h> /* for statfs() */
*** cmd/xfe/Makefile.orig Tue Aug 4 02:37:18 1998
--- cmd/xfe/Makefile Tue Aug 4 11:29:40 1998
***************
*** 618,623 ****
--- 618,637 ----
endif
########################################
+ # NetBSD
+ # Work around linker semantics that will never find our own libutil on 1.3.x
+ ifeq ($(OS_ARCH),NetBSD)
+ ifeq ($(OS_MINOR),3)
+ FOOL_GMAKE = $(EXPORT_LDFLAGS:$(DIST)/lib/lib%.a=-l%)
+ DSO_EX_LIBS = $(FOOL_GMAKE:-lutil=$(DIST)/lib/libutil.a)
+ endif
+ ifdef LIBRUNPATH
+ OS_LIBS += -R$(LIBRUNPATH)
+ endif
+ OTHER_LIBS = -L/usr/X11R6/lib -lXm -lXt -lXmu -lXext -lX11 -lSM -lICE -lm $(OS_LIBS)
+ endif
+
+ ########################################
# BSDI
ifeq ($(OS_ARCH),BSD_OS)
OTHER_LIBS = $(MOTIF)/libXm.a $(LOC_LIB_DIR)/libXt.a $(X11R6LIBS) $(LOC_LIB_DIR)/libXmu.a \
*** cmd/xfe/mozilla.c.orig Tue Jul 28 06:48:31 1998
--- cmd/xfe/mozilla.c Tue Aug 4 02:37:18 1998
***************
*** 1889,1894 ****
--- 1889,1896 ----
strcat (buf, "IRIX");
#elif defined(__FreeBSD__)
strcat (buf, "FreeBSD");
+ #elif defined(__NetBSD__)
+ strcat (buf, "NetBSD");
#elif defined(__386BSD__)
strcat (buf, "BSD/386");
#elif defined(__osf__)
***************
*** 3543,3549 ****
#else /* !OLD_UNIX_FILES */
! #if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
--- 3545,3551 ----
#else /* !OLD_UNIX_FILES */
! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
*** cmd/xfe/dialogs.c.orig Tue Jul 28 06:48:29 1998
--- cmd/xfe/dialogs.c Tue Aug 4 02:37:19 1998
***************
*** 278,284 ****
(void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0);
}
! #if !defined(__FreeBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
#include <sys/errno.h>
extern char *sys_errlist[];
extern int sys_nerr;
--- 278,284 ----
(void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0);
}
! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MKLINUX) && !defined(LINUX_GLIBC_2)
#include <sys/errno.h>
extern char *sys_errlist[];
extern int sys_nerr;
*** cmd/xfe/movemail.c.orig Tue Jul 28 06:48:31 1998
--- cmd/xfe/movemail.c Tue Aug 4 02:37:20 1998
***************
*** 40,46 ****
#include "xfe.h"
#include <sys/errno.h>
! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
--- 40,46 ----
#include "xfe.h"
#include <sys/errno.h>
! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
*** cmd/xfe/prefdialogs.c.orig Tue Jul 28 06:48:31 1998
--- cmd/xfe/prefdialogs.c Tue Aug 4 02:37:20 1998
***************
*** 76,82 ****
/* For sys_errlist and sys_nerr */
#include <sys/errno.h>
! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
--- 76,82 ----
/* For sys_errlist and sys_nerr */
#include <sys/errno.h>
! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2)
extern char *sys_errlist[];
extern int sys_nerr;
#endif
*** dbm/include/mcom_db.h.orig Tue Jul 28 06:43:48 1998
--- dbm/include/mcom_db.h Tue Aug 4 02:37:20 1998
***************
*** 200,206 ****
#define RET_SUCCESS 0
#define RET_SPECIAL 1
! #if defined(__386BSD__) || defined(SCO)
#define __BIT_TYPES_DEFINED__
#endif
--- 200,206 ----
#define RET_SUCCESS 0
#define RET_SPECIAL 1
! #if defined(__386BSD__) || defined(SCO) || defined(__NetBSD__)
#define __BIT_TYPES_DEFINED__
#endif
*** js/src/prmjtime.c.orig Tue Jul 28 06:42:20 1998
--- js/src/prmjtime.c Tue Aug 4 02:37:17 1998
***************
*** 301,307 ****
PRInt64 maxtimet;
struct tm tm;
PRMJTime prtm;
! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI )
struct tm *ptm;
#endif
--- 301,307 ----
PRInt64 maxtimet;
struct tm tm;
PRMJTime prtm;
! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) || defined( NETBSD )
struct tm *ptm;
#endif
***************
*** 320,326 ****
}
LL_L2UI(local,time);
PRMJ_basetime(time,&prtm);
! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI )
ptm = localtime(&local);
if(!ptm){
return LL_ZERO;
--- 320,326 ----
}
LL_L2UI(local,time);
PRMJ_basetime(time,&prtm);
! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) || defined( NETBSD )
ptm = localtime(&local);
if(!ptm){
return LL_ZERO;
*** modules/libreg/src/vr_stubs.h.orig Tue Jul 28 06:43:10 1998
--- modules/libreg/src/vr_stubs.h Tue Aug 4 02:37:21 1998
***************
*** 29,35 ****
#ifdef XP_MAC
#include <stat.h>
#else
! #if defined(BSDI) && !defined(BSDI_2)
#include <sys/types.h>
#endif
#include <sys/stat.h>
--- 29,35 ----
#ifdef XP_MAC
#include <stat.h>
#else
! #if (defined(BSDI) && !defined(BSDI_2)) || defined(NETBSD)
#include <sys/types.h>
#endif
#include <sys/stat.h>
*** modules/schedulr/src/Makefile.orig Tue Jul 28 06:43:18 1998
--- modules/schedulr/src/Makefile Tue Aug 4 02:37:21 1998
***************
*** 17,24 ****
DEPTH = ../../..
! MODULE = schedulr
! LIBRARY_NAME = sched
REQUIRES = nspr util
--- 17,24 ----
DEPTH = ../../..
! MODULE = schedulr
! LIBRARY_NAME = sched
REQUIRES = nspr util
*** network/main/mkconect.c.orig Tue Jul 28 06:43:29 1998
--- network/main/mkconect.c Tue Aug 4 02:37:21 1998
***************
*** 81,87 ****
#include <resolv.h>
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
#include <sys/filio.h>
#endif
--- 81,87 ----
#include <resolv.h>
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__)
#include <sys/filio.h>
#endif
*** network/main/mksockrw.c.orig Tue Jul 28 06:43:29 1998
--- network/main/mksockrw.c Tue Aug 4 02:37:21 1998
***************
*** 47,53 ****
#include <resolv.h>
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
#include <sys/filio.h>
#endif
--- 47,53 ----
#include <resolv.h>
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__)
#include <sys/filio.h>
#endif
*** network/main/prefetch.c.orig Tue Jul 28 06:43:30 1998
--- network/main/prefetch.c Tue Aug 4 02:37:21 1998
***************
*** 177,183 ****
}
}
! PRIVATE void
pre_Finished(URL_Struct* url_struct, int status, MWContext* context)
{
/* this should change to update the colors of
--- 177,183 ----
}
}
! MODULE_PRIVATE void
pre_Finished(URL_Struct* url_struct, int status, MWContext* context)
{
/* this should change to update the colors of
*** network/protocol/ftp/mkftp.c.orig Tue Jul 28 06:43:31 1998
--- network/protocol/ftp/mkftp.c Tue Aug 4 02:37:22 1998
***************
*** 60,66 ****
#endif /* XP_OS2 */
#ifdef XP_UNIX
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV)
#include <sys/filio.h>
#endif
#endif /* XP_UNIX */
--- 60,66 ----
#endif /* XP_OS2 */
#ifdef XP_UNIX
! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) || defined(__NetBSD__)
#include <sys/filio.h>
#endif
#endif /* XP_UNIX */
*** nsprpub/pr/include/md/_netbsd.h.orig Tue Jul 28 06:43:36 1998
--- nsprpub/pr/include/md/_netbsd.h Tue Aug 4 11:20:59 1998
***************
*** 63,69 ****
--- 63,76 ----
#elif defined(__alpha__)
#define JB_SP_INDEX 34
#elif defined(__arm32__)
+ /*
+ * On the arm32, the jmpbuf regs underwent a namechange after NetBSD 1.3
+ */
+ #ifdef JMPBUF_REG_R13
#define JB_SP_INDEX JMPBUF_REG_R13
+ #else
+ #define JB_SP_INDEX _JB_REG_R13
+ #endif
#else
#error "Need to define SP index in jmp_buf here"
#endif
*** config/NetBSD.mk.orig Tue Aug 4 13:31:22 1998
--- config/NetBSD.mk Tue Aug 4 13:30:45 1998
***************
*** 89,95 ****
MKSHLIB = $(LD) $(DSO_LDOPTS)
! DSO_CFLAGS = -fpic
DSO_LDFLAGS =
#
--- 89,95 ----
MKSHLIB = $(LD) $(DSO_LDOPTS)
! DSO_CFLAGS = -fPIC
DSO_LDFLAGS =
#
|
