Update to 0.5

19 files changed, 219 insertions, 204 deletions

diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 174006b8e24d..7e11808b6c21 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	sunbird
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.5
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	calendar/sunbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
@@ -58,6 +57,11 @@ post-patch:
 		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIB_BZ2}|' \
+		${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+
+post-build:
+	@(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE})
 
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
diff --git a/deskutils/lightning-thunderbird/distinfo b/deskutils/lightning-thunderbird/distinfo
index 4711a3f0d979..dcdb3f675d7a 100644
--- a/deskutils/lightning-thunderbird/distinfo
+++ b/deskutils/lightning-thunderbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3.1.source.tar.bz2) = 65465b6c6c551049c366e6fa8e2303bc
-SHA256 (sunbird-0.3.1.source.tar.bz2) = 4cf4eb5b26c5199af1332432264f82f920b1728bf150fd8172eec21ca073ff5b
-SIZE (sunbird-0.3.1.source.tar.bz2) = 44088609
+MD5 (lightning-sunbird-0.5-source.tar.bz2) = 77b2f84c7ff099934ef5b48a7c61cb24
+SHA256 (lightning-sunbird-0.5-source.tar.bz2) = 9716a7d252bbbd7cf6a541ef609dd1f893286d562811d798976a2c40c5094550
+SIZE (lightning-sunbird-0.5-source.tar.bz2) = 40374236
diff --git a/deskutils/lightning-thunderbird/files/patch-Makefile.in b/deskutils/lightning-thunderbird/files/patch-Makefile.in
new file mode 100644
index 000000000000..5b087403b086
--- /dev/null
+++ b/deskutils/lightning-thunderbird/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Mon Jul  2 06:19:35 2007
++++ Makefile.in	Mon Jul  2 06:19:47 2007
+@@ -91,7 +91,6 @@
+ #
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+ 
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+@@ -107,7 +106,6 @@
+ endif
+ 
+ ifdef MOZ_UPDATER
+-tier_1_dirs += modules/libbz2
+ tier_1_dirs += modules/libmar
+ endif
+ 
diff --git a/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
deleted file mode 100644
index 07014d87fa82..000000000000
--- a/deskutils/lightning-thunderbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
-@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
- 
- nsFontPSXft::~nsFontPSXft()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
-@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
- 
- nsXftType1Generator::~nsXftType1Generator()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
diff --git a/deskutils/lightning-thunderbird/files/patch-sysnss b/deskutils/lightning-thunderbird/files/patch-sysnss
index f1397eb524a2..7dda6b215790 100644
--- a/deskutils/lightning-thunderbird/files/patch-sysnss
+++ b/deskutils/lightning-thunderbird/files/patch-sysnss
@@ -22,8 +22,8 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	Thu Jun 22 14:47:38 2006
-+++ security/manager/Makefile.in	Thu Oct 12 23:54:37 2006
+--- 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 @@
  	SSL3_LIB \
  	SOFTOKEN3_LIB \
@@ -47,24 +47,33 @@
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -217,11 +208,6 @@
+@@ -217,13 +208,6 @@
+ 
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
- 	touch $@
+-	touch $@
  endif
  
-@@ -242,95 +228,16 @@
+ .nss.checkout:
+@@ -240,105 +224,12 @@
+ endif
  
  libs::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
+-endif
+-ifeq ($(OS_ARCH),WINNT)
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	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)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -107,16 +116,15 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
 -endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
  	$(MAKE) -C pki $@
  endif
-+endif
  
  install::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 -ifndef SKIP_CHK
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -153,10 +161,13 @@
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
 -endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -347,12 +254,6 @@
+-endif
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ 	$(MAKE) -C pki $@
+@@ -352,12 +243,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -169,3 +180,19 @@
  endif
  
  echo-requires-recursive::
