update mail/serialmail:

  - Check for tcpserver dependency in PATH rather than in ${PREFIX}/bin
  - Install additional documentation
  - Use DOCSDIR macro in pkg-plist
  - Cleanup and simplify Makefile
  - Make portlint(1) happy
  - Take maintainership

PR:		53860
Submitted by:	Sergei Kolobov <sergei@kolobov.com>

3 files changed, 27 insertions, 25 deletions

diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index d1da922e196c..1b681c35c993 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -13,21 +13,25 @@ MASTER_SITES=	http://cr.yp.to/software/ \
 		ftp://ftp.de.uu.net/pub/unix/mail/qmail/ \
 		ftp://ftp.iway.fr/pub/unix/mail/qmail/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sergei@kolobov.com
 COMMENT=	Tools for passing mail across serial links
 
-MAN1=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 serialsmtp.1 setlock.1
+RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
+		${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 
 # QMAIL_DIR is the directory where qmail is installed
 QMAIL_DIR?=	/var/qmail
 
-RUN_DEPENDS=	${PREFIX}/bin/tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
-		${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
-
-NO_PACKAGE=	Unsure of djb's license
+NO_PACKAGE=	Unsure of DJB license
 
 ALL_TARGET=	it
 
+PROGRAMS=	serialqmtp serialsmtp maildirserial setlock
+SCRIPTS=	maildirqmtp maildirsmtp
+MAN1=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
+		serialsmtp.1 setlock.1
+DOCS=		AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
+
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
@@ -35,21 +39,13 @@ post-configure:
 	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
 
 do-install:
-.for file in serialqmtp serialsmtp maildirserial setlock
-	@${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
-.endfor
-.for file in maildirqmtp maildirsmtp
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
-.endfor
-.for file in maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 serialsmtp.1 setlock.1
-	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
-.endfor
+	cd ${WRKSRC} && \
+		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
+		${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin && \
+		${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>  Copying documents to ${PREFIX}/share/doc/serialmail"
-	@${MKDIR} ${PREFIX}/share/doc/serialmail
-.for file in FROMISP TOISP AUTOTURN
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/serialmail
-.endfor
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/serialmail/pkg-descr b/mail/serialmail/pkg-descr
index 9a13fa1a8313..944963a27620 100644
--- a/mail/serialmail/pkg-descr
+++ b/mail/serialmail/pkg-descr
@@ -13,4 +13,5 @@ maildirsmtp without pestering the sysadmin. The user can also decide
 whether undeliverable messages should be left for POP retrieval or
 bounced back to the sender.
 
-WWW: http://cr.yp.to/serialmail.html
+Author:	D. J. Bernstein <djb@cr.yp.to>
+WWW:	http://cr.yp.to/serialmail.html
diff --git a/mail/serialmail/pkg-plist b/mail/serialmail/pkg-plist
index 184cfb661197..2be01095af41 100644
--- a/mail/serialmail/pkg-plist
+++ b/mail/serialmail/pkg-plist
@@ -4,7 +4,12 @@ bin/maildirsmtp
 bin/serialqmtp
 bin/serialsmtp
 bin/setlock
-%%PORTDOCS%%share/doc/serialmail/AUTOTURN
-%%PORTDOCS%%share/doc/serialmail/FROMISP
-%%PORTDOCS%%share/doc/serialmail/TOISP
-%%PORTDOCS%%@dirrm share/doc/serialmail
+%%PORTDOCS%%%%DOCSDIR%%/AUTOTURN
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/FROMISP
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/TOISP
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%@dirrm %%DOCSDIR%%