From owner-svn-ports-head@freebsd.org Thu Feb 25 14:19:17 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 90F01AAFBA4; Thu, 25 Feb 2016 14:19:17 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 462F010AB; Thu, 25 Feb 2016 14:19:17 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1PEJG6c060480; Thu, 25 Feb 2016 14:19:16 GMT (envelope-from ashish@FreeBSD.org) Received: (from ashish@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1PEJGDi060479; Thu, 25 Feb 2016 14:19:16 GMT (envelope-from ashish@FreeBSD.org) Message-Id: <201602251419.u1PEJGDi060479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ashish set sender to ashish@FreeBSD.org using -f From: Ashish SHUKLA Date: Thu, 25 Feb 2016 14:19:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r409520 - head/mail/opensmtpd 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.20 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: Thu, 25 Feb 2016 14:19:17 -0000 Author: ashish Date: Thu Feb 25 14:19:16 2016 New Revision: 409520 URL: https://svnweb.freebsd.org/changeset/ports/409520 Log: - Add SSL_PORT option to specify if OpenSSL from ports is to be used[1] - Make option descriptions generic[1] - Cleanup OPTIONS[1] - Enforce SSL_PORT for 9.x[1] - Mark as broken with LIBASRDEVEL option, due to incompatibility PR: 206523[1] Submitted by: Andrey Fesenko [1] Modified: head/mail/opensmtpd/Makefile Modified: head/mail/opensmtpd/Makefile ============================================================================== --- head/mail/opensmtpd/Makefile Thu Feb 25 14:16:10 2016 (r409519) +++ head/mail/opensmtpd/Makefile Thu Feb 25 14:19:16 2016 (r409520) @@ -3,7 +3,7 @@ PORTNAME= opensmtpd PORTVERSION= 5.7.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -18,18 +18,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 -OPTIONS_DEFINE= CA_BUNDLE LIBASRDEVEL MAILERCONF PAM TABLE_DB +OPTIONS_DEFINE= CA_BUNDLE LIBASRDEVEL MAILERCONF PAM SSL_PORT TABLE_DB OPTIONS_DEFAULT= CA_BUNDLE PAM TABLE_DB -CA_BUNDLE_DESC= Install CA bundle for OpenSSL +CA_BUNDLE_DESC= Install CA bundle for SSL LIBASRDEVEL_DESC= Use development version of libasr MAILERCONF_DESC= Activate OpenSMTPD in mailer.conf(5) +SSL_PORT_DESC= SSL/TLS support via OpenSSL/LibreSSL from port TABLE_DB_DESC= Build table-db plugin (aliases) USES= cpe libtool USE_OPENSSL= yes -WITH_OPENSSL_PORT= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \ --with-mailwrapper --with-ssl-dir=${OPENSSLBASE} @@ -46,14 +46,25 @@ GROUPS= _smtpd OPTIONS_SUB= yes -CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt +CA_BUNDLE_CONFIGURE_WITH= ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss LIBASRDEVEL_LIB_DEPENDS_OFF= libasr.so:${PORTSDIR}/dns/libasr LIBASRDEVEL_LIB_DEPENDS= libasr.so:${PORTSDIR}/dns/libasr-devel +LIBASRDEVEL_BROKEN= incompatible with libasr-devel + +PAM_CONFIGURE_WITH= pam pam-service=smtpd + +TABLE_DB_CONFIGURE_ENABLE= table-db -PAM_CONFIGURE_ON= --with-pam --with-pam-service=smtpd +.include -TABLE_DB_CONFIGURE_ON= --enable-table-db +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 && ! ${PORT_OPTIONS:MSSL_PORT} +WITH_OPENSSL_PORT= yes +.endif + +.if ${PORT_OPTIONS:MSSL_PORT} +WITH_OPENSSL_PORT= yes +.endif .include