+--- toolkit/mozapps/update/src/updater/Makefile.in.orig	Mon Jul  2 07:59:59 2007
++++ toolkit/mozapps/update/src/updater/Makefile.in	Mon Jul  2 08:00:21 2007
+@@ -52,11 +52,11 @@
+ 
+ PROGRAM = updater$(BIN_SUFFIX)
+ 
+-REQUIRES = libmar libbz2
++REQUIRES = libmar
+ 
+ LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
++	%%LIB_BZ2%% \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH),WINNT)
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 174006b8e24d..7e11808b6c21 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	sunbird
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.5
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	calendar/sunbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
@@ -58,6 +57,11 @@ post-patch:
 		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIB_BZ2}|' \
+		${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+
+post-build:
+	@(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE})
 
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
diff --git a/deskutils/lightning/distinfo b/deskutils/lightning/distinfo
index 4711a3f0d979..dcdb3f675d7a 100644
--- a/deskutils/lightning/distinfo
+++ b/deskutils/lightning/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3.1.source.tar.bz2) = 65465b6c6c551049c366e6fa8e2303bc
-SHA256 (sunbird-0.3.1.source.tar.bz2) = 4cf4eb5b26c5199af1332432264f82f920b1728bf150fd8172eec21ca073ff5b
-SIZE (sunbird-0.3.1.source.tar.bz2) = 44088609
+MD5 (lightning-sunbird-0.5-source.tar.bz2) = 77b2f84c7ff099934ef5b48a7c61cb24
+SHA256 (lightning-sunbird-0.5-source.tar.bz2) = 9716a7d252bbbd7cf6a541ef609dd1f893286d562811d798976a2c40c5094550
+SIZE (lightning-sunbird-0.5-source.tar.bz2) = 40374236
diff --git a/deskutils/lightning/files/patch-Makefile.in b/deskutils/lightning/files/patch-Makefile.in
new file mode 100644
index 000000000000..5b087403b086
--- /dev/null
+++ b/deskutils/lightning/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Mon Jul  2 06:19:35 2007
++++ Makefile.in	Mon Jul  2 06:19:47 2007
+@@ -91,7 +91,6 @@
+ #
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+ 
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+@@ -107,7 +106,6 @@
+ endif
+ 
+ ifdef MOZ_UPDATER
+-tier_1_dirs += modules/libbz2
+ tier_1_dirs += modules/libmar
+ endif
+ 
diff --git a/deskutils/lightning/files/patch-content_xslt_public_txDouble.h b/deskutils/lightning/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/deskutils/lightning/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
deleted file mode 100644
index 07014d87fa82..000000000000
--- a/deskutils/lightning/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
-@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
- 
- nsFontPSXft::~nsFontPSXft()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
-@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
- 
- nsXftType1Generator::~nsXftType1Generator()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
diff --git a/deskutils/lightning/files/patch-sysnss b/deskutils/lightning/files/patch-sysnss
index f1397eb524a2..7dda6b215790 100644
--- a/deskutils/lightning/files/patch-sysnss
+++ b/deskutils/lightning/files/patch-sysnss
@@ -22,8 +22,8 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	Thu Jun 22 14:47:38 2006
-+++ security/manager/Makefile.in	Thu Oct 12 23:54:37 2006
+--- 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 @@
  	SSL3_LIB \
  	SOFTOKEN3_LIB \
@@ -47,24 +47,33 @@
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -217,11 +208,6 @@
+@@ -217,13 +208,6 @@
+ 
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
- 	touch $@
+-	touch $@
  endif
  
-@@ -242,95 +228,16 @@
+ .nss.checkout:
+@@ -240,105 +224,12 @@
+ endif
  
  libs::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
+-endif
+-ifeq ($(OS_ARCH),WINNT)
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	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)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -107,16 +116,15 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
 -endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
  	$(MAKE) -C pki $@
  endif
-+endif
  
  install::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 -ifndef SKIP_CHK
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -153,10 +161,13 @@
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
 -endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -347,12 +254,6 @@
+-endif
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ 	$(MAKE) -C pki $@
+@@ -352,12 +243,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -169,3 +180,19 @@
  endif
  
  echo-requires-recursive::
