diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/coreconf/Darwin.mk nss-3.12.6/mozilla/security/coreconf/Darwin.mk
--- nss-3.12.6.orig/mozilla/security/coreconf/Darwin.mk	2010-02-04 13:59:10.000000000 -0500
+++ nss-3.12.6/mozilla/security/coreconf/Darwin.mk	2010-03-26 03:07:56.000000000 -0400
@@ -92,7 +92,6 @@
         endif
     endif
 
-    LDFLAGS += $(DARWIN_SDK_LDFLAGS)
 endif
 
 # "Commons" are tentative definitions in a global scope, like this:
@@ -105,7 +104,7 @@
 # definitions so that the linker can catch multiply-defined symbols.
 # Also, common symbols are not allowed with Darwin dynamic libraries.
 
-OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS)
+OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
 ifdef BUILD_OPT
 ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
@@ -122,11 +121,11 @@
 
 DSO_CFLAGS	= -fPIC
 # May override this with different compatibility and current version numbers.
-DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
+DARWIN_DYLIB_VERSIONS = -compatibility_version 1.0.1 -current_version 1.0.1
 # May override this with -bundle to create a loadable module.
-DSO_LDOPTS	= -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
+DSO_LDOPTS	= -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name $(libdir)/$(notdir $@) -headerpad_max_install_names
 
-MKSHLIB		= $(CC) $(DSO_LDOPTS) $(DARWIN_SDK_SHLIBFLAGS)
+MKSHLIB		= $(CC) $(DSO_LDOPTS)
 DLL_SUFFIX	= dylib
 PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
                 sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,_,' > $@
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk
--- nss-3.12.6.orig/mozilla/security/nss/cmd/platlibs.mk	2010-02-04 13:59:10.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk	2010-03-26 01:43:58.000000000 -0400
@@ -130,7 +130,6 @@
 	$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
 	$(PKIXLIB) \
 	$(DBMLIB) \
-	$(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
 	$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \
@@ -179,6 +178,7 @@
 # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
+	-L$(SQLITE_LIB_DIR) \
 	$(SQLITE) \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/config.mk
--- nss-3.12.6.orig/mozilla/security/nss/lib/ckfw/builtins/config.mk	2009-06-10 20:55:34.000000000 -0400
+++ nss-3.12.6/mozilla/security/nss/lib/ckfw/builtins/config.mk	2010-03-26 01:43:58.000000000 -0400
@@ -47,7 +47,7 @@
 PROGRAM        =
 
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-    SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
+    SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).so
     RES = $(OBJDIR)/$(LIBRARY_NAME).res
     RESNAME = $(LIBRARY_NAME).rc
 endif
@@ -60,6 +60,7 @@
 # To create a loadable module on Darwin, we must use -bundle.
 #
 ifeq ($(OS_TARGET),Darwin)
+DLL_SUFFIX=so
 ifndef USE_64
 DSO_LDOPTS = -bundle
 endif
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/nss/nssinit.c nss-3.12.6/mozilla/security/nss/lib/nss/nssinit.c
--- nss-3.12.6.orig/mozilla/security/nss/lib/nss/nssinit.c	2010-01-21 21:10:54.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/lib/nss/nssinit.c	2010-03-26 01:43:58.000000000 -0400
@@ -275,7 +275,7 @@
 #elif defined(HPUX) && !defined(__ia64)  /* HP-UX PA-RISC */
 	"libnssckbi.sl";
 #elif defined(DARWIN)
-	"libnssckbi.dylib";
+	"libnssckbi.so";
 #elif defined(XP_UNIX) || defined(XP_BEOS)
 	"libnssckbi.so";
 #else
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk
--- nss-3.12.6.orig/mozilla/security/nss/lib/softoken/config.mk	2009-06-10 20:55:48.000000000 -0400
+++ nss-3.12.6/mozilla/security/nss/lib/softoken/config.mk	2010-03-26 01:43:58.000000000 -0400
@@ -83,6 +83,7 @@
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
+	-L$(SQLITE_LIB_DIR) \
 	-lsqlite3 \
 	-L$(NSPR_LIB_DIR) \
 	-lplc4 \
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss/lib/sqlite/manifest.mn nss-3.12.6/mozilla/security/nss/lib/sqlite/manifest.mn
--- nss-3.12.6.orig/mozilla/security/nss/lib/sqlite/manifest.mn	2010-01-09 00:04:37.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss/lib/sqlite/manifest.mn	2010-03-26 01:43:58.000000000 -0400
@@ -38,7 +38,7 @@
 
 MODULE = nss
 
-LIBRARY_NAME = sqlite
+LIBRARY_NAME = 
 LIBRARY_VERSION = 3
 MAPFILE = $(OBJDIR)/sqlite.def
 DEFINES += -DSQLITE_THREADSAFE=1
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss-config.in nss-3.12.6/mozilla/security/nss-config.in
--- nss-3.12.6.orig/mozilla/security/nss-config.in	1969-12-31 19:00:00.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss-config.in	2010-03-26 01:43:58.000000000 -0400
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	nssutil
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+lib_nssutil=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    nssutil)
+      lib_nssutil=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=${prefix}
+fi
+if test -z "$includedir"; then
+    includedir=${prefix}/include/nss.1d
+fi
+if test -z "$libdir"; then
+    libdir=${exec_prefix}/lib/nss.1d
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      if test -n "$lib_nssutil"; then
+	libdirs="$libdirs -lnssutil${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff -Nurd -x'*~' nss-3.12.6.orig/mozilla/security/nss.pc.in nss-3.12.6/mozilla/security/nss.pc.in
--- nss-3.12.6.orig/mozilla/security/nss.pc.in	1969-12-31 19:00:00.000000000 -0500
+++ nss-3.12.6/mozilla/security/nss.pc.in	2010-03-26 01:43:58.000000000 -0400
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib/nss.1d
+includedir=${prefix}/include/nss.1d
+
+Name: NSS
+Description: Mozilla Network Security Services
+Version: @VERSION@
+Requires: nspr
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3
+Cflags: -I${includedir}