Noteworthy changes in Mailcrypt version 3.5.9:

 * GPG stdout buffer is now put into multibyte mode even when emacs is using
   unibyte mode in general (such as under 'standard-display-european'). This
   should fix the "inserts \201 before non-ascii characters" bugs
   (SF#496157, SF#501891, possibly others). A test case was added to catch
   these bugs in the future.

 * new remailer support for modern mixmaster and mixminion clients, which
   send the message directly rather than modify the emacs buffer and
   allowing the user to send the message through their emacs MUA mode.

 ** added "mc-default-remailer-scheme" to choose which remailer method you
    want to use: type1, mixmaster, or mixminion. [C-c / r] now does a
    remailer-scheme -specific function. Various MUA modes can behave
    differently if they wish.

 * Added support for PGP 6.5, generously contributed by Derek Atkins.

 * Added support for the Wanderlust MUA mode.

 * Support GNU Emacs 23.

3 files changed, 15 insertions, 10 deletions

diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index fdb6dfec0f4..acafbf70af4 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2013/04/06 20:27:23 rodent Exp $
+# $NetBSD: Makefile,v 1.25 2014/11/23 06:08:29 mef Exp $
 
-DISTNAME=	mailcrypt-3.5.8
+DISTNAME=	mailcrypt-3.5.9
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	mail security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mailcrypt/}
 
@@ -11,17 +10,22 @@ HOMEPAGE=	http://mailcrypt.sourceforge.net/
 COMMENT=	Emacs frontend for PGP and GPG
 
 # What we would like to say here is: "we want GNU emacs"
-EMACS_VERSIONS_ACCEPTED=	emacs24 emacs24nox \
+EMACS_VERSIONS_ACCEPTED=	emacs25 \
+				emacs24 emacs24nox \
 				emacs23 emacs23nox \
 				emacs22 emacs22nox \
 				emacs21 emacs21nox \
 				emacs20
 
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	autoconf makeinfo
 MAKE_FLAGS+=	prefix=${DESTDIR:Q}${PREFIX:Q} \
 		lispdir=${DESTDIR:Q}${EMACS_LISPPREFIX:Q} \
 		infodir=${DESTDIR:Q}${PREFIX:Q}/${PKGINFODIR}
 INFO_FILES=	yes
 
+pre-configure:
+		(cd ${WRKSRC}; autoconf)
+
 .include "../../editors/emacs/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailcrypt/PLIST b/mail/mailcrypt/PLIST
index 29524e34af9..fd7ec3df1f7 100644
--- a/mail/mailcrypt/PLIST
+++ b/mail/mailcrypt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/05 16:41:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/11/23 06:08:29 mef Exp $
 ${EMACS_INFOPREFIX}/mailcrypt.info
 ${EMACS_LISPPREFIX}/expect.el
 ${EMACS_LISPPREFIX}/expect.elc
@@ -10,6 +10,8 @@ ${EMACS_LISPPREFIX}/mc-pgp.el
 ${EMACS_LISPPREFIX}/mc-pgp.elc
 ${EMACS_LISPPREFIX}/mc-pgp5.el
 ${EMACS_LISPPREFIX}/mc-pgp5.elc
+${EMACS_LISPPREFIX}/mc-pgp6.el
+${EMACS_LISPPREFIX}/mc-pgp6.elc
 ${EMACS_LISPPREFIX}/mc-remail.el
 ${EMACS_LISPPREFIX}/mc-remail.elc
 ${EMACS_LISPPREFIX}/mc-setversion.el
diff --git a/mail/mailcrypt/distinfo b/mail/mailcrypt/distinfo
index 8d46aff00fc..c3d467b9306 100644
--- a/mail/mailcrypt/distinfo
+++ b/mail/mailcrypt/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:24 agc Exp $
+$NetBSD: distinfo,v 1.6 2014/11/23 06:08:29 mef Exp $
 
-SHA1 (mailcrypt-3.5.8.tar.gz) = 5c107c74150113bdb9ddd76dccf1ad62eec3c296
-RMD160 (mailcrypt-3.5.8.tar.gz) = 95b6d90f0747d970407cf8ad7d6ba613fab7b4bd
-Size (mailcrypt-3.5.8.tar.gz) = 213415 bytes
-SHA1 (patch-aa) = 6b44ca1ad6c13df2a85602c360f07fd741a2a3bd
+SHA1 (mailcrypt-3.5.9.tar.gz) = eb70f70a368e76e4fd8ffc8bd3c213a147deb9e8
+RMD160 (mailcrypt-3.5.9.tar.gz) = 462d92036b8e2e115ac4ddb0b5477c191c07cffb
+Size (mailcrypt-3.5.9.tar.gz) = 172073 bytes