From nobody Mon Feb 28 09:27:43 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 547EC19F1CA2; Mon, 28 Feb 2022 09:27:44 +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 4K6ZmJ1vw4z4r0b; Mon, 28 Feb 2022 09:27:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646040464; 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=ZBVwoODtZapIo2Tzso421wfHFI38LVGxR8YRcg7ZRaI=; b=dnUgDk3+NkzoLrQKCoRLlUiw3MB6InUX6k7dd2qkI0c5D9jCXthykmGaboKmbEH0qQxgn9 20iJ1th12FXFt1wzSZ8aJEsaV3XVhHPdMC0lJPPap4yg0XZSFfqtUJ12tIiyR9nD0PnZsr SCCJq6uLNFXLUhxmZI/2xJL8zkM2J/COaX2du81Sp0sjaWg6OTroHk3X88kiUYhUIJIgwV U5pRjVIqNvNR+5Kwtk1b20jXc5ajmgRyVQDqCBv0lyJ2/uB6zrf+2rS92JB2HCXSzmGIbg e6SWUvd5Rh0ackIMVWnJ674sOANwewnMME+ln08EDCPsaO9WXKGnWVvg2EtsbQ== 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 1397118EFD; Mon, 28 Feb 2022 09:27:44 +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 21S9RhuA079313; Mon, 28 Feb 2022 09:27:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21S9RhmO079312; Mon, 28 Feb 2022 09:27:43 GMT (envelope-from git) Date: Mon, 28 Feb 2022 09:27:43 GMT Message-Id: <202202280927.21S9RhmO079312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 6c234366823b - main - mail/meta1: remove option BDB 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c234366823b250c67164057c6a41c1d1fc22a90 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646040464; 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=ZBVwoODtZapIo2Tzso421wfHFI38LVGxR8YRcg7ZRaI=; b=OvApy4dCNbIyeedWdA4sdUsLVbapwfpEThCBggae2Edi+hB1A2qvYPcB3tVAzeeYQ+vl6G 01FH+wsk+IGW6z3l7bvuxMPyKeemLkmnnMTfFIUsPd6MxKTTdtNVZHr2m/MKsr22s5P0Zm kqPdl+SiOtirOuLAHxqGhj1kwxlJqAf0udSerGRTJo6oyYYJ4jyOsUOmuHg0iTmVCOCSUg ES2TlO49+1WTf2gzdUlyCIhXuc6pnJrmk0tIgOUrAwQaFnd75M9go/G9yDvH86BZYFxFVY aWbFaOP4I1bQZ2QDDi0/QOI6GLfyNPHvx+v8U6xp5dJKBqbH9VtR7v2a6togCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646040464; a=rsa-sha256; cv=none; b=Fc4xU7bRLTN6Sv6qhAjh5sJXgkmyO6VtsPTS+iSQ1e4ewvWOAOM3EV5873ceOF8UJOAHMk 6aTflZshLPGrTFoOU1YXWujBddOIk5blYmaaWWxJ5ZgdCiHu3IObAILHxyyeKMZVXEvibG K8twL3/QyZgAEeFMN4nU7nSBAxe1hPWx2p7IkBZKEG0HE/dBKzolUrwUF5Fbu4vvgoiYqI YrBhIFPHS+U0p2EL5jr39OHeELkgqDIXLnOYidqDQ3ARPvRkTevWYfgzH9ZAYvOjq3eHl3 WDzwNCaCUZl9pS3ZzMv0YzpdG4sYPf7Wwut+GBXysN4pX0X1SfWjG5awHPkAhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=6c234366823b250c67164057c6a41c1d1fc22a90 commit 6c234366823b250c67164057c6a41c1d1fc22a90 Author: Dirk Meyer AuthorDate: 2022-02-28 09:21:51 +0000 Commit: Dirk Meyer CommitDate: 2022-02-28 09:21:51 +0000 mail/meta1: remove option BDB PR: 262210 --- mail/meta1/Makefile | 16 +--------------- mail/meta1/pkg-plist | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile index d542a6ea2f51..c473eeef32bc 100644 --- a/mail/meta1/Makefile +++ b/mail/meta1/Makefile @@ -41,19 +41,17 @@ USERS= meta1s meta1q meta1c meta1m meta1 META1CONFDIR?= ${PREFIX}/etc/meta1 NOLOGIN_CMD?= /usr/sbin/nologin -OPTIONS_DEFINE= IPV6 BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS +OPTIONS_DEFINE= IPV6 PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS OPTIONS_DEFAULT= PMILTER DKIM SASL2 TLS NO_OPTIONS_SORT=yes OPTIONS_SUB= yes -BDB_DESC= External Berkeley DB support PMILTER_DESC= Adds policy milter support DKIM_DESC= Enable DKIM signing support 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 @@ -74,18 +72,6 @@ TLS_LDFLAGS= -L${LOCALBASE}/lib MAKE_ENV+= MTA_NETINET6=1 .endif -.if ${PORT_OPTIONS:MBDB} -BROKEN= port version of Berkeley DB is not compatible -INVALID_BDB_VER= 48 5 6 -CONFIGURE_ARGS+= --disable-included-bdb -CONFIGURE_ARGS+= --with-bdb-incdir=${BDB_INCLUDE_DIR} -CONFIGURE_ARGS+= --with-bdb-libdir=${BDB_LIB_DIR} -CONFIGURE_ARGS+= --with-bdb-lib=${BDB_LIB_NAME} -PLIST_SUB+= WITH_BDBINT="@comment " -.else -PLIST_SUB+= WITH_BDBINT="" -.endif - .if ${PORT_OPTIONS:MMSP} CONFLICTS+= courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-* .endif diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist index 4239c123e399..ab060dfda02c 100644 --- a/mail/meta1/pkg-plist +++ b/mail/meta1/pkg-plist @@ -1,16 +1,16 @@ -%%WITH_BDBINT%%bin/db_archive -%%WITH_BDBINT%%bin/db_checkpoint -%%WITH_BDBINT%%bin/db_deadlock -%%WITH_BDBINT%%bin/db_dump -%%WITH_BDBINT%%bin/db_load -%%WITH_BDBINT%%bin/db_printlog -%%WITH_BDBINT%%bin/db_recover -%%WITH_BDBINT%%bin/db_stat -%%WITH_BDBINT%%bin/db_upgrade -%%WITH_BDBINT%%bin/db_verify -%%WITH_BDBINT%%include/db.h -%%WITH_BDBINT%%lib/libdb-4.3.a -%%WITH_BDBINT%%lib/libdb.a +bin/db_archive +bin/db_checkpoint +bin/db_deadlock +bin/db_dump +bin/db_load +bin/db_printlog +bin/db_recover +bin/db_stat +bin/db_upgrade +bin/db_verify +include/db.h +lib/libdb-4.3.a +lib/libdb.a bin/createmap bin/log2time bin/mailq