4 files changed, 42 insertions, 5 deletions
diff --git a/devel/nss/distinfo b/devel/nss/distinfo
index 9cadd650930..9a21f3cd959 100644
--- a/devel/nss/distinfo
+++ b/devel/nss/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:22 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/12 20:11:26 reed Exp $
 
 SHA1 (nss-3.9.2.tar.gz) = 017b748d92c5f7376bda78915d1b78b260b44133
 RMD160 (nss-3.9.2.tar.gz) = c9e41ac596af2e717da76546c3a5dfd37272c195
@@ -7,6 +7,8 @@ SHA1 (patch-aa) = 3b0d0eb22b498d72514e4616b101d93fedc2f53d
 SHA1 (patch-ab) = 21008be57eb73f4ddd36cf89d9ca56aa082a43ee
 SHA1 (patch-ac) = f1857c2e7de7746e66602155cc3d10996a62fc6b
 SHA1 (patch-ad) = 0fecd3fc1e5865525bcfce2fc6140622bc7a8f19
-SHA1 (patch-ae) = 89a316ddd87ac65c675beae33fabc5c0c12667f2
+SHA1 (patch-ae) = ad64e308931d4eb5cbfb11ca897cd11688af5b4f
 SHA1 (patch-af) = 4c933d1cfb1ec4708b69dec18ea6b3acfbd91cfa
 SHA1 (patch-ag) = e99c7396f4a6b7430321124e7c03528ab6e7681c
+SHA1 (patch-ah) = 6c8c335d9ffe4a1dbc83a3b8defe05930d866a40
+SHA1 (patch-ai) = a68c262b67af7778024b6db350c044fe8474919e
diff --git a/devel/nss/patches/patch-ae b/devel/nss/patches/patch-ae
index 8703a258059..2e0d0e665e0 100644
--- a/devel/nss/patches/patch-ae
+++ b/devel/nss/patches/patch-ae
@@ -1,7 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/02/01 21:51:12 jschauma Exp $
+$NetBSD: patch-ae,v 1.2 2005/08/12 20:11:26 reed Exp $
 
---- cmd/platlibs.mk.orig	Thu Jan 20 06:55:35 2005
-+++ cmd/platlibs.mk	Thu Jan 20 06:56:07 2005
+--- cmd/platlibs.mk.orig	2004-06-18 23:13:45.000000000 -0700
++++ cmd/platlibs.mk	2005-08-12 12:21:35.000000000 -0700
+@@ -182,7 +182,7 @@
+ # If GNU ld is used, we must use the -rpath-link option to tell
+ # the linker where to find libsoftokn3.so, an implicit dependency
+ # of libnss3.so.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_ARCH)))
++ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
+ EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
+ endif
+ 
 @@ -216,6 +216,7 @@
  	-L$(DIST)/lib \
  	-lssl3 \
diff --git a/devel/nss/patches/patch-ah b/devel/nss/patches/patch-ah
new file mode 100644
index 00000000000..d05c576e864
--- /dev/null
+++ b/devel/nss/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/08/12 20:11:26 reed Exp $
+
+--- ../coreconf/config.mk.orig	2005-08-12 12:23:06.000000000 -0700
++++ ../coreconf/config.mk	2005-08-12 12:22:42.000000000 -0700
+@@ -59,7 +59,7 @@
+ #######################################################################
+ 
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+-              OpenVMS AIX
++              OpenVMS AIX DragonFly
+ 
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/devel/nss/patches/patch-ai b/devel/nss/patches/patch-ai
new file mode 100644
index 00000000000..df78654a240
--- /dev/null
+++ b/devel/nss/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/08/12 20:11:26 reed Exp $
+
+--- ../../dbm/src/mktemp.c.orig	2005-08-12 12:24:10.000000000 -0700
++++ ../../dbm/src/mktemp.c	2005-08-12 12:24:59.000000000 -0700
+@@ -100,7 +100,7 @@
+ static int 
+ _gettemp(char *path, register int *doopen, int extraFlags)
+ {    
+-#if !defined(_WINDOWS) || defined(_WIN32)
++#if (!defined(_WINDOWS) || defined(_WIN32)) && !defined(errno)
+ 	extern int errno;                    
+ #endif
+ 	register char *start, *trv;