- Add OPTION to only update mailer.conf(5) on demand

- Update COMMENT so it complies with guidelines in Porter's
  Handbook

PR:		198375
Submitted by:	adamw

6 files changed, 14 insertions, 9 deletions

diff --git a/mail/opensmtpd-devel/Makefile b/mail/opensmtpd-devel/Makefile
index 843edddff382..46aa863e6934 100644
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opensmtpd
 PORTVERSION=	201502012312
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
@@ -12,19 +12,20 @@ PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 
 MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	OpenSMTPD is a free MTA (development snapshot)
+COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
-OPTIONS_DEFINE=	CA_BUNDLE LIBASR
+OPTIONS_DEFINE=	CA_BUNDLE LIBASR MAILERCONF
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM
 
 CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
 LIBASR_DESC=	Use stable version of libasr
+MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \
@@ -38,6 +39,8 @@ CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-[0-9]*
 USERS=		_smtpd _smtpq
 GROUPS=		_smtpd
 
+OPTIONS_SUB=		yes
+
 LIBASR_LIB_DEPENDS_OFF=	libasr.so:${PORTSDIR}/dns/libasr-devel
 LIBASR_LIB_DEPENDS=	libasr.so:${PORTSDIR}/dns/libasr
 
diff --git a/mail/opensmtpd-devel/files/pkg-deinstall.in b/mail/opensmtpd-devel/files/pkg-deinstall.in
index 3ef0e1146da0..b2701419666c 100644
--- a/mail/opensmtpd-devel/files/pkg-deinstall.in
+++ b/mail/opensmtpd-devel/files/pkg-deinstall.in
@@ -5,7 +5,7 @@ TARGET=$2
 
 PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\/,g')
 
-if [ "$TARGET" = POST-DEINSTALL ]; then
+if [ "$TARGET" = POST-DEINSTALL -a -z "%%MAILERCONF%%" ]; then
 	sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \
 	    -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \
 	    -e 's/^### opensmtpd: //g' -i '' /etc/mail/mailer.conf
diff --git a/mail/opensmtpd-devel/files/pkg-install.in b/mail/opensmtpd-devel/files/pkg-install.in
index 86eb79f70eb7..07f1a67957df 100644
--- a/mail/opensmtpd-devel/files/pkg-install.in
+++ b/mail/opensmtpd-devel/files/pkg-install.in
@@ -3,7 +3,7 @@
 PKGNAME=$1
 TARGET=$2
 
-if [ "$TARGET" = POST-INSTALL ]; then
+if [ "$TARGET" = POST-INSTALL -a -z "%%MAILERCONF%%" ]; then
 	sed -e '/^[^#]/s/^/### opensmtpd: /g' -i '' /etc/mail/mailer.conf
 	cat >>/etc/mail/mailer.conf <<EOF
 sendmail        %%PREFIX%%/sbin/smtpctl
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 0eb5ed688510..28f13e0d0030 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -11,18 +11,20 @@ MASTER_SITES=	http://www.opensmtpd.org/archives/ \
 DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 
 MAINTAINER=	ashish@FreeBSD.org
-COMMENT=	OpenSMTPD is a free MTA
+COMMENT=	Security- and simplicity-focused SMTP server from OpenBSD
 
 LICENSE=	ISCL
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
-OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL
+OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS LIBASRDEVEL \
+		MAILERCONF
 
 OPTIONS_DEFAULT=	CA_BUNDLE PAM
 
 CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
 LIBASRDEVEL_DESC=	Use development version of libasr
+MAILERCONF_DESC=	Activate OpenSMTPD in mailer.conf(5)
 
 USES=		libtool
 USE_OPENSSL=	yes
diff --git a/mail/opensmtpd/files/pkg-deinstall.in b/mail/opensmtpd/files/pkg-deinstall.in
index 3c939c99eee1..cdc50001245a 100644
--- a/mail/opensmtpd/files/pkg-deinstall.in
+++ b/mail/opensmtpd/files/pkg-deinstall.in
@@ -5,7 +5,7 @@ TARGET=$2
 
 PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\/,g')
 
-if [ "$TARGET" = POST-DEINSTALL ]; then
+if [ "$TARGET" = POST-DEINSTALL -a -z "%%MAILERCONF%%" ]; then
 	sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \
 	    -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \
 	    -e 's/^### smtpd: //g' -i '' /etc/mail/mailer.conf
diff --git a/mail/opensmtpd/files/pkg-install.in b/mail/opensmtpd/files/pkg-install.in
index 899ad234742e..d86bb26627e9 100644
--- a/mail/opensmtpd/files/pkg-install.in
+++ b/mail/opensmtpd/files/pkg-install.in
@@ -3,7 +3,7 @@
 PKGNAME=$1
 TARGET=$2
 
-if [ "$TARGET" = POST-INSTALL ]; then
+if [ "$TARGET" = POST-INSTALL -a -z "%%MAILERCONF%%" ]; then
 	sed -e '/^[^#]/s/^/### smtpd: /g' -i '' /etc/mail/mailer.conf
 	cat >>/etc/mail/mailer.conf <<EOF
 sendmail        %%PREFIX%%/sbin/smtpctl