Date: Wed, 4 Dec 2024 12:50:01 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ad3b00d8c416 - main - devel/rubygem-licensee: fix another conflict with faraday Message-ID: <202412041250.4B4Co18i026907@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad3b00d8c41651b24fddaf19228561131743c739 commit ad3b00d8c41651b24fddaf19228561131743c739 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-12-04 12:43:02 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-12-04 12:49:38 +0000 devel/rubygem-licensee: fix another conflict with faraday further isolation ports required for gitlab to work around update by 335fc7c38d61142727cb9f01fd9e401c476e4ad8 This should fix the problem if the two ports are installed: sysutils/rubygem-vagrant_cloud devel/rubygem-licensee PR: 283073 --- devel/Makefile | 1 + devel/rubygem-licensee-gitlab/Makefile | 26 ++++++++++++++++++++++++++ devel/rubygem-licensee-gitlab/distinfo | 3 +++ devel/rubygem-licensee-gitlab/pkg-descr | 3 +++ devel/rubygem-licensee/Makefile | 6 +++--- www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index d3bbce936e9f..d0b95ec5a7c1 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7448,6 +7448,7 @@ SUBDIR += rubygem-libyajl2 SUBDIR += rubygem-license_finder SUBDIR += rubygem-licensee + SUBDIR += rubygem-licensee-gitlab SUBDIR += rubygem-listen SUBDIR += rubygem-little-plugger SUBDIR += rubygem-local_time diff --git a/devel/rubygem-licensee-gitlab/Makefile b/devel/rubygem-licensee-gitlab/Makefile new file mode 100644 index 000000000000..c7ba3eaa9c0d --- /dev/null +++ b/devel/rubygem-licensee-gitlab/Makefile @@ -0,0 +1,26 @@ +PORTNAME= licensee +PORTVERSION= 9.17.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Detects under what license a project is distributed +WWW= https://github.com/benbalter/licensee + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-dotenv>=2.0<4:misc/rubygem-dotenv \ + rubygem-octokit-gitlab>=4.20<10:net/rubygem-octokit-gitlab \ + rubygem-reverse_markdown>=1.0<3:textproc/rubygem-reverse_markdown \ + rubygem-rugged>=0.24<2.0:devel/rubygem-rugged \ + rubygem-thor>=0.19<2.0:devel/rubygem-thor + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/licensee + +.include <bsd.port.mk> diff --git a/devel/rubygem-licensee-gitlab/distinfo b/devel/rubygem-licensee-gitlab/distinfo new file mode 100644 index 000000000000..9daab429d3e2 --- /dev/null +++ b/devel/rubygem-licensee-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1724738884 +SHA256 (rubygem/licensee-9.17.1.gem) = 0be022c66d8853d35b08171a0f2575d5ccb5aef8a7020a1815938b4f26f4089a +SIZE (rubygem/licensee-9.17.1.gem) = 483840 diff --git a/devel/rubygem-licensee-gitlab/pkg-descr b/devel/rubygem-licensee-gitlab/pkg-descr new file mode 100644 index 000000000000..df5fef16abab --- /dev/null +++ b/devel/rubygem-licensee-gitlab/pkg-descr @@ -0,0 +1,3 @@ +Licensee automates the process of reading LICENSE files and compares their +contents to known licenses using a fancy math thing called Rabin-Karp +rolling-hashes. diff --git a/devel/rubygem-licensee/Makefile b/devel/rubygem-licensee/Makefile index c66e851cce5f..9d4ec702dbbe 100644 --- a/devel/rubygem-licensee/Makefile +++ b/devel/rubygem-licensee/Makefile @@ -1,10 +1,10 @@ PORTNAME= licensee PORTVERSION= 9.17.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= mfechner@FreeBSD.org +MAINTAINER= ruby@FreeBSD.org COMMENT= Detects under what license a project is distributed WWW= https://github.com/benbalter/licensee @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-dotenv>=2.0<4:misc/rubygem-dotenv \ - rubygem-octokit-gitlab>=4.20<10:net/rubygem-octokit-gitlab \ + rubygem-octokit>=4.20<10:net/rubygem-octokit \ rubygem-reverse_markdown>=1.0<3:textproc/rubygem-reverse_markdown \ rubygem-rugged>=0.24<2.0:devel/rubygem-rugged \ rubygem-thor>=0.19<2.0:devel/rubygem-thor diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 61d9f0123534..6a2d855e546e 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -195,7 +195,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ rubygem-loofah222>=2.22.0<2.23:textproc/rubygem-loofah222 \ - rubygem-licensee>=9.16<10:devel/rubygem-licensee \ + rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 7d5fd34c7bbb..7f65be2d51fb 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.6.1 -GITLAB_PORTREVISION= 2 +GITLAB_PORTREVISION= 3 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412041250.4B4Co18i026907>