From nobody Wed Jun 01 09:25: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 33B341B487BA; Wed, 1 Jun 2022 09:25: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 4LCkK40m2Kz3qKT; Wed, 1 Jun 2022 09:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654075544; 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=9LIqOA20oBxGRcwbQEz6iMpRWpGeY4CqkrnxyHVMnYI=; b=L/6Wuu6bgfkmEFUG0W02aSlW9dSLiiCwghnGMVGME3QjrTSKQeDjvDY+jVluGVqphzUmqZ 4mqkRZWQPZmMO53nWkwsJdToDIFu1oIi4LG99/laGsBDYyoVYwc3YjYAjw2PYLBe1Ut/rT znUjQHrb1h1xGSrMW8bUoRRgHQWsHApRsuQi/Rws+m/NG+IgETgGZKhG5eT3ZZ137+a00/ kEn7jEd+7cxMJOlt3LZv5hITp1LDFuRIUG9CRNMlJiXiOnb37zkJhyeNl+CHe6G705o47h TTClCh1f7CD9KWoeHOQgKM9w1wAazArb6ouGDM3szsY+5WRR0d1yJyYzwd6lig== 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 EB7B71D24F; Wed, 1 Jun 2022 09:25:43 +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 2519PhQH031375; Wed, 1 Jun 2022 09:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2519PhWf031374; Wed, 1 Jun 2022 09:25:43 GMT (envelope-from git) Date: Wed, 1 Jun 2022 09:25:43 GMT Message-Id: <202206010925.2519PhWf031374@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: ec2cb159a60b - main - devel/libffi321: Fix conflict with libffi33 by not installing a .so symlink. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec2cb159a60b1d9e175c522446efd87b8869e32e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654075544; 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=9LIqOA20oBxGRcwbQEz6iMpRWpGeY4CqkrnxyHVMnYI=; b=RtGm+KdBBeuNHs+9bjeW4Mtf6AYpnbdVqYtRANLzXPgj64qRNj7R90SgL1hq/jnZSGYd5A Bl6IpAS/cFkNrA5JKC7owezLGZdQHmSV7iLbcd8iIxYDkxJoqao8e5jmDsfznfHvLxQ4m4 tsDnR2a1ah9Z5Qpr/u81Jc748MsdrnO6CRNy3LxNRmTPUoJsTG2EBnBuxn6OmuSdCcaBg0 E9KUG0oaSzTW3+4mTDBlErgWZdS63AQ4SixS9Tvbq99G+xC5szvd01RMStYEfR29vlVs4x PbdX/6udw1cd0o8PvuBvu/BxrYufgYywDRLFTSmRfQIdnYEEH2Z7yTfp/QrmUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654075544; a=rsa-sha256; cv=none; b=Ezs8tmZz8W3HeHyHVWQX/jfq+R9kBFVv93cmz/EAcN2ZPwTTt71LAQQEqGvEvOeXM/nPgP 1FfZW4YTpJXuc1RxBlKI6D8qJ8uEowj2U3GQJH2yMeEWuqp9pACHquXRh1SL1U87eL/7e4 tRe1Gr0dGqiec9zp6YM+vvxXTeONDSwgHnw8B6S8CbwO+lP59+VH+L2Adus9XIAi/ZNdCI rvIB14tEfnntT95AeblSXmBOiExXPUBY0XMSmm+VTE2Ah94xm+AqKcNTBYUyh5Rkma7dw0 EGxqzQ45r7Hl4wwlMS1h1upNUSqSyVihPILlESOIviUvs3hHXKHkb5SlqbPlUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec2cb159a60b1d9e175c522446efd87b8869e32e commit ec2cb159a60b1d9e175c522446efd87b8869e32e Author: Gleb Popov AuthorDate: 2022-06-01 09:24:18 +0000 Commit: Gleb Popov CommitDate: 2022-06-01 09:25:25 +0000 devel/libffi321: Fix conflict with libffi33 by not installing a .so symlink. Reported by: pkg-fallout --- devel/libffi321/Makefile | 2 +- devel/libffi321/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/libffi321/Makefile b/devel/libffi321/Makefile index 56da03f1715e..084fac824f7b 100644 --- a/devel/libffi321/Makefile +++ b/devel/libffi321/Makefile @@ -2,7 +2,7 @@ PORTNAME= libffi PORTVERSION= 3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SOURCEWARE/${PORTNAME} PKGNAMESUFFIX= 321 diff --git a/devel/libffi321/pkg-plist b/devel/libffi321/pkg-plist index e305e217fa2d..71917026ee84 100644 --- a/devel/libffi321/pkg-plist +++ b/devel/libffi321/pkg-plist @@ -1,3 +1,3 @@ -lib/compat/libffi.so +@comment lib/compat/libffi.so lib/compat/libffi.so.6 lib/compat/libffi.so.6.0.4