[pkgsrc/trunk]: pkgsrc/www/seamonkey Fix default gpg2 of enigmail.

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e05d6f3680e
branches:  trunk
changeset: 649031:6e05d6f3680e
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Mar 28 22:12:27 2015 +0000

description:
Fix default gpg2 of enigmail.

* Depend on gnupg2.
* Detect gpg2 command by default.

diffstat:

 www/seamonkey/enigmail.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 6a73e6c458c2 -r 6e05d6f3680e www/seamonkey/enigmail.mk
--- a/www/seamonkey/enigmail.mk Sat Mar 28 19:05:50 2015 +0000
+++ b/www/seamonkey/enigmail.mk Sat Mar 28 22:12:27 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: enigmail.mk,v 1.16 2015/03/26 20:41:53 ryoon Exp $
+# $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.
@@ -12,7 +12,10 @@
 SITES.${ENIGMAIL_DIST}=        http://www.mozilla-enigmail.org/download/source/
 #SITES.${ENIGMAIL_DIST}=       https://dev.gentoo.org/~polynomial-c/mozilla/
 
-DEPENDS+=              gnupg-[0-9]*:../../security/gnupg
+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
@@ -22,6 +25,12 @@
 
 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: