From nobody Sun Jul 17 16:48:24 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 4Lm9yd085zz4Wlcg; Sun, 17 Jul 2022 16:48:25 +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 4Lm9yc6jrRz3vVx; Sun, 17 Jul 2022 16:48:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658076504; 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=GN8+Uqs1eURkg03t2poEN4jyNl3wODqb1qyupqfrVtY=; b=Zte3ybUSIzcawcR1LdX8CvNPlFrH4ZJ9/xavNHE1dUVuM6Vsfd+m7PM1cKFztI8zideyty n9lxtgdQY8tGlLcxvW16kk+LmExKt12+OfelWDjQ91GnaUioc96A/N7JnME92L4WAbIkXJ AOml9W/OQOAlrtlWFBZweLYPnUh0Dz6HiQOBvhR++LajU8jBn6Cq+ttkHubsA294VSs36o VaH3qLUGOPjSWphVJgBcLQaeUJae1Db/EvS7oXno+WXJxqrrLq8XWWbBiPgDik/7gvApp9 svOaQHXn4xKKt2aInOQl/sEhwBktO9hoyS/8xoks3nB75UioXT1kPZKPj4Cvxw== 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 4Lm9yc5lmRz16cx; Sun, 17 Jul 2022 16:48:24 +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 26HGmOE1048594; Sun, 17 Jul 2022 16:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HGmOvo048593; Sun, 17 Jul 2022 16:48:24 GMT (envelope-from git) Date: Sun, 17 Jul 2022 16:48:24 GMT Message-Id: <202207171648.26HGmOvo048593@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: fe74bc4851d9 - main - audio/espeak-ng: add espeak to CONFLICTS_INSTALL 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe74bc4851d9dd76ea5384885db1ee07f88c65c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658076504; 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=GN8+Uqs1eURkg03t2poEN4jyNl3wODqb1qyupqfrVtY=; b=MLKEbNws0jk17QFeE/puVXdCLYqsbaKJVHEt93j3Egs1IFJ7BtQzMOBUUkezzKZ/pA9oGX pLjrmFnBUyZxDS1jhYYsUMRW9G3fvstlHNIZ76y/wT2bXTqsR64C+PTpjmeFdYqrnFrB8A iK6RrdcaFicgsHueHJabUP8fBbzdsH6CN8OXSb9IwEB8c6zr34NzGBMuRC69wjC041nqQ7 4bD7K/uuP7tjCCGRg0ArQ722BtRLJA9knQSBuURpTCjH9cIlnVHPn/8It06epbs2+blZbz fghtxpuOVm5F1u2YCBo39Iz0rxwPX/5e80U0sZ1UD92/eA3pzYYgc4vhFTmCXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658076504; a=rsa-sha256; cv=none; b=F5JIV47R31+c9BUAjqF0ZttzriUf8EykIGYPUNxgxNYGf76T1+u5Qis+wPvZ4hUQwAX6gw M58cSkzjXPVuJBjB6UIblBu8PZjs7sISRnGi+Gq4fw36vrpLqcysN3PQzVfc/IjLb9ujl1 T8odyoY6hTr+RJqqt0XR1KLKLU2mEOYN9AM04gXp+d3PA9JVBrwMShAIBdwLsMgh6mMwxt TKulcuBeeRXyguO9N9MCBDkICDddAXFgafFDx/4b6kCfQv63GSnjArTkwLfu3JJZyKPTzZ pCnpC9jOc8yZ4c2ubPNx4aeFdlAjC7TfaR9FkvqkTw9sVYypDx/u8UPfJJ0ysA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe74bc4851d9dd76ea5384885db1ee07f88c65c9 commit fe74bc4851d9dd76ea5384885db1ee07f88c65c9 Author: Stefan Eßer AuthorDate: 2022-07-17 16:44:35 +0000 Commit: Stefan Eßer CommitDate: 2022-07-17 16:44:35 +0000 audio/espeak-ng: add espeak to CONFLICTS_INSTALL The espeak package has been replaced by espeak-ng, but since the pkg command does not understand that the latter replaces the former, it is possible that "pkg upgrade" tries to install espeak-ng on a system that already has espeak installed. Create and plan to keep the CONFLICTS_INSTALL entry for some time in order to let the pkg command know that it cannot install espeak-ng without prior deinstallation of espeak. --- audio/espeak-ng/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/espeak-ng/Makefile b/audio/espeak-ng/Makefile index 5b1d8d7e35fc..cebff200e16d 100644 --- a/audio/espeak-ng/Makefile +++ b/audio/espeak-ng/Makefile @@ -2,7 +2,7 @@ PORTNAME= espeak-ng PORTVERSION= 1.51.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio #MASTER_SITES= https://github.com/espeak-ng/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -21,7 +21,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcaudiolib -CONFLICTS_INSTALL= speak +CONFLICTS_INSTALL= espeak speak OPTIONS_DEFINE= DOCS