diff -Naur abi/ac-helpers/abi-detect-platform.m4 abi.mod/ac-helpers/abi-detect-platform.m4
--- abi/ac-helpers/abi-detect-platform.m4	Thu Aug  9 07:25:17 2001
+++ abi.mod/ac-helpers/abi-detect-platform.m4	Thu Aug 30 19:30:36 2001
@@ -63,11 +63,11 @@
 #### build MacOS version using Carbon. Change later when we 
 #### support Darwin running X and other varieties (like MacOS X
 #### using Cocoa). <hfiguiere@teaser.fr>
-
-if test "$OS_NAME" = "Darwin"; then
+if test "x$PLATFORM" = "xNetBSD"; then
+	OS_NAME=NetBSD
+elif test "$OS_NAME" = "Darwin"; then
 	OS_NAME=MACOSX
 fi
-
 # At this point, we now have the following info:
 # OS_NAME = something like 'Linux'
 # OS_RELEASE = something like '2.4.1'
diff -Naur abi/src/af/xap/xp/xap_ModuleManager.cpp abi.mod/src/af/xap/xp/xap_ModuleManager.cpp
--- abi/src/af/xap/xp/xap_ModuleManager.cpp	Wed May  9 23:29:47 2001
+++ abi.mod/src/af/xap/xp/xap_ModuleManager.cpp	Thu Aug 30 19:30:26 2001
@@ -40,7 +40,7 @@
   #include "xap_QNXModule.h"
   #define MODULE_CLASS XAP_QNXModule
 
-#elif defined (__APPLE__)
+#elif defined (__APPLE__) && defined (TARGET_OS_MAC)
   #include <ConditionalMacros.h>
   #if defined(TARGET_RT_MAC_CFM) && (TARGET_RT_MAC_CFM == 1)
     #include "xap_MacCFMModule.h"
diff -Naur abi/src/wp/ap/unix/ap_UnixApp.cpp abi.mod/src/wp/ap/unix/ap_UnixApp.cpp
--- abi/src/wp/ap/unix/ap_UnixApp.cpp	Thu Aug 30 09:35:38 2001
+++ abi.mod/src/wp/ap/unix/ap_UnixApp.cpp	Thu Aug 30 19:29:32 2001
@@ -1205,8 +1205,8 @@
     
     sigfillset(&sa.sa_mask);  // We don't want to hear about other signals
     sigdelset(&sa.sa_mask, SIGABRT); // But we will call abort(), so we can't ignore that
-
-#ifndef AIX
+/* #ifndef AIX /* - I presume these are always #define not extern... -fjf */
+#if defined (SA_NODEFER) && defined (SA_RESETHAND)
     sa.sa_flags = SA_NODEFER | SA_RESETHAND; // Don't handle nested signals
 #else
     sa.sa_flags = 0;
diff -Naur abi/src/wp/ap/unix/ap_UnixPrefs.cpp abi.mod/src/wp/ap/unix/ap_UnixPrefs.cpp
--- abi/src/wp/ap/unix/ap_UnixPrefs.cpp	Mon Mar 19 08:39:02 2001
+++ abi.mod/src/wp/ap/unix/ap_UnixPrefs.cpp	Thu Aug 30 19:29:56 2001
@@ -87,8 +87,11 @@
 	// (most likely, all of LC_* are the same)
 	
 	const char * szNewLang = "en-US"; // default to US English
+#if defined (LC_MESSAGES)
 	char * lc_ctype = UT_strdup(setlocale(LC_MESSAGES, NULL));
-
+#else
+	char * lc_ctype = UT_strdup(setlocale(LC_CTYPE, NULL));
+#endif
 	// locale categories seem to always look like this:
 	// two letter for language (lowcase) _ two letter country code (upcase)
 	// ie. en_US, es_ES, pt_PT