git: 4cd25fe4d2cc - main - www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453
Date: Thu, 26 Dec 2024 10:13:49 UTC
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 commit 4cd25fe4d2cc8b075be5f3348adf4834e50dfe42 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-12-26 10:12:06 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-12-26 10:12:06 +0000 www/gitlab: fix regression from 001ec8e60d233781c71246f5434306c06cafb453 Error message: ===> gitlab-ce-17.7.0 depends on package: rubygem-rexml>=3.3.2<3.4 - not found Make rubygem-rexml version 3.3 available for a specific port for gitlab. --- textproc/Makefile | 1 + textproc/rubygem-rexml-gitlab/Makefile | 20 ++++++++++++++++++++ textproc/rubygem-rexml-gitlab/distinfo | 3 +++ textproc/rubygem-rexml-gitlab/pkg-descr | 9 +++++++++ www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/textproc/Makefile b/textproc/Makefile index cfc33ca05a80..2dbdd52b4b75 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1945,6 +1945,7 @@ SUBDIR += rubygem-representable SUBDIR += rubygem-reverse_markdown SUBDIR += rubygem-rexml + SUBDIR += rubygem-rexml-gitlab SUBDIR += rubygem-rexml32 SUBDIR += rubygem-rexml33 SUBDIR += rubygem-ri_cal diff --git a/textproc/rubygem-rexml-gitlab/Makefile b/textproc/rubygem-rexml-gitlab/Makefile new file mode 100644 index 000000000000..d39e751aff30 --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/Makefile @@ -0,0 +1,20 @@ +PORTNAME= rexml +PORTVERSION= 3.3.9 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= XML toolkit for Ruby +WWW= https://github.com/ruby/rexml + +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +USES= cpe gem + +NO_ARCH= yes + +CPE_VENDOR= ruby-lang + +.include <bsd.port.mk> diff --git a/textproc/rubygem-rexml-gitlab/distinfo b/textproc/rubygem-rexml-gitlab/distinfo new file mode 100644 index 000000000000..c8516a2fb213 --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1735207203 +SHA256 (rubygem/rexml-3.3.9.gem) = d71875b85299f341edf47d44df0212e7658cbdf35aeb69cefdb63f57af3137c9 +SIZE (rubygem/rexml-3.3.9.gem) = 104448 diff --git a/textproc/rubygem-rexml-gitlab/pkg-descr b/textproc/rubygem-rexml-gitlab/pkg-descr new file mode 100644 index 000000000000..bf3143c3967e --- /dev/null +++ b/textproc/rubygem-rexml-gitlab/pkg-descr @@ -0,0 +1,9 @@ +REXML was inspired by the Electric XML library for Java, which features an +easy-to-use API, small size, and speed. Hopefully, REXML, designed with the same +philosophy, has these same features. I've tried to keep the API as intuitive as +possible, and have followed the Ruby methodology for method naming and code +flow, rather than mirroring the Java API. + +REXML supports both tree and stream document parsing. Stream parsing is faster +(about 1.5 times as fast). However, with stream parsing, you don't get access to +features such as XPath. diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 21bda951eb42..6e27c4048a38 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -64,7 +64,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \ rubygem-doorkeeper-openid_connect>=1.8.10<2:security/rubygem-doorkeeper-openid_connect \ rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ - rubygem-rexml>=3.3.2<3.4:textproc/rubygem-rexml \ + rubygem-rexml-gitlab>=3.3.2<3.4:textproc/rubygem-rexml-gitlab \ rubygem-ruby-saml>=1.17.0<1.18:security/rubygem-ruby-saml \ rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ rubygem-omniauth-auth0-gitlab>=3.1.0<3.2.0:net/rubygem-omniauth-auth0-gitlab \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 6af36d5afcbe..ee9e90787a11 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.7.0 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml