Remove mozilla-enigmail option.

mail/thunderbird-enigmail supercedes this.

4 files changed, 2 insertions, 93 deletions

diff --git a/mail/thunderbird/PLIST.enigmail b/mail/thunderbird/PLIST.enigmail
deleted file mode 100644
index b7af35a2019..00000000000
--- a/mail/thunderbird/PLIST.enigmail
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST.enigmail,v 1.14 2014/11/30 10:23:29 markd Exp $
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeDecrypt.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/mimeEncrypt.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/gpgAgentHandler.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/installGnuPG.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/keyManagement.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/mimeVerify.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/pipeConsole.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_unix.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess_worker_win.js
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/${OPSYS}_${MACHINE_ARCH}-gcc3/lib/libsubprocess-${MACHINE_ARCH}-gcc3.so
-lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
diff --git a/mail/thunderbird/enigmail.mk b/mail/thunderbird/enigmail.mk
deleted file mode 100644
index ad2ace0bc8a..00000000000
--- a/mail/thunderbird/enigmail.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: enigmail.mk,v 1.14 2015/03/14 23:02:52 tnn 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}/${OBJDIR}/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/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm b/mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
deleted file mode 100644
index 4a8ef2cc050..00000000000
--- a/mail/thunderbird/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.2 2014/07/27 20:04:59 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig	2014-07-12 12:52:08.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
-@@ -338,8 +338,10 @@ function getPlatformValue(valueType) {
-         //            library name   O_NONBLOCK RLIM_T                RLIMIT_NOFILE
-         'darwin':  [ 'libc.dylib',   0x04     , ctypes.uint64_t     , 8 ],
-         'linux':   [ 'libc.so.6',    2024     , ctypes.unsigned_long, 7 ],
-+        'dragonfly': [ 'libc.so',    0x04     , ctypes.int64_t      , 8 ],
-         'freebsd': [ 'libc.so.7',    0x04     , ctypes.int64_t      , 8 ],
-         'gnu/kfreebsd': [ 'libc.so.0.1', 0x04 , ctypes.int64_t      , 8 ],
-+        'netbsd': [ 'libc.so', 0x04     , ctypes.int64_t      , 8 ],
-         'openbsd': [ 'libc.so.61.0', 0x04     , ctypes.int64_t      , 8 ],
-         'sunos':   [ 'libc.so',      0x80     , ctypes.unsigned_long, 5 ]
-     };
diff --git a/mail/thunderbird/options.mk b/mail/thunderbird/options.mk
index 42a0e56a223..4d6d64650cc 100644
--- a/mail/thunderbird/options.mk
+++ b/mail/thunderbird/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.15 2014/09/11 13:47:46 joerg Exp $
+# $NetBSD: options.mk,v 1.16 2015/07/01 12:58:35 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.thunderbird
 PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc gnome \
 			official-mozilla-branding pulseaudio \
-			mozilla-lightning mozilla-enigmail
+			mozilla-lightning
 PKG_SUGGESTED_OPTIONS=	mozilla-lightning
 
 PLIST_VARS+=		branding nobranding debug gnome jemalloc
@@ -66,10 +66,6 @@ XPI_FILES+=		${WRKSRC}/${OBJDIR}/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