Update mail/msmtp to version 1.6.1, from Leonardo Taccari in PR 49820.

pkgsrc changes:
- gnome-keyring option has changed to secret option to reflect the upstream
  change. For more information please read the changelog below.

Changes:
Version 1.6.1:
- The new configure option --with-tls replaces --with-ssl.
- A new configure option --disable-gai-idn was added.

Version 1.6.0:
- Support for SOCKS proxies was added. This allows msmtp to be used with Tor.
- GNOME Keyring support now uses libsecret instead of libgnome-keyring. It is
  now documented how to use secret-tool to manage passwords for msmtp; the
  obsolete msmtp-gnome-tool script is removed.
- Configuration file security is now only checked if the file actually contains
  secrets such as passwords. (If you still store passwords in the configuration
  file, consider using the passwordeval command or a key ring instead.)
- The GSSAPI authentication method is not chosen automatically anymore, you have
  to request it manually if you really want to use it.
- From: and Date: headers are now added to mails if necessary, for compatibility
  with sendmail, postfix, exim, and other MTAs. This can be disabled with the
  add_missing_from_header and add_missing_date_header commands.
- Libidn is not required for IDN support anymore on systems where getaddrinfo()
  supports the AI_IDN flag and the GnuTLS version is >= 3.4.0.
- The new remove_bcc_headers command replaces the old keepbcc command (but the
  old command is still supported for compatibility).
- SSLv3 is disabled, and the obsolete tls_force_sslv3 command and
  --tls-force-sslv3 option have no effect anymore.

4 files changed, 16 insertions, 20 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index b016e0dc8b2..a9205de7d61 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2014/05/05 00:48:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2015/04/08 05:31:59 wiz Exp $
 
-DISTNAME=	msmtp-1.4.32
-PKGREVISION=	1
+DISTNAME=	msmtp-1.6.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	bcv@hub3.net
 HOMEPAGE=	http://msmtp.sourceforge.net/
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index 7ff65a54af7..8609e33412a 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.10 2011/12/02 12:33:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/04/08 05:31:59 wiz Exp $
 bin/msmtp
 info/msmtp.info
 man/man1/msmtp.1
 share/examples/msmtp/msmtprc-user.example
 share/locale/de/LC_MESSAGES/msmtp.mo
 ${PLIST.scripts}share/msmtp/find_alias/find_alias_for_msmtp.sh
-${PLIST.scripts}share/msmtp/msmtp-gnome-tool/README
-${PLIST.scripts}share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py
 ${PLIST.scripts}share/msmtp/msmtpq/README.msmtpq
 ${PLIST.scripts}share/msmtp/msmtpq/msmtp-queue
 ${PLIST.scripts}share/msmtp/msmtpq/msmtpq
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 0ad35668574..1daf2a62e6c 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2014/03/11 11:55:39 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2015/04/08 05:31:59 wiz Exp $
 
-SHA1 (msmtp-1.4.32.tar.bz2) = 03186a70035dbbf7a31272a20676b96936599704
-RMD160 (msmtp-1.4.32.tar.bz2) = ffb392a25aed83d821e38c947f51ae19ddab2588
-Size (msmtp-1.4.32.tar.bz2) = 303652 bytes
+SHA1 (msmtp-1.6.1.tar.xz) = ac70151bcb53af5e192cbb147fd2b8139c637089
+RMD160 (msmtp-1.6.1.tar.xz) = 42c8eb94ea5ef9561d6ece1e687eb56dcc10e8ff
+Size (msmtp-1.6.1.tar.xz) = 279324 bytes
 SHA1 (patch-src_Makefile.in) = 373e20c6c683f8a0ef243f8ee9a75ec9838cd495
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index 40e822b0621..c24ecaf1b10 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.13 2012/06/12 15:45:58 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2015/04/08 05:31:59 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 
-PKG_SUPPORTED_OPTIONS=	gnome-keyring gsasl idn inet6 scripts
+PKG_SUPPORTED_OPTIONS=	gsasl idn inet6 scripts secret
 PKG_SUGGESTED_OPTIONS=	inet6 ssl
 
 .include "../../mk/bsd.options.mk"
@@ -48,14 +48,14 @@ CONFIGURE_ARGS+=	--without-libidn
 .endif
 
 ###
-### GNOME keyring support
+### GNOME keyring support (via libsecret)
 ###
-.if !empty(PKG_OPTIONS:Mgnome-keyring)
-.  include "../../security/gnome-keyring/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gnome-keyring
+.if !empty(PKG_OPTIONS:Msecret)
+.  include "../../security/libsecret/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libsecret
 USE_TOOLS+=		pkg-config
 .else
-CONFIGURE_ARGS+=	--without-gnome-keyring
+CONFIGURE_ARGS+=	--without-libsecret
 .endif
 
 ###
@@ -65,7 +65,6 @@ CONFIGURE_ARGS+=	--without-gnome-keyring
 CHECK_INTERPRETER_SKIP+=	share/msmtp/find_alias/find_alias_for_msmtp.sh \
 				share/msmtp/msmtpq/msmtp-queue \
 				share/msmtp/msmtpq/msmtpq \
-				share/msmtp/msmtp-gnome-tool/msmtp-gnome-tool.py \
 				share/msmtp/msmtpqueue/msmtp-enqueue.sh \
 				share/msmtp/msmtpqueue/msmtp-listqueue.sh \
 				share/msmtp/msmtpqueue/msmtp-runqueue.sh \
@@ -75,7 +74,7 @@ USE_TOOLS+=		pax
 INSTALLATION_DIRS+=	share/msmtp
 install-msmtp-scripts:
 	cd ${WRKSRC}/scripts && \
-		pax -rw find_alias msmtp-gnome-tool msmtpq msmtpqueue \
+		pax -rw find_alias msmtpq msmtpqueue \
 			set_sendmail vim \
 			${DESTDIR}${PREFIX}/share/msmtp
 .else