5 files changed, 59 insertions, 20 deletions

diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index c92b991c2ad5..b758eec5b7aa 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hotwayd
-PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hotwayd
@@ -16,16 +15,32 @@ MAINTAINER=	john@jnielsen.net
 COMMENT=	A Hotmail -> POP3 gateway
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		iconv.3:${PORTSDIR}/converters/libiconv \
+		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-MAN1=		hotwayd.1
-PLIST_FILES=	sbin/hotwayd
+MAN1=		hotwayd.1 \
+		hotsmtpd.1
 
-post-install:
+DOC_FILES=	AUTHORS COPYING INSTALL NEWS README README.hotsmtpd VERSION
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+
+post-install:	install-doc-files display-message
+
+install-doc-files:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for f in ${DOC_FILES}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+
+display-message:
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/mail/hotwayd/distinfo b/mail/hotwayd/distinfo
index c48cf60215c5..f50d1ebf5f6f 100644
--- a/mail/hotwayd/distinfo
+++ b/mail/hotwayd/distinfo
@@ -1 +1,2 @@
-MD5 (hotwayd-0.7.1.tar.bz2) = 9610c8cd7c1a155e0cf052d2ca031659
+MD5 (hotwayd-0.8.tar.bz2) = b34d5166a2c6d7ba3970d3a0325c8c1a
+SIZE (hotwayd-0.8.tar.bz2) = 148962
diff --git a/mail/hotwayd/pkg-descr b/mail/hotwayd/pkg-descr
index 99726d32545f..5087164b0479 100644
--- a/mail/hotwayd/pkg-descr
+++ b/mail/hotwayd/pkg-descr
@@ -1,6 +1,10 @@
-Hotway uses HTTPMail (the same protocol that Outlook Express uses) to access
-Microsoft's Hotmail servers.  The software acts as a proxy mail server,
-allowing you to access hotmail and MSN accounts using a standard POP3 mail
-client.
+Hotwayd uses HTTPMail (the same protocol that Outlook Express uses) to access
+servers such as Hotmail.  The software acts as a proxy mail server, allowing
+you to access e-mail on Hotmail and similar servers using standard POP3 mail
+clients.
+
+Starting with version 0.8, the port also includes hotsmtpd which can be used
+for sending e-mail through Hotmail and similar servers with standard SMTP
+mail clients.
 
 WWW: http://hotwayd.sourceforge.net
diff --git a/mail/hotwayd/pkg-message b/mail/hotwayd/pkg-message
index 500a3d127ea2..94dbbcaf8cad 100644
--- a/mail/hotwayd/pkg-message
+++ b/mail/hotwayd/pkg-message
@@ -1,19 +1,28 @@
-
-To run hotwayd you need to add it to inetd.conf.
-To use the standard pop3 port for hotwayd, add the following
-line to /etc/inetd.conf:
+hotwayd and hotsmtpd need to be run from inetd (or xinetd).
+To use the standard ports for pop3 and smtp, add lines
+like the following to /etc/inetd.conf:
 
 pop3	stream	tcp	nowait	root	/usr/local/sbin/hotwayd	hotwayd
+smtp	stream	tcp	nowait	root	/usr/local/sbin/hotsmtpd hotsmtpd
 
-You may also specify an arbitrary port for hotwayd.  Define it
-in /etc/services, and then use a line like this in /etc/inetd.conf:
+Alternatively, you may specify arbitrary ports for hotwayd and hotsmtpd.
+Define them in /etc/services, and then add lines like thke following to
+/etc/inetd.conf:
 
 hotwayd	stream	tcp	nowait	root	/usr/local/sbin/hotwayd	hotwayd
+hotsmtpd stream	tcp	nowait	root	/usr/local/sbin/hotsmtpd hotsmtpd
 
 After making your changes, restart inetd. e.g.:
 
 killall -HUP inetd
 
-You can now use fetchmail or any pop3 mail client to read your e-mail.
-The POP username should be your full hotmail or msn e-mail address,
-and the password is your hotmail/msn password.
+You can now use fetchmail or any pop3 mail client to receive your
+hotmail (or similar) e-mail. The username should be your full e-mail
+address (e.g. example@hotmail.com), and the password is your your
+password for hotmail (or whichever service you use).
+
+Similarly, you can use any mail client that supports SASL authentication
+for SMTP to send e-mail (through hotmail, etc).
+
+For more detailed information see hotwayd(1), hotsmtpd(1), and the port
+documentation in ${PREFIX}/share/doc/hotwayd.
diff --git a/mail/hotwayd/pkg-plist b/mail/hotwayd/pkg-plist
new file mode 100644
index 000000000000..c28d8854d1d5
--- /dev/null
+++ b/mail/hotwayd/pkg-plist
@@ -0,0 +1,10 @@
+sbin/hotwayd
+sbin/hotsmtpd
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.hotsmtpd
+%%PORTDOCS%%%%DOCSDIR%%/VERSION
+%%PORTDOCS%%@dirrm %%DOCSDIR%%