From owner-svn-ports-all@FreeBSD.ORG  Wed Mar 18 15:14:40 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 035D849B;
 Wed, 18 Mar 2015 15:14:40 +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 E3244998;
 Wed, 18 Mar 2015 15:14:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2IFEdBY023270;
 Wed, 18 Mar 2015 15:14:39 GMT (envelope-from ume@FreeBSD.org)
Received: (from ume@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2IFEd9X023269;
 Wed, 18 Mar 2015 15:14:39 GMT (envelope-from ume@FreeBSD.org)
Message-Id: <201503181514.t2IFEd9X023269@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ume set sender to ume@FreeBSD.org
 using -f
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 18 Mar 2015 15:14:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381557 - head/mail/cyrus-imapd25
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Mar 2015 15:14:40 -0000

Author: ume
Date: Wed Mar 18 15:14:38 2015
New Revision: 381557
URL: https://svnweb.freebsd.org/changeset/ports/381557
QAT: https://qat.redports.org/buildarchive/r381557/

Log:
  Make it buildable with both HTTP and SQLITE enabled.
  
  Spotted by:	Paul Dekkers <paul.dekkers__at__surfnet.nl>

Modified:
  head/mail/cyrus-imapd25/Makefile

Modified: head/mail/cyrus-imapd25/Makefile
==============================================================================
--- head/mail/cyrus-imapd25/Makefile	Wed Mar 18 15:06:33 2015	(r381556)
+++ head/mail/cyrus-imapd25/Makefile	Wed Mar 18 15:14:38 2015	(r381557)
@@ -62,7 +62,7 @@ HTTP_DESC=		Enable HTTP (beta quality)
 HTTP_CONFIGURE_ENABLE=	http
 HTTP_LIB_DEPENDS=	libjansson.so:${PORTSDIR}/devel/jansson \
 			libical.so:${PORTSDIR}/devel/libical
-HTTP_USE=		GNOME=libxml2,glib20 SQLITE=yes
+HTTP_USE=		GNOME=libxml2,glib20
 IDLED_DESC=		Enable IMAP idled support
 IDLED_CONFIGURE_ENABLE=	idled
 LDAP_DESC=		Enable LDAP support (experimental)
@@ -87,7 +87,6 @@ REPLICATION_CONFIGURE_ENABLE=replication
 SNMP_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 SNMP_CONFIGURE_ON=	--with-snmp=${LOCALBASE}
 SNMP_CONFIGURE_OFF=	--with-snmp=no
-SQLITE_USE=		SQLITE=yes
 SQLITE_CONFIGURE_ON=	--with-sqlite=${LOCALBASE}
 
 .include <bsd.port.pre.mk>
@@ -111,6 +110,10 @@ IGNORE=		DRAC is not available
 # USE_AUTOTOOLS=	autoconf autoheader
 .endif
 
+.if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MSQLITE}
+USE_SQLITE=yes
+.endif
+
 .if ${OSVERSION} >= 900022
 PLIST_SUB+=	MANCONF=""
 .else