3 files changed, 17 insertions, 8 deletions
diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 48fa0930477..a0982b0a016 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2008/08/12 16:39:56 reed Exp $
+# $NetBSD: Makefile,v 1.21 2009/01/06 12:08:01 obache Exp $
 
-DISTNAME=	msmtp-1.4.16
+DISTNAME=	msmtp-1.4.17
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 574ce0055f9..dc0d4b3e2ca 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/08/12 16:39:56 reed Exp $
+$NetBSD: distinfo,v 1.16 2009/01/06 12:08:01 obache Exp $
 
-SHA1 (msmtp-1.4.16.tar.bz2) = 784ee281cee05e4a312629efaa4ea892bb98a51f
-RMD160 (msmtp-1.4.16.tar.bz2) = 1142042235e42457f8244e02f078dbd53f350886
-Size (msmtp-1.4.16.tar.bz2) = 727517 bytes
+SHA1 (msmtp-1.4.17.tar.bz2) = 6b7fa1d9c9eee249b571b3f7720ebd779f94f4de
+RMD160 (msmtp-1.4.17.tar.bz2) = 749cf22bcbde90dd298f0c96ee0f9e41f93767b6
+Size (msmtp-1.4.17.tar.bz2) = 766293 bytes
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index bc0c42a6488..465f1f25369 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.9 2007/09/08 08:05:23 obache Exp $
+# $NetBSD: options.mk,v 1.10 2009/01/06 12:08:01 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	ssl
 PKG_OPTIONS_GROUP.ssl=	gnutls ssl
 
-PKG_SUPPORTED_OPTIONS=	gsasl idn inet6
+PKG_SUPPORTED_OPTIONS=	gnome-keyring gsasl idn inet6
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
@@ -37,3 +37,12 @@ CONFIGURE_ARGS+=	--disable-ssl
 .  include "../../devel/libidn/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-libidn
 .endif
+
+###
+### GNOME keyring support
+###
+.if !empty(PKG_OPTIONS:Mgnome-keyring)
+.  include "../../security/gnome-keyring/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gnome-keyring
+USE_TOOLS+=		pkg-config
+.endif