6 files changed, 30 insertions, 21 deletions

diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index c621ac50975d..8e3cb21eb0c8 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	enigmail
-PORTVERSION?=	0.84.2
+PORTVERSION?=	0.86.1
 PORTREVISION?=	0
 CATEGORIES=	mail security
-MASTER_SITES=	http://www.brunschwig.net/enigmail/src/ \
+MASTER_SITES=	\
 		http://mozdev.secsup.org/enigmail/src/ \
 		http://downloads.us-east3.mozdev.org/enigmail/src/ \
 		http://mozdev.oregonstate.edu/enigmail/src/ \
@@ -40,7 +40,7 @@ LOCAL_SUBDIR?=	lib/mozilla
 LOCAL_PREFIX=	${PREFIX}/${LOCAL_SUBDIR}
 
 COMPONENTS=	ipc.xpt enigmime.xpt libenigmime.so enigmail.xpt enigmail.js enigprefs-service.js
-CHROME=		enigmail.jar enigmail-skin.jar enigmail-skin-tbird.jar
+CHROME=		enigmime.jar enigmail.jar enigmail-skin.jar enigmail-skin-tbird.jar
 PREF=		enigmail.js
 
 PLIST_SUB=	LOCAL_SUBDIR=${LOCAL_SUBDIR}
@@ -49,15 +49,13 @@ do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CP} -R ${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla ${WRKSRC}
-	@for file in ${EXTRACT_ONLY}; do \
-		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+	@for f in ${EXTRACT_ONLY}; do \
+		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \
 	done
 
 pre-patch:
 	@${REINPLACE_CMD} -e "s|${LOCAL_SRCDIR}|mail/enigmail${PKGNAMESUFFIX}|g" \
-		${WRKSRC}/config/autoconf.mk \
-		${WRKSRC}/directory/c-sdk/config/autoconf.mk \
-		${WRKSRC}/nsprpub/config/autoconf.mk
+		`${FIND} ${WRKSRC} -name autoconf.mk`
 
 do-build:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export)
@@ -69,14 +67,14 @@ do-build:
 	@(cd ${WRKSRC}/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
 
 do-install:
-	@for file in ${COMPONENTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$file ${LOCAL_PREFIX}/components; \
+	@for f in ${COMPONENTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$f ${LOCAL_PREFIX}/components; \
 	done
-	@for file in ${CHROME}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$file ${LOCAL_PREFIX}/chrome; \
+	@for f in ${CHROME}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$f ${LOCAL_PREFIX}/chrome; \
 	done
-	@for file in ${PREF}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/defaults/pref/$$file ${LOCAL_PREFIX}/defaults/pref; \
+	@for f in ${PREF}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/defaults/pref/$$f ${LOCAL_PREFIX}/defaults/pref; \
 	done
 
 post-install:
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
index 8f0f759f34fe..b83837c0a4ba 100644
--- a/mail/enigmail/distinfo
+++ b/mail/enigmail/distinfo
@@ -1,6 +1,6 @@
-MD5 (enigmail-0.84.2.tar.gz) = f758f640fb6acffedfe593bc430238e7
-SIZE (enigmail-0.84.2.tar.gz) = 316666
+MD5 (enigmail-0.86.1.tar.gz) = e4253e97b0039c987f0650aca4caa973
+SIZE (enigmail-0.86.1.tar.gz) = 330970
 MD5 (ipc-1.0.5.tar.gz) = 457f8277b12f3e37defa71dc186f83b4
 SIZE (ipc-1.0.5.tar.gz) = 137083
-MD5 (ipc-1.0.7.tar.gz) = f605ba029ff4c71dcc10c29635c1c79e
-SIZE (ipc-1.0.7.tar.gz) = 104193
+MD5 (ipc-1.0.8.tar.gz) = 0109af0c56b20f8dfd7f3bb080b4a148
+SIZE (ipc-1.0.8.tar.gz) = 102374
diff --git a/mail/enigmail/pkg-deinstall b/mail/enigmail/pkg-deinstall
index f3078aa9385e..21a24bd8e9ec 100644
--- a/mail/enigmail/pkg-deinstall
+++ b/mail/enigmail/pkg-deinstall
@@ -3,6 +3,6 @@
 if test "$2" = "POST-DEINSTALL"; then
 FILE=${PKG_PREFIX}/lib/mozilla/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/pkg-install b/mail/enigmail/pkg-install
index c90d8db53b1e..5a7d83391a27 100644
--- a/mail/enigmail/pkg-install
+++ b/mail/enigmail/pkg-install
@@ -2,6 +2,11 @@
 
 if test "$2" = "POST-INSTALL"; then
 cat << EOF >> ${PKG_PREFIX}/lib/mozilla/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.jar!/skin/modern/enigmail/
 skin,install,url,jar:resource:/chrome/enigmail-skin.jar!/skin/classic/enigmail/
diff --git a/mail/enigmail/pkg-message b/mail/enigmail/pkg-message
index 47d56ef38e66..e20b967ea9cb 100644
--- a/mail/enigmail/pkg-message
+++ b/mail/enigmail/pkg-message
@@ -1,2 +1,7 @@
-You have to delete/rebuild the shared Mozilla component database (compreg.dat)
-as root in order to use enigmail.
+*****************************************************************************
+You have to manually delete the components database (compreg.dat), located in
+your profile directory in order to use enigmail.
+
+If you upgraded Mozilla/Thunderbird from a previous release you have to
+remove also the XUL.mfasl file and the content of the chrome subdirectory.
+*****************************************************************************
diff --git a/mail/enigmail/pkg-plist b/mail/enigmail/pkg-plist
index 0936d703e97d..c1f4a711bb57 100644
--- a/mail/enigmail/pkg-plist
+++ b/mail/enigmail/pkg-plist
@@ -7,4 +7,5 @@
 %%LOCAL_SUBDIR%%/chrome/enigmail.jar
 %%LOCAL_SUBDIR%%/chrome/enigmail-skin.jar
 %%LOCAL_SUBDIR%%/chrome/enigmail-skin-tbird.jar
+%%LOCAL_SUBDIR%%/chrome/enigmime.jar
 %%LOCAL_SUBDIR%%/defaults/pref/enigmail.js