- Update to 1.6.2

- Drop the man page patch and use REINPLACE_CMD instead to provide a proper
  SSL certs path in config sample

3 files changed, 8 insertions, 28 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index a00816d81833..bb0715aa8eb3 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	msmtp
-PORTVERSION=	1.4.32
-PORTREVISION=	3
+PORTVERSION=	1.6.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF
 
@@ -13,7 +12,7 @@ COMMENT=	SMTP plugin for MUAs
 LICENSE=	GPLv3
 
 GNU_CONFIGURE=	yes
-USES=		makeinfo pkgconfig tar:bzip2
+USES=		makeinfo pkgconfig tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INFO=	msmtp
@@ -76,6 +75,10 @@ PLIST_SUB+=		NLS="@comment "
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	@${REINPLACE_CMD} -e 's|/etc/ssl/certs/ca\\-certificates.crt|${LOCALBASE}/share/certs/ca\\-root\\-nss.crt|' \
+		${WRKSRC}/doc/msmtp.1
+
 .if ${PORT_OPTIONS:MMSMTPQ}
 PLIST_SUB+=	MSMTPQ=""
 
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 07573729a346..9cbccebb6a45 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msmtp-1.4.32.tar.bz2) = 2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88
-SIZE (msmtp-1.4.32.tar.bz2) = 303652
+SHA256 (msmtp-1.6.2.tar.xz) = 2f6ecd7cbfadf548fd55205bd24cb63b84bcbb1185efed917dd7800595a48789
+SIZE (msmtp-1.6.2.tar.xz) = 280292
diff --git a/mail/msmtp/files/patch-doc-msmtp.1 b/mail/msmtp/files/patch-doc-msmtp.1
deleted file mode 100644
index b2c7769fa562..000000000000
--- a/mail/msmtp/files/patch-doc-msmtp.1
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/msmtp.1.orig	2009-10-05 16:43:01.000000000 -0300
-+++ doc/msmtp.1	2009-10-24 10:34:52.000000000 -0200
-@@ -361,6 +361,11 @@
- .br
- On Debian based systems, you can install the \fBca\-certificates\fP package and
- use the file \fB/etc/ssl/certs/ca\-certificates.crt\fP.
-+.br
-+On FreeBSD based systems, you can install the \fBsecurity/ca_root_nss\fP port and
-++use the file \fB/usr/local/share/certs/ca-root-nss.crt\fP. Please note that if
-++you are installing msmtp from ports with OpenSSL or gnutls support,
-++the \fBsecurity/ca_root_nss\fP port will be installed automaticly. 
- .IP "tls_crl_file [\fIfile\fP]"
- This command sets or unsets a certificate revocation list (CRL) file for TLS,
- to be used during strict server certificate verification as enabled by the
-@@ -466,7 +471,7 @@
- .br
- tls on
- .br
--tls_trust_file /etc/ssl/certs/ca\-certificates.crt
-+tls_trust_file /usr/local/share/certs/ca-root-nss.crt
- .br
- logfile ~/.msmtp.log
- .br