pkg/40278: Update mail/msmtp to 1.4.17 and add its options to options.description

[Leonardo Taccari <leonardo1990%gmail.com@localhost>]

>Number:         40278
>Category:       pkg
>Synopsis:       mail/msmtp isn't the latest stable version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 27 20:40:01 +0000 2008
>Originator:     Leonardo Taccari
>Release:        NetBSD 4.0.1
>Organization:
NetBSD Italia
>Environment:
        
        
System: NetBSD bianconiglio 4.0.1 NetBSD 4.0.1 (BIANCONIGLIO) #0: Sat Oct 18 
15:44:19 CEST 2008 
leot@bianconiglio:/home/leot/builds/usr/src/sys/arch/i386/compile/BIANCONIGLIO 
i386
Architecture: i386
Machine: i386
>Description:
        Our mail/msmtp in pkgsrc is not the latest stable version. The latest 
one
        is 1.4.17.

        While here, I also saw (pkglint++) that "gsasl" and "gnome-keyring"
        options are not present in pkgsrc/mk/default/options.description.

        The latter is a new feature of the 1.4.17 release. However, I am not 
able
        to test this feature ("msmtp --version" correctly reports that
        gnome-keyring support is on) due a lack of documentation.

        For some documentation about this feature:
        http://ssatoh.livejournal.com/89041.html
>How-To-Repeat:
        There is more than one way to do it:

        $ cd ${PKGSRCDIR}/mail/mutt && make show-var VARNAME=DISTNAME

        or

        $ cd ${PKGSRCDIR}/mail/mutt && make install
        $ msmtp --version | head -n 1
>Fix:
        Just apply the attached patches, and add the option descriptions to
        pkgsrc/mk/defaults/options.description, please.

        Thank you and happy new year!


pkgsrc/mk/defaults/options.description lines:
gnome-keyring           Enable support for GNOME keyring
gsasl                   Enable support for GNU SASL


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/msmtp/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo    12 Aug 2008 16:39:56 -0000      1.15
+++ distinfo    27 Dec 2008 18:25:17 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.15 2008/08/12 16:39:56 reed 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


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/msmtp/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile    12 Aug 2008 16:39:56 -0000      1.20
+++ Makefile    27 Dec 2008 18:25:29 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.20 2008/08/12 16:39:56 reed Exp $
 
-DISTNAME=      msmtp-1.4.16
+DISTNAME=      msmtp-1.4.17
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=msmtp/}
 EXTRACT_SUFX=  .tar.bz2
@@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT=  user-destdir
 
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
+USE_TOOLS+=            pkg-config
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 


Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/msmtp/options.mk,v
retrieving revision 1.9
diff -u -p -r1.9 options.mk
--- options.mk  8 Sep 2007 08:05:23 -0000       1.9
+++ options.mk  27 Dec 2008 18:25:04 -0000
@@ -5,7 +5,7 @@ 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,11 @@ 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
+.endif

>Unformatted: