Update seamonkey, seamonkey-bin and seamonkey-gtk1 to Seamonkey 1.1.18.

Security fixes in this version:

MFSA 2009-43 Heap overflow in certificate regexp parsing
MFSA 2009-42 Compromise of SSL-protected communication

For more info, see http://www.seamonkey-project.org/releases/seamonkey1.1.18/

14 files changed, 65 insertions, 129 deletions

diff --git a/www/seamonkey-bin/Makefile b/www/seamonkey-bin/Makefile
index b4f1bea7700..d80240d5365 100644
--- a/www/seamonkey-bin/Makefile
+++ b/www/seamonkey-bin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2009/06/24 09:16:24 ghen Exp $
+# $NetBSD: Makefile,v 1.31 2009/09/15 09:26:07 ghen Exp $
 
 MOZILLA=		seamonkey
-MOZ_VER=		1.1.17
+MOZ_VER=		1.1.18
 MOZ_DISTVER=		${MOZ_VER}
 
 HOMEPAGE=		http://www.mozilla.org/projects/seamonkey/
diff --git a/www/seamonkey-bin/distinfo b/www/seamonkey-bin/distinfo
index cd5a15c6f05..800a52139d0 100644
--- a/www/seamonkey-bin/distinfo
+++ b/www/seamonkey-bin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.26 2009/06/24 09:16:24 ghen Exp $
+$NetBSD: distinfo,v 1.27 2009/09/15 09:26:07 ghen Exp $
 
-SHA1 (seamonkey/releases/1.1.17/seamonkey-1.1.17.en-US.linux-i686.tar.gz) = 6e9f9935c387626f962d0c81819304f8b1f06320
-RMD160 (seamonkey/releases/1.1.17/seamonkey-1.1.17.en-US.linux-i686.tar.gz) = 8cd7b5d3cac9421657b565d5d7d92327f3ea4246
-Size (seamonkey/releases/1.1.17/seamonkey-1.1.17.en-US.linux-i686.tar.gz) = 14829652 bytes
+SHA1 (seamonkey/releases/1.1.18/seamonkey-1.1.18.en-US.linux-i686.tar.gz) = e5b2749906d54b60865a14fb5bfafef3439586a1
+RMD160 (seamonkey/releases/1.1.18/seamonkey-1.1.18.en-US.linux-i686.tar.gz) = 57a96244f79b8e4828b897b1ec6a75953bad06fd
+Size (seamonkey/releases/1.1.18/seamonkey-1.1.18.en-US.linux-i686.tar.gz) = 15125907 bytes
diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile
index 842c435ea51..e2070c99c71 100644
--- a/www/seamonkey-gtk1/Makefile
+++ b/www/seamonkey-gtk1/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2009/08/26 20:24:11 sno Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/15 09:26:07 ghen Exp $
 
 MOZILLA=		seamonkey-gtk1
-PKGREVISION=		1
 
 COMMENT=		Full featured gecko-based browser built with GTK1
 
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 3504be2716b..7f2ba6c15e4 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2009/08/26 20:24:11 sno Exp $
+# $NetBSD: Makefile,v 1.28 2009/09/15 09:26:07 ghen Exp $
 
 MOZILLA=		seamonkey
 COMMENT=		Full featured gecko-based browser
-PKGREVISION=		1
 
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index ae26d962a9d..b2cbcd345e9 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.26 2009/06/24 09:16:24 ghen Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.27 2009/09/15 09:26:07 ghen Exp $
 # used by www/seamonkey/Makefile
 # used by www/seamonkey-gtk1/Makefile
 
 MOZILLA_BIN=		seamonkey-bin
-MOZ_VER=		1.1.17
+MOZ_VER=		1.1.18
 EXTRACT_SUFX=		.tar.bz2
 DISTNAME=		seamonkey-${MOZ_DIST_VER}.source
 CATEGORIES=		www
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index 0369eddba88..7814adf7193 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/06/14 22:00:34 joerg Exp $
+@comment $NetBSD: PLIST,v 1.18 2009/09/15 09:26:07 ghen Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -109,11 +109,14 @@ lib/${MOZILLA}/libmsgbaseutil.${SO_SUFFIX}
 lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
 lib/${MOZILLA}/libnss3.${SO_SUFFIX}
 lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
