From owner-svn-ports-head@freebsd.org Sat Apr 20 08:52:13 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 474731587C99; Sat, 20 Apr 2019 08:52:13 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DEF1388E1C; Sat, 20 Apr 2019 08:52:12 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5D77BD46; Sat, 20 Apr 2019 08:52:12 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3K8qCa5022691; Sat, 20 Apr 2019 08:52:12 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3K8qCUv022689; Sat, 20 Apr 2019 08:52:12 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201904200852.x3K8qCUv022689@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Sat, 20 Apr 2019 08:52:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499430 - in head/www/redmine: . files X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: in head/www/redmine: . files X-SVN-Commit-Revision: 499430 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DEF1388E1C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sat, 20 Apr 2019 08:52:13 -0000 Author: meta Date: Sat Apr 20 08:52:11 2019 New Revision: 499430 URL: https://svnweb.freebsd.org/changeset/ports/499430 Log: www/redmine: Remove bundler dependency pin on bundler < 2.0 To adapt upcoming update of sysutils/rubygem-bundler to 2.0.1. PR: 237384 Submitted by: meta (myself) Reviewed by: mfechner Modified: head/www/redmine/Makefile head/www/redmine/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Sat Apr 20 08:41:21 2019 (r499429) +++ head/www/redmine/Makefile Sat Apr 20 08:52:11 2019 (r499430) @@ -3,7 +3,7 @@ PORTNAME= redmine PORTVERSION= 3.4.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= https://www.redmine.org/releases/ @@ -34,10 +34,11 @@ RUN_DEPENDS= rubygem-bundler>=1.5.0:sysutils/rubygem-b rubygem-rack-openid>=0:www/rubygem-rack-openid \ rubygem-rake>=0:devel/rubygem-rake +USES= cpe +USE_RUBY= yes + NO_ARCH= yes NO_BUILD= yes -USE_RUBY= yes -USES= cpe USERS= ${WWWOWN} GROUPS= ${WWWGRP} Modified: head/www/redmine/files/patch-Gemfile ============================================================================== --- head/www/redmine/files/patch-Gemfile Sat Apr 20 08:41:21 2019 (r499429) +++ head/www/redmine/files/patch-Gemfile Sat Apr 20 08:52:11 2019 (r499430) @@ -1,9 +1,11 @@ ---- Gemfile.orig 2018-06-10 06:36:07 UTC -+++ Gemfile -@@ -4,24 +4,24 @@ if Gem::Version.new(Bundler::VERSION) < - abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." - end +--- Gemfile.orig 2019-04-19 20:09:58.067146000 +0900 ++++ Gemfile 2019-04-19 20:10:30.702127000 +0900 +@@ -1,25 +1,25 @@ + source 'https://rubygems.org' +-gem "bundler", ">= 1.5.0", "< 2.0.0" ++gem "bundler", ">= 1.5.0" + -gem "rails", "4.2.11" +gem "rails", ">= 4.2.11" gem "addressable", "2.4.0" if RUBY_VERSION < "2.0" @@ -32,7 +34,7 @@ gem "ffi", "1.9.14", :platforms => :mingw if RUBY_VERSION < "2.0" gem "xpath", "< 3.2.0" if RUBY_VERSION < "2.3" -@@ -33,76 +33,15 @@ gem "rbpdf", "~> 1.19.6" +@@ -32,76 +32,15 @@ # Optional gem for LDAP authentication group :ldap do @@ -111,11 +113,12 @@ local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") if File.exists?(local_gemfile) eval_gemfile local_gemfile -@@ -112,3 +51,7 @@ end +@@ -110,4 +49,8 @@ + # Load plugins' Gemfiles Dir.glob File.expand_path("../plugins/*/{Gemfile,PluginGemfile}", __FILE__) do |file| eval_gemfile file - end ++end + +Dir["#{File.dirname(__FILE__)}/bundler.d/*.rb"].each do |bundle| + self.instance_eval(Bundler.read_file(bundle)) -+end + end