From nobody Sun May 28 17:04:46 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 4QTlQ66lnsz4XdPQ; Sun, 28 May 2023 17:04:46 +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 4QTlQ6643jz3h2y; Sun, 28 May 2023 17:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293486; 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=1w+mSE0t9nLD6HGW03Ba3yN0Z+btUM9LUPCbxuBMlb4=; b=v+CSUZaYZpCGJ9TUlCfQ2wY8t7/0/jFWY03ISesp8kEBUmzcRKUWlJjf8KHzbsMsD9ha8Z LQUCrJ9nmG1h7PmdzUE06m6jeqL+bkJZEL0UViHje9fJOAB1OSZ5R+tgjFvOCYc/yE95+g v5qw5ClpneGVBSE0LHDpqj34c8sp3hLHZ32GLqUdg801xFc+iqFyZ/XG+b3Wv8s5FO2bqH dak7bVye1amA+xCVBr9SbuFEQm10WT3zBmxnhNsM/vJo5cI0mKcFdeTQnlHeSxyDGZg9A5 HuctuJPfcydXFqtO+yTSyJgJBuza67nKyO0v7FIJk5zXYR3ppT6t8LMAXyRTGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685293486; 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=1w+mSE0t9nLD6HGW03Ba3yN0Z+btUM9LUPCbxuBMlb4=; b=uX+sRbqGAzEgkEp3HYBh+iGNng2SHHoPBFwxTQQTsoKgEp8TMjRz7b6ycFf0WqcDk6IgcD FokqkcujyZDXT52XgY8HJKEeYOgpqq8kg3AEVr1l3HhSKe81DQk+wVpQ4RSsf3SmrkGkhB CuDaff+BqbYZQN6yvmLx3WzE71F83RU90pLXVo17LfTkyKcl6KIkKrOBuE/UNJT8oknMg5 WAvQzqOg4MTPo9qu+dIDgnmOMczWlRaPqRCG1/tW8WSb2TJpGgx5ALXBD9IcFvoZzTQEEF gWMkpR8V0nT+p9REIZI6PV94Snje48eZnPgOpx/4vcrrDsLs7lWa7qr56YipIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685293486; a=rsa-sha256; cv=none; b=PTGUkMNd1L+AWd/7fAzjmgQc3PTbIx55KI86dCDEpdnMX+9wTpErLWpPCOejzNl6SiVn2B urcN4hWyfb9rV3mlXnD8M6rieRbey+Jo0lVvTxaj5fj3R2XP7xeXrCGESGGNssx48u/Tdj ua7K/iCx5ry0zNM8J9EDSTenHEOUtaslIlqT3d+kxNPul470VvZq7QF8fbG7WoDL7PLaHg Tei7lXsLk9C7do1kb3gJAyOp4a+vCg+AHb89+kPghCbsHhF3LsCQzAcKUW5bj46Y3JMucR Ii6JabYQLNa+nj5815n1DI9kcSv6mfsyhlYWPiFd+2bAMK+WwcE3ZTrLb8KtgQ== 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 4QTlQ659c2zdpk; Sun, 28 May 2023 17:04:46 +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 34SH4kEm064367; Sun, 28 May 2023 17:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SH4k0o064366; Sun, 28 May 2023 17:04:46 GMT (envelope-from git) Date: Sun, 28 May 2023 17:04:46 GMT Message-Id: <202305281704.34SH4k0o064366@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 8331e426efd7 - main - www/rubygem-rack227: fix install conflict with www/rubygem-rack22 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8331e426efd700cc74dab80af07e71c21d5cf5ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8331e426efd700cc74dab80af07e71c21d5cf5ea commit 8331e426efd700cc74dab80af07e71c21d5cf5ea Author: Matthias Fechner AuthorDate: 2023-05-28 07:09:34 +0000 Commit: Matthias Fechner CommitDate: 2023-05-28 17:03:49 +0000 www/rubygem-rack227: fix install conflict with www/rubygem-rack22 --- www/rubygem-rack227/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/www/rubygem-rack227/Makefile b/www/rubygem-rack227/Makefile index 2ac2c534ea26..7a60433c37fe 100644 --- a/www/rubygem-rack227/Makefile +++ b/www/rubygem-rack227/Makefile @@ -1,5 +1,6 @@ PORTNAME= rack PORTVERSION= 2.2.7 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= 227 @@ -15,10 +16,12 @@ USES= cpe gem NO_ARCH= yes -PLIST_FILES= bin/rackup - CPE_VENDOR= rack_project PORTSCOUT= limit:^2\.2\.7\. +# Avoid CONFLICTS_INSTALL with www/rubygem-rack22 +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/rackup + .include