+lib/${MOZILLA}/libnssdbm3.${SO_SUFFIX}
+lib/${MOZILLA}/libnssutil3.${SO_SUFFIX}
 lib/${MOZILLA}/libplc4.${SO_SUFFIX}
 lib/${MOZILLA}/libplds4.${SO_SUFFIX}
 lib/${MOZILLA}/libprldap50.${SO_SUFFIX}
 lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
 lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
+lib/${MOZILLA}/libsqlite3.${SO_SUFFIX}
 lib/${MOZILLA}/libssl3.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
@@ -2121,80 +2124,39 @@ include/${MOZILLA}/nkcache/nsICacheSession.h
 include/${MOZILLA}/nkcache/nsICacheVisitor.h
 include/${MOZILLA}/nsBuildID.h
 include/${MOZILLA}/nsStaticComponents.h
-include/${MOZILLA}/nspr/md/_aix.h
 include/${MOZILLA}/nspr/md/_aix32.cfg
 include/${MOZILLA}/nspr/md/_aix64.cfg
 include/${MOZILLA}/nspr/md/_beos.cfg
-include/${MOZILLA}/nspr/md/_beos.h
 include/${MOZILLA}/nspr/md/_bsdi.cfg
-include/${MOZILLA}/nspr/md/_bsdi.h
 include/${MOZILLA}/nspr/md/_darwin.cfg
-include/${MOZILLA}/nspr/md/_darwin.h
 include/${MOZILLA}/nspr/md/_dgux.cfg
-include/${MOZILLA}/nspr/md/_dgux.h
 include/${MOZILLA}/nspr/md/_freebsd.cfg
-include/${MOZILLA}/nspr/md/_freebsd.h
-include/${MOZILLA}/nspr/md/_hpux.h
 include/${MOZILLA}/nspr/md/_hpux32.cfg
 include/${MOZILLA}/nspr/md/_hpux64.cfg
-include/${MOZILLA}/nspr/md/_irix.h
 include/${MOZILLA}/nspr/md/_irix32.cfg
 include/${MOZILLA}/nspr/md/_irix64.cfg
 include/${MOZILLA}/nspr/md/_linux.cfg
-include/${MOZILLA}/nspr/md/_linux.h
-include/${MOZILLA}/nspr/md/_macos.h
 include/${MOZILLA}/nspr/md/_ncr.cfg
-include/${MOZILLA}/nspr/md/_ncr.h
 include/${MOZILLA}/nspr/md/_nec.cfg
-include/${MOZILLA}/nspr/md/_nec.h
 include/${MOZILLA}/nspr/md/_netbsd.cfg
-include/${MOZILLA}/nspr/md/_netbsd.h
 include/${MOZILLA}/nspr/md/_nextstep.cfg
-include/${MOZILLA}/nspr/md/_nextstep.h
-include/${MOZILLA}/nspr/md/_nspr_pthread.h
 include/${MOZILLA}/nspr/md/_nto.cfg
-include/${MOZILLA}/nspr/md/_nto.h
 include/${MOZILLA}/nspr/md/_openbsd.cfg
-include/${MOZILLA}/nspr/md/_openbsd.h
 include/${MOZILLA}/nspr/md/_openvms.cfg
-include/${MOZILLA}/nspr/md/_openvms.h
 include/${MOZILLA}/nspr/md/_os2.cfg
-include/${MOZILLA}/nspr/md/_os2.h
-include/${MOZILLA}/nspr/md/_os2_errors.h
 include/${MOZILLA}/nspr/md/_osf1.cfg
