Remove mozilla-enigmail option.

mail/seamonkey-enigmail supercedes this.

4 files changed, 2 insertions, 103 deletions

diff --git a/www/seamonkey/enigmail.mk b/www/seamonkey/enigmail.mk
deleted file mode 100644
index 53cfac4ec75..00000000000
--- a/www/seamonkey/enigmail.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: enigmail.mk,v 1.17 2015/03/28 22:12:27 ryoon Exp $
-#
-# This Makefile fragment hooks the Enigmail OpenPGP extension
-# (see http://www.mozilla-enigmail.org/ ) into the build.
-
-ENIGMAIL_DIST=		enigmail-1.8.1.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/
-#SITES.${ENIGMAIL_DIST}=	https://dev.gentoo.org/~polynomial-c/mozilla/
-
-DEPENDS+=		gnupg2-[0-9]*:../../security/gnupg2
-FIND_PREFIX:=		GNUPG2DIR=gnupg2
-.include "../../mk/find-prefix.mk"
-
-PLIST_SRC+=		PLIST.enigmail
-
-TARGET_XPCOM_ABI=	${MACHINE_ARCH:S/i386/x86/}-gcc3
-PLIST_SUBST+=		TARGET_XPCOM_ABI=${TARGET_XPCOM_ABI}
-
-USE_TOOLS+=		patch pax
-
-REPLACE_PERL+=		${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/util/fixlang.pl
-
-SUBST_CLASSES+=		gpg2
-SUBST_STAGE.gpg2=	pre-configure
-SUBST_MESSAGE.gpg2=	Setting GnuPG2 command
-SUBST_FILES.gpg2+=	${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/package/prefs/enigmail.js
-SUBST_SED.gpg2+=          -e 's|"extensions.enigmail.agentPath","|"extensions.enigmail.agentPath","${GNUPG2DIR}/bin/gpg2"|'
-
-post-extract: enigmail-post-extract
-.PHONY: enigmail-post-extract
-enigmail-post-extract:
-	${RUN} mkdir ${WRKSRC}/${OBJDIR}/mailnews/extensions
-	${RUN} mv ${WRKDIR}/enigmail ${WRKSRC}/${OBJDIR}/mailnews/extensions
-	${RUN} cd ${WRKSRC}/${OBJDIR} && \
-		${PATCH} < ${FILESDIR}/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm && \
-		${PATCH} < ${FILESDIR}/patch-mailnews_extensions_enigmail_Makefile
-
-post-configure: enigmail-post-configure
-.PHONY: enigmail-post-configure
-enigmail-post-configure:
-	cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
-		${SETENV} ${CONFIGURE_ENV} \
-		./configure --prefix=${PREFIX}
-
-# 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:
-	rm -rf ${WRKSRC}/${OBJDIR}/mozilla/dist.save
-	cd ${WRKSRC}/${OBJDIR}/dist && pax -rwpe . ../dist.save
-	cd ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all xpi
-	${CP} ${WRKSRC}/${OBJDIR}/mailnews/extensions/enigmail/build/enigmail*.xpi \
-	  ${WRKDIR}/enigmail.xpi
-	rm -rf ${WRKSRC}/${OBJDIR}/dist
-	cd ${WRKSRC}/${OBJDIR}/dist.save && pax -rwpe . ../dist
diff --git a/www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm b/www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
deleted file mode 100644
index 1f23be99a0a..00000000000
--- a/www/seamonkey/files/mailnews_extensions_enigmail_ipc_modules_subprocess.jsm
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: mailnews_extensions_enigmail_ipc_modules_subprocess.jsm,v 1.3 2015/03/26 20:41:53 ryoon Exp $
-
---- mailnews/extensions/enigmail/ipc/modules/subprocess.jsm.orig	2015-03-23 16:38:43.000000000 +0000
-+++ mailnews/extensions/enigmail/ipc/modules/subprocess.jsm
-@@ -341,6 +341,7 @@ function getPlatformValue(valueType) {
-         'freebsd': [ 'libc.so.7',    0x04     , ctypes.int64_t      , 8 ],
-         'dragonfly':[ 'libc.so.8',   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/www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile b/www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile
deleted file mode 100644
index d7b9f33abaf..00000000000
--- a/www/seamonkey/files/patch-mailnews_extensions_enigmail_Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-mailnews_extensions_enigmail_Makefile,v 1.1 2014/03/30 04:13:17 ryoon Exp $
-
---- mailnews/extensions/enigmail/Makefile.orig	2014-01-12 13:08:29.000000000 +0000
-+++ mailnews/extensions/enigmail/Makefile
-@@ -36,10 +36,18 @@ ifeq ($(OS_TARGET),Darwin)
- PLATFORM_STR = darwin
- endif
- 
-+ifeq ($(OS_TARGET),DragonFly)
-+PLATFORM_STR = dragonfly
-+endif
-+
- ifeq ($(OS_TARGET),FreeBSD)
- PLATFORM_STR = freebsd
- endif
- 
-+ifeq ($(OS_TARGET),NetBSD)
-+PLATFORM_STR = netbsd
-+endif
-+
- ifeq ($(OS_TARGET),OpenBSD)
- PLATFORM_STR = openbsd
- endif
diff --git a/www/seamonkey/options.mk b/www/seamonkey/options.mk
index 02981cb2c3c..8df6f6ae27f 100644
--- a/www/seamonkey/options.mk
+++ b/www/seamonkey/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.31 2015/03/17 19:50:42 ryoon Exp $
+# $NetBSD: options.mk,v 1.32 2015/07/01 13:02:30 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.seamonkey
-PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc mozilla-enigmail # gnome
+PKG_SUPPORTED_OPTIONS=	alsa debug mozilla-jemalloc # gnome
 PKG_SUPPORTED_OPTIONS+=	mozilla-lightning webrtc mozilla-chatzilla pulseaudio
 
 PLIST_VARS+=	debug gnome jemalloc
@@ -62,10 +62,6 @@ CONFIGURE_ARGS+=	--disable-debug --disable-debug-symbols
 CONFIGURE_ARGS+=	--enable-install-strip
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
-.include "enigmail.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mmozilla-lightning)
 CONFIGURE_ARGS+=	--enable-calendar
 PLIST_SRC+=		PLIST.lightning