svn commit: r382567 - in head/mail: opensmtpd opensmtpd-devel opensmtpd-devel/files opensmtpd/files

[Ashish SHUKLA]

Author: ashish
Date: Sun Mar 29 05:17:43 2015
New Revision: 382567
URL: https://svnweb.freebsd.org/changeset/ports/382567
QAT: https://qat.redports.org/buildarchive/r382567/

Log:
  - 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

Modified:
  head/mail/opensmtpd-devel/Makefile
  head/mail/opensmtpd-devel/files/pkg-deinstall.in
  head/mail/opensmtpd-devel/files/pkg-install.in
  head/mail/opensmtpd/Makefile
  head/mail/opensmtpd/files/pkg-deinstall.in
  head/mail/opensmtpd/files/pkg-install.in

Modified: head/mail/opensmtpd-devel/Makefile
==============================================================================
--- head/mail/opensmtpd-devel/Makefile	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd-devel/Makefile	Sun Mar 29 05:17:43 2015	(r382567)
@@ -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 at 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]* sendma
 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
 

Modified: head/mail/opensmtpd-devel/files/pkg-deinstall.in
==============================================================================
--- head/mail/opensmtpd-devel/files/pkg-deinstall.in	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd-devel/files/pkg-deinstall.in	Sun Mar 29 05:17:43 2015	(r382567)
@@ -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

Modified: head/mail/opensmtpd-devel/files/pkg-install.in
==============================================================================
--- head/mail/opensmtpd-devel/files/pkg-install.in	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd-devel/files/pkg-install.in	Sun Mar 29 05:17:43 2015	(r382567)
@@ -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

Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd/Makefile	Sun Mar 29 05:17:43 2015	(r382567)
@@ -11,18 +11,20 @@ MASTER_SITES=	http://www.opensmtpd.org/a
 DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 
 MAINTAINER=	ashish at 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

Modified: head/mail/opensmtpd/files/pkg-deinstall.in
==============================================================================
--- head/mail/opensmtpd/files/pkg-deinstall.in	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd/files/pkg-deinstall.in	Sun Mar 29 05:17:43 2015	(r382567)
@@ -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

Modified: head/mail/opensmtpd/files/pkg-install.in
==============================================================================
--- head/mail/opensmtpd/files/pkg-install.in	Sun Mar 29 04:17:53 2015	(r382566)
+++ head/mail/opensmtpd/files/pkg-install.in	Sun Mar 29 05:17:43 2015	(r382567)
@@ -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