From owner-svn-ports-head@freebsd.org Fri Feb 24 09:37:18 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25311CEB14D; Fri, 24 Feb 2017 09:37:18 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9FBE18E6; Fri, 24 Feb 2017 09:37:17 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1O9bHPR072032; Fri, 24 Feb 2017 09:37:17 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1O9bGkZ072029; Fri, 24 Feb 2017 09:37:16 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201702240937.v1O9bGkZ072029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 24 Feb 2017 09:37:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434701 - in head/www/rubygem-gollum-lib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Feb 2017 09:37:18 -0000 Author: tz Date: Fri Feb 24 09:37:16 2017 New Revision: 434701 URL: https://svnweb.freebsd.org/changeset/ports/434701 Log: 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 Added: head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec - copied unchanged from r434700, head/www/rubygem-gollum-lib/files/patch-gemspec head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec (contents, props changed) Deleted: head/www/rubygem-gollum-lib/files/patch-gemspec Modified: head/www/rubygem-gollum-lib/Makefile Modified: head/www/rubygem-gollum-lib/Makefile ============================================================================== --- head/www/rubygem-gollum-lib/Makefile Fri Feb 24 09:36:04 2017 (r434700) +++ head/www/rubygem-gollum-lib/Makefile Fri Feb 24 09:37:16 2017 (r434701) @@ -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 Copied: head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec (from r434700, head/www/rubygem-gollum-lib/files/patch-gemspec) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/rubygem-gollum-lib/files/extra-patch-github-gemspec Fri Feb 24 09:37:16 2017 (r434701, copy of r434700, head/www/rubygem-gollum-lib/files/patch-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"]) Added: head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/rubygem-gollum-lib/files/extra-patch-gitlab-gemspec Fri Feb 24 09:37:16 2017 (r434701) @@ -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"])