Update mail/msmtp to 1.0.0, sent by Sergio Jimenez <TripleDES at

eslack dot org> in private email.

Changes:

Version 1.0.0:
- New feature: tilde expansion for filenames in the configuration file

Version 0.7.2:
- This version adds native support for Windows 9x/ME/NT/2000/XP/2003
  (with MinGW) and DOS (with DJGPP and the Watt32 library).

Version 0.7.1:
- New command: 'domain'
- New options: --pretend and --debug

Version 0.7.0:
- Support for DSN (Delivery Status Notifications) was added via
  the new commands 'dsn_notify' and 'dsn_return'.
- The 'tls_nocertcheck' command was added. It disables all server
  certificate checks. Use it if you get certificate check errors but
  still want to use the SMTP server with TLS/SSL.
- The 'nostarttls' command is now called 'tls_nostarttls'.
  Please update your configuration file.

Version 0.6.5:
- License clarification:
  msmtp is released under the GPL with the additional exemption that
  compiling, linking, and/or using OpenSSL is allowed.
- If you want to use GnuTLS instead of OpenSSL, you will now need
  GnuTLS >= 1.0.0 and libgcrypt >= 1.1.90!
- msmtp now works on systems that lack IPv6 support
- msmtp now accepts arbitrary long lines in mails

Version 0.6.4:
- fixed configuration file code

Version 0.6.3:
- portability fix for Mac OS X (Randolph Fritz)
- fixed --disable-gsasl configure option
- man page improvements

Version 0.6.2:
- use GNU Autotools (Christophe Nowicki)
- fixed wildcard support in server certificate's Common Name field

Version 0.6.1:
- improved certificate check/verification with OpenSSL
- code cleanups

Version 0.6.0:
- Added sanity checks of server certificate when using TLS
- Strict server certificate verification with tls_trust_file command
- Possibility to send client certificate if requested (tls_key_file and
  tls_cert_file commands)
- Optional support for GnuTLS instead of OpenSSL
- Optional support for GSASL (adds DIGEST-MD5 and NTLM authentication methods)
- Arguments in the configuration file may now contain blanks
- Removed the possibility to choose the TLS version with the tls command
- Proper recognition of server capabilities (EHLO response)

4 files changed, 9 insertions, 39 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index cd17ff3ff5a..123bdea70aa 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2004/04/18 04:59:14 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/06/20 21:05:02 xtraeme Exp $
 #
 
-DISTNAME=		msmtp-0.5.0
-PKGREVISION=		2
+DISTNAME=		msmtp-1.0.0
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=msmtp/}
 
@@ -10,17 +9,14 @@ MAINTAINER=		bcv@hub3.net
 HOMEPAGE=		http://msmtp.sourceforge.net/
 COMMENT=		SMTP plugin for MUAs
 
-USE_BUILDLINK3=		yes
+USE_BUILDLINK3=		YES
+GNU_CONFIGURE=    	YES
 
 EGDIR=                  ${PREFIX}/share/examples/msmtp
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/msmtp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/msmtp.1 ${PREFIX}/man/man1
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/msmtprc.example ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc.example ${EGDIR}
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index 4fab0dd1fb3..7fa6e0c63ba 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/19 09:24:29 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/20 21:05:02 xtraeme Exp $
 bin/msmtp
 man/man1/msmtp.1
 share/examples/msmtp/msmtprc.example
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 153e6f315d4..5f3beb49e54 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/09/19 09:24:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/06/20 21:05:02 xtraeme Exp $
 
-SHA1 (msmtp-0.5.0.tar.gz) = c9f5d96e5c12b4ab8c371a818ad68395bffcd92d
-Size (msmtp-0.5.0.tar.gz) = 41147 bytes
-SHA1 (patch-aa) = 73b5d5c098e10539681c594c26c47585e3d396f0
+SHA1 (msmtp-1.0.0.tar.gz) = 0acfd6bf85a6467a3c5017561aebdcc1c030a5b9
+Size (msmtp-1.0.0.tar.gz) = 144444 bytes
diff --git a/mail/msmtp/patches/patch-aa b/mail/msmtp/patches/patch-aa
deleted file mode 100644
index 5f22780338f..00000000000
--- a/mail/msmtp/patches/patch-aa
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/19 09:24:29 wiz Exp $
---- Makefile	Wed Sep 17 23:53:37 2003
-+++ Makefile.new	Wed Sep 17 23:54:06 2003
-@@ -3,15 +3,15 @@
- # 
- 
- # GNU/Linux and GNU/Hurd
--CC = gcc
--CFLAGS = -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -D_GNU_SOURCE -Wall -O2
--LFLAGS = -lssl -lcrypto -s
--EXTRAOBJS = 
-+#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
-+CFLAGS += -DHAVE_VASPRINTF -DHAVE_GETOPT_LONG -Wall
-+LFLAGS = -lssl -lcrypto -s
- #EXTRAOBJS = 
- 
- # SunOS