From 61c60d32a5ed8663f80b7e8088b7da1f6bc93dc1 Mon Sep 17 00:00:00 2001 From: tz Date: Fri, 24 Feb 2017 09:37:16 +0000 Subject: www/rubygem-gollum-lib: Add options for GITHUB and GITLAB dependency The new www/gitlab version requires rubygem-gitlab-markup, which is a fork of rubygem-github-markup. It is more a clone than a fork since it installs a file named "github-markup" causing conflicts whenever rubygem-github-markup should be installed too. Therefore the options introduced allows to choose the wanted dependency --- www/rubygem-gollum-lib/Makefile | 17 +++++++++++++++-- .../files/extra-patch-github-gemspec | 20 ++++++++++++++++++++ .../files/extra-patch-gitlab-gemspec | 21 +++++++++++++++++++++ www/rubygem-gollum-lib/files/patch-gemspec | 20 -------------------- 4 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 www/rubygem-gollum-lib/files/extra-patch-github-gemspec create mode 100644 www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec delete mode 100644 www/rubygem-gollum-lib/files/patch-gemspec (limited to 'www/rubygem-gollum-lib') diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile index d18f458f9986..bde15a51684c 100644 --- a/www/rubygem-gollum-lib/Makefile +++ b/www/rubygem-gollum-lib/Makefile @@ -3,7 +3,7 @@ PORTNAME= gollum-lib PORTVERSION= 4.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www rubygems MASTER_SITES= RG @@ -14,13 +14,26 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=2.2:graphics/rubygem-gemojione \ - rubygem-github-markup>=1.4:textproc/rubygem-github-markup \ rubygem-gollum-grit_adapter>=1.0:www/rubygem-gollum-grit_adapter \ rubygem-nokogiri>=1.6.4:textproc/rubygem-nokogiri \ rubygem-rouge>=2.0:textproc/rubygem-rouge \ rubygem-sanitize>=2.1:textproc/rubygem-sanitize \ rubygem-stringex>=2.6:devel/rubygem-stringex +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.4:textproc/rubygem-github-markup +GITLAB_RUN_DEPENDS= rubygem-gitlab-markup>=1.5:textproc/rubygem-gitlab-markup + +GITHUB_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-github-gemspec +GITLAB_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-gitlab-gemspec + NO_ARCH= yes USE_RUBY= yes USES= gem diff --git a/www/rubygem-gollum-lib/files/extra-patch-github-gemspec b/www/rubygem-gollum-lib/files/extra-patch-github-gemspec new file mode 100644 index 000000000000..30eba8c67b1e --- /dev/null +++ b/www/rubygem-gollum-lib/files/extra-patch-github-gemspec @@ -0,0 +1,20 @@ +--- gollum-lib.gemspec.orig 2017-01-03 13:59:10.693257000 -0500 ++++ gollum-lib.gemspec 2017-01-03 13:59:26.688694000 -0500 +@@ -25,13 +25,13 @@ + s.specification_version = 2 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.6.4"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.6"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.6"]) +- s.add_runtime_dependency(%q.freeze, ["~> 2.1"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.1"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.4"]) +- s.add_runtime_dependency(%q.freeze, ["~> 2.2"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.2"]) + s.add_development_dependency(%q.freeze, ["~> 0.9.9"]) + s.add_development_dependency(%q.freeze, ["~> 1.6.0"]) + s.add_development_dependency(%q.freeze, ["~> 4.2.9"]) diff --git a/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec b/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec new file mode 100644 index 000000000000..e0ecf06bf92a --- /dev/null +++ b/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec @@ -0,0 +1,21 @@ +--- gollum-lib.gemspec.orig 2017-02-02 12:04:29 UTC ++++ gollum-lib.gemspec +@@ -25,13 +25,13 @@ Gem::Specification.new do |s| + s.specification_version = 2 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then +- s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.6.4"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.6"]) + s.add_runtime_dependency(%q.freeze, ["~> 2.6"]) +- s.add_runtime_dependency(%q.freeze, ["~> 2.1"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.4"]) +- s.add_runtime_dependency(%q.freeze, ["~> 2.2"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.1"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 1.5"]) ++ s.add_runtime_dependency(%q.freeze, [">= 2.2"]) + s.add_development_dependency(%q.freeze, ["~> 0.9.9"]) + s.add_development_dependency(%q.freeze, ["~> 1.6.0"]) + s.add_development_dependency(%q.freeze, ["~> 4.2.9"]) diff --git a/www/rubygem-gollum-lib/files/patch-gemspec b/www/rubygem-gollum-lib/files/patch-gemspec deleted file mode 100644 index 30eba8c67b1e..000000000000 --- a/www/rubygem-gollum-lib/files/patch-gemspec +++ /dev/null @@ -1,20 +0,0 @@ ---- gollum-lib.gemspec.orig 2017-01-03 13:59:10.693257000 -0500 -+++ gollum-lib.gemspec 2017-01-03 13:59:26.688694000 -0500 -@@ -25,13 +25,13 @@ - s.specification_version = 2 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then -- s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) -+ s.add_runtime_dependency(%q.freeze, [">= 1.0"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.0"]) -- s.add_runtime_dependency(%q.freeze, ["~> 1.6.4"]) -+ s.add_runtime_dependency(%q.freeze, ["~> 1.6"]) - s.add_runtime_dependency(%q.freeze, ["~> 2.6"]) -- s.add_runtime_dependency(%q.freeze, ["~> 2.1"]) -+ s.add_runtime_dependency(%q.freeze, [">= 2.1"]) - s.add_runtime_dependency(%q.freeze, ["~> 1.4"]) -- s.add_runtime_dependency(%q.freeze, ["~> 2.2"]) -+ s.add_runtime_dependency(%q.freeze, [">= 2.2"]) - s.add_development_dependency(%q.freeze, ["~> 0.9.9"]) - s.add_development_dependency(%q.freeze, ["~> 1.6.0"]) - s.add_development_dependency(%q.freeze, ["~> 4.2.9"]) -- cgit