git: 50704b2d5554 - main - www/gitlab: unbreak build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Oct 2024 11:25:31 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=50704b2d55547d50db9078bbecaf75b24491666a
commit 50704b2d55547d50db9078bbecaf75b24491666a
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-10-30 11:22:12 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-10-30 11:22:12 +0000
www/gitlab: unbreak build
fixes dependency issues caused by:
5be56f86c88a5f043568ef3bbf2385798f3574a5
f79209ce44089dabaf319913ffd2365b890ca751
35f8b875d522febb1d34e748bc75bc061b7a34d5
---
devel/Makefile | 1 +
devel/rubygem-fog-core250/Makefile | 23 +++++++++++++++++++++++
devel/rubygem-fog-core250/distinfo | 3 +++
devel/rubygem-fog-core250/pkg-descr | 2 ++
net/Makefile | 1 +
net/rubygem-fog-aws328/Makefile | 26 ++++++++++++++++++++++++++
net/rubygem-fog-aws328/distinfo | 3 +++
net/rubygem-fog-aws328/pkg-descr | 1 +
net/rubygem-fog-google/Makefile | 4 ++--
www/gitlab/Makefile | 4 ++--
www/gitlab/Makefile.common | 2 +-
11 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/devel/Makefile b/devel/Makefile
index 0d3703eed2fc..657087f88d5e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -7214,6 +7214,7 @@
SUBDIR += rubygem-fog-core1
SUBDIR += rubygem-fog-core210
SUBDIR += rubygem-fog-core220
+ SUBDIR += rubygem-fog-core250
SUBDIR += rubygem-fog-json
SUBDIR += rubygem-font-awesome-rails
SUBDIR += rubygem-font-awesome-rails-rails5
diff --git a/devel/rubygem-fog-core250/Makefile b/devel/rubygem-fog-core250/Makefile
new file mode 100644
index 000000000000..d731452410cb
--- /dev/null
+++ b/devel/rubygem-fog-core250/Makefile
@@ -0,0 +1,23 @@
+PORTNAME= fog-core
+PORTVERSION= 2.5.0
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 250
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Shared classes and tests for fog providers and services
+WWW= https://github.com/fog/fog-core
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS= rubygem-builder>=0:devel/rubygem-builder \
+ rubygem-excon0>=0.71<1:devel/rubygem-excon0 \
+ rubygem-formatador>=0.2<2.0:devel/rubygem-formatador \
+ rubygem-mime-types>=0:misc/rubygem-mime-types
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-fog-core250/distinfo b/devel/rubygem-fog-core250/distinfo
new file mode 100644
index 000000000000..d14e4848df23
--- /dev/null
+++ b/devel/rubygem-fog-core250/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1730285943
+SHA256 (rubygem/fog-core-2.5.0.gem) = b47b80647a6e5817455ec2baa8f5ca5e3f431d9518e876d55330d08b450cc2ed
+SIZE (rubygem/fog-core-2.5.0.gem) = 47104
diff --git a/devel/rubygem-fog-core250/pkg-descr b/devel/rubygem-fog-core250/pkg-descr
new file mode 100644
index 000000000000..3e29961b2579
--- /dev/null
+++ b/devel/rubygem-fog-core250/pkg-descr
@@ -0,0 +1,2 @@
+rubygem-fog-core (Fog::Core) provides shared classes and tests for fog providers
+and services.
diff --git a/net/Makefile b/net/Makefile
index 8bccf76f1df1..7931645bfc46 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1287,6 +1287,7 @@
SUBDIR += rubygem-fog-aliyun
SUBDIR += rubygem-fog-atmos
SUBDIR += rubygem-fog-aws
+ SUBDIR += rubygem-fog-aws328
SUBDIR += rubygem-fog-azure
SUBDIR += rubygem-fog-brightbox
SUBDIR += rubygem-fog-cloudatcost
diff --git a/net/rubygem-fog-aws328/Makefile b/net/rubygem-fog-aws328/Makefile
new file mode 100644
index 000000000000..25d0b3266582
--- /dev/null
+++ b/net/rubygem-fog-aws328/Makefile
@@ -0,0 +1,26 @@
+PORTNAME= fog-aws
+PORTVERSION= 3.28.0
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= 328
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Module for the 'fog' gem to support Amazon Web Services
+WWW= https://github.com/fog/fog-aws
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS= rubygem-base64>=0.2.0<0.3:converters/rubygem-base64 \
+ rubygem-fog-core250>=2.1<3:devel/rubygem-fog-core250 \
+ rubygem-fog-json>=1.1<2:devel/rubygem-fog-json \
+ rubygem-fog-xml>=0.1<1:textproc/rubygem-fog-xml
+
+USES= gem
+
+NO_ARCH= yes
+
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/bin/console ${STAGEDIR}${PREFIX}/bin/setup
+
+.include <bsd.port.mk>
diff --git a/net/rubygem-fog-aws328/distinfo b/net/rubygem-fog-aws328/distinfo
new file mode 100644
index 000000000000..e774eb7264a3
--- /dev/null
+++ b/net/rubygem-fog-aws328/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1730286749
+SHA256 (rubygem/fog-aws-3.28.0.gem) = 7d2e7e13eb123914be9cea12f3d134285fa9fc14e0fa0daebc97386a3d9567cd
+SIZE (rubygem/fog-aws-3.28.0.gem) = 433664
diff --git a/net/rubygem-fog-aws328/pkg-descr b/net/rubygem-fog-aws328/pkg-descr
new file mode 100644
index 000000000000..2a3a99644d5a
--- /dev/null
+++ b/net/rubygem-fog-aws328/pkg-descr
@@ -0,0 +1 @@
+Fog::Aws is a module for the 'fog' gem to support Amazon Web Services.
diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile
index 30acbc80ac4d..ab09919b0859 100644
--- a/net/rubygem-fog-google/Makefile
+++ b/net/rubygem-fog-google/Makefile
@@ -1,6 +1,6 @@
PORTNAME= fog-google
PORTVERSION= 1.24.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net rubygems
MASTER_SITES= RG
@@ -12,7 +12,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.md
RUN_DEPENDS= rubygem-addressable>=2.7.0:www/rubygem-addressable \
- rubygem-fog-core>=0<2.6:devel/rubygem-fog-core \
+ rubygem-fog-core250>=0<2.6:devel/rubygem-fog-core250 \
rubygem-fog-json>=1.2<2:devel/rubygem-fog-json \
rubygem-fog-xml>=0.1.0<0.2:textproc/rubygem-fog-xml \
rubygem-google-apis-compute_v1>=0.53<1:devel/rubygem-google-apis-compute_v1 \
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 6f3439ea12a7..ad9f4b7bfb87 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -110,7 +110,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \
rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
- rubygem-fog-aws>=3.26<4:net/rubygem-fog-aws \
+ rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \
rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
rubygem-fog-google>=1.24.1<1.25:net/rubygem-fog-google \
rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
@@ -192,7 +192,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
- rubygem-loofah>=2.22.0<2.23:textproc/rubygem-loofah \
+ rubygem-loofah222>=2.22.0<2.23:textproc/rubygem-loofah222 \
rubygem-licensee>=9.16<10:devel/rubygem-licensee \
rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \
rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index ed13ae884ce2..4dcefc11a462 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
GITLAB_VERSION= 17.5.1
-GITLAB_PORTREVISION= 0
+GITLAB_PORTREVISION= 1
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml