From nobody Tue Nov 21 17:45:37 2023 X-Original-To: dev-commits-ports-all@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 4SZWxY3v4Jz521lj; Tue, 21 Nov 2023 17:45:37 +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 4SZWxY3MHdz4jmQ; Tue, 21 Nov 2023 17:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700588737; 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=LaiXDNquAGYQK+5U89HxLZMnNmrBJmbeQPkpNnAzE1s=; b=dRsmMKN0iMv+YUjIuT73uMGxoXeUqZBPF9ZdKOaQoiuqmu5TyLzlKFyJg7dKRtKYUpDbbH xlp/1Vf6+r31dhEz5m40WlR0JsrdGW8Z3vf8MYOrOe0fvPGzF28HSVP1COuqlH6FXmMd4h hi9oWDNUEkRj8Gmue2ZY1htaS1wyuNuOLwok2QoxOwhZBJiqrh/hqVMKjKKbuWLzvxRsBf 2CW4mDyveSXEEY0IsZxHbxC65GmIv9qEVU9pVO7mBqmDYoAtsnnuC5XQGBKesix7pJz8in gxjDBDz55ljnAVIi+idzZG/izfSTBlDZEkOuJxy/0meJe7z+WpbX3egl+Owxjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700588737; 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=LaiXDNquAGYQK+5U89HxLZMnNmrBJmbeQPkpNnAzE1s=; b=bT3C1jFukcUmlkajJoPlyyypDU2GNzC1WKvf2PEQjDQYHc0XKp29vyXipOxIclmvwyGwNi K011ueAHYxr10QwMngnYapJxivJwhoWMRjeEO+Ak8cQhBBJm04ee9Aen46LDJcuZioDNwp gq8fYOBBAmMgeuxyJinVzKj5YNVCFg7gkOhc7zZ+c+8y1Zc/ka7v48tj1tMNZD3vhkuvRr 0fHDH1YeOVVN+iPENN93xOGdkwebd7dNRA5X9wHdnwj9K6qpSOjmu90FxY+dm+AZWTlkvm zeft+V6tNCti9i9DRTsS0ccKMlHBwkaY+ygz6ZtuRech/5EvF9437hFCzbIMKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700588737; a=rsa-sha256; cv=none; b=aBe06tdHxiSkY7sG+8qeM/BOXirxCGKkhH32ZrypzP99sr1wA+YSKdVtJQ0XYMpJxW7+vZ iSiXoHiSM9moldmxmy9TWTX1sQHee7hNREfRGDx6/WM3MwlAWEIAA6oOKw//+2KIzZpHSx OxNq0jITdv1b1zN+7dxJdXQDj614wYWcYW8yXN7V0GAd5ZxYU9xwsvDKp+mPpSP/xlW8OL LSfpOtCXP33y9B43qbwZ/e0lFniOAfSuuswxHI5nA+yJRQ+AhWYggKOGJMcmKi0CsboEmH t8GglAv6GRuI4ku+KCJvW4iPy0V+iJiMNvQh61+tca0tuWQ0A0kBHJGgPZITNQ== 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 4SZWxY2PdXzlVs; Tue, 21 Nov 2023 17:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ALHjbft061678; Tue, 21 Nov 2023 17:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALHjbO8061675; Tue, 21 Nov 2023 17:45:37 GMT (envelope-from git) Date: Tue, 21 Nov 2023 17:45:37 GMT Message-Id: <202311211745.3ALHjbO8061675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Antoine Brodin Subject: git: 877580d27f72 - main - mail/postfix-current: fix some PKGBASE collisions List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: antoine X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 877580d27f7260a54fb10e912821e3ac0ae837e0 Auto-Submitted: auto-generated The branch main has been updated by antoine: URL: https://cgit.FreeBSD.org/ports/commit/?id=877580d27f7260a54fb10e912821e3ac0ae837e0 commit 877580d27f7260a54fb10e912821e3ac0ae837e0 Author: Antoine Brodin AuthorDate: 2023-11-21 17:45:12 +0000 Commit: Antoine Brodin CommitDate: 2023-11-21 17:45:36 +0000 mail/postfix-current: fix some PKGBASE collisions --- mail/postfix-current/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index f1b63b89bea6..c57bd08d31e7 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -29,31 +29,31 @@ default_CONFLICTS_INSTALL= postfix-current-base-ldap postfix-current-base-sasl \ postfix-current-mysql postfix-current-base-mysql \ postfix-current-pgsql postfix-current-base-pgsql \ postfix-current-sqlite postfix-current-base-sqlite -ldap_PKGNAMESUFFIX= -ldap +ldap_PKGNAMESUFFIX= -current-ldap ldap_CONFLICTS_INSTALL= postfix-current postfix-current-base \ postfix-current-base-sasl postfix-current-sasl \ postfix-current-mysql postfix-current-base-mysql \ postfix-current-pgsql postfix-current-base-pgsql \ postfix-current-sqlite postfix-current-base-sqlite -mysql_PKGNAMESUFFIX= -mysql +mysql_PKGNAMESUFFIX= -current-mysql mysql_CONFLICTS_INSTALL= postfix-current postfix-current-base \ postfix-current-ldap postfix-current-base-ldap \ postfix-current-pgsql postfix-current-base-pgsql \ postfix-current-sasl postfix-current-base-sasl \ postfix-current-sqlite postfix-current-base-sqlite -pgsql_PKGNAMESUFFIX= -pgsql +pgsql_PKGNAMESUFFIX= -current-pgsql pgsql_CONFLICTS_INSTALL= postfix-current postfix-current-base \ postfix-current-ldap postfix-current-base-ldap \ postfix-current-mysql postfix-current-base-mysql \ postfix-current-sasl postfix-current-base-sasl \ postfix-current-sqlite postfix-current-base-sqlite -sasl_PKGNAMESUFFIX= -sasl +sasl_PKGNAMESUFFIX= -current-sasl sasl_CONFLICTS_INSTALL= postfix-current postfix-current-base \ postfix-current-base-ldap postfix-current-ldap \ postfix-current-mysql postfix-current-base-mysql \ postfix-current-pgsql postfix-current-base-pgsql \ postfix-current-sqlite postfix-current-base-sqlite -sqlite_PKGNAMESUFFIX= -sqlite +sqlite_PKGNAMESUFFIX= -current-sqlite sqlite_CONFLICTS_INSTALL= postfix-current postfix-current-base \ postfix-current-ldap postfix-current-base-ldap \ postfix-current-mysql postfix-current-base-mysql \