From owner-svn-ports-all@FreeBSD.ORG Mon May 25 19:55:12 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42B88973; Mon, 25 May 2015 19:55:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 23E4676E; Mon, 25 May 2015 19:55:12 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4PJtCQZ026706; Mon, 25 May 2015 19:55:12 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4PJtBdn026704; Mon, 25 May 2015 19:55:11 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201505251955.t4PJtBdn026704@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 25 May 2015 19:55:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387415 - in head/www/redmine: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2015 19:55:12 -0000 Author: sunpoet Date: Mon May 25 19:55:11 2015 New Revision: 387415 URL: https://svnweb.freebsd.org/changeset/ports/387415 Log: - Cleanup Makefile: - Remove USE_RAKE - Remove USE_RUBY_FEATURES - Use bsd.port.options.mk - Remove tab-only line - Regenerate patch file with makepatch: Modified: head/www/redmine/Makefile head/www/redmine/files/patch-Gemfile Modified: head/www/redmine/Makefile ============================================================================== --- head/www/redmine/Makefile Mon May 25 19:55:05 2015 (r387414) +++ head/www/redmine/Makefile Mon May 25 19:55:11 2015 (r387415) @@ -28,8 +28,7 @@ RUN_DEPENDS= rubygem-rubytree>=0:${PORTS USES= cpe USE_RUBY= yes -USE_RUBY_FEATURES= iconv -USE_RAKE= yes +#USE_RAKE= yes NO_BUILD= yes SUB_LIST+= RUBY_NAME=${RUBY_NAME} USERS= ${WWWOWN} @@ -47,7 +46,7 @@ PASSENGER_DESC= Use Apache/Nginx WEB ser MYSQL2_DESC= MySQL database support (via mysql2 rubygem) NO_OPTIONS_SORT=yes -.include +.include .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= rubygem-mysql>=2.8.1:${PORTSDIR}/databases/rubygem-mysql @@ -95,10 +94,9 @@ do-install: post-install: ${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock - if ! [ -r ${STAGEDIR}${WWWDIR}/config/settings.yml ]; then \ ${INSTALL_DATA} ${STAGEDIR}${WWWDIR}/config/settings.yml-dist \ ${STAGEDIR}${WWWDIR}/config/settings.yml; \ fi -.include +.include Modified: head/www/redmine/files/patch-Gemfile ============================================================================== --- head/www/redmine/files/patch-Gemfile Mon May 25 19:55:05 2015 (r387414) +++ head/www/redmine/files/patch-Gemfile Mon May 25 19:55:11 2015 (r387415) @@ -1,8 +1,8 @@ ---- Gemfile.orig 2015-02-19 13:15:56.000000000 -0600 -+++ Gemfile 2015-03-15 12:49:50.000000000 -0500 -@@ -1,13 +1,13 @@ +--- Gemfile.orig 2015-05-25 16:10:44 UTC ++++ Gemfile +@@ -1,15 +1,15 @@ source 'https://rubygems.org' - + -gem "rails", "3.2.21" +gem "rails", "~> 3.2" gem "jquery-rails", "~> 3.1.1" @@ -13,20 +13,22 @@ +gem "request_store", "~> 1.1.0" gem "mime-types" gem "rbpdf", "~> 1.18.5" - + -gem "i18n", "~> 0.6.11" +gem "i18n", "~> 0.7.0" - -@@ -18,7 +18,7 @@ - + + # Optional gem for LDAP authentication + group :ldap do +@@ -21,7 +21,7 @@ gem "thin", "~> 1.6.2" + # Optional gem for OpenID authentication group :openid do - gem "ruby-openid", "~> 2.3.0", :require => "openid" + gem "ruby-openid", "~> 2.7", :require => "openid" gem "rack-openid" end - -@@ -35,7 +35,7 @@ + +@@ -37,7 +37,7 @@ platforms :mri, :mingw do # Optional Markdown support, not for JRuby group :markdown do # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped @@ -34,11 +36,11 @@ + gem "redcarpet", "~> 3.0" end end - -@@ -81,23 +81,6 @@ + +@@ -84,23 +84,6 @@ else warn("Please configure your config/database.yml first") end - + -group :development do - gem "rdoc", ">= 2.4.2" - gem "yard"