svn commit: r314458 - head/mail/serialmail

[Bryan Drewery]

Author: bdrewery
Date: Sun Mar 17 16:34:17 2013
New Revision: 314458
URL: http://svnweb.freebsd.org/changeset/ports/314458

Log:
  - Take maintainership
  - Fix space in WWW
  - Fix plist with UCSPI_SSL option
  - Use PORTDOCS

Modified:
  head/mail/serialmail/Makefile
  head/mail/serialmail/pkg-descr
  head/mail/serialmail/pkg-plist

Modified: head/mail/serialmail/Makefile
==============================================================================
--- head/mail/serialmail/Makefile	Sun Mar 17 16:08:59 2013	(r314457)
+++ head/mail/serialmail/Makefile	Sun Mar 17 16:34:17 2013	(r314458)
@@ -10,25 +10,26 @@ 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 at FreeBSD.org
+MAINTAINER=	bdrewery at FreeBSD.org
 COMMENT=	Tools for passing mail across serial links
 
 RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
+
 USES=		qmail:run
 
 RESTRICTED=	Unsure of DJB license
 
 ALL_TARGET=	it
 
-OPTIONS_DEFINE=	AUTH UCSPI_SSL
+OPTIONS_DEFINE=	AUTH DOCS UCSPI_SSL
 AUTH_DESC=	Add CRAM-MD5, PLAIN and LOGIN authentication
-UCSPI_SSL_DESC=	Add ucspi-ssl SMTP SSL transport layer support
+UCSPI_SSL_DESC=	ucspi-ssl SMTP SSL transport layer support
 
 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
+PORTDOCS=	AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
 
 .include <bsd.port.options.mk>
 
@@ -41,8 +42,10 @@ PATCH_DIST_STRIP=	-p1
 .if ${PORT_OPTIONS:MUCSPI_SSL}
 RUN_DEPENDS+=	sslclient:${PORTSDIR}/sysutils/ucspi-ssl
 
-PLIST_FILES+=	bin/maildirsmtps
 MLINKS+=	maildirsmtp.1 maildirsmtps.1
+PLIST_SUB+=	UCSPI_SSL=""
+.else
+PLIST_SUB+=	UCSPI_SSL="@comment "
 .endif
 
 post-patch:
@@ -68,7 +71,7 @@ do-install:
 		${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${INSTALL_SCRIPT} ${WRKDIR}/maildirsmtps ${PREFIX}/bin

Modified: head/mail/serialmail/pkg-descr
==============================================================================
--- head/mail/serialmail/pkg-descr	Sun Mar 17 16:08:59 2013	(r314457)
+++ head/mail/serialmail/pkg-descr	Sun Mar 17 16:34:17 2013	(r314458)
@@ -13,4 +13,4 @@ maildirsmtp without pestering the sysadm
 whether undeliverable messages should be left for POP retrieval or
 bounced back to the sender.
 
-WWW:	http://cr.yp.to/serialmail.html
+WWW: http://cr.yp.to/serialmail.html

Modified: head/mail/serialmail/pkg-plist
==============================================================================
--- head/mail/serialmail/pkg-plist	Sun Mar 17 16:08:59 2013	(r314457)
+++ head/mail/serialmail/pkg-plist	Sun Mar 17 16:34:17 2013	(r314458)
@@ -1,15 +1,7 @@
 bin/maildirqmtp
 bin/maildirserial
 bin/maildirsmtp
+%%UCSPI_SSL%%bin/maildirsmtps
 bin/serialqmtp
 bin/serialsmtp
 bin/setlock
-%%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%%