git: 888fb1e9677f - main - www/gitlab-ce: fix rubygem-rdoc problem

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Mon, 27 Dec 2021 09:04:09 UTC

The branch main has been updated by mfechner:

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

commit 888fb1e9677f7d1bb2f99894bca04101d4d070dd
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-12-27 08:59:24 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-12-27 09:04:03 +0000

    www/gitlab-ce: fix rubygem-rdoc problem
    
    The upgrade of rubygem-rdoc to 6.4 in commit
    1a6659dcb611aab06e7e9ba3adee8c81ce3f9d93
    broke gitlab.
    Use version rdoc 6.4 does not work due to segfaults, please see
    commit log of devel/rubygem-rdoc63 for more details.
    
    PR:             260679
    Reported by:    lysfjord.daniel@smokepit.net
---
 www/gitlab-ce/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index fcd2607e0ac4..1ad1267ddfcb 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitlab-ce
 PORTVERSION=	14.6.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -119,7 +119,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-commonmarker>=0.23.2<0.24:textproc/rubygem-commonmarker \
 	rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \
 	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
-	rubygem-rdoc>=6.3.2<7:devel/rubygem-rdoc \
+	rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \
 	rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
 	rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
 	rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \