3 files changed, 28 insertions, 16 deletions

diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index b9b5494fa139..d14b5fecbcc9 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	sunbird
-PORTVERSION=	0.7
-PORTREVISION=	2
+PORTVERSION=	0.9
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
@@ -27,7 +26,7 @@ USE_BZIP2=	yes
 WANT_GNOME=	yes
 WANT_PERL=	yes
 SUNBIRD=	${PORTNAME}
-SUNBIRD_ICON_SRC=	${PREFIX}/lib/sunbird/icons/default.xpm
+SUNBIRD_ICON_SRC=	${PREFIX}/lib/sunbird/chrome/icons/default/default.xpm
 SUNBIRD_ICON=		${PORTNAME}.xpm
 LIBS=		-Wl,-Bsymbolic -lc
 MOZ_PKGCONFIG_FILES=	${PORTNAME}-js ${PORTNAME}-xpcom ${PORTNAME}-plugin
@@ -38,6 +37,9 @@ MOZ_OPTIONS=	--enable-application=calendar \
 		--enable-canvas
 MOZ_MK_OPTIONS=	MOZ_CO_PROJECT=calendar
 
+GECKO_PLIST_PRE_FILES=	lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest \
+			lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
+
 .include <bsd.init.mk>
 .include <bsd.libnames.mk>
 .include <bsd.port.pre.mk>
@@ -69,5 +71,7 @@ do-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/sunbird.desktop ${PREFIX}/share/applications
 	${LN} -sf ${SUNBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${SUNBIRD_ICON}
+	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
+	${TOUCH} ${PREFIX}/lib/sunbird/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo
index a46dd3ee5579..cc32fcdad0b5 100644
--- a/deskutils/sunbird/distinfo
+++ b/deskutils/sunbird/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/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss
index 7dda6b215790..6846244b32a5 100644
--- a/deskutils/sunbird/files/patch-sysnss
+++ b/deskutils/sunbird/files/patch-sysnss
@@ -22,9 +22,9 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	Mon Jun 26 18:14:34 2006
-+++ security/manager/Makefile.in	Mon Jul  2 06:13:12 2007
-@@ -54,22 +54,13 @@
+--- security/manager/Makefile.in.orig	2008-11-23 09:08:49.000000000 +1000
++++ security/manager/Makefile.in	2008-11-23 09:11:24.000000000 +1000
+@@ -54,22 +54,14 @@
  	SSL3_LIB \
  	SOFTOKEN3_LIB \
  	SOFTOKEN3_CHK \
@@ -34,7 +34,7 @@
  	HAVE_FREEBL_LIBS_32INT64 \
  	HAVE_FREEBL_LIBS_64 \
  	$(NULL)
--
+ 
 -LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
  endif
  
@@ -47,7 +47,7 @@
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -217,13 +208,6 @@
+@@ -217,13 +209,6 @@
  
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
@@ -61,7 +61,7 @@
  endif
  
  .nss.checkout:
-@@ -240,105 +224,12 @@
+@@ -240,113 +225,14 @@
  endif
  
  libs::
@@ -74,7 +74,15 @@
 -	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)
@@ -117,7 +125,7 @@
 -endif
 -endif
 -	$(MAKE) -C boot $@
--	$(MAKE) -C ssl $@
+	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
  	$(MAKE) -C pki $@
@@ -163,11 +171,11 @@
 -endif
 -endif
 -	$(MAKE) -C boot $@
--	$(MAKE) -C ssl $@
+	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
  	$(MAKE) -C pki $@
-@@ -352,12 +243,6 @@
+@@ -360,12 +244,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS