- Update to 0.7.2

PR:		ports/65094
Submitted by:	Herbert J. Skuhra <herbert.skuhra@gmx.at>
Approved by:	maintainer

4 files changed, 40 insertions, 70 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index 936da9f1c435..9776d6af7a3d 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	msmtp
-PORTVERSION=	0.5.0
+PORTVERSION=	0.7.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	msmtp
@@ -14,28 +14,32 @@ MASTER_SITE_SUBDIR=	msmtp
 MAINTAINER=	rip@devco.net
 COMMENT=	SMTP plugin for MUAs
 
-USE_GETOPT_LONG=	yes
-USE_OPENSSL=	yes
-USE_REINPLACE=	yes
-
+GNU_CONFIGURE=	yes
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_GMAKE=	yes
 MAN1=		msmtp.1
 PLIST_FILES=	bin/msmtp
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=|g ; \
-		s|CC =|CC ?=|g' \
-		${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/msmtp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/msmtp.1 ${PREFIX}/man/man1
-
-post-install:
-	@${ECHO_CMD} "*****************************************************************************"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Please note that since version 0.5.0 this program uses a configuration file"
-	@${ECHO_CMD} "rather than the old command line options, see the man page."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "***************************************************************************##"
+.if !defined(WITH_OPENSSL)
+WITH_GNUTLS=	yes
+.endif
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+.endif
+
+.if defined(WITH_OPENSSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=	--with-ssl=openssl
+.endif
+
+.if defined(WITH_GNU_SASL)
+LIB_DEPENDS+=	gsasl:${PORTSDIR}/security/gsasl
+.else
+CONFIGURE_ARGS+=	--disable-gsasl
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 5aaf4bc630a1..e0322bc8c0ed 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (msmtp-0.5.0.tar.gz) = 8d1f7b62eb7f9d32355bf11d6dbb5817
-SIZE (msmtp-0.5.0.tar.gz) = 41147
+MD5 (msmtp-0.7.2.tar.gz) = a9a44243211c8b84a220779335a257a5
+SIZE (msmtp-0.7.2.tar.gz) = 139544
diff --git a/mail/msmtp/files/patch-aa b/mail/msmtp/files/patch-aa
deleted file mode 100644
index 1b3eb4e9b22a..000000000000
--- a/mail/msmtp/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-*** Makefile.orig	Thu Aug 21 22:28:13 2003
---- Makefile	Thu Aug 21 22:28:44 2003
-***************
-*** 3,18 ****
-  # 
-  
-  # GNU/Linux and GNU/Hurd
-- CC = gcc
-- CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -D_GNU_SOURCE -Wall -O2
-- LFLAGS = -lssl -lcrypto -s
-- EXTRAOBJS = 
-- 
-- # FreeBSD, NetBSD, OpenBSD
-  #CC = gcc
-! #CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -Wall -O2
-  #LFLAGS = -lssl -lcrypto -s
-  #EXTRAOBJS = 
-  
-  # SunOS
-  #CC = cc
---- 3,18 ----
-  # 
-  
-  # GNU/Linux and GNU/Hurd
-  #CC = gcc
-! #CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -D_GNU_SOURCE -Wall -O2
-  #LFLAGS = -lssl -lcrypto -s
-  #EXTRAOBJS = 
-+ 
-+ # FreeBSD, NetBSD, OpenBSD
-+ CC = gcc
-+ CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -Wall -O2 -I${LOCALBASE}/include
-+ LFLAGS = -lssl -lcrypto -s -L${LOCALBASE}/lib
-+ EXTRAOBJS = getopt.o getopt1.o
-  
-  # SunOS
-  #CC = cc
diff --git a/mail/msmtp/pkg-descr b/mail/msmtp/pkg-descr
index 1267b722b24b..abf462527eca 100644
--- a/mail/msmtp/pkg-descr
+++ b/mail/msmtp/pkg-descr
@@ -1,18 +1,21 @@
-msmtp -- SMTP plugin for MUAs
+msmtp -- An SMTP client 
 
-This is a simple program that works as an "SMTP plugin" for Mutt and probably 
-other MUAs (mail user agents).  msmtp forwards mails to an SMTP server (for 
-example at a free mail provider) which does the delivery.  
+Is an SMTP client that can be used as an "SMTP plugin" for Mutt and probably 
+other MUAs (mail user agents). It forwards mails to an SMTP server (for 
+example at a free mail provider) which does the delivery.
+To use this program, create a configuration file with your mail account(s) and 
+tell your MUA to call msmtp instead of /usr/sbin/sendmail.
 
 Features include:
+
     * SMTP AUTH methods PLAIN, LOGIN and CRAM-MD5
+      (and DIGEST-MD5 and NTLM when compiled with GSASL support)
     * TLS encrypted connections
-    * IPv6 support
-    * robustness
-    * detailed error messages (including the full answer of the SMTP server) 
-      if something goes wrong
+      (including server certificate verification and the possibility to send 
+       a client certificate)
+    * DSN (Delivery Status Notification) support
+    * IPv6 support (on systems that support it)
+    * support for multiple accounts
     * sendmail compatible exit codes (which most MUAs understand).
 
-Simply tell your MUA to call msmtp instead of /usr/sbin/sendmail 
-
 WWW: http://msmtp.sourceforge.net/