From 5d59a4b837a974937cba09cf0f186deb115bd984 Mon Sep 17 00:00:00 2001
From: novel <novel@FreeBSD.org>
Date: Fri, 20 Jun 2008 06:45:04 +0000
Subject: - Update to 1.4.15 - Depend on security/ca_root_nss instead of
 expired security/ca-roots

---
 mail/msmtp/Makefile                |  5 ++---
 mail/msmtp/distinfo                |  6 +++---
 mail/msmtp/files/patch-doc-msmtp.1 | 22 +++++++++++-----------
 3 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'mail/msmtp')

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index a7764b91b6ee..d354b69dcc4e 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	msmtp
-PORTVERSION=	1.4.14
-PORTREVISION=	1
+PORTVERSION=	1.4.15
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	msmtp
@@ -35,7 +34,7 @@ CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 .if defined(WITH_GNUTLS) || defined(WITH_OPENSSL)
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root.crt:${PORTSDIR}/security/ca-roots
+RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 .endif
 
 .if defined(WITH_GSASL)
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index a37e311183e7..5d83ecd16835 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (msmtp-1.4.14.tar.bz2) = 4b17967f9dc1ebefa4191b6ca701af33
-SHA256 (msmtp-1.4.14.tar.bz2) = e805994f72ce0d8b54d86f65b3cca034f9a0fd21bec9c12cbf26c2ad20309345
-SIZE (msmtp-1.4.14.tar.bz2) = 721839
+MD5 (msmtp-1.4.15.tar.bz2) = 52dfb3039f4253581292eba8285379c1
+SHA256 (msmtp-1.4.15.tar.bz2) = 83264896af3d1b6954baf3a8a83e8f732d6166616e364f396ecc9cab67e7d572
+SIZE (msmtp-1.4.15.tar.bz2) = 737203
diff --git a/mail/msmtp/files/patch-doc-msmtp.1 b/mail/msmtp/files/patch-doc-msmtp.1
index 3f214f57fdc5..8235c53b7518 100644
--- a/mail/msmtp/files/patch-doc-msmtp.1
+++ b/mail/msmtp/files/patch-doc-msmtp.1
@@ -1,23 +1,23 @@
---- doc/msmtp.1.orig	Thu Apr 26 20:11:59 2007
-+++ doc/msmtp.1	Thu Apr 26 20:31:22 2007
-@@ -332,6 +332,11 @@
+--- doc/msmtp.1.orig	Sat Jun  7 18:28:15 2008
++++ doc/msmtp.1	Fri Jun 20 09:40:57 2008
+@@ -356,6 +356,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-roots\fP port and
-+use the file \fB/usr/local/share/certs/ca-root.crt\fP. Please note that if 
++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-roots\fP port will be installed automaticly.
- .IP "tls_key_file [\fIfile\fP]"
- This command (together with the \fBtls_cert_file\fP command) enables msmtp to
- send a client certificate to the SMTP server if requested.
-@@ -418,7 +423,7 @@
++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
+@@ -460,7 +465,7 @@
  .br
  tls on
  .br
 -tls_trust_file /etc/ssl/certs/ca-certificates.crt
-+tls_trust_file /usr/local/share/certs/ca-root.crt
++tls_trust_file /usr/local/share/certs/ca-root-nss.crt
  .br
  logfile ~/.msmtp.log
  .br
-- 
cgit