git: e5bf2131ff57 - main - www/gitlab: decouple from www/rubygem-rqrcode

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Sun, 27 Apr 2025 04:22:34 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e5bf2131ff5710c26771c6c6a4d2541653c11436

commit e5bf2131ff5710c26771c6c6a4d2541653c11436
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-04-27 04:17:56 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-04-27 04:21:56 +0000

    www/gitlab: decouple from www/rubygem-rqrcode
    
    This makes it possible to upgrade www/rubygem-rqrcode to version 3
    which unbreaks it due to update of www/rubygem-rqrcode_core.
    
    PR:             286372
---
 www/Makefile                              |  2 ++
 www/gitlab/Makefile                       |  2 +-
 www/gitlab/Makefile.common                |  2 +-
 www/rubygem-rqrcode-gitlab/Makefile       | 21 +++++++++++++++++++++
 www/rubygem-rqrcode-gitlab/distinfo       |  3 +++
 www/rubygem-rqrcode-gitlab/pkg-descr      |  3 +++
 www/rubygem-rqrcode_core-gitlab/Makefile  | 18 ++++++++++++++++++
 www/rubygem-rqrcode_core-gitlab/distinfo  |  3 +++
 www/rubygem-rqrcode_core-gitlab/pkg-descr | 15 +++++++++++++++
 9 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/www/Makefile b/www/Makefile
index eaa63c80c1b8..3e8187a15c9a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2356,6 +2356,8 @@
     SUBDIR += rubygem-roda
     SUBDIR += rubygem-rqrcode
     SUBDIR += rubygem-rqrcode_core
+    SUBDIR += rubygem-rqrcode_core-gitlab
+    SUBDIR += rubygem-rqrcode-gitlab
     SUBDIR += rubygem-rss
     SUBDIR += rubygem-rtlit
     SUBDIR += rubygem-ruby-oembed
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 17ca43c9922d..a2bac91b338d 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -86,7 +86,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
 	rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \
-	rubygem-rqrcode>=2.2.0<3:www/rubygem-rqrcode \
+	rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
 	rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
 	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
 	rubygem-acme-client-gitlab>=2.0.21<3:security/rubygem-acme-client-gitlab \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index a7bd8f577853..b2819cf58287 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		17.11.1
-GITLAB_PORTREVISION=	0
+GITLAB_PORTREVISION=	1
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
diff --git a/www/rubygem-rqrcode-gitlab/Makefile b/www/rubygem-rqrcode-gitlab/Makefile
new file mode 100644
index 000000000000..acd6fcf32361
--- /dev/null
+++ b/www/rubygem-rqrcode-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	rqrcode
+PORTVERSION=	2.2.0
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Library for encoding QR Codes
+WWW=		https://whomwah.github.io/rqrcode/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-chunky_png>=1.0<2:graphics/rubygem-chunky_png \
+		rubygem-rqrcode_core-gitlab>=1.0<2:www/rubygem-rqrcode_core-gitlab
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-rqrcode-gitlab/distinfo b/www/rubygem-rqrcode-gitlab/distinfo
new file mode 100644
index 000000000000..61930fac660c
--- /dev/null
+++ b/www/rubygem-rqrcode-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1698066054
+SHA256 (rubygem/rqrcode-2.2.0.gem) = 23eea88bb44c7ee6d6cab9354d08c287f7ebcdc6112e1fe7bcc2d010d1ffefc1
+SIZE (rubygem/rqrcode-2.2.0.gem) = 105984
diff --git a/www/rubygem-rqrcode-gitlab/pkg-descr b/www/rubygem-rqrcode-gitlab/pkg-descr
new file mode 100644
index 000000000000..2265a5614c0e
--- /dev/null
+++ b/www/rubygem-rqrcode-gitlab/pkg-descr
@@ -0,0 +1,3 @@
+rQRCode is a library for encoding QRCodes in Ruby. It has a simple interface
+with all the standard qrcode options. It was adapted from the Javascript
+library by Kazuhiko Arase.
diff --git a/www/rubygem-rqrcode_core-gitlab/Makefile b/www/rubygem-rqrcode_core-gitlab/Makefile
new file mode 100644
index 000000000000..639aa3c46762
--- /dev/null
+++ b/www/rubygem-rqrcode_core-gitlab/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	rqrcode_core
+DISTVERSION=	1.2.0
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-gitlab
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Ruby library for encoding QR Codes
+WWW=		https://github.com/whomwah/rqrcode_core
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-rqrcode_core-gitlab/distinfo b/www/rubygem-rqrcode_core-gitlab/distinfo
new file mode 100644
index 000000000000..428064471f40
--- /dev/null
+++ b/www/rubygem-rqrcode_core-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1745725395
+SHA256 (rubygem/rqrcode_core-1.2.0.gem) = cf4989dc82d24e2877984738c4ee569308625fed2a810960f1b02d68d0308d1a
+SIZE (rubygem/rqrcode_core-1.2.0.gem) = 18944
diff --git a/www/rubygem-rqrcode_core-gitlab/pkg-descr b/www/rubygem-rqrcode_core-gitlab/pkg-descr
new file mode 100644
index 000000000000..6f9fb5bbada5
--- /dev/null
+++ b/www/rubygem-rqrcode_core-gitlab/pkg-descr
@@ -0,0 +1,15 @@
+rqrcode_core is a library for encoding QR Codes in pure Ruby. It has a
+simple interface with all the standard qrcode options. It was originally
+adapted in 2008 from a Javascript library by Kazuhiko Arase.
+
+Features:
+* rqrcode_core is a Ruby only library. It requires no 3rd party
+  libraries. Just Ruby!
+* It is an encoding library. You can't decode QR Codes with it.
+* The interface is simple and assumes you just want to encode a string
+  into a QR Code, but also allows for encoding multiple segments.
+* QR Code is trademarked by Denso Wave inc.
+
+rqrcode_core is the basis of the popular rqrcode gem. This gem allows
+you to generate different renderings of your QR Code, including png, svg
+and ansi.