- Update to 0.9

With hat:	gecko

3 files changed, 19 insertions, 13 deletions

diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile
index ab486d5de960..5632fe631ed6 100644
--- a/mail/lightning/Makefile
+++ b/mail/lightning/Makefile
@@ -6,8 +6,7 @@
 #   $MCom: ports/mail/lightning/Makefile,v 1.1 2006/10/14 03:49:20 ahze Exp $
 
 PORTNAME=	lightning
-PORTVERSION=	0.7
-PORTREVISION=	5
+PORTVERSION=	0.9
 CATEGORIES=	mail deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	calendar/${PORTNAME}/releases/${DISTVERSION}/source
@@ -67,7 +66,6 @@ post-patch:
 
 port-pre-install:
 	${MKDIR} ${FAKEDIR}/${LIGHTNING_DIR}
-	${UNZIP_CMD} ${WRKSRC}/dist/xpi-stage/lightning.xpi -d ${FAKEDIR}/${LIGHTNING_DIR}
 
 pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST}
diff --git a/mail/lightning/distinfo b/mail/lightning/distinfo
index a46dd3ee5579..cc32fcdad0b5 100644
--- a/mail/lightning/distinfo
+++ b/mail/lightning/distinfo
@@ -1,3 +1,3 @@
-MD5 (lightning-sunbird-0.7-source.tar.bz2) = 14412fad1c72a5281164ca96f6c23cf4
-SHA256 (lightning-sunbird-0.7-source.tar.bz2) = 814628a87e803734e401a26b3beff46adeed47b0cb10f3241fe8fc6034f9baa1
-SIZE (lightning-sunbird-0.7-source.tar.bz2) = 39951865
+MD5 (lightning-sunbird-0.9-source.tar.bz2) = 7757ffefd4a30bcc1497b93b3dc6c0ce
+SHA256 (lightning-sunbird-0.9-source.tar.bz2) = 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64
+SIZE (lightning-sunbird-0.9-source.tar.bz2) = 43121977
diff --git a/mail/lightning/files/patch-sysnss b/mail/lightning/files/patch-sysnss
index d69df4045ea9..32e236318122 100644
--- a/mail/lightning/files/patch-sysnss
+++ b/mail/lightning/files/patch-sysnss
@@ -7,8 +7,8 @@
 -
  ifndef MOZ_NATIVE_JPEG
  tier_1_dirs	+= jpeg
---- security/manager/Makefile.in.orig	Tue Mar 28 14:36:54 2006
-+++ security/manager/Makefile.in	Tue Mar 28 14:40:29 2006
+--- security/manager/Makefile.in.orig	2008-05-24 01:45:26.000000000 +0200
++++ security/manager/Makefile.in	2009-07-11 18:33:46.000000000 +0200
 @@ -54,22 +54,13 @@
  	SSL3_LIB \
  	SOFTOKEN3_LIB \
@@ -32,7 +32,7 @@
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -217,11 +208,6 @@
+@@ -218,11 +209,6 @@
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
  	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
@@ -44,11 +44,19 @@
  	touch $@
  endif
  
-@@ -248,47 +234,6 @@
+@@ -249,55 +235,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 $(DEFAULT_GMAKE_FLAGS)
+-	$(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"
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
@@ -92,7 +100,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -299,42 +244,6 @@
+@@ -308,42 +245,6 @@
  
  install::
  ifndef MOZ_NATIVE_NSS
@@ -135,7 +143,7 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -351,12 +260,6 @@
+@@ -360,12 +261,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS