Update to 0.8.2

PR:		ports/75125
Submitted by:	maintainer

5 files changed, 31 insertions, 23 deletions

diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index fe1323eb745c..9bb7caa9f975 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hotwayd
-PORTVERSION=	0.7.4
+PORTVERSION=	0.8.2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,24 +15,26 @@ MASTER_SITE_SUBDIR=	hotwayd
 MAINTAINER=	john@jnielsen.net
 COMMENT=	A Hotmail -> POP3 gateway
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
+		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 
-MAN1=		hotwayd.1
+MAN1=		hotwayd.1 \
+		hotsmtpd.1
 
-DOC_FILES=	AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
-DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
+PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README VERSION
+PLIST_FILES=	sbin/hotwayd sbin/hotsmtpd
 
 post-install:	install-doc-files display-message
 
 install-doc-files:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for f in ${DOC_FILES}
+.for f in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/hotwayd/distinfo b/mail/hotwayd/distinfo
index 600cf0fe425f..5fd864ee5d82 100644
--- a/mail/hotwayd/distinfo
+++ b/mail/hotwayd/distinfo
@@ -1,2 +1,2 @@
-MD5 (hotwayd-0.7.4.tar.bz2) = 55ffa28a319d84b59bfdccf87f9bde90
-SIZE (hotwayd-0.7.4.tar.bz2) = 135826
+MD5 (hotwayd-0.8.2.tar.bz2) = 0d1e3a691c8d5757a6e67b32745ab2cb
+SIZE (hotwayd-0.8.2.tar.bz2) = 150424
diff --git a/mail/hotwayd/files/patch-hotsmtpd-commands_smtp.c b/mail/hotwayd/files/patch-hotsmtpd-commands_smtp.c
new file mode 100644
index 000000000000..9bf08fce6aa0
--- /dev/null
+++ b/mail/hotwayd/files/patch-hotsmtpd-commands_smtp.c
@@ -0,0 +1,11 @@
+--- hotsmtpd/commands_smtp.c.orig	Sat Dec 11 18:33:17 2004
++++ hotsmtpd/commands_smtp.c	Wed Dec 15 12:21:00 2004
+@@ -199,7 +199,7 @@
+   }
+ 
+   /* Clean up after ourselves */
+-  httpmail_destroy();
++  /*httpmail_destroy();*/
+   if (body)
+       free(body);
+ }
diff --git a/mail/hotwayd/pkg-message b/mail/hotwayd/pkg-message
index 91f0cd024298..24e60e92e13e 100644
--- a/mail/hotwayd/pkg-message
+++ b/mail/hotwayd/pkg-message
@@ -1,15 +1,18 @@
+
 ********************
-hotwayd should normally be run from inetd (or xinetd).
-To use the standard ports for pop3 and smtp, add lines
-like the following to /etc/inetd.conf:
+hotwayd and hotsmtpd should normally 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
 
-Alternatively, you may specify an arbitrary port for hotwayd.
-Define them in /etc/services, and then add a line like the following to
+Alternatively, you may specify arbitrary ports for hotwayd and hotsmtpd.
+Define them in /etc/services, and then add lines like the 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.:
 
@@ -20,6 +23,7 @@ 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).
 
-For more detailed information see hotwayd(1) and the port
+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
deleted file mode 100644
index 5a7660257458..000000000000
--- a/mail/hotwayd/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-sbin/hotwayd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/VERSION
-%%PORTDOCS%%@dirrm %%DOCSDIR%%