Update enigmail to 1.3 release to support Thunderbird 6 and Seamonkey 2.3.

Read UPDATING.

5 files changed, 41 insertions, 24 deletions

diff --git a/UPDATING b/UPDATING
index 245381d85a92..04480068e53b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110818:
+  AFFECTS: users of mail/enigmail-* ports
+  AUTHOR: ale@FreeBSD.org
+
+  Like other XPIs ports, enigmail now registers itself as a global
+  extension and doesn't create the XPI to be installed manually.
+  Upgrading users should remove enigmail from their profile before
+  installing the new port.
+
 20110815:
   AFFECTS: users of sysutils/swapexd
   AUTHOR: crees
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index 8b59f127434d..b6ab8ed33270 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -14,6 +14,6 @@ MASTERDIR=	${.CURDIR}/../enigmail
 
 GECKO=		thunderbird
 GECKO_PORTDIR=	mail/${GECKO}
-GECKO_EXTDIR=	comm-miramar
+GECKO_EXTDIR=	comm-release
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index ae20a1188952..3f88dd885650 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	enigmail
-PORTVERSION?=	1.2.1
+PORTVERSION?=	1.3
 PORTREVISION?=	0
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/download/source/
@@ -16,12 +16,12 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	A GnuPG extension for the Mozilla mail clients
 
 EXTRACT_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:${GECKO_TARGET} \
-		${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
+		${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gmake:${PORTSDIR}/devel/gmake \
 		intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
-BUILD_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR}
-RUN_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
+BUILD_DEPENDS=	${GECKO}:${PORTSDIR}/${GECKO_PORTDIR}
+RUN_DEPENDS=	${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gpg:${PORTSDIR}/security/gnupg
 
 .if !defined(GECKO)
@@ -50,9 +50,10 @@ USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
-XPI_FILE=	${DISTNAME}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
-PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
-PLIST_DIRS=	%%DATADIR%%
+XPI_FILE=	${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH}.xpi
+XPI_LIBDIR=	${PREFIX}/lib/xpi
+XPI_ORIG_ID=	{847b3a00-7ab1-11d4-8f02-006008948af5}
+XPI_ID=		${GECKO}@mozilla-enigmail.org
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
@@ -66,6 +67,10 @@ pre-patch:
 	@${REINPLACE_CMD} -e "s|${GECKO_PORTDIR}|mail/enigmail-${GECKO}|g" \
 		`${FIND} ${WRKSRC} -name autoconf.mk`
 
+post-patch:
+	${REINPLACE_CMD} "s/^XPI_MODULE_VERS = [0-9.]*/XPI_MODULE_VERS = ${PORTVERSION}/" \
+		${WRKSRC}/mailnews/extensions/enigmail/Makefile.in
+
 do-build:
 .if ${GECKO_TARGET} == "configure"
 	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_base
@@ -84,10 +89,22 @@ do-build:
 	cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GMAKE} xpi
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${MOZSRC}/dist/bin/${DISTNAME:C/1.([02]).[0-9]/1.\1/}-freebsd-${ARCH}.xpi ${DATADIR}/${XPI_FILE}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO}
+	@(cd ${XPI_LIBDIR}/${XPI_ID}; /usr/bin/tar xf ${XPI_FILE})
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
+	@${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
+	@${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
+	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/${GECKO}/extensions 2>/dev/null || true
+	@${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO} 2>/dev/null || true
+	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
+		${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
+	@${ECHO_CMD} 'lib/xpi/symlinks/${GECKO}/${XPI_ID}' >> ${TMPPLIST}
+	@${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/${GECKO}/extensions 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/${GECKO}/extensions/${XPI_ID}' >> ${TMPPLIST}
+	@(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
+		${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/${GECKO} 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
+	@${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
index 4a2815b78ad6..bf5cbc1d6ee5 100644
--- a/mail/enigmail/distinfo
+++ b/mail/enigmail/distinfo
@@ -2,5 +2,5 @@ SHA256 (enigmail-1.0.1.tar.gz) = 7bc8541eef483d67246f3d83682ba13263f001fa94b5982
 SIZE (enigmail-1.0.1.tar.gz) = 1201945
 SHA256 (enigmail-1.1.2.tar.gz) = dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
 SIZE (enigmail-1.1.2.tar.gz) = 1280923
-SHA256 (enigmail-1.2.1.tar.gz) = b13eec1418240aefb64e27f4f02b3026edd1782524ea524c9af233086c7c7f45
-SIZE (enigmail-1.2.1.tar.gz) = 1463012
+SHA256 (enigmail-1.3.tar.gz) = 4345722ef178d177ccdd1cbaf32497357d63e9cf0d4d11e5a579edd2f208307e
+SIZE (enigmail-1.3.tar.gz) = 1379908
diff --git a/mail/enigmail/pkg-message b/mail/enigmail/pkg-message
deleted file mode 100644
index 7716010dfec8..000000000000
--- a/mail/enigmail/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-*****************************************************************************
-In order to activate the Enigmail extension, every user should install the 
-XPI file into his own profile via the menu:
-
-Tools -> Add-ons -> Install (for Thunderbird)
-- or -
-File -> Open file (for Seamonkey)
-
-*****************************************************************************