Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jan 2022 19:05:42 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 56467e81552e - main - www/rubygem-gollum-lib: Clean up
Message-ID:  <202201111905.20BJ5g5n091022@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

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

commit 56467e81552e249465603661c5c510a388926daf
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-01-11 17:40:48 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-01-11 18:47:42 +0000

    www/rubygem-gollum-lib: Clean up
    
    Remove the options since gitlab uses textproc/rubygem-gitlab-markup directly now.
---
 www/rubygem-gollum-lib/Makefile | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index 640702ff5f95..afd8ab1152e5 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -12,6 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-gemojione>=3.2<4:graphics/rubygem-gemojione \
+		rubygem-github-markup>=1.6:textproc/rubygem-github-markup \
 		rubygem-gollum-grit_adapter10>=1.0<2:www/rubygem-gollum-grit_adapter10 \
 		rubygem-nokogiri>=1.6.1<2.0:textproc/rubygem-nokogiri \
 		rubygem-rouge2>=2.1<3:textproc/rubygem-rouge2 \
@@ -20,24 +21,8 @@ RUN_DEPENDS=	rubygem-gemojione>=3.2<4:graphics/rubygem-gemojione \
 		rubygem-twitter-text1=1.14.7:textproc/rubygem-twitter-text1
 
 USES=		gem
-
-OPTIONS_RADIO=	MARKUP
-OPTIONS_RADIO_MARKUP=	GITHUB GITLAB
-OPTIONS_DEFAULT?=	GITHUB
-
-MARKUP_DESC=	Markup Selection
-GITHUB_DESC=	Use rubygem-github-markup (default)
-GITLAB_DESC=	Use rubygem-gitlab-markup instead
-
-GITHUB_RUN_DEPENDS=	rubygem-github-markup>=1.6:textproc/rubygem-github-markup
-GITLAB_RUN_DEPENDS=	rubygem-gitlab-markup>=1.5:textproc/rubygem-gitlab-markup
-
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
-post-patch-GITLAB-on:
-# change runtime dependency from "github-markup >= 1.6" to "gitlab-markup >= 1.5"
-	@${REINPLACE_CMD} -e '/s.add_runtime_dependency/ s|github-markup\(.*\)1.6|gitlab-markup\11.5|' ${WRKSRC}/${GEMSPEC}
-
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201111905.20BJ5g5n091022>