- Update to 2.5.1

- Stage
- Sort plist

www/redmine/Makefile

@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	redmine
-PORTVERSION=	2.3.3
-PORTREVISION=	4
+PORTVERSION=	2.5.1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.redmine.org/releases/
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A flexible project management web application
@@ -20,6 +18,8 @@ RUN_DEPENDS=	rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree \
 		rubygem-coderay>=1.0.9:${PORTSDIR}/textproc/rubygem-coderay \
 		rubygem-fastercsv>=1.5.0:${PORTSDIR}/devel/rubygem-fastercsv \
 		rubygem-builder>=3.0.0:${PORTSDIR}/devel/rubygem-builder \
+		rubygem-redcarpet>0:${PORTSDIR}/textproc/rubygem-redcarpet \
+		rubygem-awesome_nested_set>0:${PORTSDIR}/databases/rubygem-awesome_nested_set \
 		rubygem-net-ldap>=0.3.1:${PORTSDIR}/net/rubygem-net-ldap
 
 USE_RUBY=	yes
@@ -39,7 +39,6 @@ PASSENGER_DESC=	Use Apache/Nginx WEB server
 MYSQL2_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
@@ -81,23 +80,23 @@ pre-install:
 	${MKDIR} ${WRKSRC}/public/plugin_assets
 
 do-install:
-	${MKDIR} ${WWWDIR}
-	${MKDIR} ${WWWDIR}/tmp/pids
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/pids
 	cd ${WRKSRC} && \
-	${COPYTREE_SHARE} "*" ${WWWDIR} "! ( -name *\.orig -o -name *\.bak )"
+	${COPYTREE_SHARE} "*" ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )"
 	${FIND} ${WRKSRC}/script -type f -print | ${XARGS} ${CHMOD} 755
 
 post-install:
-	${TOUCH} ${WWWDIR}/Gemfile.lock
-	${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}/Gemfile.lock
+	${TOUCH} ${STAGEDIR}${WWWDIR}/Gemfile.lock
+	${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/Gemfile.lock
 	
-	if ! [ -r ${WWWDIR}/config/settings.yml ]; then			\
-		${INSTALL_DATA} ${WWWDIR}/config/settings.yml-dist	\
-			${WWWDIR}/config/settings.yml;			\
+	if ! [ -r ${STAGEDIR}${WWWDIR}/config/settings.yml ]; then		\
+		${INSTALL_DATA} ${STAGEDIR}${WWWDIR}/config/settings.yml-dist	\
+			${STAGEDIR}${WWWDIR}/config/settings.yml;		\
 	fi
 	for subdir in files log tmp public/plugin_assets; do \
-		${CHOWN} -R :${WWWGRP} ${WWWDIR}/$$subdir; \
-		${CHMOD} -R g+w ${WWWDIR}/$$subdir; \
+		${CHOWN} -R :${WWWGRP} ${STAGEDIR}${WWWDIR}/$$subdir; \
+		${CHMOD} -R g+w ${STAGEDIR}${WWWDIR}/$$subdir; \
 	done
 	@${CAT} ${PKGMESSAGE}
 

www/redmine/distinfo

@@ -1,2 +1,2 @@
-SHA256 (redmine-2.3.3.tar.gz) = dbec7b62417b8cd36c02bf98f38d26429c27b67430217879ce8fe25af6add97b
-SIZE (redmine-2.3.3.tar.gz) = 3803852
+SHA256 (redmine-2.5.1.tar.gz) = 1580396c030c1233e9acffcb97bf43b69fb3c04c6b00accbabf77d2a4a8c93f0
+SIZE (redmine-2.5.1.tar.gz) = 3889516

www/redmine/files/patch-Gemfile

@@ -1,44 +1,40 @@
---- Gemfile.orig	2013-09-14 06:48:49.000000000 +0000
-+++ Gemfile	2014-02-18 22:11:46.426041222 +0000
+--- Gemfile.orig	2014-03-29 19:50:17.216630353 +0000
++++ Gemfile	2014-03-29 19:59:55.539590486 +0000
 @@ -1,11 +1,11 @@
  source 'https://rubygems.org'
  
--gem "rails", "3.2.13"
+-gem "rails", "3.2.17"
+-gem "rake", "~> 10.1.1"
 -gem "jquery-rails", "~> 2.0.2"
 +gem "rails", "~> 3.2.17"
++gem "rake", "~> 10.2.2"
 +gem "jquery-rails", "~> 3.0"
- gem "i18n", "~> 0.6.0"
--gem "coderay", "~> 1.0.9"
-+gem "coderay", "~> 1.1.0"
+ gem "coderay", "~> 1.1.0"
  gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 -gem "builder", "3.0.0"
 +gem "builder", "~> 3.0.0"
+ gem "mime-types"
+ gem "awesome_nested_set", "2.1.6"
  
- # Optional gem for LDAP authentication
- group :ldap do
-@@ -14,7 +14,7 @@
+@@ -16,7 +16,7 @@
  
  # Optional gem for OpenID authentication
  group :openid do
--  gem "ruby-openid", "~> 2.2.3", :require => "openid"
-+  gem "ruby-openid", "~> 2.2", :require => "openid"
+-  gem "ruby-openid", "~> 2.3.0", :require => "openid"
++  gem "ruby-openid", "~> 2.3", :require => "openid"
    gem "rack-openid"
  end
  
-@@ -46,10 +46,10 @@
-     adapters.each do |adapter|
-       case adapter
-       when 'mysql2'
--        gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw]
-+        gem "mysql2", "~> 0.3", :platforms => [:mri, :mingw]
-         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-       when 'mysql'
--        gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
-+        gem "mysql", "~> 2.8", :platforms => [:mri, :mingw]
-         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
-       when /postgresql/
-         gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]
-@@ -71,18 +71,6 @@
+@@ -32,7 +32,7 @@
+   # Optional Markdown support, not for JRuby
+   group :markdown do
+     # TODO: upgrade to redcarpet 3.x when ruby1.8 support is dropped
+-    gem "redcarpet", "~> 2.3.0"
++    gem "redcarpet", "~> 3.0"
+   end
+ end
+ 
+@@ -79,20 +79,6 @@
    warn("Please configure your config/database.yml first")
  end
  
@@ -49,9 +45,11 @@
 -
 -group :test do
 -  gem "shoulda", "~> 3.3.2"
--  gem "mocha", "~> 0.13.3"
--  gem 'capybara', '~> 2.0.0'
--  gem 'nokogiri', '< 1.6.0'
+-  gem "mocha", ">= 0.14", :require => 'mocha/api'
+-  if RUBY_VERSION >= '1.9.3'
+-    gem "capybara", "~> 2.1.0"
+-    gem "selenium-webdriver"
+-  end
 -end
 -
  local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")