* Fix Movemail and RSS support

* Install a GNOME desktop icon [1]
* Correct installation when root's shell is non-standard (e.g.
  /usr/local/bin/bash) [2]

Submitted by:	ahze [1]
		Clemens Fischer <ino-qc@spotteswoode.de.eu.org> [2]

16 files changed, 104 insertions, 28 deletions

diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile
index 1bc92e239d89..11e5c1c0250c 100644
--- a/mail/thunderbird-devel/Makefile
+++ b/mail/thunderbird-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thunderbird
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}
@@ -34,7 +34,7 @@ HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 PLIST=		${WRKDIR}/plist
 ALL_TARGET=	default
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -46,6 +46,9 @@ LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 ESD_LIB=		libesd.so.2
 
+THUNDERBIRD_ICON=	thunderbird.xpm
+THUNDERBIRD_ICON_SRC=	${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
+
 OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
@@ -135,6 +138,8 @@ post-patch:
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+	@${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \
+		< ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop
 
 pre-configure:
 	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
@@ -163,6 +168,8 @@ pre-install:
 .for ii in thunderbird thunderbird-config
 	@${ECHO_CMD} bin/${ii} >> ${PLIST}
 .endfor
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
+		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 	@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
 	${FIND} * -type d -empty | ${SORT} | ${SED} -e \
 		"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
@@ -170,6 +177,9 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} '@dirrm ${LOCAL_SUBDIR}/defaults/isp' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/thunderbird.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -198,5 +208,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
 	${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
+	${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird-devel/files/mozconfig.in b/mail/thunderbird-devel/files/mozconfig.in
index e4c0bcd9ecd1..d5faf34896bb 100644
--- a/mail/thunderbird-devel/files/mozconfig.in
+++ b/mail/thunderbird-devel/files/mozconfig.in
@@ -6,7 +6,6 @@ export MOZ_THUNDERBIRD=1
 mk_add_options MOZ_MOZ_THUNDERBIRD=1
 ac_add_options --enable-crypto
 ac_add_options --disable-mathml
-ac_add_options --disable-installer
 ac_add_options --disable-activex
 ac_add_options --disable-activex-scripting
 ac_add_options --disable-oji
@@ -15,7 +14,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-profilesharing
 ac_add_options --enable-single-profile
 ac_add_options --disable-freetype2
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm
 ac_add_options --enable-default-toolkit=gtk2
diff --git a/mail/thunderbird-devel/files/thunderbird.desktop.in b/mail/thunderbird-devel/files/thunderbird.desktop.in
new file mode 100644
index 000000000000..78db15b185f0
--- /dev/null
+++ b/mail/thunderbird-devel/files/thunderbird.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Thunderbird
+Comment=Mail client and News Reader
+Exec=thunderbird
+Icon=@THUNDERBIRD_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/mail/thunderbird-devel/pkg-install.in b/mail/thunderbird-devel/pkg-install.in
index 415295540dc1..c507611b72aa 100644
--- a/mail/thunderbird-devel/pkg-install.in
+++ b/mail/thunderbird-devel/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 1bc92e239d89..11e5c1c0250c 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thunderbird
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}
@@ -34,7 +34,7 @@ HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 PLIST=		${WRKDIR}/plist
 ALL_TARGET=	default
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -46,6 +46,9 @@ LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 ESD_LIB=		libesd.so.2
 
+THUNDERBIRD_ICON=	thunderbird.xpm
+THUNDERBIRD_ICON_SRC=	${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
+
 OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
@@ -135,6 +138,8 @@ post-patch:
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+	@${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \
+		< ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop
 
 pre-configure:
 	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
@@ -163,6 +168,8 @@ pre-install:
 .for ii in thunderbird thunderbird-config
 	@${ECHO_CMD} bin/${ii} >> ${PLIST}
 .endfor
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
+		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 	@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
 	${FIND} * -type d -empty | ${SORT} | ${SED} -e \
 		"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
@@ -170,6 +177,9 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} '@dirrm ${LOCAL_SUBDIR}/defaults/isp' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/thunderbird.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -198,5 +208,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
 	${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
+	${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in
index e4c0bcd9ecd1..d5faf34896bb 100644
--- a/mail/thunderbird-esr/files/mozconfig.in
+++ b/mail/thunderbird-esr/files/mozconfig.in
@@ -6,7 +6,6 @@ export MOZ_THUNDERBIRD=1
 mk_add_options MOZ_MOZ_THUNDERBIRD=1
 ac_add_options --enable-crypto
 ac_add_options --disable-mathml
-ac_add_options --disable-installer
 ac_add_options --disable-activex
 ac_add_options --disable-activex-scripting
 ac_add_options --disable-oji
@@ -15,7 +14,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-profilesharing
 ac_add_options --enable-single-profile
 ac_add_options --disable-freetype2
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm
 ac_add_options --enable-default-toolkit=gtk2
diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in
new file mode 100644
index 000000000000..78db15b185f0
--- /dev/null
+++ b/mail/thunderbird-esr/files/thunderbird.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Thunderbird
+Comment=Mail client and News Reader
+Exec=thunderbird
+Icon=@THUNDERBIRD_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in
index 415295540dc1..c507611b72aa 100644
--- a/mail/thunderbird-esr/pkg-install.in
+++ b/mail/thunderbird-esr/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 1bc92e239d89..11e5c1c0250c 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thunderbird
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}
@@ -34,7 +34,7 @@ HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 PLIST=		${WRKDIR}/plist
 ALL_TARGET=	default
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -46,6 +46,9 @@ LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 ESD_LIB=		libesd.so.2
 
+THUNDERBIRD_ICON=	thunderbird.xpm
+THUNDERBIRD_ICON_SRC=	${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
+
 OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
@@ -135,6 +138,8 @@ post-patch:
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+	@${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \
+		< ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop
 
 pre-configure:
 	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
@@ -163,6 +168,8 @@ pre-install:
 .for ii in thunderbird thunderbird-config
 	@${ECHO_CMD} bin/${ii} >> ${PLIST}
 .endfor
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
+		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 	@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
 	${FIND} * -type d -empty | ${SORT} | ${SED} -e \
 		"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
@@ -170,6 +177,9 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} '@dirrm ${LOCAL_SUBDIR}/defaults/isp' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/thunderbird.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -198,5 +208,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
 	${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
+	${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird/files/mozconfig.in b/mail/thunderbird/files/mozconfig.in
index e4c0bcd9ecd1..d5faf34896bb 100644
--- a/mail/thunderbird/files/mozconfig.in
+++ b/mail/thunderbird/files/mozconfig.in
@@ -6,7 +6,6 @@ export MOZ_THUNDERBIRD=1
 mk_add_options MOZ_MOZ_THUNDERBIRD=1
 ac_add_options --enable-crypto
 ac_add_options --disable-mathml
-ac_add_options --disable-installer
 ac_add_options --disable-activex
 ac_add_options --disable-activex-scripting
 ac_add_options --disable-oji
@@ -15,7 +14,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-profilesharing
 ac_add_options --enable-single-profile
 ac_add_options --disable-freetype2
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm
 ac_add_options --enable-default-toolkit=gtk2
diff --git a/mail/thunderbird/files/thunderbird.desktop.in b/mail/thunderbird/files/thunderbird.desktop.in
new file mode 100644
index 000000000000..78db15b185f0
--- /dev/null
+++ b/mail/thunderbird/files/thunderbird.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Thunderbird
+Comment=Mail client and News Reader
+Exec=thunderbird
+Icon=@THUNDERBIRD_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/mail/thunderbird/pkg-install.in b/mail/thunderbird/pkg-install.in
index 415295540dc1..c507611b72aa 100644
--- a/mail/thunderbird/pkg-install.in
+++ b/mail/thunderbird/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 1bc92e239d89..11e5c1c0250c 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thunderbird
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}
@@ -34,7 +34,7 @@ HAS_CONFIGURE=	yes
 NO_MTREE=	yes
 PLIST=		${WRKDIR}/plist
 ALL_TARGET=	default
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
@@ -46,6 +46,9 @@ LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 ESD_LIB=		libesd.so.2
 
+THUNDERBIRD_ICON=	thunderbird.xpm
+THUNDERBIRD_ICON_SRC=	${WRKSRC}/other-licenses/branding/thunderbird/default.xpm
+
 OPTIONS=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
 		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
@@ -135,6 +138,8 @@ post-patch:
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
+	@${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \
+		< ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop
 
 pre-configure:
 	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
@@ -163,6 +168,8 @@ pre-install:
 .for ii in thunderbird thunderbird-config
 	@${ECHO_CMD} bin/${ii} >> ${PLIST}
 .endfor
+	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
+		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
 	@cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \
 	${FIND} * -type d -empty | ${SORT} | ${SED} -e \
 		"s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
@@ -170,6 +177,9 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} '@dirrm ${LOCAL_SUBDIR}/defaults/isp' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${THUNDERBIRD_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/thunderbird.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -198,5 +208,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/mozicon50.xpm \
 	${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/messengerWindow16.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${THUNDERBIRD_ICON}
+	${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird3/files/mozconfig.in b/mail/thunderbird3/files/mozconfig.in
index e4c0bcd9ecd1..d5faf34896bb 100644
--- a/mail/thunderbird3/files/mozconfig.in
+++ b/mail/thunderbird3/files/mozconfig.in
@@ -6,7 +6,6 @@ export MOZ_THUNDERBIRD=1
 mk_add_options MOZ_MOZ_THUNDERBIRD=1
 ac_add_options --enable-crypto
 ac_add_options --disable-mathml
-ac_add_options --disable-installer
 ac_add_options --disable-activex
 ac_add_options --disable-activex-scripting
 ac_add_options --disable-oji
@@ -15,7 +14,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-profilesharing
 ac_add_options --enable-single-profile
 ac_add_options --disable-freetype2
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm
 ac_add_options --enable-default-toolkit=gtk2
diff --git a/mail/thunderbird3/files/thunderbird.desktop.in b/mail/thunderbird3/files/thunderbird.desktop.in
new file mode 100644
index 000000000000..78db15b185f0
--- /dev/null
+++ b/mail/thunderbird3/files/thunderbird.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Thunderbird
+Comment=Mail client and News Reader
+Exec=thunderbird
+Icon=@THUNDERBIRD_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in
index 415295540dc1..c507611b72aa 100644
--- a/mail/thunderbird3/pkg-install.in
+++ b/mail/thunderbird3/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0