Index: head/www/rubygem-gollum-lib/Makefile =================================================================== --- head/www/rubygem-gollum-lib/Makefile (revision 437825) +++ head/www/rubygem-gollum-lib/Makefile (revision 437826) @@ -1,41 +1,41 @@ # Created by: Johannes Meixner # $FreeBSD$ PORTNAME= gollum-lib -PORTVERSION= 4.2.2 -PORTREVISION= 3 +PORTVERSION= 4.2.3 CATEGORIES= www rubygems MASTER_SITES= RG MAINTAINER= ruby@FreeBSD.org COMMENT= Simple, Git-powered wiki with a sweet API and local frontend LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-gemojione>=2.2:graphics/rubygem-gemojione \ 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 +GITHUB_RUN_DEPENDS= rubygem-github-markup>=1.6: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 + +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 Index: head/www/rubygem-gollum-lib/distinfo =================================================================== --- head/www/rubygem-gollum-lib/distinfo (revision 437825) +++ head/www/rubygem-gollum-lib/distinfo (revision 437826) @@ -1,3 +1,3 @@ -TIMESTAMP = 1480760185 -SHA256 (rubygem/gollum-lib-4.2.2.gem) = 44529ee6079b139c3d57eeec8b20d999893c774cabff9b6134dbee7382df0f1b -SIZE (rubygem/gollum-lib-4.2.2.gem) = 49152 +TIMESTAMP = 1491396497 +SHA256 (rubygem/gollum-lib-4.2.3.gem) = f7f23d3074faf91348365dcbd54caf542eba87db8e79fb5e08b3a79c31ee5c4a +SIZE (rubygem/gollum-lib-4.2.3.gem) = 49152 Index: head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec =================================================================== --- head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec (revision 437825) +++ head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec (nonexistent) @@ -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"]) Property changes on: head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec =================================================================== --- head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec (revision 437825) +++ head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec (nonexistent) @@ -1,21 +0,0 @@ ---- 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"]) Property changes on: head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/rubygem-gollum-lib/files/patch-gemspec =================================================================== --- head/www/rubygem-gollum-lib/files/patch-gemspec (nonexistent) +++ head/www/rubygem-gollum-lib/files/patch-gemspec (revision 437826) @@ -0,0 +1,20 @@ +--- gollum-lib.gemspec.orig 2017-04-05 13:01:50 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, [">= 2.1"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.6"]) +- 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"]) Property changes on: head/www/rubygem-gollum-lib/files/patch-gemspec ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property