From nobody Sat Apr 16 22:01:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 26C1411CAAB8; Sat, 16 Apr 2022 22:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgnGM0b47z3pd7; Sat, 16 Apr 2022 22:01:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650146491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvPNADeobSN5pLkaDFZPUEcmWmE9rai0OtdQ/AhTuQ4=; b=kcTzP1AbN5WchN2de8RJN6FWEGldUcpe/9pk6ZSuUNiNeGOek9T1D3O+8zU/RHjBSO/DF0 KXFxN24n6l5yiYjq7Z3VE4QhGbIDhy4YBu7NVvtpMHmT+HfqhKIRwFuzh64ZOALXMXcgGL FMYEPk4cdlfQG/XoFG2tCUd8nq1Im153eJgLhcdP3glJNgj2Ws3cFw3kB0FskRYChtP+lN /g+d/Pt1+u/A104H6VhIslSW7g6BkgbUvzqJ7cuzKfLBELsbI7HrYedq866SJoXTDcDnrc NBFea9p2+1X1AyuOrcjHcVQrV101OPAk8Xs+UpuGCgljR6XPs6+rb/6AY/60xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E837212043; Sat, 16 Apr 2022 22:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23GM1Uf6039459; Sat, 16 Apr 2022 22:01:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GM1UjW039458; Sat, 16 Apr 2022 22:01:30 GMT (envelope-from git) Date: Sat, 16 Apr 2022 22:01:30 GMT Message-Id: <202204162201.23GM1UjW039458@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: c0ed6e081a3a - main - Revert "mail/dovecot: Add FLAVORs for CDB, LDAP, MYSQL, PGSQL, and SQLITE3" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0ed6e081a3a3d394dcbcb8714573cc8facc8204 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650146491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TvPNADeobSN5pLkaDFZPUEcmWmE9rai0OtdQ/AhTuQ4=; b=cjL4Atji3jodWsdD6Xm4kqisAaHMo4ceKe1bvGMF+ORroe/Q+TKK3huhCcmCBQl63PC6MC PFxuPhuSp1OBVJV7zV50at5JlVFF+WnnzWtoY0RjoEdliF/rXSdRyLUiaMttTipXgTNTl6 F/1n+PJ6v9b2smQVzIrL7703rgajIeydsC07dgoVYZFvHq8geEH1LY3IFYWStKRBC4LVeG MOgAUWW30+dY9geYTnvID5Qsdm+h9rbobYz3GV86yXcdpOyjUK7ASjNCoapxyJoElj0BW6 lJobfzh6E0izSkcC1wXIPK4BE5mWTlCOC47NX5/HevqJ6m8taekBWU1MyPADsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650146491; a=rsa-sha256; cv=none; b=t1zzCo1QBmrHsIXlcnRGKlecx+QffaAJmiTaM0SRQV3r0EF39O+q1GAcXFVKn4x+pc6dlz uVyquKaQeiK9qMKpOWgPuSwQFX6GcR+5cBMOeiWYiDRiB+do5dbgm+cM3fEaZ0k2evXK8Z 1tConBxYaD+6BmW45ZRgavJZMZNkiC5cP26I+wVmPZ1orKKSYKHejiZeY9iIqhE7TfLAUH Xsy2csh58eqOc5O4eVdKj5J8kjvnWlOQuxk2qJgPVrKjMlpRicDasT89yMvZbBBS5GJ9Xl Bc5aNxROyRCV0+uNoHZZAWTRA4InpoXYwNLzMD6FxQc5pAyCJtKy5smJ/jJXnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0ed6e081a3a3d394dcbcb8714573cc8facc8204 commit c0ed6e081a3a3d394dcbcb8714573cc8facc8204 Author: Larry Rosenman AuthorDate: 2022-04-16 21:59:42 +0000 Commit: Larry Rosenman 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