git: add98e12a4e1 - main - www/gitlab-ce: fix build problem due to json upgrade
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Dec 2023 11:48:54 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=add98e12a4e1ebcd7995f534466a613d93acf751
commit add98e12a4e1ebcd7995f534466a613d93acf751
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-12-14 08:19:08 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-12-14 11:48:35 +0000
www/gitlab-ce: fix build problem due to json upgrade
Fixes a regression from c7de4cbee4139154462556de356afb6534d5ea7a
---
devel/Makefile | 1 +
devel/rubygem-json26/Makefile | 16 ++++++++++++++++
devel/rubygem-json26/distinfo | 3 +++
devel/rubygem-json26/pkg-descr | 3 +++
www/gitlab-ce/Makefile | 5 +++--
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/devel/Makefile b/devel/Makefile
index b6d54b34345e..b4ba7d8ed336 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -7045,6 +7045,7 @@
SUBDIR += rubygem-json-canonicalization
SUBDIR += rubygem-json-schema
SUBDIR += rubygem-json1
+ SUBDIR += rubygem-json26
SUBDIR += rubygem-json_pure
SUBDIR += rubygem-json_pure1
SUBDIR += rubygem-json_schema
diff --git a/devel/rubygem-json26/Makefile b/devel/rubygem-json26/Makefile
new file mode 100644
index 000000000000..84993ac398ac
--- /dev/null
+++ b/devel/rubygem-json26/Makefile
@@ -0,0 +1,16 @@
+PORTNAME= json
+PORTVERSION= 2.6.3
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 26
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Parse JSON texts and generate them from ruby data structures
+WWW= https://flori.github.io/json/
+
+LICENSE= BSD2CLAUSE RUBY
+LICENSE_COMB= dual
+
+USES= gem
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-json26/distinfo b/devel/rubygem-json26/distinfo
new file mode 100644
index 000000000000..b994bec1ba10
--- /dev/null
+++ b/devel/rubygem-json26/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1702540745
+SHA256 (rubygem/json-2.6.3.gem) = 86aaea16adf346a2b22743d88f8dcceeb1038843989ab93cda44b5176c845459
+SIZE (rubygem/json-2.6.3.gem) = 67072
diff --git a/devel/rubygem-json26/pkg-descr b/devel/rubygem-json26/pkg-descr
new file mode 100644
index 000000000000..dbc5c9403654
--- /dev/null
+++ b/devel/rubygem-json26/pkg-descr
@@ -0,0 +1,3 @@
+This library can parse JSON texts and generate them from ruby data structures.
+This port implemented in C and comes with its own unicode conversion functions
+and a parser generated by the Ragel State Machine Compiler.
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index ed2eb7759df8..617739697476 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.6.2
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@@ -189,7 +190,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \
rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
- rubygem-terser>=1.0.2:textproc/rubygem-terser \
+ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
rubygem-tanuki_emoji>=0.9<1:graphics/rubygem-tanuki_emoji \
rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
@@ -253,7 +254,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
rubygem-jsonb_accessor>=1.3.10<1.4:www/rubygem-jsonb_accessor \
- rubygem-json>=2.6.3<3:devel/rubygem-json \
+ rubygem-json26>=2.6.3<2.7:devel/rubygem-json26 \
rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
rubygem-oj313>=3.13.21<3.14:devel/rubygem-oj313 \
rubygem-oj-introspect>=0.7<1:devel/rubygem-oj-introspect \