4 files changed, 56 insertions, 46 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index d681807fa5b0..381d579cce28 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	1.1.17
-PORTREVISION=	1
+DISTVERSION=	1.1.18
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 9d39770bf076..4c1f32033ba9 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (seamonkey-1.1.17.source.tar.bz2) = 9eba600ba6ca522b8eada9a0a8e890e2
-SHA256 (seamonkey-1.1.17.source.tar.bz2) = 249eb89447658ef4d6974b784dd7ecfad9383924e3d7dc541d7f60525cee08a6
-SIZE (seamonkey-1.1.17.source.tar.bz2) = 38082419
+MD5 (seamonkey-1.1.18.source.tar.bz2) = ef4455becf3a12833dca7dd92854aeaa
+SHA256 (seamonkey-1.1.18.source.tar.bz2) = fa7f2b8a94297027cf0151847e52f6dbe031b21599218888c4629f08daec910f
+SIZE (seamonkey-1.1.18.source.tar.bz2) = 36466846
diff --git a/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in b/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in
new file mode 100644
index 000000000000..40562345842c
--- /dev/null
+++ b/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in
@@ -0,0 +1,13 @@
+--- db/sqlite3/src/Makefile.in.orig	2009-08-22 00:49:32.000000000 +0200
++++ db/sqlite3/src/Makefile.in	2009-08-22 00:51:29.000000000 +0200
+@@ -113,6 +113,10 @@
+ ##SIMPLE_PROGRAMS = sqlite-shell
+ endif
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++EXTRA_LIBS	+= -lpthread
++endif
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ sqlite-shell.$(OBJ_SUFFIX): shell.c
diff --git a/www/seamonkey/files/patch-sysnss b/www/seamonkey/files/patch-sysnss
index b2794202d46d..cd1e26811ad1 100644
--- a/www/seamonkey/files/patch-sysnss
+++ b/www/seamonkey/files/patch-sysnss
@@ -7,12 +7,36 @@
 -
  ifndef MOZ_NATIVE_JPEG
  tier_1_dirs	+= jpeg
---- security/manager/Makefile.in.orig	2008-06-15 23:23:29.000000000 +0100
-+++ security/manager/Makefile.in	2008-07-12 05:54:16.000000000 +0100
-@@ -54,22 +54,13 @@
- 	SSL3_LIB \
+--- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
++++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
+@@ -124,19 +124,19 @@
+ 		  pipboot \
+ 		  $(NULL)
+ 
+-EXTRA_DEPS = $(NSS_DEP_LIBS)
+ 
+ DEFINES += -DNSS_ENABLE_ECC
+ 
+ # Use local includes because they are inserted before INCLUDES
+ # so that Mozilla's nss.h is used, not glibc's
+-LOCAL_INCLUDES += $(NSS_CFLAGS)
++LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
+ 
+ EXTRA_DSO_LDOPTS += \
+ 		$(MOZ_UNICHARUTIL_LIBS) \
+ 		$(MOZ_COMPONENT_LIBS) \
+ 		$(MOZ_JS_LIBS) \
+ 		$(NSS_LIBS) \
++		$(LOCAL_INCLUDES) \
+ 		$(NULL)
+ 
+ include $(topsrcdir)/config/rules.mk
+--- security/manager/Makefile.in.orig	2009-08-07 22:37:51.000000000 +0200
++++ security/manager/Makefile.in	2009-08-21 10:41:53.000000000 +0200
+@@ -56,24 +56,13 @@
  	SOFTOKEN3_LIB \
  	SOFTOKEN3_CHK \
+ 	NSSDBM3_LIB \
 -	LOADABLE_ROOT_MODULE \
  	HAVE_FREEBL_LIBS \
  	HAVE_FREEBL_LIBS_32 \
@@ -24,15 +48,17 @@
  endif
  
 -NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
+-NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
 -SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
 -SSL3_LIB =  $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
 -SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
 -SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk
+-NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
 -
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -218,11 +209,6 @@
+@@ -222,11 +211,6 @@
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
  	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
@@ -44,19 +70,11 @@
  	touch $@
  endif
  
-@@ -249,55 +235,6 @@
+@@ -253,49 +237,6 @@
  	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
  endif
  ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs
--	$(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean
--	# In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h.
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins"
+-	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
@@ -67,6 +85,8 @@
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DIST)/bin
+-	$(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin
 -	$(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin
 -ifdef HAVE_FREEBL_LIBS
@@ -100,7 +120,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -308,42 +245,6 @@
+@@ -306,44 +247,6 @@
  
  install::
  ifndef MOZ_NATIVE_NSS
@@ -110,6 +130,8 @@
 -endif
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir)
+-	$(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir)
 -ifdef HAVE_FREEBL_LIBS
@@ -143,7 +165,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -360,12 +261,6 @@
+@@ -360,12 +263,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -156,27 +178,3 @@
  endif
  
  echo-requires-recursive::
---- security/manager/ssl/src/Makefile.in.orig	Mon Aug 14 19:22:52 2006
-+++ security/manager/ssl/src/Makefile.in	Thu Aug 31 15:17:20 2006
-@@ -124,19 +124,19 @@
- 		  pipboot \
- 		  $(NULL)
- 
--EXTRA_DEPS = $(NSS_DEP_LIBS)
- 
- DEFINES += -DNSS_ENABLE_ECC
- 
- # Use local includes because they are inserted before INCLUDES
- # so that Mozilla's nss.h is used, not glibc's
--LOCAL_INCLUDES += $(NSS_CFLAGS)
-+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss
- 
- EXTRA_DSO_LDOPTS += \
- 		$(MOZ_UNICHARUTIL_LIBS) \
- 		$(MOZ_COMPONENT_LIBS) \
- 		$(MOZ_JS_LIBS) \
- 		$(NSS_LIBS) \
-+		$(LOCAL_INCLUDES) \
- 		$(NULL)
- 
- include $(topsrcdir)/config/rules.mk