From owner-svn-ports-head@freebsd.org  Thu Aug 11 19:51:44 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 DA4C6BB6CDB;
 Thu, 11 Aug 2016 19:51:44 +0000 (UTC)
 (envelope-from dinoex@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 AA50A188E;
 Thu, 11 Aug 2016 19:51:44 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7BJphWh056439;
 Thu, 11 Aug 2016 19:51:43 GMT (envelope-from dinoex@FreeBSD.org)
Received: (from dinoex@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7BJphU9056438;
 Thu, 11 Aug 2016 19:51:43 GMT (envelope-from dinoex@FreeBSD.org)
Message-Id: <201608111951.u7BJphU9056438@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dinoex set sender to
 dinoex@FreeBSD.org using -f
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 11 Aug 2016 19:51:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r420100 - head/mail/meta1
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Aug 2016 19:51:45 -0000

Author: dinoex
Date: Thu Aug 11 19:51:43 2016
New Revision: 420100
URL: https://svnweb.freebsd.org/changeset/ports/420100

Log:
  - cleanup options

Modified:
  head/mail/meta1/Makefile

Modified: head/mail/meta1/Makefile
==============================================================================
--- head/mail/meta1/Makefile	Thu Aug 11 19:34:51 2016	(r420099)
+++ head/mail/meta1/Makefile	Thu Aug 11 19:51:43 2016	(r420100)
@@ -54,6 +54,8 @@ MSP_DESC=	Enable mail submision program
 SASL2_DESC=	Adds SASL2 support
 SASL2AUTHD_DESC=	Enable plaintext authentication via SASL2
 
+BDB_USES=		bdb
+PMILTER_USES=		ssl
 PMILTER_CONFIGURE_ENABLE=	pmilter
 DKIM_CONFIGURE_ENABLE=	DKIM
 MSP_CONFIGURE_ENABLE=	msp
@@ -71,10 +73,8 @@ MAKE_ENV+=	MTA_NETINET6=1
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
-# Why keep the option if it can't work ?
 BROKEN=		port version of Berkeley DB is not compatible
-USES+=		bdb
-INVALID_BDB_VER=	46 47 48 5 6
+INVALID_BDB_VER=	48 5 6
 BERKELEYDB_SUFFIX=	-db${BDB_VER}
 CONFIGURE_ARGS+=	--disable-included-bdb
 CONFIGURE_ARGS+=	--with-bdb-incdir=${BDB_INCLUDE_DIR}
@@ -85,9 +85,7 @@ BERKELEYDB_SUFFIX=	-intbdb
 PLIST_SUB+=	WITH_BDBINT=""
 .endif
 
-.if ${PORT_OPTIONS:MPMILTER}
-USES+=		ssl
-.else
+.if ! ${PORT_OPTIONS:MPMILTER}
 PMILTER_SUFFIX?=	-nopmilter
 .endif