From nobody Thu Aug 14 06:11:45 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 4c2ZdF5MfPz6589r; Thu, 14 Aug 2025 06:11:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2ZdF4Ssxz3Sys; Thu, 14 Aug 2025 06:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755151905; 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=UPOA7aa/DdZsZuanm+IDJTnRSgbz2S66eQJjPGinXDU=; b=QnXKjCjaPg/wdkBB/qbfD7DgURif8cbw7JoW5utq/Ff0QAy/DX0gA7DVnNl/puRy6+F/rW gA5Xeszm431A4kFgVPHpHPTQfkh/0Cr4EE8+bhkD3mucGS+FzKZMsoQdKfdVElMy9TKnIw 7GAQpPZjOOrkWiByhcOxtZis23PIbvosarSAHssW+G+6evMapZY9qWuhpMNcEMdGEqxRW0 2FoSCiP5Y981s7MjdHCVmLWapk3mLc/Irl7975WKLSXIgUHejmFH+x0+5eTE9LmMaezNsm LpdpDq725/OKQkwULaYynYMRxkXB/aII8ULVULM4Tn0c2MliHk75cvVGKrbc5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755151905; 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=UPOA7aa/DdZsZuanm+IDJTnRSgbz2S66eQJjPGinXDU=; b=nb5+q9ZdviMgeaXGzDdkiC5WrwPfO/plHRMSY1YVS+Jl/X/+p0ou3YTFHVGuOfPlrscrHZ PEh/ysCfoNzUChHzm1RINk0Iq2jgWd+dEr0YClA75KGutsr512P5fx4Dt+UtbGevi0EYHK t5xpr/MZBHEybRQTE/dSfPziQSiRsGRMC1asrNPAsSulYsUP0qqFX67GroX9tEl3Xj6PGT em9qWSgDPiH8esRSOke9G2kUr9PaWPHSKlEmR6E94QTS8BuzbTZrbZda+BgHydFY/miTZN aHkmc4lC9p3uL9IpMcJgldIVZ20fpm8EWivvTWfGhBZARXOTlfHiDDVOdX2psw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755151905; a=rsa-sha256; cv=none; b=s0evZhjc5fc695SVyqZH3BgqOEogocLDmd1AB31sr0ZbX1u55rQ3DK5Wp4aLxkcYHf6IaD /Exa+z/ANrpGjRXvxJBppv2jj1TYGoS19YMoqqWfvx1w0IieNLpdX7MMoQr1yb/AJtYwCq /HnPgA9NA8Nq1wdAbxauscjFguLlBGn8A3WBY2+d+RBIt+SMxPX8WSWTNYGGI3QwcbW1LZ ejWpoPBD5pwOSqzNZ/pUU3smazGetFnFCN40+Ppx6L9AnuuK4zwIt+2FspMbKyy+2Leq4V lCRT+TXZ2EOFWEMpBXT+dDHA/+pcUfgDA59rptMLYEYiIf6V1Zn45YaWkR3clg== 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 4c2ZdF3rQ1zh5t; Thu, 14 Aug 2025 06:11:45 +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 57E6BjEA066031; Thu, 14 Aug 2025 06:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57E6BjSj066027; Thu, 14 Aug 2025 06:11:45 GMT (envelope-from git) Date: Thu, 14 Aug 2025 06:11:45 GMT Message-Id: <202508140611.57E6BjSj066027@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: 236ae80cffcf - main - www/rubygem-jsonb_accessor: fix conflict by rubygem-pg upgrade 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: 236ae80cffcfb18e42d5722b3f2756b443382811 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=236ae80cffcfb18e42d5722b3f2756b443382811 commit 236ae80cffcfb18e42d5722b3f2756b443382811 Author: Matthias Fechner AuthorDate: 2025-08-14 06:04:17 +0000 Commit: Matthias Fechner CommitDate: 2025-08-14 06:04:17 +0000 www/rubygem-jsonb_accessor: fix conflict by rubygem-pg upgrade Fixes regression by f51ddcf76a79fb2918dd557352becbb9bd49e14d --- www/rubygem-jsonb_accessor/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/www/rubygem-jsonb_accessor/Makefile b/www/rubygem-jsonb_accessor/Makefile index 0fb9f86f5926..2c319eb51e9f 100644 --- a/www/rubygem-jsonb_accessor/Makefile +++ b/www/rubygem-jsonb_accessor/Makefile @@ -1,5 +1,6 @@ PORTNAME= jsonb_accessor PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= www devel rubygems MASTER_SITES= RG @@ -10,9 +11,9 @@ WWW= https://github.com/devmynd/jsonb_accessor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= rubygem-activerecord70>=6.1:databases/rubygem-activerecord70 \ - rubygem-activesupport70>=6.1:devel/rubygem-activesupport70 \ - rubygem-pg>=0.18.1:databases/rubygem-pg +RUN_DEPENDS= rubygem-activerecord-gitlab>=6.1:databases/rubygem-activerecord-gitlab \ + rubygem-activesupport-gitlab>=6.1:devel/rubygem-activesupport-gitlab \ + rubygem-pg-gitlab>=0.18.1:databases/rubygem-pg-gitlab USES= gem shebangfix