+--- toolkit/mozapps/update/src/updater/Makefile.in.orig	Mon Jul  2 07:59:59 2007
++++ toolkit/mozapps/update/src/updater/Makefile.in	Mon Jul  2 08:00:21 2007
+@@ -52,11 +52,11 @@
+ 
+ PROGRAM = updater$(BIN_SUFFIX)
+ 
+-REQUIRES = libmar libbz2
++REQUIRES = libmar
+ 
+ LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
++	%%LIB_BZ2%% \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH),WINNT)
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 174006b8e24d..7e11808b6c21 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -7,13 +7,12 @@
 #
 
 PORTNAME=	sunbird
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTVERSION=	0.5
 PORTEPOCH=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	calendar/sunbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}.source
+DISTNAME=	lightning-${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
@@ -58,6 +57,11 @@ post-patch:
 		${FILESDIR}/sunbird.desktop.in >${WRKDIR}/sunbird.desktop
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LIB_BZ2%%|${LIB_BZ2}|' \
+		${WRKSRC}/toolkit/mozapps/update/src/updater/Makefile.in
+
+post-build:
+	@(cd ${WRKSRC}/xpfe/components/autocomplete/src && ${GMAKE})
 
 pre-install:
 	${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST}
diff --git a/deskutils/sunbird/distinfo b/deskutils/sunbird/distinfo
index 4711a3f0d979..dcdb3f675d7a 100644
--- a/deskutils/sunbird/distinfo
+++ b/deskutils/sunbird/distinfo
@@ -1,3 +1,3 @@
-MD5 (sunbird-0.3.1.source.tar.bz2) = 65465b6c6c551049c366e6fa8e2303bc
-SHA256 (sunbird-0.3.1.source.tar.bz2) = 4cf4eb5b26c5199af1332432264f82f920b1728bf150fd8172eec21ca073ff5b
-SIZE (sunbird-0.3.1.source.tar.bz2) = 44088609
+MD5 (lightning-sunbird-0.5-source.tar.bz2) = 77b2f84c7ff099934ef5b48a7c61cb24
+SHA256 (lightning-sunbird-0.5-source.tar.bz2) = 9716a7d252bbbd7cf6a541ef609dd1f893286d562811d798976a2c40c5094550
+SIZE (lightning-sunbird-0.5-source.tar.bz2) = 40374236
diff --git a/deskutils/sunbird/files/patch-Makefile.in b/deskutils/sunbird/files/patch-Makefile.in
new file mode 100644
index 000000000000..5b087403b086
--- /dev/null
+++ b/deskutils/sunbird/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Mon Jul  2 06:19:35 2007
++++ Makefile.in	Mon Jul  2 06:19:47 2007
+@@ -91,7 +91,6 @@
+ #
+ # tier 1 -  3rd party individual libraries
+ #
+-tier_1_dirs	+= dbm
+ 
+ ifndef MOZ_NATIVE_JPEG
+ tier_1_dirs	+= jpeg
+@@ -107,7 +106,6 @@
+ endif
+ 
+ ifdef MOZ_UPDATER
+-tier_1_dirs += modules/libbz2
+ tier_1_dirs += modules/libmar
+ endif
+ 
diff --git a/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h b/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
deleted file mode 100644
index 534bccba48be..000000000000
--- a/deskutils/sunbird/files/patch-content_xslt_public_txDouble.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
-@@ -41,7 +41,7 @@
- #define __txdouble_h__
- 
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
-+/* #ifdef __FreeBSD__
- #include <ieeefp.h>
- #ifdef __alpha__
- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
-@@ -50,7 +50,7 @@
- #endif
- fp_except_t oldmask = fpsetmask(~allmask);
- #endif
--
-+*/
- /**
-  * Macros to workaround math-bugs bugs in various platforms
-  */
diff --git a/deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp b/deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
deleted file mode 100644
index 07014d87fa82..000000000000
--- a/deskutils/sunbird/files/patch-gfx_src_ps_nsFontMetricsPS.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	Fri Dec 15 01:42:25 2006
-+++ gfx/src/ps/nsFontMetricsPS.cpp	Fri Dec 15 01:41:20 2006
-@@ -1037,8 +1037,10 @@ nsFontPSXft::Init(nsXftEntry* aEntry,
- 
- nsFontPSXft::~nsFontPSXft()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
-@@ -2327,8 +2329,10 @@ nsXftType1Generator::Init(nsXftEntry* aE
- 
- nsXftType1Generator::~nsXftType1Generator()
- {
--  if (mEntry->mFace) 
-+  if (mEntry->mFace) {
-     FT_Done_Face(mEntry->mFace);
-+    mEntry->mFace = nsnull;
-+  }
- 
-   if (FT_Done_FreeType(mFreeTypeLibrary))
-     return;
diff --git a/deskutils/sunbird/files/patch-sysnss b/deskutils/sunbird/files/patch-sysnss
index f1397eb524a2..7dda6b215790 100644
--- a/deskutils/sunbird/files/patch-sysnss
+++ b/deskutils/sunbird/files/patch-sysnss
@@ -22,8 +22,8 @@
  		$(NULL)
  
  include $(topsrcdir)/config/rules.mk
---- security/manager/Makefile.in.orig	Thu Jun 22 14:47:38 2006
-+++ security/manager/Makefile.in	Thu Oct 12 23:54:37 2006
+--- 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 @@
  	SSL3_LIB \
  	SOFTOKEN3_LIB \
@@ -47,24 +47,33 @@
  # Default
  HAVE_FREEBL_LIBS = 1
  
-@@ -217,11 +208,6 @@
+@@ -217,13 +208,6 @@
+ 
  .nss.cleaned: .nss.checkout
  ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
- 	touch $@
+-	touch $@
  endif
  
-@@ -242,95 +228,16 @@
+ .nss.checkout:
+@@ -240,105 +224,12 @@
+ endif
  
  libs::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
+-endif
+-ifeq ($(OS_ARCH),WINNT)
+-	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
+-else
+-	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)
 -ifndef SKIP_CHK
 -	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -107,16 +116,15 @@
 -	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
 -endif
 -endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
  ifdef MOZ_XUL
  	$(MAKE) -C pki $@
  endif
-+endif
  
  install::
- ifndef MOZ_NATIVE_NSS
+-ifndef MOZ_NATIVE_NSS
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 -ifndef SKIP_CHK
 -	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -153,10 +161,13 @@
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir)
 -	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir)
 -endif
- endif
- 	$(MAKE) -C boot $@
- 	$(MAKE) -C ssl $@
-@@ -347,12 +254,6 @@
+-endif
+-	$(MAKE) -C boot $@
+-	$(MAKE) -C ssl $@
+ 	$(MAKE) -C locales $@
+ ifdef MOZ_XUL
+ 	$(MAKE) -C pki $@
+@@ -352,12 +243,6 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
@@ -169,3 +180,19 @@
  endif
  
  echo-requires-recursive::
+--- toolkit/mozapps/update/src/updater/Makefile.in.orig	Mon Jul  2 07:59:59 2007
++++ toolkit/mozapps/update/src/updater/Makefile.in	Mon Jul  2 08:00:21 2007
+@@ -52,11 +52,11 @@
+ 
+ PROGRAM = updater$(BIN_SUFFIX)
+ 
+-REQUIRES = libmar libbz2
++REQUIRES = libmar
+ 
+ LIBS += \
+ 	$(DIST)/lib/$(LIB_PREFIX)mar.$(LIB_SUFFIX) \
+-	$(DIST)/lib/$(LIB_PREFIX)bz2.$(LIB_SUFFIX) \
++	%%LIB_BZ2%% \
+ 	$(NULL)
+ 
+ ifeq ($(OS_ARCH),WINNT)
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index f20da869bfb3..6f9161e83bfd 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -244,6 +244,12 @@ MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 		-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'
 MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS}
 
+.if ${OSVERSION} >= 700000 || exists(/usr/lib/libbz2_p.a)
+LIB_BZ2=	-lbz2_p
+.else
+LIB_BZ2=	-lbz2
+.endif
+
 post-patch: gecko-post-patch gecko-moz-pis-patch
 
 gecko-post-patch: