aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-03-18 00:34:17 +0800
committerbdrewery <bdrewery@FreeBSD.org>2013-03-18 00:34:17 +0800
commit7d158de1411a487dc54f5cbd8eeb5347c516126e (patch)
tree6ad08ca637b079eadc4924d3417c8c43e5c1f788
parent832e827c924833a80992ac09f1620231041119be (diff)
downloadfreebsd-ports-gnome-7d158de1411a487dc54f5cbd8eeb5347c516126e.tar.gz
freebsd-ports-gnome-7d158de1411a487dc54f5cbd8eeb5347c516126e.tar.zst
freebsd-ports-gnome-7d158de1411a487dc54f5cbd8eeb5347c516126e.zip
- Take maintainership
- Fix space in WWW - Fix plist with UCSPI_SSL option - Use PORTDOCS
-rw-r--r--mail/serialmail/Makefile15
-rw-r--r--mail/serialmail/pkg-descr2
-rw-r--r--mail/serialmail/pkg-plist10
3 files changed, 11 insertions, 16 deletions
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index d5a6b15729a6..dd3d3f8274e5 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -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@FreeBSD.org
+MAINTAINER= bdrewery@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
diff --git a/mail/serialmail/pkg-descr b/mail/serialmail/pkg-descr
index 072c5e1d5961..9a13fa1a8313 100644
--- a/mail/serialmail/pkg-descr
+++ b/mail/serialmail/pkg-descr
@@ -13,4 +13,4 @@ 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
+WWW: http://cr.yp.to/serialmail.html
diff --git a/mail/serialmail/pkg-plist b/mail/serialmail/pkg-plist
index 2be01095af41..7a1702b3a681 100644
--- a/mail/serialmail/pkg-plist
+++ b/mail/serialmail/pkg-plist
@@ -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%%