Changes 1.4.0:

- This is the new stable release of msmtp.
  BEWARE: When upgrading from 1.2.4, note that
  - Authentication is not enabled automatically anymore! Insert the command
    "auth on" into account definitions that need it.
  - Some command line options have changed!
- Summary of new features since 1.2.4:
  - Sendmail compatible command line options, including -t, -N, and -R
  - New long options to configure almost everything on the command line
  - Optional account selection with -f/--from
  - Support for a system wide configuration file
  - Optional automatic construction of envelope from addresses
  - More flexible account definitions
  - Configurable connection timeouts
  - Improved log file logging
  - Syslog logging
  - Improved TLS/SSL support
  - Support for LMTP
  - Support for the EXTERNAL and GSSAPI authentication methods
  - Support for .netrc and password prompting
  - Rewritten documentation, available in various formats

4 files changed, 30 insertions, 34 deletions

diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index eb10dea0213..27641ac0494 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,22 +1,26 @@
-# $NetBSD: Makefile,v 1.7 2005/01/19 15:30:25 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/04/04 08:45:24 adam Exp $
 
-DISTNAME=	msmtp-1.2.4
+DISTNAME=	msmtp-1.4.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=msmtp/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	bcv@hub3.net
 HOMEPAGE=	http://msmtp.sourceforge.net/
 COMMENT=	SMTP plugin for MUAs
 
 USE_BUILDLINK3=		yes
-GNU_CONFIGURE=    	yes
+GNU_CONFIGURE=		yes
 
-EGDIR=                  ${PREFIX}/share/examples/msmtp
+EGDIR=		${PREFIX}/share/examples/msmtp
+
+INFO_FILES=	msmtp.info
 
 .include "options.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc.example ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-system.example ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/msmtprc-user.example ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/msmtp/PLIST b/mail/msmtp/PLIST
index 7fa6e0c63ba..09a03170ff5 100644
--- a/mail/msmtp/PLIST
+++ b/mail/msmtp/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/06/20 21:05:02 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/04/04 08:45:24 adam Exp $
 bin/msmtp
 man/man1/msmtp.1
-share/examples/msmtp/msmtprc.example
+share/examples/msmtp/msmtprc-system.example
+share/examples/msmtp/msmtprc-user.example
 @dirrm share/examples/msmtp
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 600830b0166..0a99fd66a9b 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/04/04 08:45:24 adam Exp $
 
-SHA1 (msmtp-1.2.4.tar.gz) = d62747d2c38c6dd32f953441f49ee3a8dcf36d53
-RMD160 (msmtp-1.2.4.tar.gz) = 634950d0ecfc14469c6b0e6c7b25749a722dad38
-Size (msmtp-1.2.4.tar.gz) = 159416 bytes
+SHA1 (msmtp-1.4.0.tar.bz2) = b3b202883831d62d53d8cc7347fe5b654d6ed38f
+RMD160 (msmtp-1.4.0.tar.bz2) = 394b962b4c554b04757b1917ecd733972a2792f4
+Size (msmtp-1.4.0.tar.bz2) = 404850 bytes
diff --git a/mail/msmtp/options.mk b/mail/msmtp/options.mk
index 9e9f36c6de3..eb10cd9e0fb 100644
--- a/mail/msmtp/options.mk
+++ b/mail/msmtp/options.mk
@@ -1,38 +1,29 @@
-# $NetBSD: options.mk,v 1.4 2005/01/10 20:59:43 adrianp Exp $
+# $NetBSD: options.mk,v 1.5 2005/04/04 08:45:24 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.msmtp
-PKG_SUPPORTED_OPTIONS=	gnutls inet6 ssl gsasl nossl
-
-.if !defined(PKG_OPTIONS.msmtp)
-PKG_DEFAULT_OPTIONS+=	ssl
-.endif
+PKG_DEFAULT_OPTIONS=	ssl
+PKG_SUPPORTED_OPTIONS=	gnutls gsasl inet6 ssl
 
 .include "../../mk/bsd.options.mk"
 
-###
-### GNUtls support.
-###
+# GNUtls support
 .if !empty(PKG_OPTIONS:Mgnutls)
 .include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=gnutls
 .endif
 
-###
-### OpenSSL support.
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/openssl/buildlink3.mk"
-.endif
-
-###
-### GNUsasl support.
-###
+# GNUsasl support
 .if !empty(PKG_OPTIONS:Mgsasl)
 .include "../../security/gsasl/buildlink3.mk"
 .endif
 
-###
-### No SSL support.
-###
-.if !empty(PKG_OPTIONS:Mnossl)
+# OpenSSL support
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-ssl=openssl
+.endif
+
+# Disable any SSL support
+.if empty(PKG_OPTIONS:Mgnutls) && empty(PKG_OPTIONS:Mssl)
 CONFIGURE_ARGS+=	--disable-ssl
 .endif