git: c0ed6e081a3a - main - Revert "mail/dovecot: Add FLAVORs for CDB, LDAP, MYSQL, PGSQL, and SQLITE3"

From: Larry Rosenman <ler_at_FreeBSD.org>
Date: Sat, 16 Apr 2022 22:01:30 UTC
The branch main has been updated by ler:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c0ed6e081a3a3d394dcbcb8714573cc8facc8204

commit c0ed6e081a3a3d394dcbcb8714573cc8facc8204
Author:     Larry Rosenman <ler@FreeBSD.org>
AuthorDate: 2022-04-16 21:59:42 +0000
Commit:     Larry Rosenman <ler@FreeBSD.org>
CommitDate: 2022-04-16 21:59:42 +0000

    Revert "mail/dovecot: Add FLAVORs for CDB, LDAP, MYSQL, PGSQL, and SQLITE3"
    
    Flavors currently breaks mail/dovecot-pigeonhole,
    mail/dovecot-fts-xapian, mail/dovecot-fts-flatcurve.
    
    nc & I (ler) will work to see if we can come to a better way to do this
    
    This reverts commit 0dd69d0adfd2ef48dc949bb2325c2c534117fc29.
---
 mail/dovecot/Makefile | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 4b96bf4c4506..0379f598643f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -23,14 +23,6 @@ LIB_DEPENDS=	libzstd.so:archivers/zstd
 USES=		cpe iconv libtool pkgconfig ssl
 USE_RC_SUBR=	dovecot
 
-FLAVORS=	default cdb ldap mysql pgsql sqlite3
-FLAVOR?=	${FLAVORS:[1]}
-cdb_PKGNAMESUFFIX=	-cdb
-ldap_PKGNAMESUFFIX=	-ldap
-mysql_PKGNAMESUFFIX=	-mysql
-pgsql_PKGNAMESUFFIX=	-pgsql
-sqlite3_PKGNAMESUFFIX=	-sqlite3
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-docs \
@@ -56,22 +48,6 @@ OPTIONS_GROUP_FTS=	ICU LUCENE SOLR TEXTCAT
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
-.if ${FLAVOR} == cdb
-OPTIONS_DEFAULT+=	CDB
-.endif
-.if ${FLAVOR} == ldap
-OPTIONS_DEFAULT+=	LDAP
-.endif
-.if ${FLAVOR} == mysql
-OPTIONS_DEFAULT+=	MYSQL
-.endif
-.if ${FLAVOR} == pgsql
-OPTIONS_DEFAULT+=	PGSQL
-.endif
-.if ${FLAVOR} == sqlite3
-OPTIONS_DEFAULT+=	SQLITE3
-.endif
-
 DB_DESC=	Database support
 CDB_DESC=	CDB database support