-include/${MOZILLA}/nspr/md/_osf1.h
-include/${MOZILLA}/nspr/md/_pcos.h
-include/${MOZILLA}/nspr/md/_pth.h
 include/${MOZILLA}/nspr/md/_qnx.cfg
-include/${MOZILLA}/nspr/md/_qnx.h
 include/${MOZILLA}/nspr/md/_reliantunix.cfg
-include/${MOZILLA}/nspr/md/_reliantunix.h
-include/${MOZILLA}/nspr/md/_rhapsody.cfg
-include/${MOZILLA}/nspr/md/_rhapsody.h
 include/${MOZILLA}/nspr/md/_riscos.cfg
-include/${MOZILLA}/nspr/md/_riscos.h
 include/${MOZILLA}/nspr/md/_scoos.cfg
-include/${MOZILLA}/nspr/md/_scoos.h
 include/${MOZILLA}/nspr/md/_solaris.cfg
-include/${MOZILLA}/nspr/md/_solaris.h
 include/${MOZILLA}/nspr/md/_sony.cfg
-include/${MOZILLA}/nspr/md/_sony.h
 include/${MOZILLA}/nspr/md/_sunos4.cfg
-include/${MOZILLA}/nspr/md/_sunos4.h
-include/${MOZILLA}/nspr/md/_unix_errors.h
-include/${MOZILLA}/nspr/md/_unixos.h
 include/${MOZILLA}/nspr/md/_unixware.cfg
-include/${MOZILLA}/nspr/md/_unixware.h
 include/${MOZILLA}/nspr/md/_unixware7.cfg
 include/${MOZILLA}/nspr/md/_win16.cfg
-include/${MOZILLA}/nspr/md/_win16.h
-include/${MOZILLA}/nspr/md/_win32_errors.h
 include/${MOZILLA}/nspr/md/_win95.cfg
-include/${MOZILLA}/nspr/md/_win95.h
 include/${MOZILLA}/nspr/md/_winnt.cfg
-include/${MOZILLA}/nspr/md/_winnt.h
-include/${MOZILLA}/nspr/md/prosdep.h
-include/${MOZILLA}/nspr/md/sunos4.h
 include/${MOZILLA}/nspr/nspr.h
 include/${MOZILLA}/nspr/obsolete/pralarm.h
 include/${MOZILLA}/nspr/obsolete/probslet.h
@@ -2996,6 +2958,7 @@ include/${MOZILLA}/nss/nssilock.h
 include/${MOZILLA}/nss/nsslocks.h
 include/${MOZILLA}/nss/nssrwlk.h
 include/${MOZILLA}/nss/nssrwlkt.h
+include/${MOZILLA}/nss/nssutil.h
 include/${MOZILLA}/nss/ocsp.h
 include/${MOZILLA}/nss/ocspt.h
 include/${MOZILLA}/nss/p12.h
@@ -3041,7 +3004,7 @@ include/${MOZILLA}/nss/ssl.h
 include/${MOZILLA}/nss/sslerr.h
 include/${MOZILLA}/nss/sslproto.h
 include/${MOZILLA}/nss/sslt.h
-include/${MOZILLA}/nss/watcomfx.h
+include/${MOZILLA}/nss/utilrename.h
 @comment end INCLUDE-PUBLIC
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index c60912bfc0d..726be6f6611 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.41 2009/06/24 09:16:24 ghen Exp $
+$NetBSD: distinfo,v 1.42 2009/09/15 09:26:07 ghen Exp $
 
-SHA1 (seamonkey-1.1.17.source.tar.bz2) = 81fea04abe908066311e5e13b268b078c45f577a
-RMD160 (seamonkey-1.1.17.source.tar.bz2) = cc7ac7b80739537f340efa1ab543e878759ecde8
-Size (seamonkey-1.1.17.source.tar.bz2) = 38082419 bytes
+SHA1 (seamonkey-1.1.18.source.tar.bz2) = 11c154ea7f77f903449f3b8394678e0a2d64e7d2
+RMD160 (seamonkey-1.1.18.source.tar.bz2) = 3a49321f5d0a6d897ff590849d8fde3aced4ec4e
+Size (seamonkey-1.1.18.source.tar.bz2) = 36466846 bytes
 SHA1 (patch-aa) = 2d117311991c4c71803f3c446334d7b6f1e1067a
 SHA1 (patch-ab) = 598039b566d03d87ba89001aa644e034eee40999
 SHA1 (patch-ac) = 393920aabf9476b668510a88af041d9a54c6019d
@@ -21,12 +21,12 @@ SHA1 (patch-ap) = 088124f118b44a41834eb734c555828b93772696
 SHA1 (patch-aq) = 29183e61d6b1a38853151426c2d4ffe45efd9c43
 SHA1 (patch-aw) = db73e21e67dc4200312285973faaaed308ea436e
 SHA1 (patch-ax) = 2d5cfeef594ed34249828b6d7c222b17901a4164
-SHA1 (patch-ba) = 6913628bbbd38596b008730be49a79ed038dd9fb
+SHA1 (patch-ba) = 72b65dc1ecbff188d010e25cf304f9b623f45f26
 SHA1 (patch-bb) = 02739e33cc1f35294257125c39a1223e0e1b07a6
 SHA1 (patch-bm) = 3e297a2dece8dcad7bde86f79f944a98d09174a7
 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358
 SHA1 (patch-bq) = 2b29436d138fea4e1941d537be1a636969db9a77
-SHA1 (patch-br) = ff781a96f356185947451deaddf6f9ad2acacd9d
+SHA1 (patch-br) = e7d95b62209f0feefe6f79efc7a55fca8d0b5789
 SHA1 (patch-bs) = 3263560fed55d5c7075f28d405d9d705608bfb67
 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
@@ -52,9 +52,8 @@ SHA1 (patch-de) = 909a9226be4141da96a1fa749d4e539a37307486
 SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
 SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
-SHA1 (patch-dk) = 183fa0d6a9040f53d9988fcc8868bdf83229803b
+SHA1 (patch-dk) = f8f1fa091dd46b10fbd702a13c78c9c5a9a721de
 SHA1 (patch-dl) = cba07cba5717a75c89f007aba36295dccc1c25ab
-SHA1 (patch-dm) = eb86aee54fd213eb64a89e5bc2754971db9648f4
 SHA1 (patch-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3
 SHA1 (patch-dr) = 377b1d83079ada4d819b6702c1010cdd900575fc
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
@@ -63,6 +62,5 @@ SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-dw) = 263a64d06c6b62041c62ed4532858339d37e1873
 SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b
-SHA1 (patch-dy) = 00117db97d6615c60c3db20c62032cab3512e243
-SHA1 (patch-dz) = fa80fc396c46ea2a66e587fa015f74b7a15afb66
 SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
+SHA1 (patch-ed) = d489079ae84fe336498bc1d9cf11edc71b38a9a4
diff --git a/www/seamonkey/patches/patch-ba b/www/seamonkey/patches/patch-ba
index a71137872ee..12dbc012c2a 100644
--- a/www/seamonkey/patches/patch-ba
+++ b/www/seamonkey/patches/patch-ba
@@ -1,10 +1,10 @@
-$NetBSD: patch-ba,v 1.2 2008/05/19 10:43:02 tnn Exp $
+$NetBSD: patch-ba,v 1.3 2009/09/15 09:26:07 ghen Exp $
 
---- nsprpub/pr/include/md/_netbsd.cfg.orig	2004-04-28 02:33:44.000000000 +0200
+--- nsprpub/pr/include/md/_netbsd.cfg.orig	2007-11-26 19:17:17.000000000 +0100
 +++ nsprpub/pr/include/md/_netbsd.cfg
-@@ -48,7 +48,8 @@
- 
- #define PR_AF_INET6 24  /* same as AF_INET6 */
+@@ -52,7 +52,8 @@
+ #define HAVE_LONG_LONG
+ #endif
  
 -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__)
 +#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
@@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.2 2008/05/19 10:43:02 tnn Exp $
  
  #define IS_LITTLE_ENDIAN 1
  #undef  IS_BIG_ENDIAN
-@@ -94,7 +95,53 @@
+@@ -97,7 +98,53 @@
  #define PR_ALIGN_OF_DOUBLE  4
  #define PR_ALIGN_OF_POINTER 4
  
@@ -67,7 +67,7 @@ $NetBSD: patch-ba,v 1.2 2008/05/19 10:43:02 tnn Exp $
  
  #undef IS_LITTLE_ENDIAN
  #define  IS_BIG_ENDIAN 1
-@@ -187,6 +234,55 @@
+@@ -188,6 +235,55 @@
  #define PR_BYTES_PER_WORD_LOG2  3
  #define PR_BYTES_PER_DWORD_LOG2 3
  
diff --git a/www/seamonkey/patches/patch-br b/www/seamonkey/patches/patch-br
index fc31e582929..0646d6b7dc2 100644
--- a/www/seamonkey/patches/patch-br
+++ b/www/seamonkey/patches/patch-br
@@ -1,8 +1,8 @@
-$NetBSD: patch-br,v 1.2 2009/04/07 08:01:01 hasso Exp $
+$NetBSD: patch-br,v 1.3 2009/09/15 09:26:07 ghen Exp $
 
---- nsprpub/pr/src/misc/prnetdb.c.orig	2006-11-14 19:41:59 +0200
-+++ nsprpub/pr/src/misc/prnetdb.c	2009-04-04 18:10:55 +0300
-@@ -113,6 +113,11 @@ PRLock *_pr_dnsLock = NULL;
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2008-01-13 02:27:15.000000000 +0100
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -114,6 +114,11 @@ PRLock *_pr_dnsLock = NULL;
  #define _PR_HAVE_5_ARG_GETPROTO_R
  #endif
  
@@ -11,10 +11,10 @@ $NetBSD: patch-br,v 1.2 2009/04/07 08:01:01 hasso Exp $
 +#define _PR_HAVE_5_ARG_GETPROTO_R
 +#endif
 +
- #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
+ /* BeOS has glibc but not the glibc-style getprotobyxxx_r functions. */
+ #if (defined(__GLIBC__) && __GLIBC__ >= 2 && !defined(XP_BEOS))
  #define _PR_HAVE_GETPROTO_R
- #define _PR_HAVE_5_ARG_GETPROTO_R
-@@ -329,7 +334,7 @@ _pr_QueryNetIfs(void)
+@@ -331,7 +336,7 @@ _pr_QueryNetIfs(void)
  }
  
  #elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD) \
@@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.2 2009/04/07 08:01:01 hasso Exp $
  
  /*
   * Use the BSD getifaddrs function.
-@@ -2115,7 +2120,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
+@@ -2039,7 +2044,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
           */
          hints.ai_socktype = SOCK_STREAM;
  
diff --git a/www/seamonkey/patches/patch-dk b/www/seamonkey/patches/patch-dk
index 6d703bffd6b..787f189dcf5 100644
--- a/www/seamonkey/patches/patch-dk
+++ b/www/seamonkey/patches/patch-dk
@@ -1,14 +1,13 @@
-$NetBSD: patch-dk,v 1.1 2006/06/28 21:23:29 joerg Exp $
+$NetBSD: patch-dk,v 1.2 2009/09/15 09:26:07 ghen Exp $
 
-diff -ruN ../Orig/mozilla/security/coreconf/config.mk ./security/coreconf/config.mk
---- ../Orig/mozilla/security/coreconf/config.mk	2004-04-26 00:02:17.000000000 +0900
-+++ ./security/coreconf/config.mk	2005-12-04 19:44:47.000000000 +0900
-@@ -63,7 +63,7 @@
+--- security/coreconf/config.mk.orig	2009-02-13 18:14:05.000000000 +0100
++++ security/coreconf/config.mk
+@@ -63,7 +63,7 @@ endif
  #######################################################################
  
  TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX DragonFly
