- Update to 0.86.1 release [1]

- Pet portlint s/file/f/ [1]
- Re-enable support for Thunderbird !

PR:		ports/73359 [1]
Submitted by:	dougb [1]

4 files changed, 10 insertions, 10 deletions

diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index 8561022304a7..82d198b8d72f 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -12,17 +12,14 @@ COMMENT=	A GnuPG extension for the Thunderbird mail client
 EXTRACT_DEPENDS=${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla/Makefile:${PORTSDIR}/${LOCAL_SRCDIR}:configure
 RUN_DEPENDS=	thunderbird:${PORTSDIR}/${LOCAL_SRCDIR}
 
-IGNORE=		cannot be installed globally with the new thunderbird 0.7+ extension manager
-
-IPCVERSION=	1.0.7
+IPCVERSION=	1.0.8
 
 MASTERDIR=	${.CURDIR}/../enigmail
 
 PKGINSTALL=	${.CURDIR}/pkg-install
 PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
-PKGMESSAGE=	${.CURDIR}/pkg-message
 
 LOCAL_SRCDIR=	mail/thunderbird
-LOCAL_SUBDIR=	lib/thunderbird/lib/thunderbird-0.7
+LOCAL_SUBDIR=	lib/thunderbird/lib/thunderbird-0.8
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail-thunderbird/pkg-deinstall b/mail/enigmail-thunderbird/pkg-deinstall
index 1eaa87ad0e4a..8b1893beef0a 100644
--- a/mail/enigmail-thunderbird/pkg-deinstall
+++ b/mail/enigmail-thunderbird/pkg-deinstall
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if test "$2" = "POST-DEINSTALL"; then
-FILE=${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.7/chrome/installed-chrome.txt
+FILE=${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.8/chrome/installed-chrome.txt
 cp ${FILE} ${FILE}.orig
-cat ${FILE}.orig | grep -v enigmail > ${FILE}
+cat ${FILE}.orig | grep -v enigmime | grep -v enigmail > ${FILE}
 rm ${FILE}.orig
 fi
diff --git a/mail/enigmail-thunderbird/pkg-install b/mail/enigmail-thunderbird/pkg-install
index c65d71bd93df..ba4fcf327073 100644
--- a/mail/enigmail-thunderbird/pkg-install
+++ b/mail/enigmail-thunderbird/pkg-install
@@ -1,7 +1,12 @@
 #!/bin/sh
 
 if test "$2" = "POST-INSTALL"; then
-cat << EOF >> ${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.7/chrome/installed-chrome.txt
+cat << EOF >> ${PKG_PREFIX}/lib/thunderbird/lib/thunderbird-0.8/chrome/installed-chrome.txt
+skin,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
+locale,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
+content,install,url,jar:resource:/chrome/enigmime.jar!/content/enigmime/
+skin,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
+locale,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
 content,install,url,jar:resource:/chrome/enigmail.jar!/content/enigmail/
 skin,install,url,jar:resource:/chrome/enigmail-skin-tbird.jar!/skin/classic/enigmail/
 locale,install,url,jar:resource:/chrome/enigmail.jar!/locale/en-US/enigmail/
diff --git a/mail/enigmail-thunderbird/pkg-message b/mail/enigmail-thunderbird/pkg-message
deleted file mode 100644
index 97a810299624..000000000000
--- a/mail/enigmail-thunderbird/pkg-message
+++ /dev/null
@@ -1,2 +0,0 @@
-If you upgraded Thunderbird from a previous release you have to locate
-your user profile directory and delete the file XUL.mfasl.