From nobody Sun Oct 26 18:59:34 2025 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 4cvmCW0GFwz6DnpJ; Sun, 26 Oct 2025 18:59:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvmCV6jbNz47Px; Sun, 26 Oct 2025 18:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761505175; 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=W6u4DhvE3SFOXZZrnE8Kp+dG2wy3vSBx+uMt/AihXvg=; b=U2iPXpzEpxCLQtkMDgXge+7aBzmsR/rGQtVcNDof5A+HbkaGFKqxGqXw1qQHd5oBKnb43+ 0atMz3Plvw0YQG9zK2+iKlUIulGy6tVgoN1EMx8r0Zj8duJivW3NgXpjR/RNlJ6EJshefO qxt571KTpPK0MsWIStULH22TndtLRopDbstDEjXRvIz31cu4JwTUaDz1Ux5ZWYoRGMNFKp H9E2U0UEy958bNNV844b2ONt0UDL0RdoQu2rmYjgKmvMs7FGMBNEFvUBl59afZpHfEnuvJ /p1ugMAQM9c9+2UAZnD1jVAS8RO/YJuUTRQYHVpprf+FNgK6BZ8cSjc2G3WPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761505175; 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=W6u4DhvE3SFOXZZrnE8Kp+dG2wy3vSBx+uMt/AihXvg=; b=abmTGV2qNJhzyer9PWU4OXxq5p8U1gYjNmtmYNi/Ry2zWr/JS8iAhE2XdZAl0fLk2g+Lrt w8sezDk4qDLbYu30CPe8aD1RXhqrvltPe+11RdNbAp7F36RHI+vusvzHdkNKkpzZSxZLEe 2GwC4/2vdiCdP64ZNOjUY/msgKNS1A5fMoaNxjperXrxcaKdH6RQrBD16O8fV5faPLJ8ts dXINQvm74uyIpfEnR4DtMbi/AUo2Weckd+0IIHThEK0wgUVeViMPjQQaQkfrn645BH5692 a0sHJK9stCDbkks/UMZDL45qVd5y8kUTTw0EZoRAFBp/uHODvbglbDJUs1FWQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761505175; a=rsa-sha256; cv=none; b=PLAR+QTtRupKGyQxCA9AZVJgz3rF9yrw3fxgI9xyiEZhggW+2f/3kRVmU4P4Xw4MHwb+lx 3HMNayj8mJUynjlKVy5yJk96CUrPT4PHdJG6aSHX3/2mbaAIutw27h7mmwXgzbQY0hb9Wt L/xJU2592PtrNSARFEM8+x6JXb/uTGUJ81D7vFc+00p2cJ0DFIDyaUfPN94W5YlMvdNOTw n7pMqlnFlIdx563Fsd1DWSiNVn3BTxOnttjwpczPvpGzpU5K11lFfMc7OMgXKejY1ivNft URyCofNeJJ8JHRyeQ+tSrQP9tHkf4/mA3tn76WnaS0E4gVQgec3G/L+76i5pww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cvmCV6H6qzmHl; Sun, 26 Oct 2025 18:59:34 +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 59QIxYXS037033; Sun, 26 Oct 2025 18:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QIxYoU037030; Sun, 26 Oct 2025 18:59:34 GMT (envelope-from git) Date: Sun, 26 Oct 2025 18:59:34 GMT Message-Id: <202510261859.59QIxYoU037030@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: 724e92f337b2 - main - net/rubygem-activestorage-gitlab: fix conflict in 2025Q4 with devel/rubygem-marcel 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 724e92f337b2420e2008ba00fdfdedd31048f915 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=724e92f337b2420e2008ba00fdfdedd31048f915 commit 724e92f337b2420e2008ba00fdfdedd31048f915 Author: Matthias Fechner AuthorDate: 2025-10-26 18:58:58 +0000 Commit: Matthias Fechner CommitDate: 2025-10-26 18:59:31 +0000 net/rubygem-activestorage-gitlab: fix conflict in 2025Q4 with devel/rubygem-marcel --- net/rubygem-activestorage-gitlab/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/rubygem-activestorage-gitlab/Makefile b/net/rubygem-activestorage-gitlab/Makefile index aa7f53cc97cc..3bea55bb28f9 100644 --- a/net/rubygem-activestorage-gitlab/Makefile +++ b/net/rubygem-activestorage-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= activestorage PORTVERSION= ${RAILS_VERSION} +PORTREVISION= 1 CATEGORIES= net rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -16,7 +17,7 @@ RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rub rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \ rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \ - rubygem-marcel>=1.0<2:devel/rubygem-marcel + rubygem-marcel-gitlab>=1.0<2:devel/rubygem-marcel-gitlab USES= gem