From nobody Mon Feb 14 20:46:14 2022 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 A9F54194E4A8; Mon, 14 Feb 2022 20:46:14 +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 4JyGTf4K0sz4kbS; Mon, 14 Feb 2022 20:46:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644871574; 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=m79D+i01uM7WWm0y7dc+P+zzMA0WUI2+S+L+yZooQJc=; b=tulr4u4DoHobtvlGmKbndp7abAAorQO6O6PBZbwVopHQ+WchL6e4NRMRs1kLYDC0DYBe0p DspTu8Uze5z41p1dJx1uLsEMoByMmLX3e4dHET1k4psDGRaAflCbNuSnysr6/9dcgj+zuC 5qGQksc6q5BwJvNPb4m5S/OAWzlEQ0218IWkOwT5yoT8GQV5QdbVKpUAyTAxH+8hdXR+Aj NKwHll1TXhB2MWDmcBoDeo/uHjRGwtBtDJegjLmAgSSBCNLJz8psp7ddXgXSvKlQNSeA/Z CqivgrISHf4dX4toOOjEjh0T9LmdAuER+cO4AdqnJW424xAF3d5+XUHHIoKuWg== 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 6FEEB156F5; Mon, 14 Feb 2022 20:46:14 +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 21EKkEcg016739; Mon, 14 Feb 2022 20:46:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EKkEYf016738; Mon, 14 Feb 2022 20:46:14 GMT (envelope-from git) Date: Mon, 14 Feb 2022 20:46:14 GMT Message-Id: <202202142046.21EKkEYf016738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 14a03240db5a - main - www/rubygem-gollum: remove incorrect dependency 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14a03240db5afd2841d11f349481175901395a41 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644871574; 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=m79D+i01uM7WWm0y7dc+P+zzMA0WUI2+S+L+yZooQJc=; b=H8rZzmUTMyTNcY9so2mauheO6lcb43PdqLszT3rVPPNCfcJb2FCYZhLgxXCYjhF7tr5pRS kw8AGZDWtMTyCPeEdFAWB+df4m+fkdXVqHNAipbBbtSvXinNTVeGQssNcWhKwb9uccsBHH zpsyo8w88dD7Yja4nN/lpF8xukOp7ONmVpk0lKwjaUPqvdTcHGkjMo3x7lgcG1//jusxc7 LNlwD/U5kioVT0wOWr9nEjCJ0HK+ttbUiXI77hmgUFi72h+kBrvYw+BKwZ62q0KTy6aNz+ 4C+BqULOVhVDfxujqsjTYcovf7s4CxRxZef4cHxGZRWO9NzMNHfL6Zf77tkwnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644871574; a=rsa-sha256; cv=none; b=TjBfOH7gX6XTVamzy6fLB1nDon6entUmfgGH1Y6bu2uoYRwtSw35AAlKBifj6H4Lp2Mj4m 88x0SM5TvAXYZgaR/RHgf2fK6793+dlY1T2/ahbGxQjCtIUwhzWO0RV/glTY+fbFb4eF1W CpNcaRlhMiS4VpyD3Ey83rF6r5ZjaSy5FnU5sgbh3Y8QqXcrTm3GLoK0O3/45TiN5b9xA6 xJnTn8teqtsMWH7s10q5fTol4F9aiBZvr9zDbwK8dccE+XvuL4/PZb9xK3GfkmvM1n72RA 6hs8cFvqGby9jxBRlOTSHYhLR7c+3pnKQ8cJNpi7T7btjJxi/66rcy50RbNGcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=14a03240db5afd2841d11f349481175901395a41 commit 14a03240db5afd2841d11f349481175901395a41 Author: Dan Langille AuthorDate: 2022-02-14 20:34:39 +0000 Commit: Dan Langille CommitDate: 2022-02-14 20:46:00 +0000 www/rubygem-gollum: remove incorrect dependency www/rubygem-gollum-lib: add missing dependency www/rubygem-gollum was depending up on www/rubygem-gollum-rugged_adapter which should instead be a dependency of www/rubygem-gollum-lib Also, remove the patch-gemspec.rb patch on www/rubygem-gollum-lib PR: 261637 Reported by: Sir l33tname Approved by: ruby@ (zi) --- www/rubygem-gollum-lib/Makefile | 4 +++- www/rubygem-gollum-lib/files/patch-gemspec.rb | 11 ----------- www/rubygem-gollum/Makefile | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile index e4be5bec7018..e5182f54485d 100644 --- a/www/rubygem-gollum-lib/Makefile +++ b/www/rubygem-gollum-lib/Makefile @@ -2,6 +2,7 @@ PORTNAME= gollum-lib PORTVERSION= 5.1.3 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -13,11 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=4.1:graphics/rubygem-gemojione \ rubygem-github-markup>=1.6:textproc/rubygem-github-markup \ + rubygem-gollum-rugged_adapter>=1.0<2.0:www/rubygem-gollum-rugged_adapter \ rubygem-nokogiri>=1.8.0<2.0:textproc/rubygem-nokogiri \ rubygem-rouge>=3.1<4:textproc/rubygem-rouge \ rubygem-twitter-text1=1.14.7:textproc/rubygem-twitter-text1 \ rubygem-loofah>=2.12.0:textproc/rubygem-loofah \ - rubygem-github-markup>=4.0.0<5.0:textproc/rubygem-github-markup \ + rubygem-github-markup>=4.0.0<5.0:textproc/rubygem-github-markup \ rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \ rubygem-octicons>=12.0.0:misc/rubygem-octicons diff --git a/www/rubygem-gollum-lib/files/patch-gemspec.rb b/www/rubygem-gollum-lib/files/patch-gemspec.rb deleted file mode 100644 index 256181928017..000000000000 --- a/www/rubygem-gollum-lib/files/patch-gemspec.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- gemspec.rb.orig 2021-12-04 10:42:00 UTC -+++ gemspec.rb -@@ -31,7 +31,7 @@ def specification(version, default_adapter, platform = - s.add_dependency 'loofah', '~> 2.3' - s.add_dependency 'github-markup', '~> 4.0' - s.add_dependency 'gemojione', '~> 4.1' -- s.add_dependency 'octicons', '~> 12.0' -+ s.add_dependency 'octicons', '~> 16.0' - s.add_dependency 'twitter-text', '1.14.7' - - s.add_development_dependency 'org-ruby', '~> 0.9.9' diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile index ee00269ec45e..dc8f0840a88b 100644 --- a/www/rubygem-gollum/Makefile +++ b/www/rubygem-gollum/Makefile @@ -2,6 +2,7 @@ PORTNAME= gollum PORTVERSION= 5.2.3 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG @@ -14,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= git:devel/git \ rubygem-gemojione>=3.3.0:graphics/rubygem-gemojione \ rubygem-gollum-lib>=5.1.3:www/rubygem-gollum-lib \ - rubygem-gollum-rugged_adapter>=1.0:www/rubygem-gollum-rugged_adapter \ rubygem-kramdown>=2.3.1:textproc/rubygem-kramdown \ rubygem-kramdown-parser-gfm>=1.1.0:textproc/rubygem-kramdown-parser-gfm \ rubygem-mustache0>=0.99.5:devel/rubygem-mustache0 \