+-              OpenVMS AIX RISCOS WINNT WIN95 WINCE
++              OpenVMS AIX DragonFly RISCOS WINNT WIN95 WINCE
  
  ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
  include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
diff --git a/www/seamonkey/patches/patch-dm b/www/seamonkey/patches/patch-dm
deleted file mode 100644
index 25ab717e0aa..00000000000
--- a/www/seamonkey/patches/patch-dm
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-dm,v 1.1 2006/06/28 21:23:29 joerg Exp $
-
-diff -ruN ../Orig/mozilla/security/nss/cmd/platlibs.mk ./security/nss/cmd/platlibs.mk
---- ../Orig/mozilla/security/nss/cmd/platlibs.mk	2005-04-07 06:35:41.000000000 +0900
-+++ ./security/nss/cmd/platlibs.mk	2005-12-04 19:44:52.000000000 +0900
-@@ -186,8 +186,8 @@
- # 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)))
--EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
-+ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD DragonFly, $(OS_ARCH)))
-+EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib -R/usr/pkg/lib/firefox
- endif
- 
- ifeq ($(OS_ARCH), SunOS)
diff --git a/www/seamonkey/patches/patch-dy b/www/seamonkey/patches/patch-dy
deleted file mode 100644
index c76ac035ce9..00000000000
--- a/www/seamonkey/patches/patch-dy
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dy,v 1.1 2008/07/06 06:46:05 ghen Exp $
-
---- security/nss-fips/lib/freebl/Makefile.orig	2006-08-24 00:57:26.000000000 +0200
-+++ security/nss-fips/lib/freebl/Makefile
-@@ -192,7 +192,7 @@ endif
- # to bind the blapi function references in FREEBLVector vector
- # (ldvector.c) to the blapi functions defined in the freebl
- # shared libraries.
--ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
-+ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET)))
-     MKSHLIB += -Wl,-Bsymbolic
- endif
- 
diff --git a/www/seamonkey/patches/patch-dz b/www/seamonkey/patches/patch-dz
deleted file mode 100644
index 755da36802e..00000000000
--- a/www/seamonkey/patches/patch-dz
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-dz,v 1.1 2008/07/06 06:46:05 ghen Exp $
-
---- security/nss-fips/cmd/platlibs.mk.orig	2006-11-17 03:13:16.000000000 +0100
-+++ security/nss-fips/cmd/platlibs.mk
-@@ -213,7 +213,7 @@ endif
- # 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 DragonFly FreeBSD Linux NetBSD, $(OS_ARCH)))
- EXTRA_SHARED_LIBS += -Wl,-rpath-link,$(DIST)/lib
- endif
- 
diff --git a/www/seamonkey/patches/patch-ed b/www/seamonkey/patches/patch-ed
new file mode 100644
index 00000000000..74b015b83e8
--- /dev/null
+++ b/www/seamonkey/patches/patch-ed
@@ -0,0 +1,20 @@
+$NetBSD: patch-ed,v 1.1 2009/09/15 09:26:07 ghen Exp $
+
+--- security/nss/tests/libpkix/libpkix.sh.orig	2008-11-11 10:06:52.000000000 +0100
++++ security/nss/tests/libpkix/libpkix.sh
+@@ -85,12 +85,12 @@ libpkix_cleanup()
+ ParseArgs ()
+ {
+     while [ $# -gt 0 ]; do
+-        if [ $1 == "-checkmem" ]; then
++        if [ $1 = "-checkmem" ]; then
+             checkMemArg=$1
+             memText="   (Memory Checking Enabled)"
+-        elif [ $1 == "-quiet" ]; then
++        elif [ $1 = "-quiet" ]; then
+             quietArg=$1
+-        elif [ $1 == "-arenas" ]; then
++        elif [ $1 = "-arenas" ]; then
+             arenasArg=$1
+         fi
+         shift