From owner-svn-ports-head@FreeBSD.ORG Sun Mar 29 05:17:46 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D7B827C; Sun, 29 Mar 2015 05:17:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DF25E0D; Sun, 29 Mar 2015 05:17:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2T5HkZE088177; Sun, 29 Mar 2015 05:17:46 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2T5Hi5o088168; Sun, 29 Mar 2015 05:17:44 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201503290517.t2T5Hi5o088168@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Sun, 29 Mar 2015 05:17:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382567 - in head/mail: opensmtpd opensmtpd-devel opensmtpd-devel/files opensmtpd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2015 05:17:46 -0000 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@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 <>/etc/mail/mailer.conf <