svn commit: r381557 - head/mail/cyrus-imapd25

[Hajimu UMEMOTO]

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