diff -uNr nspr-4.6.7/mozilla/nsprpub/configure nspr-4.6.7-new/mozilla/nsprpub/configure
--- nspr-4.6.7/mozilla/nsprpub/configure	2007-04-27 16:01:01.000000000 -0400
+++ nspr-4.6.7-new/mozilla/nsprpub/configure	2007-11-07 14:56:50.000000000 -0500
@@ -100,6 +100,16 @@
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
+# NLS nuisances.
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
+
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
@@ -488,16 +498,6 @@
   esac
 done
 
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
@@ -3349,7 +3349,7 @@
         elif test -z "$MACOSX_DEPLOYMENT_TARGET" ; then
                                                 case "${target_cpu}" in
                 powerpc*)
-                                        export MACOSX_DEPLOYMENT_TARGET=10.1
+                                        export MACOSX_DEPLOYMENT_TARGET=10.2
                     ;;
                 i*86*)
                                         export MACOSX_DEPLOYMENT_TARGET=10.4
@@ -3855,7 +3855,7 @@
     PR_MD_CSRCS=linux.c
     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
     DSO_CFLAGS=-fPIC
-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
+    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
     _OPTIMIZE_FLAGS=-O2
     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
                                    # combo is not yet good at debugging inlined
diff -uNr nspr-4.6.7/mozilla/nsprpub/pr/include/md/_pth.h nspr-4.6.7-new/mozilla/nsprpub/pr/include/md/_pth.h
--- nspr-4.6.7/mozilla/nsprpub/pr/include/md/_pth.h	2005-07-21 14:22:53.000000000 -0400
+++ nspr-4.6.7-new/mozilla/nsprpub/pr/include/md/_pth.h	2007-11-07 14:57:40.000000000 -0500
@@ -202,13 +202,6 @@
 #define PT_NO_SIGTIMEDWAIT
 #endif
 
-/*
- * These platforms don't have pthread_kill()
- */
-#if defined(DARWIN)
-#define pthread_kill(thread, sig) ENOSYS
-#endif
-
 #if defined(OSF1) || defined(VMS)
 #define PT_PRIO_MIN            PRI_OTHER_MIN
 #define PT_PRIO_MAX            PRI_OTHER_MAX
diff -uNr nspr-4.6.7/mozilla/nsprpub/pr/src/misc/prtime.c nspr-4.6.7-new/mozilla/nsprpub/pr/src/misc/prtime.c
--- nspr-4.6.7/mozilla/nsprpub/pr/src/misc/prtime.c	2007-01-15 19:31:10.000000000 -0500
+++ nspr-4.6.7-new/mozilla/nsprpub/pr/src/misc/prtime.c	2007-11-07 14:56:11.000000000 -0500
@@ -1553,7 +1553,7 @@
                 case TT_EET: zone_offset =  2 * 60; break;
                 case TT_JST: zone_offset =  9 * 60; break;
                 default:
-                  PR_ASSERT (0);
+                  return PR_FAILURE;
                   break;
                 }
         }
@@ -1595,11 +1595,12 @@
           struct tm localTime;
           time_t secs;
 
-          PR_ASSERT(tm.tm_month > -1 
+          if (!(tm.tm_month > -1
                                    && tm.tm_mday > 0 
                                    && tm.tm_hour > -1
                                    && tm.tm_min > -1
-                                   && tm.tm_sec > -1);
+                                   && tm.tm_sec > -1)) 
+		return PR_FAILURE;
 
             /*
              * To obtain time_t from a tm structure representing the local