ports/139133: [PATCH] Update mail/msmtp to 1.4.18

[Herbert J. Skuhra]

>Number:         139133
>Category:       ports
>Synopsis:       [PATCH] Update mail/msmtp to 1.4.18
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 25 13:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 8.0-RC1 i386
>Organization:
>Environment:
FreeBSD localhost 8.0-RC1 FreeBSD 8.0-RC1 #0 r197392: Mon Sep 21 21:19:31 CEST 2009     root at localhost:/usr/obj/usr/src/sys/PC1  i386
>Description:
1. Update mail/msmtp to 1.4.18 (released on 09/08/2009)
2. Add GNOME Keyring support
3. Add OPTIONS
>How-To-Repeat:

>Fix:
Patch attached.


Patch attached with submission follows:

diff -ruN mail/msmtp.bak/Makefile mail/msmtp/Makefile
--- mail/msmtp.bak/Makefile	2009-08-22 02:27:49.000000000 +0200
+++ mail/msmtp/Makefile	2009-09-25 15:33:08.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	msmtp
-PORTVERSION=	1.4.17
-PORTREVISION=	2
+PORTVERSION=	1.4.18
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -22,6 +21,15 @@
 MAN1=	msmtp.1
 INFO=	msmtp
 
+OPTIONS=	GNUTLS "Build with GNUTLS support" off \
+		OPENSSL "Build with OPENSSL support" off \
+		GSASL "Build with GSASL support" off \
+		GNOME_KEYRING "Build with GNOME_KEYRING support" off \
+	 	IDN "Build with IDN support" on \
+		NLS "Build with NLS support" on
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=	--with-ssl=gnutls
@@ -42,6 +50,13 @@
 CONFIGURE_ARGS+=	--without-gsasl
 .endif
 
+.if defined(WITH_GNOME_KEYRING)
+LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+CONFIGURE_ARGS+=	--with-gnome-keyring
+.else
+CONFIGURE_ARGS+=	--without-gnome-keyring
+.endif
+
 .if !defined(WITHOUT_IDN)
 LIB_DEPENDS+=	idn.16:${PORTSDIR}/dns/libidn
 CONFIGURE_ARGS+=	--with-libidn
@@ -58,4 +73,4 @@
 PLIST_SUB=		NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN mail/msmtp.bak/distinfo mail/msmtp/distinfo
--- mail/msmtp.bak/distinfo	2008-12-27 08:39:47.000000000 +0100
+++ mail/msmtp/distinfo	2009-09-25 14:16:16.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (msmtp-1.4.17.tar.bz2) = b0b74f1144812b60688f590c62a0d3dd
-SHA256 (msmtp-1.4.17.tar.bz2) = f9f25b1f39be95ae11b432e3a5f22275fa8336c7c9cac7820efe1ba1246b96e6
-SIZE (msmtp-1.4.17.tar.bz2) = 766293
+MD5 (msmtp-1.4.18.tar.bz2) = 74f80b41c058a0ee34819d6bf5ff3b1a
+SHA256 (msmtp-1.4.18.tar.bz2) = f743d2269e3b3219c0d197d22e13645076e0d6d44e2bde4b613b9ec1b4a19d7f
+SIZE (msmtp-1.4.18.tar.bz2) = 818691


>Release-Note:
>Audit-Trail:
>Unformatted: