From nobody Fri Jun 20 03:59:02 2025 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 4bNkHV31CRz5yR9w; Fri, 20 Jun 2025 03:59:02 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bNkHV1VRWz4DM7; Fri, 20 Jun 2025 03:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750391942; 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=EOZBHjtPjb5Q5XXwqRFzD9DtGnWlgiwvjrIpkTl3p9Q=; b=tva+X0DQJNalVZgPaM7Tvo/LBj+o5PLpsvNAxmGYBif0oAp6m7qlKI8OikRtKpx8VanQgX +kOCL9cfgywXPxkhK3UGQv3HUPkIapak9pvwmbuLRlX4vuDHNK4CoUJHPih2HuwWHocIYn W2PfCFUFR5IfbGQZMKlIFeiBf1w3kJl1BKnypYb4UlT6ZuA/K7DtMkwe3IrkldZEGJeGSY PZ48y6d8lfLpRMfQ7zRXgocVU4D94pRwpmX61+7mG3BV0VKhH0Rx2o1o+5skQjnD0Tuso+ XlugdI9OM00RyVI6oXKHuQV1nw9QTGcfyxkfcHTJF3Ejite0jUSPr2RL6fidWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750391942; 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=EOZBHjtPjb5Q5XXwqRFzD9DtGnWlgiwvjrIpkTl3p9Q=; b=cDoaCsHpBIVb+Mqvr44Be/x3R++R2nVvICfG+pGOtxhOS0uPISit5XwOK48RUBh7YPvkWq BB5UlYBxDC20NEno5Dt0G3CNdiwuMY+4BWnCSTo4J4aRj/9YWOdgeeef/rTZoEB9eL7cwR c6eASWEoC6lA/y6rVoci92cPIeyzXNl0sDJP7wOUJzZmcghLc3mzG6r6wGOLTkxCRkT2nR ELiv3A9r1QamTWTD5ol/mICo16R++58Znch+Gnwennfac8MpMXGaFg0YuZVQxBbiY4ztKw QFZQ1TdkmrcyTevg2dEN5GpyKZ4vj9LEfPHydB9NI8lXyr0Z503Jhc3+rji/0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750391942; a=rsa-sha256; cv=none; b=CJ7AqBVg6ne21scGyCCOCisjstuPOrStM7OuGi1sAa6q6+YoqqThI/N8rrz0k3Xa3Dz6CP ggX6at8K+GPt2XhMRTWbFqNh9zH8JcsBwsJWiNk5jNpc80+Qr2b/V0/0mcfgXvg+PkLzOG 6GRuCL7N5JypRLhQXWGhPPHkU1rQ9bgQpWg2FT+ZR7yPOuz79BEqk64vCusby5iz4xa80e IUD3DyXtm1Dr6IwER3NyT/fxi3j3VNyFRunpgKcJSyj/CzuOt//TDeA+m25wpLis6AeZAQ V1WSsFoWTQ/ZbcMhV2+UeQiK0Ti8lZFbHO5QNQQzTZlitsCogE+aMTLq1O45Lg== 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 4bNkHV0vZjzCvT; Fri, 20 Jun 2025 03:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55K3x2Kr028382; Fri, 20 Jun 2025 03:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55K3x2Al028379; Fri, 20 Jun 2025 03:59:02 GMT (envelope-from git) Date: Fri, 20 Jun 2025 03:59:02 GMT Message-Id: <202506200359.55K3x2Al028379@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: d53110609e37 - main - devel/rubygem-sprockets-rails-rails-gitlab: fix rubygem-sprockets conflict 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: d53110609e37d64eb23f621905bff8805f0d245b Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d53110609e37d64eb23f621905bff8805f0d245b commit d53110609e37d64eb23f621905bff8805f0d245b Author: Matthias Fechner AuthorDate: 2025-06-18 14:00:12 +0000 Commit: Matthias Fechner CommitDate: 2025-06-20 03:55:33 +0000 devel/rubygem-sprockets-rails-rails-gitlab: fix rubygem-sprockets conflict --- devel/rubygem-sprockets-rails-rails-gitlab/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/rubygem-sprockets-rails-rails-gitlab/Makefile b/devel/rubygem-sprockets-rails-rails-gitlab/Makefile index e2eb78e0843d..07d7a9b55460 100644 --- a/devel/rubygem-sprockets-rails-rails-gitlab/Makefile +++ b/devel/rubygem-sprockets-rails-rails-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= sprockets-rails PORTVERSION= 3.5.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails-gitlab @@ -13,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-actionpack-gitlab>=5.2:www/rubygem-actionpack-gitlab \ rubygem-activesupport-gitlab>=5.2:devel/rubygem-activesupport-gitlab \ - rubygem-sprockets>=3.0.0:devel/rubygem-sprockets + rubygem-sprockets-gitlab>=3.0.0:devel/rubygem-sprockets-gitlab USES= gem