head 1.27; access; symbols pkgsrc-2013Q2:1.27.0.32 pkgsrc-2013Q2-base:1.27 pkgsrc-2012Q4:1.27.0.30 pkgsrc-2012Q4-base:1.27 pkgsrc-2011Q4:1.27.0.28 pkgsrc-2011Q4-base:1.27 pkgsrc-2011Q2:1.27.0.26 pkgsrc-2011Q2-base:1.27 pkgsrc-2009Q4:1.27.0.24 pkgsrc-2009Q4-base:1.27 pkgsrc-2008Q4:1.27.0.22 pkgsrc-2008Q4-base:1.27 pkgsrc-2008Q3:1.27.0.20 pkgsrc-2008Q3-base:1.27 cube-native-xorg:1.27.0.18 cube-native-xorg-base:1.27 pkgsrc-2008Q2:1.27.0.16 pkgsrc-2008Q2-base:1.27 pkgsrc-2008Q1:1.27.0.14 pkgsrc-2008Q1-base:1.27 pkgsrc-2007Q4:1.27.0.12 pkgsrc-2007Q4-base:1.27 pkgsrc-2007Q3:1.27.0.10 pkgsrc-2007Q3-base:1.27 pkgsrc-2007Q2:1.27.0.8 pkgsrc-2007Q2-base:1.27 pkgsrc-2007Q1:1.27.0.6 pkgsrc-2007Q1-base:1.27 pkgsrc-2006Q4:1.27.0.4 pkgsrc-2006Q4-base:1.27 pkgsrc-2006Q3:1.27.0.2 pkgsrc-2006Q3-base:1.27 pkgsrc-2006Q2:1.26.0.16 pkgsrc-2006Q2-base:1.26 pkgsrc-2006Q1:1.26.0.14 pkgsrc-2006Q1-base:1.26 pkgsrc-2005Q4:1.26.0.12 pkgsrc-2005Q4-base:1.26 pkgsrc-2005Q3:1.26.0.10 pkgsrc-2005Q3-base:1.26 pkgsrc-2005Q2:1.26.0.8 pkgsrc-2005Q2-base:1.26 pkgsrc-2005Q1:1.26.0.6 pkgsrc-2005Q1-base:1.26 pkgsrc-2004Q4:1.26.0.4 pkgsrc-2004Q4-base:1.26 pkgsrc-2004Q3:1.26.0.2 pkgsrc-2004Q3-base:1.26 pkgsrc-2004Q2:1.25.0.4 pkgsrc-2004Q2-base:1.25 pkgsrc-2004Q1:1.25.0.2 pkgsrc-2004Q1-base:1.25 pkgsrc-2003Q4:1.23.0.2 pkgsrc-2003Q4-base:1.23 netbsd-1-6-1:1.22.0.2 netbsd-1-6-1-base:1.22 netbsd-1-6:1.20.0.6 netbsd-1-6-RELEASE-base:1.20 pkgviews:1.20.0.2 pkgviews-base:1.20 buildlink2-base:1.19 netbsd-1-5-RELEASE:1.15 netbsd-1-4-PATCH003:1.15 netbsd-1-4-PATCH002:1.9 comdex-fall-1999:1.9 netbsd-1-4-PATCH001:1.9 netbsd-1-4-RELEASE:1.9 netbsd-1-3-PATCH003:1.8 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.27 date 2006.09.24.16.46.28; author salo; state dead; branches; next 1.26; 1.26 date 2004.06.21.14.14.00; author taya; state Exp; branches; next 1.25; 1.25 date 2004.02.05.17.29.06; author jmmv; state Exp; branches; next 1.24; 1.24 date 2003.11.27.00.03.53; author taya; state dead; branches; next 1.23; 1.23 date 2003.03.17.16.07.33; author taya; state Exp; branches 1.23.2.1; next 1.22; 1.22 date 2002.12.04.15.20.28; author taya; state Exp; branches; next 1.21; 1.21 date 2002.08.29.15.11.13; author taya; state Exp; branches; next 1.20; 1.20 date 2002.07.04.03.45.31; author taya; state Exp; branches; next 1.19; 1.19 date 2001.03.30.09.37.49; author taya; state dead; branches; next 1.18; 1.18 date 2001.02.17.11.03.28; author taya; state Exp; branches; next 1.17; 1.17 date 2001.01.16.16.01.21; author taya; state Exp; branches; next 1.16; 1.16 date 2001.01.13.19.33.27; author mycroft; state Exp; branches; next 1.15; 1.15 date 2000.10.14.09.24.46; author martin; state Exp; branches; next 1.14; 1.14 date 2000.08.30.21.59.52; author martin; state Exp; branches; next 1.13; 1.13 date 2000.08.16.21.23.48; author tron; state Exp; branches; next 1.12; 1.12 date 2000.06.19.04.17.27; author soren; state Exp; branches; next 1.11; 1.11 date 2000.06.13.23.18.53; author soren; state Exp; branches; next 1.10; 1.10 date 2000.06.13.23.11.54; author soren; state dead; branches; next 1.9; 1.9 date 98.11.09.01.25.13; author fvdl; state Exp; branches; next 1.8; 1.8 date 98.09.15.16.47.09; author tv; state Exp; branches; next 1.7; 1.7 date 98.08.08.20.33.59; author fvdl; state Exp; branches; next 1.6; 1.6 date 98.08.07.11.14.25; author agc; state Exp; branches; next 1.5; 1.5 date 98.08.04.13.09.21; author fvdl; state Exp; branches; next 1.4; 1.4 date 98.07.04.23.29.54; author fvdl; state Exp; branches; next 1.3; 1.3 date 98.05.24.23.28.30; author fvdl; state Exp; branches; next 1.2; 1.2 date 98.04.09.00.03.09; author fvdl; state Exp; branches; next 1.1; 1.1 date 98.04.08.22.24.45; author fvdl; state Exp; branches; next ; 1.23.2.1 date 2003.12.05.17.05.26; author agc; state dead; branches; next ; desc @@ 1.27 log @Remove Mozilla Suite and friends. No longer maintained upstream, replaced by SeaMonkey. @ text @$NetBSD: patch-aa,v 1.26 2004/06/21 14:14:00 taya Exp $ diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in --- ../Orig/mozilla/config/autoconf.mk.in 2004-03-21 11:31:17.000000000 +0900 +++ ./config/autoconf.mk.in 2004-06-10 22:55:06.000000000 +0900 @@@@ -31,13 +31,13 @@@@ prefix = @@prefix@@ exec_prefix = @@exec_prefix@@ bindir = @@bindir@@ -includedir = @@includedir@@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir = @@includedir@@/$(MOZILLA_PKG_NAME) libdir = @@libdir@@ datadir = @@datadir@@ mandir = @@mandir@@ -idldir = @@datadir@@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +idldir = @@datadir@@/idl/$(MOZILLA_PKG_NAME) -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +mozappdir = $(libdir)/$(MOZILLA_PKG_NAME) mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) mrelibdir = $(mredir)/lib @ 1.26 log @ Update mozilla to 1.7 New features and fixes Browser * A new option to prevent sites from using JavaScript to block the browser's context menu. * Password Manager has a "show passwords" mode which will display saved passwords. You will need to enter your master password if you are using one. * The "Set As Wallpaper" feature now has a confirmation dialog. * Linux GTK2 builds have improved support for OS themes. * Cookie dialogs have been reworked to make them more usable. * Date handling, especially on OS X, has been improved. * It is now possible to fine-tune Mozilla's pop-up blocking using two preferences (dom.popup_maximum and dom.popup_allowed_events) but there's no UI for that yet. Even without a UI, users should notice a greater variety of pop-ups blocked (primarily mouseover pop-ups) and a limit of 20 or so open at one time - regardless of whether pop-up blocking is active. This will provide some protection from sites that open hundreds of windows in a loop. * Downloaded files are now moved to the target directory as soon as the user selects the desired location. This was the frequently reported bug 55690. * There is now user interface to activate Smooth Scrolling (Preferences -> Appearance). * Mozilla now supports basic FTP upload. Mail * Many improvements to Palm Sync. * IMAP IDLE support has been added. * Support for "MSN Authentication" and Secure Password * Authentication using SSPI NTLM auth for SMTP and POP3. * A new preference to "always use the default character encoding for replies" rather than using the encoding of the message being replied to. * Improvements to performance of downloading, viewing, and saving mail messages. * Support for multiple identities on the same mail account. See the Multiple Identity Support documentation for more details. * Support for relative paths for mail folders in prefs.js. This makes it easier to copy profiles around without having to fix up prefs.js afterwards. * You can now edit address lists containing "Last, First" style names. * When composing mail, you can now use the up and down arrow keys to scroll through the To/Cc/Bcc list. * All Mozilla LDAP queries now default to using LDAPv3 (previously, they used LDAPv2). Mozilla should gracefully fall back to v2 if v3 isn't found. Chatzilla * Chatzilla now supports zooming of fonts with keyboard shortcuts (Ctrl + and Ctrl -), as well as with the View menu. * Improved date handling; using the date/time format for the locale. * Support for the /ignore command. * The ability to change the font family and size. * Working custom sounds on Windows and Linux. * Improvements to the preferences panel and the user interface for half-op mode. Under the Hood * Size and performance have improved dramatically with this release. When compared to Mozilla 1.6, Mozilla 1.7 is 7% faster at startup, is 8% faster to open a window, has 9% faster page loading, and is 5% smaller in binary size. * A long-standing bug with CSS backgrounds on table elements has been fixed (standards mode only). * Support for Kerberos HTTP authentication using GSSAPI (benefits Unix-like platforms including Linux and OS X). * Support for smb:// URLs using the gnome-vfs library (only enabled in GTK2+XFT Linux builds). * Support for server push of XML documents using multipart/x-mixed-replace and XMLHttpRequest. * Liveconnect now works when a Java applet's codebase is in a different domain. * Support for the CSS3 opacity property. * Mozilla adds support for the onbeforeunload event. This lets web application developers add code that alerts the user about potential data-loss when closing a web application, or when leaving a HTML page with potentially sensitive information. * This release has a new SVG backend. The feature is not yet enabled in the mozilla.org releases but developers may wish to compile with this feature enabled. * Mozilla handles dynamic style changes much better (see bug 15608 for details.) * Mozilla has upgraded the NSS libraries to version 3.9. NSS 3.9 passes all the NISCC SSL/TLS and S/MIME tests (1.6 million test cases of invalid input data) without crashes or memory leaks. @ text @d1 1 a1 1 $NetBSD$ @ 1.25 log @Enable installation of pkgconfig files in mozilla-gtk2. This requires a new patch to fix paths to includes and libs. Bump PKGREVISION of mozilla-gtk2 to 1. @ text @d3 4 a6 3 --- config/autoconf.mk.in.orig 2003-10-30 22:11:05.000000000 +0100 +++ config/autoconf.mk.in @@@@ -29,13 +29,13 @@@@ MOZILLA_VERSION = @@MOZILLA_VERSION@@ d10 1 a10 1 -includedir = @@includedir@@/mozilla-$(MOZILLA_VERSION) d15 1 a15 1 -idldir = @@datadir@@/idl/mozilla-$(MOZILLA_VERSION) d18 1 a18 1 -mozappdir = $(libdir)/mozilla-$(MOZILLA_VERSION) d20 1 a20 1 mredir = $(libdir)/mre/mre-$(MOZILLA_VERSION) @ 1.24 log @ Update mozilla to 1.5.1 New Features and Fixes * Mozilla now includes a spellchecker for MailNews and Composer. * Additional MailNews improvements include: o Users can add header lines to *every* message sent out via a certain identity. o A common application hang with SSL-encrypted SMTP connections has been fixed. o Printing of the attachments list is now supported. o Users can now mark message as read by date. * Many great improvements to Mozilla Composer including: o Better resizing for images, tables, and absolutely positioned objects. o Support for absolutely positioned objects, movable on the canvas using the mouse. o Support for z-index management. o "Snap to grid" when moving an absolutely positioned object. o Source View now uses an editor instead of a simple textarea (allows find and replace). o Numerous fixes in caret management, inline styles handling, and CSS styles handling. * Improvements to tabbed browsing, including: o Tabs are now replaced when a bookmark group is loaded. This can be changed to the old "append" behavior in the Tabbed browsing preferences. o Back and Forward navigation for tabbed browsing and bookmark groups has been improved. Users can now use the back button after loading a bookmark group to restore the previous set of tabs. o Closing a window with multiple tabs now prompts the user with a confirmation dialog (which can be disabled for future close operations). * ChatZilla, Mozilla's internet relay chat (IRC) client, has had a major overhaul bringing logging and many additional improvements. * DOM Inspector can now display the #document node (the document root). * It is now possible to jump from the JavaScript console to the relevant line in the View Source Window. * Mozilla's view source now displays line and column numbers in the status bar. * A quicksearch filter has been implemented for about:config. * Gecko now supports setting color for
. * The '::' notation for CSS pseudo-elements is now supported. The old ':' notation is still supported only for pseudo-elements in CSS2 (:first-line, :first-letter, :before, :after) and the various :-moz-tree-* pseudo-elements. * Unstyled XML display has been improved. * Some Windows GDI problems in Mozilla have been resolved. * A common problem collapsing the URL bar popup on Windows has been fixed. * Mozilla has improved performance, stability, standards support and Web compatibility. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.23 2003/03/17 16:07:33 taya Exp $ d3 19 a21 12 diff -ru ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c ./nsprpub/pr/src/pthreads/ptthread.c --- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c 2002-08-28 23:42:52.000000000 +0900 +++ ./nsprpub/pr/src/pthreads/ptthread.c 2003-03-14 16:58:37.000000000 +0900 @@@@ -360,7 +360,7 @@@@ /* * Linux doesn't have pthread_attr_setstacksize. */ -#ifndef LINUX +#if !defined(LINUX) && !defined(NETBSD) rv = pthread_attr_setstacksize(&tattr, stackSize); PR_ASSERT(0 == rv); #endif @ 1.23 log @ Update mozilla to 1.3 What's new from release notes * Mozilla Mail has junk-mail classification. With some initial "training" the client can identify and segregate spam messages from good messages. To see more about Mozilla's junk-mail classification, visit the Mozilla Spam Filtering page. * Newsgroup filters have been implemented. * An initial implementation of Mozilla Midas, rich text editing controls, has landed in Mozilla for 1.3. See the Midas page for more information. * Image auto sizing allows a user to toggle between full-sized images and images sized to fit the browser window. To give it a try, load a large image into the browser window or size the window to be much smaller. Now clicking on the image will alternate between auto-sized and full-sized. The feature can be disabled (or enabled) from the Appearance panel in Preferences. * Users can now "dynamically" switch profiles. To give it a try, from the tools menu select "Switch Profile..." * Find as you type, formerly known as type ahead find, has a new preferences panel (Advanced: Keyboard Navigation). * When installed, Chatzilla now has a normal Mozilla preferences panel. * Mozilla 1.3 also includes fixes for performance, standards compliance and site compatibility. * Mozilla has a new splash screen. We already know. Please don't report this to Bugzilla. Thanks @ text @d1 1 a1 1 $NetBSD$ @ 1.23.2.1 log @Pullup mozilla-1.5.1 to pkgsrc-2003Q4 branch, requested by Grant Beattie. Module Name: pkgsrc Committed By: taya Date: Thu Nov 27 00:03:53 UTC 2003 Modified Files: pkgsrc/www/mozilla: Makefile PLIST buildlink2.mk distinfo pkgsrc/www/mozilla/patches: patch-ab patch-ac patch-ad patch-ae patch-af patch-ag patch-am patch-aw patch-ba patch-bb patch-be patch-bm patch-bn patch-bo patch-bp Added Files: pkgsrc/www/mozilla/patches: patch-bq Removed Files: pkgsrc/www/mozilla/patches: patch-aa Log Message: Update mozilla to 1.5.1 New Features and Fixes * Mozilla now includes a spellchecker for MailNews and Composer. * Additional MailNews improvements include: o Users can add header lines to *every* message sent out via a certain identity. o A common application hang with SSL-encrypted SMTP connections has been fixed. o Printing of the attachments list is now supported. o Users can now mark message as read by date. * Many great improvements to Mozilla Composer including: o Better resizing for images, tables, and absolutely positioned objects. o Support for absolutely positioned objects, movable on the canvas using the mouse. o Support for z-index management. o "Snap to grid" when moving an absolutely positioned object. o Source View now uses an editor instead of a simple textarea (allows find and replace). o Numerous fixes in caret management, inline styles handling, and CSS styles handling. * Improvements to tabbed browsing, including: o Tabs are now replaced when a bookmark group is loaded. This can be changed to the old "append" behavior in the Tabbed browsing preferences. o Back and Forward navigation for tabbed browsing and bookmark groups has been improved. Users can now use the back button after loading a bookmark group to restore the previous set of tabs. o Closing a window with multiple tabs now prompts the user with a confirmation dialog (which can be disabled for future close operations). * ChatZilla, Mozilla's internet relay chat (IRC) client, has had a major overhaul bringing logging and many additional improvements. * DOM Inspector can now display the #document node (the document root). * It is now possible to jump from the JavaScript console to the relevant line in the View Source Window. * Mozilla's view source now displays line and column numbers in the status bar. * A quicksearch filter has been implemented for about:config. * Gecko now supports setting color for
. * The '::' notation for CSS pseudo-elements is now supported. The old ':' notation is still supported only for pseudo-elements in CSS2 (:first-line, :first-letter, :before, :after) and the various :-moz-tree-* pseudo-elements. * Unstyled XML display has been improved. * Some Windows GDI problems in Mozilla have been resolved. * A common problem collapsing the URL bar popup on Windows has been fixed. * Mozilla has improved performance, stability, standards support and Web compatibility. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.23 2003/03/17 16:07:33 taya Exp $ @ 1.22 log @Update mozilla to 1.2.1 What's new from Release notes: (See release notes for detail - http://www.mozilla.org/releases/mozilla1.2.1/) Browser * Type Ahead Find is a new feature that allows quick navigation when you type a succession of characters in the browser, matching the text in one or more links on the page. * Building on Mozilla's customizability, you can now show toolbars as text/icons/both (in the default Classic theme). We also have a few other usability improvements like image selection visualization (image highlights with system selection color when selected) and the removal of the confusing toolbar grippies. * Improvements to native look and feel in both the browser interface and the browser content area. We now support most native GTK themes in Mozilla which means that your Mozilla toolbars and other widgets will pick up the GTK theme look and feel. We also support native look and feel for web content like form controls under windowsXP. * Making tabbed browsing even more useful, you can launch the browser with a group of bookmarks as your start page. This loads several pages into tabs at startup. * Keyboard access is greatly improved including additional accesskeys for menus, other ui elements and page elements. * We have a new features that utilizes browser idle time to download or prefetch documents that the user might visit in the near future. * XML prettyprinting, similar to IEs default-view for XML is now available in Mozilla. Mail * Mozilla Mail has a new "filter after the fact" capability so users can create a filter and then run that filter on already downloaded mail. Filter logging has also been implemented which allows power users to see a log of all of the filter actions. * In mail you can now select and copy text from message headers and you can now drag and drop from the message search results window. @ text @d4 2 a5 2 --- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c Wed Aug 28 23:42:52 2002 +++ ./nsprpub/pr/src/pthreads/ptthread.c Wed Nov 13 14:21:15 2002 @ 1.21 log @ fix PLIST merge PLIST-* to PLIST improve install script to share with mozilla-1.0 branch(not imported yet) @ text @d4 2 a5 2 --- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c Wed Jul 24 13:06:42 2002 +++ ./nsprpub/pr/src/pthreads/ptthread.c Wed Aug 28 11:21:40 2002 @ 1.20 log @ add pthread support.(but disabled now) @ text @d4 2 a5 2 --- ../Orig/mozilla/nsprpub/pr/src/pthreads/ptthread.c Wed Apr 10 12:17:39 2002 +++ ./nsprpub/pr/src/pthreads/ptthread.c Sun Jun 30 16:30:39 2002 @ 1.19 log @ Update to mozilla 0.8.1 See the release notes for detail: http://www.mozilla.org/releases/mozilla0.8.1/ Currently only tested(and worked) on -current/i386. Tested on 1.5.1_ALPHA/mac68k, but did not work(still investigating). @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 2001/02/17 11:03:28 taya Exp $ d3 12 a14 20 diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in --- ../Orig/mozilla/config/autoconf.mk.in Wed Feb 7 09:10:17 2001 +++ ./config/autoconf.mk.in Sat Feb 17 02:07:16 2001 @@@@ -76,7 +76,6 @@@@ NO_NETSCAPE_STATIC = @@NO_STATIC_LIB@@ ENABLE_TESTS = @@ENABLE_TESTS@@ BUILD_IDLC = @@BUILD_IDLC@@ -NEED_BASE_DLL_NAME_ALSO = @@NEED_BASE_DLL_NAME_ALSO@@ MOZ_ENDER_LITE = @@MOZ_ENDER_LITE@@ MOZ_LDAP_XPCOM = @@MOZ_LDAP_XPCOM@@ XPCOM_USE_LEA = @@XPCOM_USE_LEA@@ @@@@ -255,8 +254,6 @@@@ MKSHLIB_UNFORCE_ALL = @@MKSHLIB_UNFORCE_ALL@@ DSO_LDOPTS = @@DSO_LDOPTS@@ DLL_SUFFIX = @@DLL_SUFFIX@@ -SHLIB_LDSTARTFILE = @@SHLIB_LDSTARTFILE@@ -SHLIB_LDENDFILE = @@SHLIB_LDENDFILE@@ endif NO_LD_ARCHIVE_FLAGS = @@NO_LD_ARCHIVE_FLAGS@@ @ 1.18 log @ Update to mozilla 0.8 See release notes for detail. http://www.mozilla.org/releases/mozilla0.8/ @ text @d1 1 a1 1 $NetBSD$ @ 1.17 log @ Update to mozilla 0.7 Most major change is SSL daemon(psm) has included. See release notes for detail. http://www.mozilla.org/releases/mozilla0.7/ @ text @d4 3 a6 3 --- ../Orig/mozilla/config/autoconf.mk.in Wed Dec 27 07:19:14 2000 +++ ./config/autoconf.mk.in Mon Jan 15 15:36:23 2001 @@@@ -75,7 +75,6 @@@@ d13 2 a14 2 @@@@ -243,8 +242,6 @@@@ @ 1.16 log @Arrange to add -Wl,--export-dynamic to BIN_FLAGS, and nuke the (unused and essentially complete bullshit) NEED_BASE_DLL_NAME_ALSO. @ text @d3 4 a6 3 --- config/autoconf.mk.in.orig Fri Sep 15 00:19:30 2000 +++ config/autoconf.mk.in Sat Jan 13 19:25:34 2001 @@@@ -72,7 +72,6 @@@@ d14 1 a14 1 @@@@ -238,8 +237,6 @@@@ @ 1.15 log @Update pkg to Mozilla Milestone 18 (pkg from Taya via mail to tech-pkg). Lot of changes, for details see http://www.mozilla.org/projects/seamonkey/release-notes/m18-detail.html#whats_new This is supposed to improve speed and stability. I am commiting this now (during freeze) because (a) about nothing depends on it and it is know to realy only work on i386/elf yet (although some changes to fix problems on MacPPC, sparc and mips have been integrated); and (b) Taya mentioned update problems (which I couldn't reproduce) from M17 to M18, so it's better to avoid these by having the newer version in the tagged pkgsrc. @ text @d3 11 a13 4 diff -ru /usr/local/src/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in --- /usr/local/src/mozilla/config/autoconf.mk.in Fri Sep 15 09:19:30 2000 +++ ./config/autoconf.mk.in Fri Oct 13 11:23:07 2000 @@@@ -238,8 +238,6 @@@@ @ 1.14 log @Update pkg to new version send by Taya via e-mail (as requested by Tron). @ text @d3 4 a6 3 --- config/autoconf.mk.in.orig Wed Jul 19 21:53:00 2000 +++ config/autoconf.mk.in Wed Aug 16 22:16:56 2000 @@@@ -236,8 +236,6 @@@@ @ 1.13 log @Update "mozilla" package to 5.0 milestone 17. This release is completely different from the 19980728 snapshot on which our last package version was based. The most important change is the new GTK+ based GUI and the gecko rendering engine. This update wouldn't exist without the work of Shin'ichiro TAYA who not only contributed several NetBSD related fixes to the mozilla sources but also created the base for this NetBSD package. @ text @@ 1.12 log @Add RCS IDs. @ text @d3 11 a13 8 diff -ru ../mozilla-current.orig/mozilla/build/unix/nspr_my_config.mk.in ./build/unix/nspr_my_config.mk.in --- ../mozilla-current.orig/mozilla/build/unix/nspr_my_config.mk.in Tue Jun 15 08:36:02 1999 +++ ./build/unix/nspr_my_config.mk.in Sun Jun 4 14:06:22 2000 @@@@ -5,3 +5,4 @@@@ NS_USE_NATIVE=@@MOZ_NSPRENV_NS_USE_NATIVE@@ MOZILLA_CLIENT=@@MOZ_NSPRENV_MOZILLA_CLIENT@@ CLASSIC_NSPR=@@MOZ_NSPRENV_CLASSIC_NSPR@@ +OBJECT_FMT=@@OBJECT_FMT@@ @ 1.11 log @Add Taya-san's patches. @ text @d1 2 @ 1.10 log @Obsolete. @ text @d1 8 a8 121 $NetBSD: patch-aa,v 1.9 1998/11/09 01:25:13 fvdl Exp $ *** network/main/prefetch.c.orig Thu Oct 8 22:24:29 1998 --- network/main/prefetch.c Sat Nov 7 20:02:13 1998 *************** *** 76,82 **** /* Returns bool to indicate if its OK to prefetch the specified URL. we don't prefetch mailto:, file:, etc. */ ! PRIVATE Bool pre_OKToPrefetch(char* url) { int type; --- 76,82 ---- /* Returns bool to indicate if its OK to prefetch the specified URL. we don't prefetch mailto:, file:, etc. */ ! MODULE_PRIVATE Bool pre_OKToPrefetch(char* url) { int type; *************** *** 101,107 **** return FALSE; } ! PRIVATE void pre_Finished(URL_Struct* url_struct, int status, MWContext* context) { /* this should change to update the colors of --- 101,107 ---- return FALSE; } ! MODULE_PRIVATE void pre_Finished(URL_Struct* url_struct, int status, MWContext* context) { /* this should change to update the colors of *** nsprpub/config/NetBSD.mk.orig Thu Oct 8 22:24:51 1998 --- nsprpub/config/NetBSD.mk Mon Nov 9 01:49:34 1998 *************** *** 44,49 **** --- 44,51 ---- ARCH = netbsd + DLL_SUFFIX = so.1.0 + DSO_CFLAGS = -fPIC DSO_LDFLAGS = DSO_LDOPTS = -Bshareable *************** *** 55,60 **** --- 57,66 ---- endif ifeq ($(OS_TEST),pmax) DSO_LDOPTS = -shared + endif + + ifdef LIBRUNPATH + DSO_LDOPTS += -R$(LIBRUNPATH) endif MKSHLIB = $(LD) $(DSO_LDOPTS) *** nsprpub/pr/include/md/_netbsd.h.orig Thu Oct 8 22:25:16 1998 --- nsprpub/pr/include/md/_netbsd.h Sat Nov 7 20:13:58 1998 *************** *** 48,53 **** --- 48,55 ---- #define HAVE_DLL #define USE_DLFCN #define _PR_HAVE_SOCKADDR_LEN + #define _PR_NO_LARGE_FILES + #define _PR_STAT_HAS_ST_ATIMESPEC #define USE_SETJMP *** cmd/xfe/Makefile.orig Thu Oct 8 22:34:06 1998 --- cmd/xfe/Makefile Mon Nov 9 01:48:42 1998 *************** *** 749,758 **** ifeq ($(OS_ARCH),NetBSD) # Work around linker semantics that will never find our own libutil on 1.3.x - ifeq ($(shell uname -r | cut -f2 -d.),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) --- 749,756 ---- *** config/NetBSD.mk.orig Thu Oct 8 22:28:25 1998 --- config/NetBSD.mk Mon Nov 9 01:49:13 1998 *************** *** 41,47 **** # Don't define BSD, because it's already defined in /usr/include/sys/param.h. PLATFORM_FLAGS = -DNETBSD $(DSO_CFLAGS) MOVEMAIL_FLAGS = -DHAVE_STRERROR ! PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK PDJAVA_FLAGS = -mx128m OS_GPROF_FLAGS = -pg LD_FLAGS = -L/usr/X11R6/lib -lXm --- 41,47 ---- # Don't define BSD, because it's already defined in /usr/include/sys/param.h. PLATFORM_FLAGS = -DNETBSD $(DSO_CFLAGS) MOVEMAIL_FLAGS = -DHAVE_STRERROR ! PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK -DHAVE_SYSERRLIST PDJAVA_FLAGS = -mx128m OS_GPROF_FLAGS = -pg LD_FLAGS = -L/usr/X11R6/lib -lXm *************** *** 101,104 **** --- 101,108 ---- DSO_LDOPTS = -shared else DSO_LDOPTS = -Bshareable + endif + + ifdef LIBRUNPATH + DSO_LDOPTS += -R$(LIBRUNPATH) endif @ 1.9 log @Update to 19981008 version. Keep the .so files at 1.0, bumping the major (which is currently unused) to work around linker semantics isn't quite right, since, for example, libjpeg might also conflict, not just libutil, etc. Just always link in the mozilla libutil statically for now (it's tiny). Package needs to be updated to use the pkg libz and libjpeg in stead of the private copied sometime. Note that this version has a non-functional URL Bar, File->Open Page must be used. This is fixed in mozilla-current, but we can't create a package for this. Still, this version fixes a lot of other problems. @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @The linking with libutil _still_ didn't work on a real 1.3.2 system. Fix this the only way that works with a stock 1.3.x ld: bump the major numbers to 5. Split out affected patches from the patch bundle. @ text @d1 3 a3 135 $NetBSD: patch-aa,v 1.7 1998/08/08 20:33:59 fvdl Exp $ *** 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 #include #include + #ifndef MOTIF11 + #include + #endif #include #include #include *** 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 /* for statfs() */ + #elif defined(NETBSD) + #include /* for statfs() */ #define STATFS statfs #else #include /* for statfs() */ *** 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 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 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 ! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif --- 40,46 ---- #include "xfe.h" #include ! #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 d6 7 a12 7 /* For sys_errlist and sys_nerr */ #include ! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif d14 7 a20 45 /* For sys_errlist and sys_nerr */ #include ! #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 d22 2 a23 99 *** 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 #else ! #if defined(BSDI) && !defined(BSDI_2) #include #endif #include --- 29,35 ---- #ifdef XP_MAC #include #else ! #if (defined(BSDI) && !defined(BSDI_2)) || defined(NETBSD) #include #endif #include *** 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 ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif --- 81,87 ---- #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__) #include #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 ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif --- 47,53 ---- #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__) #include #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 **** } d30 2 a31 2 --- 177,183 ---- } d38 2 a39 2 *** 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 d41 2 a42 2 *** 60,66 **** #endif /* XP_OS2 */ d44 1 a44 7 #ifdef XP_UNIX ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif #endif /* XP_UNIX */ --- 60,66 ---- #endif /* XP_OS2 */ d46 5 a50 7 #ifdef XP_UNIX ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) || defined(__NetBSD__) #include #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 d52 70 a121 16 *** 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 @ 1.7 log @Update to re-enable workaround for 1.3.x (a.out) ld.so link semantics, which was inadvertently disabled. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 1998/08/07 11:14:25 agc Exp $ a65 25 *** 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 \ a342 36 *** config/NetBSD.mk.orig Tue Jul 28 06:44:26 1998 --- config/NetBSD.mk Sat Aug 8 21:09:47 1998 *************** *** 38,44 **** MOTIFLIB = OS_LIBS = ! OS_MINOR = $(shell echo $(OS_VERSION) | cut -f2 -d.) # Don't define BSD, because it's already defined in /usr/include/sys/param.h. PLATFORM_FLAGS = -DNETBSD $(DSO_CFLAGS) --- 38,44 ---- MOTIFLIB = OS_LIBS = ! OS_MINOR = $(shell echo $(OS_RELEASE) | cut -f2 -d.) # Don't define BSD, because it's already defined in /usr/include/sys/param.h. PLATFORM_FLAGS = -DNETBSD $(DSO_CFLAGS) *************** *** 89,95 **** MKSHLIB = $(LD) $(DSO_LDOPTS) ! DSO_CFLAGS = -fpic DSO_LDFLAGS = # --- 89,95 ---- MKSHLIB = $(LD) $(DSO_LDOPTS) ! DSO_CFLAGS = -fPIC DSO_LDFLAGS = # @ 1.6 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d368 19 a386 2 *** config/NetBSD.mk.orig Tue Aug 4 13:31:22 1998 --- config/NetBSD.mk Tue Aug 4 13:30:45 1998 @ 1.5 log @Update to 19980728 version. Use -fPIC instead of -fpic everywhere. Provide a link ${PREFIX}/bin/mozilla -> ${PREFIX}/bin/moz-export to make usage a bit more obvious. @ text @d1 2 @ 1.4 log @Update for 0603 version. @ text @d1 2 a2 2 *** js/src/prmjtime.c.orig Wed Jun 3 09:49:29 1998 --- js/src/prmjtime.c Tue Jun 30 15:58:42 1998 d4 3 a6 15 *** 289,295 **** PRInt64 maxtimet; struct tm tm; PRMJTime prtm; ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) struct tm *ptm; #endif --- 289,295 ---- PRInt64 maxtimet; struct tm tm; PRMJTime prtm; ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined ( SNI ) || defined( NETBSD ) struct tm *ptm; #endif d8 12 d21 13 a33 18 *** 308,314 **** } 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; --- 308,314 ---- } 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; *** cmd/xfe/src/HTMLView.cpp.orig Wed Jun 3 10:04:51 1998 --- cmd/xfe/src/HTMLView.cpp Tue Jun 30 15:54:55 1998 d35 1 a35 1 *** 345,351 **** d43 1 a43 1 --- 345,351 ---- d51 2 a52 2 *** cmd/xfe/src/context_funcs.cpp.orig Wed Jun 3 10:04:58 1998 --- cmd/xfe/src/context_funcs.cpp Tue Jun 30 15:54:56 1998 d54 2 a55 2 *** 71,76 **** --- 71,78 ---- d64 2 a65 2 *** cmd/xfe/Microline3.0/XmL/Grid.c.orig Wed Jun 3 10:03:33 1998 --- cmd/xfe/Microline3.0/XmL/Grid.c Tue Jun 30 15:54:56 1998 d67 2 a68 16 *** 30,35 **** --- 30,38 ---- #include #include #include + #ifndef MOTIF11 + #include + #endif #include #include #include *** cmd/xfe/Makefile.orig Wed Jun 3 10:03:22 1998 --- cmd/xfe/Makefile Tue Jun 30 15:54:56 1998 *************** *** 536,541 **** --- 536,555 ---- d89 2 a90 2 *** cmd/xfe/mozilla.c.orig Wed Jun 3 10:03:26 1998 --- cmd/xfe/mozilla.c Tue Jun 30 15:54:57 1998 d92 2 a93 2 *** 1890,1895 **** --- 1890,1897 ---- d103 1 a103 1 *** 3496,3502 **** d111 1 a111 1 --- 3498,3504 ---- d119 2 a120 2 *** cmd/xfe/dialogs.c.orig Wed Jun 3 10:03:23 1998 --- cmd/xfe/dialogs.c Tue Jun 30 15:54:57 1998 d122 1 a122 1 *** 239,245 **** d130 1 a130 1 --- 239,245 ---- d138 2 a139 2 *** cmd/xfe/movemail.c.orig Wed Jun 3 10:03:26 1998 --- cmd/xfe/movemail.c Tue Jun 30 15:54:57 1998 d157 2 a158 2 *** cmd/xfe/prefdialogs.c.orig Wed Jun 3 10:03:26 1998 --- cmd/xfe/prefdialogs.c Tue Jun 30 15:54:58 1998 d160 1 a160 1 *** 75,81 **** d168 1 a168 1 --- 75,81 ---- d176 2 a177 19 *** cmd/stubfe/Makefile.orig Wed Jun 3 10:03:20 1998 --- cmd/stubfe/Makefile Tue Jun 30 15:54:58 1998 *************** *** 542,547 **** --- 542,553 ---- endif ######################################## + # NetBSD + ifeq ($(OS_ARCH),NetBSD) + OTHER_LIBS = -lm $(OS_LIBS) + endif + + ######################################## # BSDI ifeq ($(OS_ARCH),BSD_OS) OTHER_LIBS = -lm $(OS_LIBS) *** dbm/include/mcom_db.h.orig Wed Jun 3 09:54:50 1998 --- dbm/include/mcom_db.h Tue Jun 30 15:54:58 1998 d195 2 a196 2 *** lib/xp/xp_file.c.orig Wed Jun 3 09:50:28 1998 --- lib/xp/xp_file.c Tue Jun 30 15:54:58 1998 d198 6 a203 370 *** 836,842 **** case xpMimeTypes: case xpSocksConfig: case xpMailFolder: ! #ifdef BSDI /* In bsdi, mkdir fails if the directory name is terminated * with a '/'. - dp */ --- 836,842 ---- case xpMimeTypes: case xpSocksConfig: case xpMailFolder: ! #if defined(BSDI) || defined(NETBSD) /* In bsdi, mkdir fails if the directory name is terminated * with a '/'. - dp */ *** nsprpub/pr/src/md/unix/Makefile.orig Wed Jun 3 09:54:11 1998 --- nsprpub/pr/src/md/unix/Makefile Tue Jun 30 15:55:21 1998 *************** *** 57,62 **** --- 57,66 ---- freebsd.c \ $(NULL) + NETBSD_CSRCS = \ + netbsd.c \ + $(NULL) + BSDI_CSRCS = \ bsdi.c \ $(NULL) *************** *** 122,127 **** --- 126,134 ---- endif ifeq ($(OS_ARCH),FreeBSD) CSRCS += $(FREEBSD_CSRCS) + endif + ifeq ($(OS_ARCH),NetBSD) + CSRCS += $(NETBSD_CSRCS) endif ifeq ($(OS_ARCH),BSD_OS) CSRCS += $(BSDI_CSRCS) *** nsprpub/pr/src/md/unix/objs.mk.orig Wed Jun 3 09:54:11 1998 --- nsprpub/pr/src/md/unix/objs.mk Tue Jun 30 15:55:21 1998 *************** *** 49,54 **** --- 49,58 ---- freebsd.c \ $(NULL) + NETBSD_CSRCS = \ + netbsd.c \ + $(NULL) + BSDI_CSRCS = \ bsdi.c \ $(NULL) *************** *** 115,120 **** --- 119,127 ---- endif ifeq ($(OS_ARCH),FreeBSD) CSRCS += $(FREEBSD_CSRCS) + endif + ifeq ($(OS_ARCH),NetBSD) + CSRCS += $(NETBSD_CSRCS) endif ifeq ($(OS_ARCH),BSD_OS) CSRCS += $(BSDI_CSRCS) *** nsprpub/pr/src/md/unix/unix.c.orig Wed Jun 3 09:54:11 1998 --- nsprpub/pr/src/md/unix/unix.c Tue Jun 30 15:55:22 1998 *************** *** 48,54 **** || defined(SUNOS4) || defined(NCR) || defined(RHAPSODY) #define _PRSockLen_t int #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ ! || defined(UNIXWARE) #define _PRSockLen_t size_t #else #error "Cannot determine architecture" --- 48,54 ---- || defined(SUNOS4) || defined(NCR) || defined(RHAPSODY) #define _PRSockLen_t int #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ ! || defined(UNIXWARE) || defined(NETBSD) #define _PRSockLen_t size_t #else #error "Cannot determine architecture" *** nsprpub/pr/src/md/unix/unix_errors.c.orig Wed Jun 3 09:54:11 1998 --- nsprpub/pr/src/md/unix/unix_errors.c Tue Jun 30 16:10:32 1998 *************** *** 160,166 **** case EROFS: PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 160,166 ---- case EROFS: PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 185,191 **** PR_SetError(PR_PENDING_INTERRUPT_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: #endif --- 185,191 ---- PR_SetError(PR_PENDING_INTERRUPT_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 278,284 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 278,284 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 329,335 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: #endif --- 329,335 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 395,401 **** case EIO: PR_SetError(PR_IO_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 395,401 ---- case EIO: PR_SetError(PR_IO_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 432,438 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: #endif --- 432,438 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 1345,1351 **** PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) case EMULTIHOP: case ENOLINK: #endif --- 1345,1351 ---- PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(RHAPSODY) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *** nsprpub/pr/src/md/unix/uxwrap.c.orig Wed Jun 3 09:54:11 1998 --- nsprpub/pr/src/md/unix/uxwrap.c Tue Jun 30 15:55:22 1998 *************** *** 324,329 **** --- 324,331 ---- int poll(struct pollfd filedes[], unsigned int nfds, int timeout) #elif defined(HPUX9) int poll(struct pollfd filedes[], int nfds, int timeout) + #elif defined(NETBSD) + int poll(struct pollfd *filedes, nfds_t nfds, int timeout) #else int poll(struct pollfd *filedes, unsigned long nfds, int timeout) #endif *** nsprpub/pr/src/md/unix/netbsd.c.orig Tue Jun 30 15:55:22 1998 --- nsprpub/pr/src/md/unix/netbsd.c Tue Jun 30 15:55:22 1998 *************** *** 0 **** --- 1,102 ---- + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + + #include "primpl.h" + + #include + #include + #include + + void _MD_EarlyInit(void) + { + /* + * Ignore FPE because coercion of a NaN to an int causes SIGFPE + * to be raised. + */ + struct sigaction act; + + act.sa_handler = SIG_IGN; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGFPE, &act, 0); + } + + PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) + { + #ifndef _PR_PTHREADS + if (isCurrent) { + (void) sigsetjmp(CONTEXT(t), 1); + } + *np = sizeof(CONTEXT(t)) / sizeof(PRWord); + return (PRWord *) CONTEXT(t); + #else + *np = 0; + return NULL; + #endif + } + + #ifndef _PR_PTHREADS + void + _MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri) + { + return; + } + + PRStatus + _MD_InitializeThread(PRThread *thread) + { + return PR_SUCCESS; + } + + PRStatus + _MD_WAIT(PRThread *thread, PRIntervalTime ticks) + { + PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); + _PR_MD_SWITCH_CONTEXT(thread); + return PR_SUCCESS; + } + + PRStatus + _MD_WAKEUP_WAITER(PRThread *thread) + { + if (thread) { + PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); + } + return PR_SUCCESS; + } + + /* These functions should not be called for OSF1 */ + void + _MD_YIELD(void) + { + PR_NOT_REACHED("_MD_YIELD should not be called for OSF1."); + } + + PRStatus + _MD_CREATE_THREAD( + PRThread *thread, + void (*start) (void *), + PRThreadPriority priority, + PRThreadScope scope, + PRThreadState state, + PRUint32 stackSize) + { + PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1."); + return PR_FAILURE; + } + #endif /* ! _PR_PTHREADS */ *** nsprpub/pr/src/md/prosdep.c.orig Wed Jun 3 09:54:08 1998 --- nsprpub/pr/src/md/prosdep.c Tue Jun 30 16:12:37 1998 *************** *** 42,48 **** /* Get page size */ #ifdef XP_UNIX #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ ! || defined FREEBSD || defined RHAPSODY _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ --- 42,48 ---- /* Get page size */ #ifdef XP_UNIX #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ ! || defined FREEBSD || defined RHAPSODY || defined(NETBSD) _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ *** nsprpub/pr/src/pthreads/ptio.c.orig Wed Jun 3 09:54:15 1998 --- nsprpub/pr/src/pthreads/ptio.c Tue Jun 30 15:55:22 1998 *************** *** 75,81 **** #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ || defined(OSF1) || defined(SOLARIS) \ || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ ! || defined(FREEBSD) #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" --- 75,81 ---- #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ || defined(OSF1) || defined(SOLARIS) \ || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ ! || defined(FREEBSD) || defined(NETBSD) #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" *************** *** 2506,2512 **** d206 6 a211 27 #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ ! || defined(AIX) || defined(LINUX) || defined(FREEBSD) #define _PR_FCNTL_FLAGS O_NONBLOCK #else #error "Can't determine architecture" --- 2506,2512 ---- #endif #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ ! || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) #define _PR_FCNTL_FLAGS O_NONBLOCK #else #error "Can't determine architecture" *** nsprpub/pr/src/pthreads/ptthread.c.orig Wed Jun 3 09:54:15 1998 --- nsprpub/pr/src/pthreads/ptthread.c Tue Jun 30 15:55:23 1998 *************** *** 194,204 **** if (EPERM != pt_schedpriv) { ! #if !defined(_PR_DCETHREADS) && !defined(FREEBSD) struct sched_param schedule; #endif ! #if !defined(FREEBSD) rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED); PR_ASSERT(0 == rv); a212 1 --- 194,204 ---- a213 10 if (EPERM != pt_schedpriv) { ! #if !defined(_PR_DCETHREADS) && !defined(FREEBSD) && !defined(NETBSD) struct sched_param schedule; #endif ! #if !defined(FREEBSD) && !defined(NETBSD) rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED); PR_ASSERT(0 == rv); #endif d215 18 a232 50 *** 208,214 **** #if defined(_PR_DCETHREADS) rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority)); PR_ASSERT(0 == rv); ! #elif !defined(FREEBSD) rv = pthread_attr_getschedparam(&tattr, &schedule); PR_ASSERT(0 == rv); schedule.sched_priority = pt_PriorityMap(priority); --- 208,214 ---- #if defined(_PR_DCETHREADS) rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority)); PR_ASSERT(0 == rv); ! #elif !defined(FREEBSD) && !defined(NETBSD) rv = pthread_attr_getschedparam(&tattr, &schedule); PR_ASSERT(0 == rv); schedule.sched_priority = pt_PriorityMap(priority); *************** *** 550,556 **** rv = pthread_setprio(thred->id, pt_PriorityMap(newPri)); /* pthread_setprio returns the old priority */ PR_ASSERT(-1 != rv); ! #elif !defined(FREEBSD) if (EPERM != pt_schedpriv) { int policy; --- 550,556 ---- rv = pthread_setprio(thred->id, pt_PriorityMap(newPri)); /* pthread_setprio returns the old priority */ PR_ASSERT(-1 != rv); ! #elif !defined(FREEBSD) && !defined(NETBSD) if (EPERM != pt_schedpriv) { int policy; *************** *** 751,757 **** * conflict with the use of these two signals in our GC support. * So we don't know how to support GC on Linux pthreads. */ ! #if !defined(LINUX) && !defined(FREEBSD) init_pthread_gc_support(); #endif --- 751,757 ---- * conflict with the use of these two signals in our GC support. * So we don't know how to support GC on Linux pthreads. */ ! #if !defined(LINUX) && !defined(FREEBSD) && !defined(NETBSD) init_pthread_gc_support(); #endif d234 6 a239 7 *** 1036,1042 **** pthread_cond_signal(&me->suspendResumeCV); while (me->suspend & PT_THREAD_SUSPENDED) { ! #if !defined(FREEBSD) /*XXX*/ PRIntn rv; sigwait(&sigwait_set, &rv); d241 4 a244 71 --- 1036,1042 ---- pthread_cond_signal(&me->suspendResumeCV); while (me->suspend & PT_THREAD_SUSPENDED) { ! #if !defined(FREEBSD) && !defined(NETBSD) /*XXX*/ PRIntn rv; sigwait(&sigwait_set, &rv); #endif *** nsprpub/pr/include/md/_pth.h.orig Wed Jun 3 09:54:00 1998 --- nsprpub/pr/include/md/_pth.h Tue Jun 30 15:55:23 1998 *************** *** 69,75 **** (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t))) #define PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ ! || defined(HPUX) || defined(LINUX) || defined(FREEBSD) #define PTHREAD_ZERO_THR_HANDLE(t) (t) = 0 #define PTHREAD_THR_HANDLE_IS_ZERO(t) (t) == 0 #define PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) --- 69,76 ---- (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t))) #define PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ ! || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \ ! || defined(NETBSD) #define PTHREAD_ZERO_THR_HANDLE(t) (t) = 0 #define PTHREAD_THR_HANDLE_IS_ZERO(t) (t) == 0 #define PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) *************** *** 134,140 **** * These platforms don't have pthread_atfork() */ #if defined(_PR_DCETHREADS) || defined(FREEBSD) \ ! || (defined(LINUX) && defined(__alpha)) #define PT_NO_ATFORK #endif --- 135,142 ---- * These platforms don't have pthread_atfork() */ #if defined(_PR_DCETHREADS) || defined(FREEBSD) \ ! || (defined(LINUX) && defined(__alpha)) \ ! || defined(NETBSD) #define PT_NO_ATFORK #endif *************** *** 142,148 **** * These platforms don't have sigtimedwait() */ #if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX) \ ! || defined(FREEBSD) #define PT_NO_SIGTIMEDWAIT #endif --- 144,150 ---- * These platforms don't have sigtimedwait() */ #if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX) \ ! || defined(FREEBSD) || defined(NETBSD) #define PT_NO_SIGTIMEDWAIT #endif *************** *** 184,190 **** */ #define PT_PRIO_MIN 1 #define PT_PRIO_MAX 127 ! #elif defined(FREEBSD) /* XXX */ #define PT_PRIO_MIN 0 #define PT_PRIO_MAX 126 d246 1 a246 510 --- 186,192 ---- */ #define PT_PRIO_MIN 1 #define PT_PRIO_MAX 127 ! #elif defined(FREEBSD) || defined(NETBSD)/* XXX */ #define PT_PRIO_MIN 0 #define PT_PRIO_MAX 126 #else *************** *** 213,219 **** #define PTHREAD_YIELD() sched_yield() #elif defined(LINUX) #define PTHREAD_YIELD() sched_yield() ! #elif defined(FREEBSD) #define PTHREAD_YIELD() pthread_yield() #else #error "Need to define PTHREAD_YIELD for this platform" --- 215,221 ---- #define PTHREAD_YIELD() sched_yield() #elif defined(LINUX) #define PTHREAD_YIELD() sched_yield() ! #elif defined(FREEBSD) || defined(NETBSD) #define PTHREAD_YIELD() pthread_yield() #else #error "Need to define PTHREAD_YIELD for this platform" *** nsprpub/pr/include/md/prosdep.h.orig Wed Jun 3 09:54:00 1998 --- nsprpub/pr/include/md/prosdep.h Tue Jun 30 15:55:23 1998 *************** *** 59,64 **** --- 59,67 ---- #elif defined(FREEBSD) #include "md/_freebsd.h" + #elif defined(NETBSD) + #include "md/_netbsd.h" + #elif defined(BSDI) #include "md/_bsdi.h" *** nsprpub/pr/include/md/_netbsd.cfg.orig Tue Jun 30 15:55:23 1998 --- nsprpub/pr/include/md/_netbsd.cfg Tue Jun 30 15:55:23 1998 *************** *** 0 **** --- 1,262 ---- + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + + #ifndef nspr_cpucfg___ + #define nspr_cpucfg___ + + #ifndef XP_UNIX + #define XP_UNIX + #endif + + #ifndef NETBSD + #define NETBSD + #endif + + #if defined(__i386__) || defined(__arm32__) + + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define HAVE_LONG_LONG + #undef HAVE_ALIGNED_DOUBLES + #undef HAVE_ALIGNED_LONGLONGS + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 + #define PR_BYTES_PER_INT64 8 + #define PR_BYTES_PER_LONG 4 + #define PR_BYTES_PER_FLOAT 4 + #define PR_BYTES_PER_DOUBLE 8 + #define PR_BYTES_PER_WORD 4 + #define PR_BYTES_PER_DWORD 8 + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + + #define PR_BITS_PER_BYTE 8 + #define PR_BITS_PER_SHORT 16 + #define PR_BITS_PER_INT 32 + #define PR_BITS_PER_INT64 64 + #define PR_BITS_PER_LONG 32 + #define PR_BITS_PER_FLOAT 32 + #define PR_BITS_PER_DOUBLE 64 + #define PR_BITS_PER_WORD 32 + + #define PR_BITS_PER_BYTE_LOG2 3 + #define PR_BITS_PER_SHORT_LOG2 4 + #define PR_BITS_PER_INT_LOG2 5 + #define PR_BITS_PER_INT64_LOG2 6 + #define PR_BITS_PER_LONG_LOG2 5 + #define PR_BITS_PER_FLOAT_LOG2 5 + #define PR_BITS_PER_DOUBLE_LOG2 6 + #define PR_BITS_PER_WORD_LOG2 5 + + #define PR_ALIGN_OF_SHORT 2 + #define PR_ALIGN_OF_INT 4 + #define PR_ALIGN_OF_LONG 4 + #define PR_ALIGN_OF_INT64 4 + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 4 + #define PR_ALIGN_OF_POINTER 4 + + #elif defined(__sparc__) + + #undef IS_LITTLE_ENDIAN 1 + #define IS_BIG_ENDIAN 1 + #define HAVE_LONG_LONG + #define HAVE_ALIGNED_DOUBLES + #define HAVE_ALIGNED_LONGLONGS + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 + #define PR_BYTES_PER_INT64 8 + #define PR_BYTES_PER_LONG 4 + #define PR_BYTES_PER_FLOAT 4 + #define PR_BYTES_PER_DOUBLE 8 + #define PR_BYTES_PER_WORD 4 + #define PR_BYTES_PER_DWORD 8 + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + + #define PR_BITS_PER_BYTE 8 + #define PR_BITS_PER_SHORT 16 + #define PR_BITS_PER_INT 32 + #define PR_BITS_PER_INT64 64 + #define PR_BITS_PER_LONG 32 + #define PR_BITS_PER_FLOAT 32 + #define PR_BITS_PER_DOUBLE 64 + #define PR_BITS_PER_WORD 32 + + #define PR_BITS_PER_BYTE_LOG2 3 + #define PR_BITS_PER_SHORT_LOG2 4 + #define PR_BITS_PER_INT_LOG2 5 + #define PR_BITS_PER_INT64_LOG2 6 + #define PR_BITS_PER_LONG_LOG2 5 + #define PR_BITS_PER_FLOAT_LOG2 5 + #define PR_BITS_PER_DOUBLE_LOG2 6 + #define PR_BITS_PER_WORD_LOG2 5 + + #define PR_ALIGN_OF_SHORT 2 + #define PR_ALIGN_OF_INT 4 + #define PR_ALIGN_OF_LONG 4 + #define PR_ALIGN_OF_INT64 8 + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 4 + + #elif defined(__alpha__) + #define IS_LITTLE_ENDIAN 1 + #undef IS_BIG_ENDIAN + #define IS_64 + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 + #define PR_BYTES_PER_INT64 8 + #define PR_BYTES_PER_LONG 8 + #define PR_BYTES_PER_FLOAT 4 + #define PR_BYTES_PER_DOUBLE 8 + #define PR_BYTES_PER_WORD 8 + #define PR_BYTES_PER_DWORD 8 + + #define PR_BITS_PER_BYTE 8 + #define PR_BITS_PER_SHORT 16 + #define PR_BITS_PER_INT 32 + #define PR_BITS_PER_INT64 64 + #define PR_BITS_PER_LONG 64 + #define PR_BITS_PER_FLOAT 32 + #define PR_BITS_PER_DOUBLE 64 + #define PR_BITS_PER_WORD 64 + + #define PR_BITS_PER_BYTE_LOG2 3 + #define PR_BITS_PER_SHORT_LOG2 4 + #define PR_BITS_PER_INT_LOG2 5 + #define PR_BITS_PER_INT64_LOG2 6 + #define PR_BITS_PER_LONG_LOG2 6 + #define PR_BITS_PER_FLOAT_LOG2 5 + #define PR_BITS_PER_DOUBLE_LOG2 6 + #define PR_BITS_PER_WORD_LOG2 6 + + #define PR_ALIGN_OF_SHORT 2 + #define PR_ALIGN_OF_INT 4 + #define PR_ALIGN_OF_LONG 8 + #define PR_ALIGN_OF_INT64 8 + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 8 + #define PR_ALIGN_OF_POINTER 8 + + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + + #elif defined(__powerpc__) || defined(__m68k__) + + #undef IS_LITTLE_ENDIAN + #define IS_BIG_ENDIAN 1 + + #define PR_BYTES_PER_BYTE 1 + #define PR_BYTES_PER_SHORT 2 + #define PR_BYTES_PER_INT 4 + #define PR_BYTES_PER_INT64 8 + #define PR_BYTES_PER_LONG 4 + #define PR_BYTES_PER_FLOAT 4 + #define PR_BYTES_PER_DOUBLE 8 + #define PR_BYTES_PER_WORD 4 + #define PR_BYTES_PER_DWORD 8 + + #define PR_BITS_PER_BYTE 8 + #define PR_BITS_PER_SHORT 16 + #define PR_BITS_PER_INT 32 + #define PR_BITS_PER_INT64 64 + #define PR_BITS_PER_LONG 32 + #define PR_BITS_PER_FLOAT 32 + #define PR_BITS_PER_DOUBLE 64 + #define PR_BITS_PER_WORD 32 + + #define PR_BITS_PER_BYTE_LOG2 3 + #define PR_BITS_PER_SHORT_LOG2 4 + #define PR_BITS_PER_INT_LOG2 5 + #define PR_BITS_PER_INT64_LOG2 6 + #define PR_BITS_PER_LONG_LOG2 5 + #define PR_BITS_PER_FLOAT_LOG2 5 + #define PR_BITS_PER_DOUBLE_LOG2 6 + #define PR_BITS_PER_WORD_LOG2 5 + + #define PR_ALIGN_OF_SHORT 2 + #define PR_ALIGN_OF_INT 4 + #define PR_ALIGN_OF_LONG 4 + #define PR_ALIGN_OF_INT64 4 + #define PR_ALIGN_OF_FLOAT 4 + #define PR_ALIGN_OF_DOUBLE 4 + #define PR_ALIGN_OF_POINTER 4 + + #define PR_BYTES_PER_WORD_LOG2 2 + #define PR_BYTES_PER_DWORD_LOG2 3 + + #else + + #error Must define constants for type sizes here. + + #endif + + + #ifndef NO_NSPR_10_SUPPORT + + #define BYTES_PER_BYTE PR_BYTES_PER_BYTE + #define BYTES_PER_SHORT PR_BYTES_PER_SHORT + #define BYTES_PER_INT PR_BYTES_PER_INT + #define BYTES_PER_INT64 PR_BYTES_PER_INT64 + #define BYTES_PER_LONG PR_BYTES_PER_LONG + #define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT + #define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE + #define BYTES_PER_WORD PR_BYTES_PER_WORD + #define BYTES_PER_DWORD PR_BYTES_PER_DWORD + + #define BITS_PER_BYTE PR_BITS_PER_BYTE + #define BITS_PER_SHORT PR_BITS_PER_SHORT + #define BITS_PER_INT PR_BITS_PER_INT + #define BITS_PER_INT64 PR_BITS_PER_INT64 + #define BITS_PER_LONG PR_BITS_PER_LONG + #define BITS_PER_FLOAT PR_BITS_PER_FLOAT + #define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE + #define BITS_PER_WORD PR_BITS_PER_WORD + + #define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2 + #define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2 + #define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2 + #define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2 + #define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2 + #define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2 + #define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2 + #define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2 + + #define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT + #define ALIGN_OF_INT PR_ALIGN_OF_INT + #define ALIGN_OF_LONG PR_ALIGN_OF_LONG + #define ALIGN_OF_INT64 PR_ALIGN_OF_INT64 + #define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT + #define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE + #define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER + #define ALIGN_OF_WORD PR_ALIGN_OF_WORD + + #define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2 + #define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2 + #define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2 + + #endif /* NO_NSPR_10_SUPPORT */ + + #endif /* nspr_cpucfg___ */ *** nsprpub/pr/include/md/_netbsd.h.orig Tue Jun 30 15:55:23 1998 --- nsprpub/pr/include/md/_netbsd.h Tue Jun 30 18:15:37 1998 *************** *** 0 **** --- 1,168 ---- + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + + #ifndef nspr_netbsd_defs_h___ + #define nspr_netbsd_defs_h___ + + #include + + #define PR_LINKER_ARCH "netbsd" + #define _PR_SI_SYSNAME "NetBSD" + #if defined(__i386) + #define _PR_SI_ARCHITECTURE "x86" + #elif defined(__alpha__) + #define _PR_SI_ARCHITECTURE "alpha" + #elif defined(__m68k__) + #define _PR_SI_ARCHITECTURE "m68k" + #elif defined(__powerpc__) + #define _PR_SI_ARCHITECTURE "powerpc" + #elif defined(__sparc__) + #define _PR_SI_ARCHITECTURE "sparc" + #elif defined(__arm32__) + #define _PR_SI_ARCHITECTURE "arm32" + #endif + + #define PR_DLL_SUFFIX ".so.1.0" + + #define _PR_VMBASE 0x30000000 + #define _PR_STACK_VMBASE 0x50000000 + #define _MD_DEFAULT_STACK_SIZE 65536L + #define _MD_MMAP_FLAGS MAP_PRIVATE + + #undef HAVE_STACK_GROWING_UP + #define HAVE_DLL + #define USE_DLFCN + + #define USE_SETJMP + + #ifndef _PR_PTHREADS + #include + + #define PR_CONTEXT_TYPE sigjmp_buf + + #define CONTEXT(_th) ((_th)->md.context) + + #if defined(__i386) || defined(__sparc__) || defined(__m68k__) + #define JB_SP_INDEX 2 + #elif defined(__alpha__) + #define JB_SP_INDEX 34 + #elif defined(__arm32__) + #define JB_SP_INDEX JMPBUF_REG_R13 + #else + #error "Need to define SP index in jmp_buf here" + #endif + + #define _MD_GET_SP(_th) (_th)->md.context[JB_SP_INDEX] + + #define PR_NUM_GCREGS _JBLEN + + /* + ** Initialize a thread context to run "_main()" when started + */ + #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ + { \ + *status = PR_TRUE; \ + if (sigsetjmp(CONTEXT(_thread), 1)) { \ + _main(); \ + } \ + _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \ + } + + #define _MD_SWITCH_CONTEXT(_thread) \ + if (!sigsetjmp(CONTEXT(_thread), 1)) { \ + (_thread)->md.errcode = errno; \ + _PR_Schedule(); \ + } + + /* + ** Restore a thread context, saved by _MD_SWITCH_CONTEXT + */ + #define _MD_RESTORE_CONTEXT(_thread) \ + { \ + errno = (_thread)->md.errcode; \ + _MD_SET_CURRENT_THREAD(_thread); \ + siglongjmp(CONTEXT(_thread), 1); \ + } + + /* Machine-dependent (MD) data structures */ + + struct _MDThread { + PR_CONTEXT_TYPE context; + int id; + int errcode; + }; + + struct _MDThreadStack { + PRInt8 notused; + }; + + struct _MDLock { + PRInt8 notused; + }; + + struct _MDSemaphore { + PRInt8 notused; + }; + + struct _MDCVar { + PRInt8 notused; + }; + + struct _MDSegment { + PRInt8 notused; + }; + + struct _MDCPU { + struct _MDCPU_Unix md_unix; + }; + + #define _MD_INIT_LOCKS() + #define _MD_NEW_LOCK(lock) PR_SUCCESS + #define _MD_FREE_LOCK(lock) + #define _MD_LOCK(lock) + #define _MD_UNLOCK(lock) + #define _MD_INIT_IO() + #define _MD_IOQ_LOCK() + #define _MD_IOQ_UNLOCK() + + #define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) + #define _MD_INIT_THREAD _MD_InitializeThread + #define _MD_EXIT_THREAD(thread) + #define _MD_SUSPEND_THREAD(thread) _MD_suspend_thread + #define _MD_RESUME_THREAD(thread) _MD_resume_thread + #define _MD_CLEAN_THREAD(_thread) + + #endif /* ! _PR_PTHREADS */ + + #define _MD_EARLY_INIT _MD_EarlyInit + #define _MD_FINAL_INIT _PR_UnixInit + #define _MD_GET_INTERVAL _PR_UNIX_GetInterval + #define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond + + /* + * We wrapped the select() call. _MD_SELECT refers to the built-in, + * unwrapped version. + */ + #define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) + #define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout) + + #if defined(NetBSD1_3) && NetBSD1_3 == 1 + typedef unsigned int nfds_t; + #endif + + #endif /* nspr_netbsd_defs_h___ */ *** nsprpub/pr/include/md/Makefile.orig Wed Jun 3 09:53:59 1998 --- nsprpub/pr/include/md/Makefile Tue Jun 30 15:55:23 1998 *************** *** 55,60 **** --- 55,64 ---- MDCPUCFG_H = _freebsd.cfg endif + ifeq ($(OS_ARCH),NetBSD) + MDCPUCFG_H = _netbsd.cfg + endif + ifeq ($(OS_ARCH),HP-UX) MDCPUCFG_H = _hpux.cfg endif *** nsprpub/pr/include/md/_unixos.h.orig Wed Jun 3 09:54:00 1998 --- nsprpub/pr/include/md/_unixos.h Tue Jun 30 16:13:15 1998 *************** *** 49,55 **** || defined(UNIXWARE) || defined(NCR) || defined(SNI) || defined(NEC) \ || defined(BSDI) || defined(SONY) #include ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) || defined(RHAPSODY) #include #elif defined(LINUX) #include --- 49,55 ---- || defined(UNIXWARE) || defined(NCR) || defined(SNI) || defined(NEC) \ || defined(BSDI) || defined(SONY) #include ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) || defined(RHAPSODY) || defined(NETBSD) a247 93 #elif defined(LINUX) #include *** nsprpub/config/UNIX.mk.orig Wed Jun 3 09:53:39 1998 --- nsprpub/config/UNIX.mk Sat Jul 4 14:17:59 1998 *************** *** 32,38 **** endif # Name of the binary code directories ! OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ MKDEPEND_DIR = $(DEPTH)/config/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend --- 32,38 ---- endif # Name of the binary code directories ! OBJDIR_NAME = NetBSD1.3.2_OPT.OBJ MKDEPEND_DIR = $(DEPTH)/config/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend *** nsprpub/config/NetBSD.mk.orig Tue Jun 30 15:55:24 1998 --- nsprpub/config/NetBSD.mk Tue Jun 30 15:55:24 1998 *************** *** 0 **** --- 1,58 ---- + # + # The contents of this file are subject to the Netscape Public License + # Version 1.0 (the "NPL"); you may not use this file except in + # compliance with the NPL. You may obtain a copy of the NPL at + # http://www.mozilla.org/NPL/ + # + # Software distributed under the NPL is distributed on an "AS IS" basis, + # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + # for the specific language governing rights and limitations under the + # NPL. + # + # The Initial Developer of this code under the NPL is Netscape + # Communications Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All Rights + # Reserved. + # + + # + # Config stuff for NetBSD 1.x + # + + include $(MOD_DEPTH)/config/UNIX.mk + + CC = gcc + CCC = g++ + RANLIB = ranlib + + OS_REL_CFLAGS = + #CPU_ARCH = x86 + + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + + ifeq ($(USE_PTHREADS),1) + OS_LIBS = -lc_r + # XXX probably should define _THREAD_SAFE too. + else + OS_LIBS = -lc + DEFINES += -D_PR_LOCAL_THREADS_ONLY + endif + + ARCH = netbsd + + DSO_CFLAGS = -fPIC + DSO_LDFLAGS = + DSO_LDOPTS = -Bshareable + ifeq ($(OS_TEST),alpha) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),mips) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),pmax) + DSO_LDOPTS = -shared + endif + + MKSHLIB = $(LD) $(DSO_LDOPTS) + + G++INCLUDES = -I/usr/include/g++ *** include/mcom_db.h.orig Wed Jun 3 09:48:08 1998 --- include/mcom_db.h Tue Jun 30 15:55:24 1998 *************** *** 224,230 **** #define RET_SUCCESS 0 #define RET_SPECIAL 1 ! #if defined(__386BSD__) || defined(SCO) #define __BIT_TYPES_DEFINED__ d249 3 a251 11 --- 224,230 ---- #define RET_SUCCESS 0 #define RET_SPECIAL 1 ! #if defined(__386BSD__) || defined(SCO) || defined(__NetBSD__) #define __BIT_TYPES_DEFINED__ #endif *** modules/schedulr/src/Makefile.orig Wed Jun 3 09:52:16 1998 --- modules/schedulr/src/Makefile Tue Jun 30 15:55:24 1998 d271 2 a272 2 *** modules/libreg/src/vr_stubs.h.orig Wed Jun 3 09:51:45 1998 --- modules/libreg/src/vr_stubs.h Tue Jun 30 15:55:24 1998 d274 1 a274 20 *** 29,35 **** #ifdef XP_MAC #include #else ! #if defined(BSDI) && !defined(BSDI_2) #include #endif #include --- 29,35 ---- #ifdef XP_MAC #include #else ! #if (defined(BSDI) && !defined(BSDI_2)) || defined(NETBSD) #include #endif #include *** network/main/mkconect.c.orig Wed Jun 3 09:53:17 1998 --- network/main/mkconect.c Tue Jun 30 16:05:33 1998 *************** *** 80,86 **** d282 1 a282 1 --- 80,86 ---- d290 2 a291 2 *** network/main/mksockrw.c.orig Wed Jun 3 09:53:18 1998 --- network/main/mksockrw.c Tue Jun 30 16:06:17 1998 d309 2 a310 2 *** network/main/prefetch.c.orig Wed Jun 3 09:53:19 1998 --- network/main/prefetch.c Tue Jun 30 16:06:48 1998 d328 2 a329 2 *** network/protocol/ftp/mkftp.c.orig Wed Jun 3 09:53:27 1998 --- network/protocol/ftp/mkftp.c Tue Jun 30 16:03:46 1998 d347 21 a367 2 *** sun-java/stubs/include/typedefs_md.h.orig Wed Jun 3 09:58:37 1998 --- sun-java/stubs/include/typedefs_md.h Tue Jun 30 16:13:58 1998 d369 1 a369 1 *** 43,49 **** d371 7 a377 1 typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ d379 1 a379 5 ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(RHAPSODY) typedef int64 int64_t; #else /* --- 43,49 ---- d381 2 a382 1 typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ a383 154 ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(RHAPSODY) && !defined(NETBSD) typedef int64 int64_t; #else /* *** config/NetBSD.mk.orig Tue Jun 30 15:55:25 1998 --- config/NetBSD.mk Sat Jul 4 14:05:18 1998 *************** *** 0 **** --- 1,107 ---- + # + # The contents of this file are subject to the Netscape Public License + # Version 1.0 (the "NPL"); you may not use this file except in + # compliance with the NPL. You may obtain a copy of the NPL at + # http://www.mozilla.org/NPL/ + # + # Software distributed under the NPL is distributed on an "AS IS" basis, + # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + # for the specific language governing rights and limitations under the + # NPL. + # + # The Initial Developer of this code under the NPL is Netscape + # Communications Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All Rights + # Reserved. + # + + ###################################################################### + # Config stuff for FreeBSD + ###################################################################### + # + ###################################################################### + # Version-independent + ###################################################################### + + ARCH := netbsd + ifeq (86,$(findstring 86,$(OS_TEST))) + CPU_ARCH := x86 + else + CPU_ARCH := $(OS_TEST) + endif + GFX_ARCH := x + + OS_INCLUDES = -I/usr/X11R6/include + G++INCLUDES = -I/usr/include/g++ + LOC_LIB_DIR = + MOTIF = + MOTIFLIB = + OS_LIBS = + + OS_MINOR = $(shell uname -r | cut -f2 -d.) + + # Don't define BSD, because it's already defined in /usr/include/sys/param.h. + PLATFORM_FLAGS = -DNETBSD $(DSO_CFLAGS) + MOVEMAIL_FLAGS = -DHAVE_STRERROR + PORT_FLAGS = -DSW_THREADS -DNEED_UINT -DHAVE_LCHOWN -DNTOHL_ENDIAN_H -DHAVE_FILIO_H -DNEED_SYS_TIME_H -DNEED_UINT_T -DHAVE_BSD_FLOCK + PDJAVA_FLAGS = -mx128m + OS_GPROF_FLAGS = -pg + LD_FLAGS = -L/usr/X11R6/lib -lXm + + OS_CFLAGS = $(PLATFORM_FLAGS) $(PORT_FLAGS) $(MOVEMAIL_FLAGS) + + LOCALE_MAP = $(DEPTH)/cmd/xfe/intl/bsd386.lm + EN_LOCALE = C + DE_LOCALE = de_DE.ISO8859-1 + FR_LOCALE = fr_FR.ISO8859-1 + JP_LOCALE = ja + SJIS_LOCALE = ja_JP.SJIS + KR_LOCALE = ko_KR.EUC + CN_LOCALE = zh + TW_LOCALE = zh + I2_LOCALE = i2 + + ###################################################################### + # Version-specific stuff + ###################################################################### + + ###################################################################### + # Overrides for defaults in config.mk (or wherever) + ###################################################################### + + DLL_SUFFIX = so.1.0 + EMACS = /usr/bin/true + JAVA_PROG = $(JAVA_BIN)java + RANLIB = /usr/bin/ranlib + + ###################################################################### + # Other + ###################################################################### + + ifeq ($(USE_PTHREADS),1) + OS_LIBS = -lc_r + PORT_FLAGS += -D_PR_NEED_FAKE_POLL + else + OS_LIBS = -lc + PORT_FLAGS += -D_PR_LOCAL_THREADS_ONLY + endif + + BUILD_UNIX_PLUGINS = 1 + + MKSHLIB = $(LD) $(DSO_LDOPTS) + + # + # For NetBSD > 1.3, this can all be -shared. + # + DSO_CFLAGS = -fPIC + DSO_LDFLAGS = + DSO_LDOPTS = -Bshareable + ifeq ($(OS_TEST),alpha) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),mips) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),pmax) + DSO_LDOPTS = -shared + endif *** config/rules.mk.orig Wed Jun 3 09:57:41 1998 --- config/rules.mk Tue Jun 30 15:55:25 1998 *************** *** 102,107 **** --- 102,110 ---- ifeq ($(OS_ARCH),FreeBSD) SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0) else + ifeq ($(OS_ARCH),NetBSD) + SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0) + else ifeq ($(OS_ARCH)$(OS_RELEASE),SunOS4.1) SHARED_LIBRARY := $(LIBRARY:.a=.so.1.0) else *************** *** 109,114 **** --- 112,118 ---- SHARED_LIBRARY := $(LIBRARY:.a=)_shr.a else SHARED_LIBRARY := $(LIBRARY:.a=.so) + endif endif endif endif *** config/config.mk.orig Wed Jun 3 09:57:39 1998 --- config/config.mk Tue Jun 30 15:55:25 1998 *************** *** 83,89 **** # but save the version to allow multiple versions of the same base # platform to be built in the same tree. # ! ifneq (,$(filter FreeBSD HP-UX IRIX Linux OSF1 SunOS,$(OS_ARCH))) OS_VERS := $(suffix $(OS_RELEASE)) OS_RELEASE := $(basename $(OS_RELEASE)) OS_VERSION := $(shell echo $(OS_VERS) | sed 's/-.*//') --- 83,89 ---- # but save the version to allow multiple versions of the same base # platform to be built in the same tree. a384 4 ! ifneq (,$(filter FreeBSD HP-UX IRIX Linux OSF1 SunOS NetBSD,$(OS_ARCH))) OS_VERS := $(suffix $(OS_RELEASE)) OS_RELEASE := $(basename $(OS_RELEASE)) OS_VERSION := $(shell echo $(OS_VERS) | sed 's/-.*//') @ 1.3 log @Upgrade to 2804 version. @ text @d1 2 a2 2 *** js/src/prmjtime.c.orig Wed Apr 29 20:54:26 1998 --- js/src/prmjtime.c Sun May 24 22:04:50 1998 d4 1 a4 2 *** 287,293 **** PRInt32 diff; d7 2 a8 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) d11 2 a12 3 PRMJTime prtm; --- 287,293 ---- PRInt32 diff; d15 2 a16 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined(NETBSD) d19 1 a19 1 PRMJTime prtm; d21 1 a21 1 *** 307,313 **** d25 1 a25 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) d29 1 a29 1 --- 307,313 ---- d33 1 a33 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined ( HPUX9 ) || defined(NETBSD) d37 2 a38 2 *** cmd/xfe/src/HTMLView.cpp.orig Wed Apr 29 21:16:45 1998 --- cmd/xfe/src/HTMLView.cpp Sun May 24 22:00:15 1998 d56 2 a57 2 *** cmd/xfe/src/context_funcs.cpp.orig Wed Apr 29 21:16:53 1998 --- cmd/xfe/src/context_funcs.cpp Sun May 24 22:00:15 1998 d59 2 a60 2 *** 67,72 **** --- 67,74 ---- d69 2 a70 2 *** cmd/xfe/Microline3.0/XmL/Grid.c.orig Wed Apr 29 21:15:36 1998 --- cmd/xfe/Microline3.0/XmL/Grid.c Sun May 24 22:00:15 1998 d83 2 a84 2 *** cmd/xfe/Makefile.orig Wed Apr 29 21:15:29 1998 --- cmd/xfe/Makefile Sun May 24 22:00:16 1998 d86 2 a87 2 *** 488,493 **** --- 488,507 ---- d108 2 a109 2 *** cmd/xfe/mozilla.c.orig Wed Apr 29 21:15:32 1998 --- cmd/xfe/mozilla.c Sun May 24 22:05:44 1998 d111 2 a112 2 *** 1885,1890 **** --- 1885,1892 ---- d122 1 a122 1 *** 3476,3482 **** d130 1 a130 1 --- 3478,3484 ---- d138 2 a139 2 *** cmd/xfe/dialogs.c.orig Wed Apr 29 21:15:30 1998 --- cmd/xfe/dialogs.c Sun May 24 22:06:07 1998 d157 2 a158 2 *** cmd/xfe/movemail.c.orig Wed Apr 29 21:15:32 1998 --- cmd/xfe/movemail.c Sun May 24 22:00:16 1998 d176 2 a177 2 *** cmd/xfe/prefdialogs.c.orig Wed Apr 29 21:15:32 1998 --- cmd/xfe/prefdialogs.c Sun May 24 22:00:17 1998 d195 2 a196 2 *** cmd/stubfe/Makefile.orig Wed Apr 29 21:15:27 1998 --- cmd/stubfe/Makefile Sun May 24 22:00:15 1998 d212 2 a213 2 *** dbm/include/mcom_db.h.orig Wed Apr 29 20:59:11 1998 --- dbm/include/mcom_db.h Sun May 24 22:00:15 1998 d231 2 a232 2 *** lib/xp/xp_file.c.orig Wed Apr 29 20:55:26 1998 --- lib/xp/xp_file.c Sun May 24 22:00:13 1998 d234 1 a234 1 *** 804,810 **** d242 1 a242 1 --- 804,810 ---- d250 2 a251 78 *** lib/libnet/mkftp.c.orig Wed Apr 29 20:55:10 1998 --- lib/libnet/mkftp.c Sun May 24 22:00:13 1998 *************** *** 53,59 **** #endif /* XP_OS2 */ #ifdef XP_UNIX ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif #endif /* XP_UNIX */ --- 53,59 ---- #endif /* XP_OS2 */ #ifdef XP_UNIX ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) || defined(__NetBSD__) #include #endif #endif /* XP_UNIX */ *** lib/libnet/mkconect.c.orig Wed Apr 29 20:55:09 1998 --- lib/libnet/mkconect.c Sun May 24 22:00:13 1998 *************** *** 77,83 **** #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif --- 77,83 ---- #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__) #include #endif *** lib/libnet/mksockrw.c.orig Wed Apr 29 20:55:12 1998 --- lib/libnet/mksockrw.c Sun May 24 22:00:13 1998 *************** *** 48,54 **** #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) #include #endif --- 48,54 ---- #include ! #if !defined(__osf__) && !defined(AIXV3) && !defined(_HPUX_SOURCE) && !defined(__386BSD__) && !defined(__linux) && !defined(SCO_SV) && !defined(__NetBSD__) #include #endif *** lib/libnet/prefetch.c.orig Wed Apr 29 20:55:12 1998 --- lib/libnet/prefetch.c Sun May 24 22:00:13 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 *** nsprpub/pr/src/md/unix/Makefile.orig Wed Apr 29 20:58:18 1998 --- nsprpub/pr/src/md/unix/Makefile Sun May 24 22:00:14 1998 d266 2 a267 2 *** 118,123 **** --- 122,130 ---- d277 2 a278 2 *** nsprpub/pr/src/md/unix/objs.mk.orig Wed Apr 29 20:58:18 1998 --- nsprpub/pr/src/md/unix/objs.mk Sun May 24 22:00:14 1998 d293 2 a294 2 *** 111,116 **** --- 115,123 ---- d304 2 a305 2 *** nsprpub/pr/src/md/unix/unix.c.orig Wed Apr 29 20:58:19 1998 --- nsprpub/pr/src/md/unix/unix.c Sun May 24 22:00:14 1998 d308 1 a308 1 || defined(SUNOS4) || defined(NCR) d316 1 a316 1 || defined(SUNOS4) || defined(NCR) d323 2 a324 2 *** nsprpub/pr/src/md/unix/unix_errors.c.orig Wed Apr 29 20:58:19 1998 --- nsprpub/pr/src/md/unix/unix_errors.c Sun May 24 22:00:14 1998 d330 1 a330 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d338 1 a338 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d347 1 a347 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d355 1 a355 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d364 1 a364 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d372 1 a372 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d381 1 a381 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d389 1 a389 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d398 1 a398 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d406 1 a406 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d415 1 a415 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d423 1 a423 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d432 1 a432 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) d440 1 a440 1 ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) d444 2 a445 2 *** nsprpub/pr/src/md/unix/uxwrap.c.orig Wed Apr 29 20:58:19 1998 --- nsprpub/pr/src/md/unix/uxwrap.c Sun May 24 22:00:14 1998 d457 2 a458 2 *** nsprpub/pr/src/md/unix/netbsd.c.orig Sun May 24 22:00:14 1998 --- nsprpub/pr/src/md/unix/netbsd.c Sun May 24 22:00:14 1998 d564 2 a565 2 *** nsprpub/pr/src/md/prosdep.c.orig Wed Apr 29 20:58:15 1998 --- nsprpub/pr/src/md/prosdep.c Sun May 24 22:00:14 1998 d571 1 a571 1 ! || defined FREEBSD d579 1 a579 1 ! || defined FREEBSD || defined NETBSD d583 2 a584 2 *** nsprpub/pr/src/pthreads/ptio.c.orig Wed Apr 29 20:58:25 1998 --- nsprpub/pr/src/pthreads/ptio.c Sun May 24 22:00:14 1998 d619 2 a620 2 *** nsprpub/pr/src/pthreads/ptthread.c.orig Wed Apr 29 20:58:25 1998 --- nsprpub/pr/src/pthreads/ptthread.c Sun May 24 22:07:22 1998 d714 2 a715 21 *** nsprpub/pr/src/linking/prlink.c.orig Wed Apr 29 20:58:08 1998 --- nsprpub/pr/src/linking/prlink.c Sun May 24 22:00:14 1998 *************** *** 75,81 **** /************************************************************************/ ! #if ( !defined(USE_DLFCN) && !defined(HAVE_STRERROR) ) || defined(HPUX) || defined(BSDI) || defined(LINUX) static char* errStrBuf = NULL; #define ERR_STR_BUF_LENGTH 20 static char* errno_string(PRIntn oserr) --- 75,81 ---- /************************************************************************/ ! #if ( !defined(USE_DLFCN) && !defined(HAVE_STRERROR) ) || defined(HPUX) || defined(BSDI) || defined(LINUX) || defined(NETBSD) static char* errStrBuf = NULL; #define ERR_STR_BUF_LENGTH 20 static char* errno_string(PRIntn oserr) *** nsprpub/pr/include/md/_pth.h.orig Wed Apr 29 20:58:01 1998 --- nsprpub/pr/include/md/_pth.h Sun May 24 22:07:59 1998 d803 2 a804 2 *** nsprpub/pr/include/md/prosdep.h.orig Wed Apr 29 20:58:01 1998 --- nsprpub/pr/include/md/prosdep.h Sun May 24 22:00:13 1998 d817 2 a818 2 *** nsprpub/pr/include/md/_netbsd.cfg.orig Sun May 24 23:32:44 1998 --- nsprpub/pr/include/md/_netbsd.cfg Sun May 24 22:00:41 1998 d1084 2 a1085 2 *** nsprpub/pr/include/md/_netbsd.h.orig Sun May 24 23:32:50 1998 --- nsprpub/pr/include/md/_netbsd.h Sun May 24 22:00:41 1998 d1088 1 a1088 1 --- 1,169 ---- a1253 1 + #define O_SYNC O_FSYNC d1257 2 a1258 2 *** nsprpub/pr/include/md/Makefile.orig Wed Apr 29 20:58:01 1998 --- nsprpub/pr/include/md/Makefile Sun May 24 22:00:13 1998 d1272 2 a1273 2 *** nsprpub/pr/include/md/_unixos.h.orig Wed Apr 29 20:58:01 1998 --- nsprpub/pr/include/md/_unixos.h Sun May 24 22:00:13 1998 d1279 1 a1279 1 ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) d1287 1 a1287 1 ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) || defined(NETBSD) d1291 2 a1292 2 *** nsprpub/config/UNIX.mk.orig Wed Apr 29 20:57:38 1998 --- nsprpub/config/UNIX.mk Sun May 24 23:11:32 1998 d1306 1 a1306 1 ! OBJDIR_NAME = NetBSD1.3E_OPT.OBJ d1310 2 a1311 2 *** nsprpub/config/NetBSD.mk.orig Sun May 24 22:00:13 1998 --- nsprpub/config/NetBSD.mk Sun May 24 22:00:13 1998 d1373 2 a1374 2 *** include/mcom_db.h.orig Wed Apr 29 20:53:35 1998 --- include/mcom_db.h Sun May 24 22:00:12 1998 d1392 2 a1393 2 *** modules/schedulr/src/Makefile.orig Wed Apr 29 20:56:51 1998 --- modules/schedulr/src/Makefile Sun May 24 22:00:13 1998 d1413 2 a1414 2 *** modules/libreg/src/vr_stubs.h.orig Wed Apr 29 20:56:24 1998 --- modules/libreg/src/vr_stubs.h Sun May 24 22:00:13 1998 d1432 78 a1509 2 *** sun-java/stubs/include/typedefs_md.h.orig Wed Apr 29 21:03:22 1998 --- sun-java/stubs/include/typedefs_md.h Sun May 24 22:11:50 1998 d1511 1 a1511 1 *** 38,44 **** d1515 1 a1515 1 ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX2_0) && !defined(MKLINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) d1519 1 a1519 1 --- 38,44 ---- d1523 1 a1523 1 ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX2_0) && !defined(MKLINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(NETBSD) d1527 2 a1528 2 *** config/NetBSD.mk.orig Sun May 24 23:33:28 1998 --- config/NetBSD.mk Sun May 24 22:00:51 1998 d1572 1 a1572 1 + OS_MINOR = $(shell echo $(OS_VERSION) | cut -f2 -d.) d1639 2 a1640 2 *** config/rules.mk.orig Wed Apr 29 21:02:19 1998 --- config/rules.mk Sun May 24 22:00:17 1998 d1663 2 a1664 2 *** config/config.mk.orig Wed Apr 29 21:02:18 1998 --- config/config.mk Sun May 24 22:00:17 1998 @ 1.2 log @Correct a few problems pointed out by Charles Hannum. @ text @d1 2 a2 2 *** ./include/mcom_db.h.orig Tue Mar 31 04:03:49 1998 --- ./include/mcom_db.h Wed Apr 1 04:59:54 1998 d4 1 a4 20 *** 224,230 **** #define RET_SUCCESS 0 #define RET_SPECIAL 1 ! #if defined(__386BSD__) || defined(SCO) #define __BIT_TYPES_DEFINED__ #endif --- 224,230 ---- #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 Mar 31 04:04:03 1998 --- ./js/src/prmjtime.c Wed Apr 1 03:13:59 1998 *************** *** 390,396 **** d8 1 a8 1 ! #if defined( XP_PC ) || defined( FREEBSD ) d12 1 a12 1 --- 390,396 ---- d16 1 a16 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined( NETBSD ) d21 1 a21 1 *** 409,415 **** d25 1 a25 1 ! #if defined( XP_PC ) || defined( FREEBSD ) d29 1 a29 1 --- 409,415 ---- d33 1 a33 1 ! #if defined( XP_PC ) || defined( FREEBSD ) || defined( NETBSD ) d37 177 d215 3 a217 2 *** 844,850 **** /* seconds += dstOffset;*/ d219 2 a221 6 ! #if defined(XP_PC) || defined(XP_MAC) || defined( FREEBSD ) lt = *localtime(&seconds); #else localtime_r(&seconds,<); --- 844,850 ---- /* seconds += dstOffset;*/ d223 6 d230 22 a251 6 ! #if defined(XP_PC) || defined(XP_MAC) || defined( FREEBSD ) || defined (NETBSD) lt = *localtime(&seconds); #else localtime_r(&seconds,<); *** ./lib/libnet/mkftp.c.orig Tue Mar 31 04:04:31 1998 --- ./lib/libnet/mkftp.c Wed Apr 1 05:00:28 1998 d269 2 a270 2 *** ./lib/libnet/mkconect.c.orig Tue Mar 31 04:04:31 1998 --- ./lib/libnet/mkconect.c Wed Apr 1 05:00:58 1998 d288 2 a289 2 *** ./lib/libnet/mksockrw.c.orig Tue Mar 31 04:04:34 1998 --- ./lib/libnet/mksockrw.c Wed Apr 1 05:01:12 1998 d307 2 a308 2 *** ./lib/libnet/prefetch.c.orig Tue Mar 31 04:04:34 1998 --- ./lib/libnet/prefetch.c Thu Apr 2 02:16:08 1998 d326 2 a327 2 *** ./lib/xp/xp_file.c.orig Tue Mar 31 04:04:41 1998 --- ./lib/xp/xp_file.c Wed Apr 1 04:45:00 1998 d329 12 a340 18 *** 804,810 **** case xpMimeTypes: case xpSocksConfig: case xpMailFolder: ! #ifdef BSDI /* In bsdi, mkdir fails if the directory name is terminated * with a '/'. - dp */ --- 804,810 ---- case xpMimeTypes: case xpSocksConfig: case xpMailFolder: ! #if defined(BSDI) || defined(NETBSD) /* In bsdi, mkdir fails if the directory name is terminated * with a '/'. - dp */ *** ./modules/libreg/src/vr_stubs.h.orig Tue Mar 31 04:04:54 1998 --- ./modules/libreg/src/vr_stubs.h Wed Apr 1 04:45:46 1998 d342 13 a354 18 *** 29,35 **** #ifdef XP_MAC #include #else ! #if defined(BSDI) && !defined(BSDI_2) #include #endif #include --- 29,35 ---- #ifdef XP_MAC #include #else ! #if (defined(BSDI) && !defined(BSDI_2)) || defined(NETBSD) #include #endif #include *** ./modules/schedulr/src/Makefile.orig Tue Mar 31 04:05:31 1998 --- ./modules/schedulr/src/Makefile Sun Apr 5 23:54:52 1998 d356 4 a359 1 *** 17,24 **** d361 174 a534 18 DEPTH = ../../.. ! MODULE = schedulr ! LIBRARY_NAME = sched REQUIRES = nspr util --- 17,24 ---- DEPTH = ../../.. ! MODULE = schedulr ! LIBRARY_NAME = sched REQUIRES = nspr util *** ./nsprpub/config/NetBSD1.mk.orig Wed Apr 1 01:14:46 1998 --- ./nsprpub/config/NetBSD1.mk Mon Apr 6 23:06:58 1998 d537 32 a568 17 --- 1,58 ---- + # + # The contents of this file are subject to the Netscape Public License + # Version 1.0 (the "NPL"); you may not use this file except in + # compliance with the NPL. You may obtain a copy of the NPL at + # http://www.mozilla.org/NPL/ + # + # Software distributed under the NPL is distributed on an "AS IS" basis, + # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + # for the specific language governing rights and limitations under the + # NPL. + # + # The Initial Developer of this code under the NPL is Netscape + # Communications Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All Rights + # Reserved. + # d570 5 a574 3 + # + # Config stuff for NetBSD 1.x + # d576 13 a588 1 + include $(MOD_DEPTH)/config/UNIX.mk d590 6 a595 3 + CC = gcc + CCC = g++ + RANLIB = ranlib d597 5 a601 2 + OS_REL_CFLAGS = + #CPU_ARCH = x86 d603 7 a609 1 + OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DNETBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK d611 8 a618 7 + ifeq ($(USE_PTHREADS),1) + OS_LIBS = -lc_r + # XXX probably should define _THREAD_SAFE too. + else + OS_LIBS = -lc + DEFINES += -D_PR_LOCAL_THREADS_ONLY + endif d620 6 a625 1 + ARCH = netbsd d627 175 a801 22 + DSO_CFLAGS = -fPIC + DSO_LDFLAGS = + DSO_LDOPTS = -Bshareable + ifeq ($(OS_TEST),alpha) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),mips) + DSO_LDOPTS = -shared + endif + ifeq ($(OS_TEST),pmax) + DSO_LDOPTS = -shared + endif + + MKSHLIB = $(LD) $(DSO_LDOPTS) + + G++INCLUDES = -I/usr/include/g++ *** ./nsprpub/config/arch.mk.orig Wed Apr 1 01:30:26 1998 --- ./nsprpub/config/arch.mk Wed Apr 1 01:33:34 1998 *************** *** 58,64 **** # Handle one dot (2.2-STABLE) and two dot (2.2.5-RELEASE) forms. # d803 1 a803 7 ! ifeq ($(OS_ARCH),FreeBSD) OS_RELEASE := $(basename $(shell uname -r)) NEW_OS_RELEASE := $(basename $(OS_RELEASE)) ifneq ($(NEW_OS_RELEASE),"") --- 58,65 ---- # Handle one dot (2.2-STABLE) and two dot (2.2.5-RELEASE) forms. # d805 6 a810 7 ! #ifeq ($(OS_ARCH),FreeBSD) ! ifneq (,$(filter FreeBSD NetBSD,$(OS_ARCH))) OS_RELEASE := $(basename $(shell uname -r)) NEW_OS_RELEASE := $(basename $(OS_RELEASE)) ifneq ($(NEW_OS_RELEASE),"") *** ./nsprpub/pr/include/md/_pth.h.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/include/md/_pth.h Wed Apr 1 03:16:24 1998 d851 1 a851 1 #if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX2_0) \ d859 1 a859 1 #if (defined(AIX) && !defined(AIX4_3)) || defined(LINUX2_0) \ d882 1 a882 1 *** 210,216 **** d890 1 a890 1 --- 212,218 ---- d898 2 a899 2 *** ./nsprpub/pr/include/md/prosdep.h.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/include/md/prosdep.h Wed Apr 1 04:11:48 1998 d912 2 a913 2 *** ./nsprpub/pr/include/md/_netbsd.cfg.orig Wed Apr 1 01:36:34 1998 --- ./nsprpub/pr/include/md/_netbsd.cfg Tue Apr 7 22:38:07 1998 d946 1 a946 1 + #ifdef __i386__ d1179 2 a1180 417 *** ./nsprpub/pr/include/md/_netbsd.h.orig Wed Apr 1 01:36:40 1998 --- ./nsprpub/pr/include/md/_netbsd.h Thu Apr 9 01:52:41 1998 *************** *** 0 **** --- 1,169 ---- + /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* + * The contents of this file are subject to the Netscape Public License + * Version 1.0 (the "NPL"); you may not use this file except in + * compliance with the NPL. You may obtain a copy of the NPL at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the NPL is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL + * for the specific language governing rights and limitations under the + * NPL. + * + * The Initial Developer of this code under the NPL is Netscape + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998 Netscape Communications Corporation. All Rights + * Reserved. + */ + + #ifndef nspr_netbsd_defs_h___ + #define nspr_netbsd_defs_h___ + + #include + + #define PR_LINKER_ARCH "netbsd" + #define _PR_SI_SYSNAME "NetBSD" + #if defined(__i386__) + #define _PR_SI_ARCHITECTURE "x86" + #elif defined(__alpha__) + #define _PR_SI_ARCHITECTURE "alpha" + #elif defined(__m68k__) + #define _PR_SI_ARCHITECTURE "m68k" + #elif defined(__powerpc__) + #define _PR_SI_ARCHITECTURE "powerpc" + #elif defined(__sparc__) + #define _PR_SI_ARCHITECTURE "sparc" + #elif defined(__arm32__) + #define _PR_SI_ACRHITECTURE "arm32" + #endif + + #define PR_DLL_SUFFIX ".so.1.0" + + #define _PR_VMBASE 0x30000000 + #define _PR_STACK_VMBASE 0x50000000 + #define _MD_DEFAULT_STACK_SIZE 65536L + #define _MD_MMAP_FLAGS MAP_PRIVATE + + #undef HAVE_STACK_GROWING_UP + #define HAVE_DLL + #define USE_DLFCN + + #define USE_SETJMP + + #ifndef _PR_PTHREADS + #include + + #define PR_CONTEXT_TYPE sigjmp_buf + + #define CONTEXT(_th) ((_th)->md.context) + + #if defined(__i386__) || defined(__sparc__) || defined(__m68k__) || defined(__powerpc__) + #define JB_SP_INDEX 2 + #elif defined(__alpha__) + #define JB_SP_INDEX 34 + #elif defined(__arm32__) + #define JB_SP_INDEX JMPBUF_REG_R13 + #else + #error "Need to define SP index in jmp_buf here" + #endif + + #define _MD_GET_SP(_th) (_th)->md.context[JB_SP_INDEX] + + #define PR_NUM_GCREGS _JBLEN + + /* + ** Initialize a thread context to run "_main()" when started + */ + #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ + { \ + *status = PR_TRUE; \ + if (sigsetjmp(CONTEXT(_thread), 1)) { \ + _main(); \ + } \ + _MD_GET_SP(_thread) = (unsigned char*) ((_sp) - 64); \ + } + + #define _MD_SWITCH_CONTEXT(_thread) \ + if (!sigsetjmp(CONTEXT(_thread), 1)) { \ + (_thread)->md.errcode = errno; \ + _PR_Schedule(); \ + } + + /* + ** Restore a thread context, saved by _MD_SWITCH_CONTEXT + */ + #define _MD_RESTORE_CONTEXT(_thread) \ + { \ + errno = (_thread)->md.errcode; \ + _MD_SET_CURRENT_THREAD(_thread); \ + siglongjmp(CONTEXT(_thread), 1); \ + } + + /* Machine-dependent (MD) data structures */ + + struct _MDThread { + PR_CONTEXT_TYPE context; + int id; + int errcode; + }; + + struct _MDThreadStack { + PRInt8 notused; + }; + + struct _MDLock { + PRInt8 notused; + }; + + struct _MDSemaphore { + PRInt8 notused; + }; + + struct _MDCVar { + PRInt8 notused; + }; + + struct _MDSegment { + PRInt8 notused; + }; + + struct _MDCPU { + struct _MDCPU_Unix md_unix; + }; + + #define _MD_INIT_LOCKS() + #define _MD_NEW_LOCK(lock) PR_SUCCESS + #define _MD_FREE_LOCK(lock) + #define _MD_LOCK(lock) + #define _MD_UNLOCK(lock) + #define _MD_INIT_IO() + #define _MD_IOQ_LOCK() + #define _MD_IOQ_UNLOCK() + + #define _MD_INIT_RUNNING_CPU(cpu) _MD_unix_init_running_cpu(cpu) + #define _MD_INIT_THREAD _MD_InitializeThread + #define _MD_EXIT_THREAD(thread) + #define _MD_SUSPEND_THREAD(thread) _MD_suspend_thread + #define _MD_RESUME_THREAD(thread) _MD_resume_thread + #define _MD_CLEAN_THREAD(_thread) + + #endif /* ! _PR_PTHREADS */ + + #define _MD_EARLY_INIT _MD_EarlyInit + #define _MD_FINAL_INIT _PR_UnixInit + #define _MD_GET_INTERVAL _PR_UNIX_GetInterval + #define _MD_INTERVAL_PER_SEC _PR_UNIX_TicksPerSecond + + /* + * We wrapped the select() call. _MD_SELECT refers to the built-in, + * unwrapped version. + */ + #define _MD_SELECT(nfds,r,w,e,tv) syscall(SYS_select,nfds,r,w,e,tv) + #define _MD_POLL(fds,nfds,timeout) syscall(SYS_poll,fds,nfds,timeout) + + #if defined(NetBSD1_3) && NetBSD1_3 == 1 + typedef unsigned int nfds_t; + #define O_SYNC O_FSYNC + #endif + + #endif /* nspr_netbsd_defs_h___ */ *** ./nsprpub/pr/include/md/Makefile.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/include/md/Makefile Wed Apr 1 02:48:34 1998 *************** *** 55,60 **** --- 55,64 ---- MDCPUCFG_H = _freebsd.cfg endif + ifeq ($(OS_ARCH),NetBSD) + MDCPUCFG_H = _netbsd.cfg + endif + ifeq ($(OS_ARCH),HP-UX) MDCPUCFG_H = _hpux.cfg endif *** ./nsprpub/pr/include/md/_unixos.h.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/include/md/_unixos.h Wed Apr 1 03:16:41 1998 *************** *** 49,55 **** || defined(UNIXWARE) || defined(NCR) || defined(SNI) || defined(NEC) \ || defined(BSDI) || defined(SONY) #include ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) #include #elif defined(LINUX) #include --- 49,55 ---- || defined(UNIXWARE) || defined(NCR) || defined(SNI) || defined(NEC) \ || defined(BSDI) || defined(SONY) #include ! #elif defined(SUNOS4) || defined(SCO) || defined(FREEBSD) || defined(NETBSD) #include #elif defined(LINUX) #include *** ./nsprpub/pr/src/md/unix/Makefile.orig Tue Mar 31 04:05:26 1998 --- ./nsprpub/pr/src/md/unix/Makefile Wed Apr 1 03:50:43 1998 *************** *** 57,62 **** --- 57,66 ---- freebsd.c \ $(NULL) + NETBSD_CSRCS = \ + netbsd.c \ + $(NULL) + BSDI_CSRCS = \ bsdi.c \ $(NULL) *************** *** 118,123 **** --- 122,130 ---- endif ifeq ($(OS_ARCH),FreeBSD) CSRCS += $(FREEBSD_CSRCS) + endif + ifeq ($(OS_ARCH),NetBSD) + CSRCS += $(NETBSD_CSRCS) endif ifeq ($(OS_ARCH),BSD_386) CSRCS += $(BSDI_CSRCS) *** ./nsprpub/pr/src/md/unix/objs.mk.orig Tue Mar 31 04:05:26 1998 --- ./nsprpub/pr/src/md/unix/objs.mk Wed Apr 1 03:51:09 1998 *************** *** 49,54 **** --- 49,58 ---- freebsd.c \ $(NULL) + NETBSD_CSRCS = \ + netbsd.c \ + $(NULL) + BSDI_CSRCS = \ bsdi.c \ $(NULL) *************** *** 111,116 **** --- 115,123 ---- endif ifeq ($(OS_ARCH),FreeBSD) CSRCS += $(FREEBSD_CSRCS) + endif + ifeq ($(OS_ARCH),NetBSD) + CSRCS += $(NETBSD_CSRCS) endif ifeq ($(OS_ARCH),BSD_386) CSRCS += $(BSDI_CSRCS) *** ./nsprpub/pr/src/md/unix/unix.c.orig Tue Mar 31 04:05:26 1998 --- ./nsprpub/pr/src/md/unix/unix.c Wed Apr 1 03:20:06 1998 *************** *** 44,50 **** || defined(SUNOS4) #define _PRSockLen_t int #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ ! || defined(UNIXWARE) #define _PRSockLen_t size_t #else #error "Cannot determine architecture" --- 44,50 ---- || defined(SUNOS4) #define _PRSockLen_t int #elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ ! || defined(UNIXWARE) || defined(NETBSD) #define _PRSockLen_t size_t #else #error "Cannot determine architecture" *** ./nsprpub/pr/src/md/unix/unix_errors.c.orig Tue Mar 31 04:05:26 1998 --- ./nsprpub/pr/src/md/unix/unix_errors.c Wed Apr 1 03:21:08 1998 *************** *** 160,166 **** case EROFS: PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 160,166 ---- case EROFS: PR_SetError(PR_READ_ONLY_FILESYSTEM_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 185,191 **** PR_SetError(PR_PENDING_INTERRUPT_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: #endif --- 185,191 ---- PR_SetError(PR_PENDING_INTERRUPT_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 278,284 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 278,284 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 329,335 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: #endif --- 329,335 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 395,401 **** case EIO: PR_SetError(PR_IO_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); --- 395,401 ---- case EIO: PR_SetError(PR_IO_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: PR_SetError(PR_REMOTE_FILE_ERROR, err); *************** *** 432,438 **** case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: #endif --- 432,438 ---- case ELOOP: PR_SetError(PR_LOOP_ERROR, err); break; ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *************** *** 1345,1351 **** PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) case EMULTIHOP: case ENOLINK: #endif --- 1345,1351 ---- PR_SetError(PR_NO_ACCESS_RIGHTS_ERROR, err); break; case ETIMEDOUT: ! #if !defined(OSF1) && !defined(FREEBSD) && !defined(BSDI) && !defined(NETBSD) case EMULTIHOP: case ENOLINK: #endif *** ./nsprpub/pr/src/md/unix/uxwrap.c.orig Tue Mar 31 04:05:26 1998 --- ./nsprpub/pr/src/md/unix/uxwrap.c Wed Apr 1 03:47:19 1998 *************** *** 326,331 **** --- 326,333 ---- int poll(struct pollfd filedes[], unsigned int nfds, int timeout) #elif defined(HPUX9) int poll(struct pollfd filedes[], int nfds, int timeout) + #elif defined(NETBSD) + int poll(struct pollfd *filedes, nfds_t nfds, int timeout) #else int poll(struct pollfd *filedes, unsigned long nfds, int timeout) #endif *** ./nsprpub/pr/src/md/unix/netbsd.c.orig Wed Apr 1 03:26:27 1998 --- ./nsprpub/pr/src/md/unix/netbsd.c Mon Apr 6 00:06:25 1998 d1183 1 a1183 1 --- 1,102 ---- d1202 2 a1203 1 + #include "primpl.h" a1204 2 + #include + #include d1207 105 a1311 7 + void _MD_EarlyInit(void) + { + /* + * Ignore FPE because coercion of a NaN to an int causes SIGFPE + * to be raised. + */ + struct sigaction act; d1313 3 a1315 5 + act.sa_handler = SIG_IGN; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGFPE, &act, 0); + } d1317 8 a1324 13 + PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) + { + #ifndef _PR_PTHREADS + if (isCurrent) { + (void) sigsetjmp(CONTEXT(t), 1); + } + *np = sizeof(CONTEXT(t)) / sizeof(PRWord); + return (PRWord *) CONTEXT(t); + #else + *np = 0; + return NULL; + #endif + } d1326 6 a1331 6 + #ifndef _PR_PTHREADS + void + _MD_SET_PRIORITY(_MDThread *thread, PRUintn newPri) + { + return; + } d1333 1 a1333 5 + PRStatus + _MD_InitializeThread(PRThread *thread) + { + return PR_SUCCESS; + } d1335 4 a1338 7 + PRStatus + _MD_WAIT(PRThread *thread, PRIntervalTime ticks) + { + PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); + _PR_MD_SWITCH_CONTEXT(thread); + return PR_SUCCESS; + } d1340 6 a1345 8 + PRStatus + _MD_WAKEUP_WAITER(PRThread *thread) + { + if (thread) { + PR_ASSERT(!(thread->flags & _PR_GLOBAL_SCOPE)); + } + return PR_SUCCESS; + } d1347 4 a1350 6 + /* These functions should not be called for OSF1 */ + void + _MD_YIELD(void) + { + PR_NOT_REACHED("_MD_YIELD should not be called for OSF1."); + } d1352 3 a1354 15 + PRStatus + _MD_CREATE_THREAD( + PRThread *thread, + void (*start) (void *), + PRThreadPriority priority, + PRThreadScope scope, + PRThreadState state, + PRUint32 stackSize) + { + PR_NOT_REACHED("_MD_CREATE_THREAD should not be called for OSF1."); + return PR_FAILURE; + } + #endif /* ! _PR_PTHREADS */ *** ./nsprpub/pr/src/md/prosdep.c.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/src/md/prosdep.c Wed Apr 1 03:17:59 1998 d1356 4 a1359 20 *** 42,48 **** /* Get page size */ #ifdef XP_UNIX #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ ! || defined FREEBSD _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ --- 42,48 ---- /* Get page size */ #ifdef XP_UNIX #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ ! || defined FREEBSD || defined NETBSD _pr_pageSize = getpagesize(); #elif defined(HPUX) /* I have no idea. Don't get me started. --Rob */ *** ./nsprpub/pr/src/linking/prlink.c.orig Tue Mar 31 04:05:25 1998 --- ./nsprpub/pr/src/linking/prlink.c Wed Apr 1 04:53:37 1998 *************** *** 75,81 **** d1361 9 a1369 16 /************************************************************************/ ! #if ( !defined(USE_DLFCN) && !defined(HAVE_STRERROR) ) || defined(HPUX) || defined(BSDI) || defined(LINUX) static char* errStrBuf = NULL; #define ERR_STR_BUF_LENGTH 20 static char* errno_string(PRIntn oserr) --- 75,81 ---- /************************************************************************/ ! #if ( !defined(USE_DLFCN) && !defined(HAVE_STRERROR) ) || defined(HPUX) || defined(BSDI) || defined(LINUX) || defined(NETBSD) static char* errStrBuf = NULL; #define ERR_STR_BUF_LENGTH 20 static char* errno_string(PRIntn oserr) *** ./nsprpub/pr/src/pthreads/ptio.c.orig Tue Mar 31 04:05:27 1998 --- ./nsprpub/pr/src/pthreads/ptio.c Wed Apr 1 03:22:42 1998 d1371 18 a1388 16 *** 84,90 **** #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ || defined(OSF1) || defined(SOLARIS) \ || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ ! || defined(FREEBSD) #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" --- 84,90 ---- #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ || defined(OSF1) || defined(SOLARIS) \ || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ ! || defined(FREEBSD) || defined(NETBSD) #define _PRSelectFdSetArg_t fd_set * #else #error "Cannot determine architecture" d1390 2 a1391 2 *** 2385,2391 **** #endif d1393 2 a1394 7 #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ ! || defined(AIX) || defined(LINUX) || defined(FREEBSD) #define _PR_FCNTL_FLAGS O_NONBLOCK #else #error "Can't determine architecture" --- 2385,2391 ---- #endif d1396 4 a1399 9 #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ ! || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) #define _PR_FCNTL_FLAGS O_NONBLOCK #else #error "Can't determine architecture" *** ./nsprpub/pr/src/pthreads/ptthread.c.orig Tue Mar 31 04:05:27 1998 --- ./nsprpub/pr/src/pthreads/ptthread.c Wed Apr 1 03:24:16 1998 *************** *** 191,201 **** d1401 2 a1402 5 if (EPERM != pt_schedpriv) { ! #if !defined(_PR_DCETHREADS) && !defined(FREEBSD) struct sched_param schedule; #endif d1404 67 a1470 16 ! #if !defined(FREEBSD) rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED); PR_ASSERT(0 == rv); #endif --- 191,201 ---- if (EPERM != pt_schedpriv) { ! #if !defined(_PR_DCETHREADS) && !defined(FREEBSD) && !defined(NETBSD) struct sched_param schedule; #endif ! #if !defined(FREEBSD) && !defined(NETBSD) rv = pthread_attr_setinheritsched(&tattr, PTHREAD_EXPLICIT_SCHED); PR_ASSERT(0 == rv); #endif d1472 1 a1472 71 *** 205,211 **** #if defined(_PR_DCETHREADS) rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority)); PR_ASSERT(0 == rv); ! #elif !defined(FREEBSD) rv = pthread_attr_getschedparam(&tattr, &schedule); PR_ASSERT(0 == rv); schedule.sched_priority = pt_PriorityMap(priority); --- 205,211 ---- #if defined(_PR_DCETHREADS) rv = pthread_attr_setprio(&tattr, pt_PriorityMap(priority)); PR_ASSERT(0 == rv); ! #elif !defined(FREEBSD) && !defined(NETBSD) rv = pthread_attr_getschedparam(&tattr, &schedule); PR_ASSERT(0 == rv); schedule.sched_priority = pt_PriorityMap(priority); *************** *** 539,545 **** rv = pthread_setprio(thred->id, pt_PriorityMap(newPri)); /* pthread_setprio returns the old priority */ PR_ASSERT(-1 != rv); ! #elif !defined(FREEBSD) if (EPERM != pt_schedpriv) { int policy; --- 539,545 ---- rv = pthread_setprio(thred->id, pt_PriorityMap(newPri)); /* pthread_setprio returns the old priority */ PR_ASSERT(-1 != rv); ! #elif !defined(FREEBSD) && !defined(NETBSD) if (EPERM != pt_schedpriv) { int policy; *************** *** 730,736 **** * conflict with the use of these two signals in our GC support. * So we don't know how to support GC on Linux pthreads. */ ! #if !defined(LINUX2_0) && !defined(FREEBSD) init_pthread_gc_support(); #endif --- 730,736 ---- * conflict with the use of these two signals in our GC support. * So we don't know how to support GC on Linux pthreads. */ ! #if !defined(LINUX2_0) && !defined(FREEBSD) && !defined(NETBSD) init_pthread_gc_support(); #endif *************** *** 1015,1021 **** pthread_cond_signal(&me->suspendResumeCV); while (me->suspend & PT_THREAD_SUSPENDED) { ! #if !defined(FREEBSD) /*XXX*/ PRIntn rv; sigwait(&sigwait_set, &rv); #endif --- 1015,1021 ---- pthread_cond_signal(&me->suspendResumeCV); while (me->suspend & PT_THREAD_SUSPENDED) { ! #if !defined(FREEBSD) && !defined(NETBSD) /*XXX*/ PRIntn rv; sigwait(&sigwait_set, &rv); #endif *** ./dbm/include/mcom_db.h.orig Tue Mar 31 04:05:30 1998 --- ./dbm/include/mcom_db.h Wed Apr 1 05:01:27 1998 *************** *** 200,206 **** d1480 1 a1480 1 --- 200,206 ---- d1488 2 a1489 2 *** ./cmd/stubfe/Makefile.orig Tue Mar 31 04:05:33 1998 --- ./cmd/stubfe/Makefile Wed Apr 1 04:49:28 1998 d1491 1 a1491 3 *** 542,547 **** --- 542,553 ---- endif d1493 1 a1493 68 ######################################## + # 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 Mar 31 04:05:42 1998 --- ./cmd/xfe/Microline3.0/XmL/Grid.c Thu Apr 2 01:35:01 1998 *************** *** 30,35 **** --- 30,38 ---- #include #include #include + #ifndef MOTIF11 + #include + #endif #include #include #include *** ./cmd/xfe/src/HTMLView.cpp.orig Tue Mar 31 04:06:22 1998 --- ./cmd/xfe/src/HTMLView.cpp Wed Apr 1 04:52:19 1998 *************** *** 343,349 **** 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). --- 343,349 ---- 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 Mar 31 04:06:29 1998 --- ./cmd/xfe/src/context_funcs.cpp Thu Apr 9 01:36:26 1998 *************** *** 65,71 **** #include /* for statfs() */ extern "C" int statfs(char *, struct statfs *); #define STATFS statfs ! #elif defined(BSDI) #include /* for statfs() */ #define STATFS statfs #else --- 65,71 ---- #include /* for statfs() */ extern "C" int statfs(char *, struct statfs *); #define STATFS statfs ! #elif defined(BSDI) || defined(NETBSD) #include /* for statfs() */ #define STATFS statfs #else *** ./cmd/xfe/Makefile.orig Tue Mar 31 04:05:35 1998 --- ./cmd/xfe/Makefile Wed Apr 8 23:43:07 1998 *************** *** 485,490 **** --- 485,504 ---- endif d1495 2 a1496 33 ######################################## + # 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 Wed Apr 1 04:59:26 1998 --- ./cmd/xfe/mozilla.c Thu Apr 2 01:49:10 1998 *************** *** 1886,1891 **** --- 1886,1893 ---- 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__) *************** *** 3477,3483 **** d1498 1 a1498 1 #else /* !OLD_UNIX_FILES */ d1500 1 a1500 5 ! #if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif --- 3479,3485 ---- d1502 1 a1502 1 #else /* !OLD_UNIX_FILES */ d1504 2 a1505 10 ! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif *** ./cmd/xfe/dialogs.c.orig Tue Mar 31 04:05:37 1998 --- ./cmd/xfe/dialogs.c Thu Apr 2 01:44:10 1998 *************** *** 239,245 **** (void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0); } d1507 1 a1507 7 ! #if !defined(__FreeBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) #include extern char *sys_errlist[]; extern int sys_nerr; --- 239,245 ---- (void) fe_dialog (parent, "error", message, FALSE, 0, FALSE, FALSE, 0); } d1509 2 a1510 6 ! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(MACLINUX) && !defined(LINUX_GLIBC_2) #include extern char *sys_errlist[]; extern int sys_nerr; *** ./cmd/xfe/movemail.c.orig Tue Mar 31 04:05:40 1998 --- ./cmd/xfe/movemail.c Thu Apr 2 01:48:34 1998 d1512 6 a1517 7 *** 40,46 **** #include "xfe.h" #include ! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; d1519 7 a1525 7 --- 40,46 ---- #include "xfe.h" #include ! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; d1527 3 a1529 2 *** ./cmd/xfe/prefdialogs.c.orig Tue Mar 31 04:05:40 1998 --- ./cmd/xfe/prefdialogs.c Thu Apr 2 01:49:23 1998 d1531 9 a1539 1 *** 77,83 **** d1541 1 a1541 7 /* For sys_errlist and sys_nerr */ #include ! #if !defined(__FreeBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif --- 77,83 ---- d1543 6 a1548 8 /* For sys_errlist and sys_nerr */ #include ! #if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(LINUX_GLIBC_2) extern char *sys_errlist[]; extern int sys_nerr; #endif *** ./config/NetBSD.mk.orig Wed Apr 1 00:16:52 1998 --- ./config/NetBSD.mk Thu Apr 9 01:45:31 1998 d1551 1 a1551 1 --- 1,106 ---- d1634 1 d1647 1 a1647 1 + DSO_CFLAGS = -fpic d1659 2 a1660 2 *** ./config/rules.mk.orig Tue Mar 31 04:07:28 1998 --- ./config/rules.mk Tue Apr 7 01:36:14 1998 d1683 2 a1684 2 *** ./config/config.mk.orig Tue Mar 31 04:06:41 1998 --- ./config/config.mk Tue Apr 7 22:04:05 1998 a1701 19 *** ./sun-java/stubs/include/typedefs_md.h.orig Tue Mar 31 04:07:55 1998 --- ./sun-java/stubs/include/typedefs_md.h Wed Apr 1 05:11:54 1998 *************** *** 38,44 **** typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX2_0) && !defined(MACLINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) typedef int64 int64_t; #else /* --- 38,44 ---- typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */ ! #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX2_0) && !defined(MACLINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11) && !defined(NETBSD) typedef int64 int64_t; #else /* @ 1.1 log @Mozilla (free Netscape) package. Note that Mozilla is a very young package, as its sources have just been released. Expect some changes. Currently untested on architectures other than the i386. @ text @d662 1 a662 1 --- ./nsprpub/pr/include/md/_netbsd.h Tue Apr 7 22:29:17 1998 d691 1 a691 1 + #if defined(__i386) d725 1 a725 1 + #if defined(__i386) || defined(__sparc__) || defined(__m68k__) d1422 1 a1422 1 --- ./cmd/xfe/src/context_funcs.cpp Wed Apr 1 04:52:38 1998 d1424 3 a1426 2 *** 67,72 **** --- 67,74 ---- d1428 9 a1436 1 #elif defined(BSDI) a1437 2 + #elif defined(NETBSD) + #include /* for statfs() */ a1439 1 #include /* for statfs() */ d1553 1 a1553 1 --- ./config/NetBSD.mk Wed Apr 8 23:42:56 1998 d1556 1 a1556 1 --- 1,107 ---- a1638 1 + PORT_FLAGS += -D_PR_NEED_FAKE_POLL @