Remove mozilla-enigmail option, distfile no longer exists. Add SHA512 sum.

4 files changed, 4 insertions, 82 deletions

diff --git a/mail/thunderbird24/PLIST.enigmail b/mail/thunderbird24/PLIST.enigmail
deleted file mode 100644
index 45e61fb861b..00000000000
--- a/mail/thunderbird24/PLIST.enigmail
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST.enigmail,v 1.2 2014/08/31 12:51:39 richard Exp $
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/gpgAgentHandler.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/installGnuPG.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${TARGET_XPCOM_ABI}/lib/libsubprocess-${TARGET_XPCOM_ABI}.so
-lib/thunderbird24/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
diff --git a/mail/thunderbird24/distinfo b/mail/thunderbird24/distinfo
index d423f6ebbd9..f86286f6c9f 100644
--- a/mail/thunderbird24/distinfo
+++ b/mail/thunderbird24/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2016/12/23 22:29:59 joerg Exp $
+$NetBSD: distinfo,v 1.7 2017/03/23 17:36:35 joerg Exp $
 
-SHA1 (enigmail-1.7.2.tar.gz) = e72eeff5a47491267981090129b0b2594b5dc96f
-RMD160 (enigmail-1.7.2.tar.gz) = 1dcd10e758321846eb20ac7f1d3ae6465c47bfe7
-Size (enigmail-1.7.2.tar.gz) = 1420346 bytes
 SHA1 (thunderbird-24.8.1.source.tar.bz2) = 6b14b7044a238469ad26e68abd53629513c7387e
 RMD160 (thunderbird-24.8.1.source.tar.bz2) = 6f1647412edb01926bcddd823909ff4ff1293aba
+SHA512 (thunderbird-24.8.1.source.tar.bz2) = 9fe0290900e45e7cc80d7649c4bfe6958fde7550f0aa5a4e97673f18b8b831757dfaa71d169e3f668a844d27260ec5fc53e4cf0d7048b5bf7095c196fd81a2d6
 Size (thunderbird-24.8.1.source.tar.bz2) = 140524150 bytes
 SHA1 (patch-aa) = bd980f50da7fb78499a4a7689a3278743b0e72c4
 SHA1 (patch-ak) = b47277baa1137a7610445b7c4dd147b331d5c5e6
diff --git a/mail/thunderbird24/enigmail.mk b/mail/thunderbird24/enigmail.mk
deleted file mode 100644
index 6989d86a89e..00000000000
--- a/mail/thunderbird24/enigmail.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: enigmail.mk,v 1.2 2014/08/31 12:51:39 richard Exp $
-#
-# This Makefile fragment hooks the Enigmail OpenPGP extension
-# (see http://www.mozilla-enigmail.org/ ) into the build.
-
-ENIGMAIL_DIST=		enigmail-1.7.2.tar.gz
-XPI_FILES+=		${WRKDIR}/enigmail.xpi
-.if !defined(DISTFILES)
-DISTFILES=		${DEFAULT_DISTFILES}
-.endif
-DISTFILES+=		${ENIGMAIL_DIST}
-SITES.${ENIGMAIL_DIST}=	http://www.mozilla-enigmail.org/download/source/
-
-REPLACE_PERL+=		mailnews/extensions/enigmail/util/fixlang.pl
-
-DEPENDS+=		gnupg-[0-9]*:../../security/gnupg
-PLIST_SRC+=		PLIST.enigmail
-
-TARGET_XPCOM_ABI=	${MACHINE_ARCH:S/i386/x86/}-gcc3
-PLIST_SUBST+=		TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
-
-post-extract: enigmail-post-extract
-.PHONY: enigmail-post-extract
-enigmail-post-extract:
-	${RUN} mv ${WRKDIR}/enigmail ${WRKSRC}/mailnews/extensions/
-	${RUN} cd ${WRKSRC} && \
-		${PATCH} < ${FILESDIR}/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail && \
-		${PATCH} -p1 < ${FILESDIR}/patch-ipc_src_Makefile
-
-post-configure: enigmail-post-configure
-.PHONY: enigmail-post-configure
-enigmail-post-configure:
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail &&		\
-	  ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
-
-# We need to do a switcheroo of the dist directory while building enigmail;
-# otherwise we get extra files contamination in the PLIST.
-post-build: enigmail-post-build
-.PHONY: enigmail-post-build
-enigmail-post-build:
-	${RUN} cd ${WRKSRC}/mozilla/dist && pax -rwpe . ../dist.save
-	${RUN} cd ${WRKSRC}/mailnews/extensions/enigmail &&		\
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} &&			\
-	  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
-	${CP} ${WRKSRC}/mailnews/extensions/enigmail/build/enigmail*.xpi\
-	  ${WRKDIR}/enigmail.xpi
-#	${RUN} rm -rf ${WRKSRC}/mozilla/dist
-#	${RUN} cd ${WRKSRC}/mozilla/dist.save && pax -rwpe . ../dist
diff --git a/mail/thunderbird24/options.mk b/mail/thunderbird24/options.mk
index 716baa23180..40dd67334e2 100644
--- a/mail/thunderbird24/options.mk
+++ b/mail/thunderbird24/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2014/08/30 16:54:16 richard Exp $
+# $NetBSD: options.mk,v 1.3 2017/03/23 17:36:35 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird24
-PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
+PKG_SUPPORTED_OPTIONS=	debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning
 PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
@@ -46,10 +46,6 @@ XPI_FILES+=		${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi
 CONFIGURE_ARGS+=	--disable-calendar
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
-.include "enigmail.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 CONFIGURE_ARGS+=	--enable-official-branding
 PLIST.branding=		yes