Update to 3.1.1

Changhelog:
== 2015-09-20 v3.1.1

* Feature #11253: Total time spent from subtasks on the issue list
* Feature #20688: Add Total estimated hours column on issue list
* Feature #20738: Upgrade Rails 4.2.4
* Defect #19577: Open redirect vulnerability
* Defect #20761: Fix typo of Japanese translation for notice_gantt_chart_truncated
* Defect #20427: Cannot create a custom query visibility is "to these roles only"
* Defect #20454: Mail handler: unwanted assignment to a group occurs
* Defect #20278: Wrong syntax for resizing inline images will throw a 500 error
* Defect #20401: "Spent time" panel: columns not wrapping
* Defect #20407: Monospace font-family values are differ between application.css and scm.css
* Defect #20456: 3.1-stable/3.1.0: missing commits (omitted from being merged from trunk)
* Defect #20466: Broken email notification layout in Outlook
* Defect #20490: WARNING: Can't mass-assign protected attributes for User
* Defect #20633: Help cursor showing up since r14154
* Patch #20293: Russian translation for 2.6-stable
* Patch #20294: Russian translation for 2.6-stable
* Patch #20408: Turkish translation for 2.6-stable
* Patch #20557: Czech translation for 2.6-stable
* Patch #20735: Markdown: Upgrade redcarpet gem to 3.3 (ruby 1.9 and higher)
* Patch #20745: Portuguese translation for 2.6-stable
* Patch #20512: Project.copy_from deletes enabled_modules on source
* Patch #20737: Czech translation for 3.0-stable
* Patch #20746: Portuguese translation for 3.0-stable
* Patch #20243: Use https links instead of http links in ApplicationHelper#avatar_edit_link and Redmine::Info class methods
* Patch #20410: Turkish translation for 3.1-stable
* Patch #20452: Czech localisation update
* Patch #20731: Change Japanese translation for "spent time"
* Patch #20747: Portuguese translation for 3.1-stable

1 files changed, 19 insertions, 18 deletions

diff --git a/devel/ruby-redmine/options.mk b/devel/ruby-redmine/options.mk
index 81da886d77a..e45a8a9562e 100644
--- a/devel/ruby-redmine/options.mk
+++ b/devel/ruby-redmine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/07/05 23:55:25 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2015/10/10 02:03:04 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.redmine
 
@@ -15,38 +15,38 @@ PLIST_VARS+=	mysql pgsql sqlite3
 ###
 ### Use mysql, pgsql, or sqlite3 backend
 ###
-MYSQL_DISTFILE=		mysql2-0.3.18.gem
-PGSQL_DISTFILE=		pg-0.18.1.gem
+MYSQL_DISTFILE=		mysql2-0.3.20.gem
+PGSQL_DISTFILE=		pg-0.18.3.gem
 SQLITE3_DISTFILE=	sqlite3-1.3.10.gem
 
 .if make (distinfo) || make (mdi) # for checksum generation only
-DISTFILES+=	${MYSQL_DISTFILE}
-DISTFILES+=	${PGSQL_DISTFILE}
-DISTFILES+=	${SQLITE3_DISTFILE}
+GEMS_DISTFILES+=	${MYSQL_DISTFILE}
+GEMS_DISTFILES+=	${PGSQL_DISTFILE}
+GEMS_DISTFILES+=	${SQLITE3_DISTFILE}
 .elif !empty(PKG_OPTIONS:Mmysql)
-DISTFILES+=	${MYSQL_DISTFILE}
+GEMS_DISTFILES+=	${MYSQL_DISTFILE}
 .include "../../mk/mysql.buildlink3.mk"
-PLIST_SRC=	${PLIST_SRC_DFLT} PLIST.mysql
+RM_PLIST_SRC+=		PLIST.mysql
 .elif !empty(PKG_OPTIONS:Mpgsql)
-DISTFILES+=	${PGSQL_DISTFILE}
+GEMS_DISTFILES+=	${PGSQL_DISTFILE}
 .include "../../mk/pgsql.buildlink3.mk"
 CHECK_INTERPRETER_SKIP+=	${RM_DIR}/gems/gems/pg-*/spec/*
 CHECK_INTERPRETER_SKIP+=	${RM_DIR}/gems/gems/pg-*/spec/pg/*
-PLIST_SRC=	${PLIST_SRC_DFLT} PLIST.pgsql
+RM_PLIST_SRC+=		PLIST.pgsql
 .elif !empty(PKG_OPTIONS:Msqlite3)
-DISTFILES+=	${SQLITE3_DISTFILE}
+GEMS_DISTFILES+=	${SQLITE3_DISTFILE}
 .include "../../databases/sqlite3/buildlink3.mk"
-PLIST_SRC=	${PLIST_SRC_DFLT} PLIST.sqlite3
+RM_PLIST_SRC+=		PLIST.sqlite3
 .endif
 
 ###
 ### Use Unicorn web server
 ###
 .if !empty(PKG_OPTIONS:Municorn) || make (distinfo) || make (mdi)
-PLIST_SRC+=	PLIST.unicorn
-DISTFILES+=	kgio-2.9.3.gem \
-		raindrops-0.13.0.gem \
-		unicorn-4.9.0.gem
+RM_PLIST_SRC+=		PLIST.unicorn
+GEMS_DISTFILES+=	kgio-2.10.0.gem \
+			raindrops-0.15.0.gem \
+			unicorn-4.9.0.gem
 
 SUBST_CLASSES+=			prefix
 SUBST_STAGE.prefix=		pre-configure
@@ -55,14 +55,14 @@ SUBST_FILES.prefix=		${WRKDIR}/unicorn.rb
 SUBST_SED.prefix+=		-e "s|@RUBY_PKGPREFIX@|${RUBY_PKGPREFIX}|g"
 SUBST_VARS.prefix+=		PREFIX
 
-.include "../../lang/ruby/rubyversion.mk"
-
 RCD_SCRIPTS+=	redmine_unicorn${RUBY_SUFFIX}
 RCD_SCRIPT_SRC.redmine_unicorn${RUBY_SUFFIX}=	${FILESDIR}/redmine_unicorn.sh
 
 CONF_FILES+=	${EGDIR}/unicorn.rb.example \
 		${PREFIX}/${RM_DIR}/app/config/unicorn.rb
 
+PLIST_SRC=	${PLIST_SRC_DFLT} ${RM_PLIST_SRC}
+
 post-extract:
 	${CP} ${FILESDIR}/unicorn.rb ${WRKDIR}/unicorn.rb
 
@@ -72,6 +72,7 @@ unicorn-post-install:
 		${DESTDIR}${EGDIR}/unicorn.rb.example
 	${CP} ${FILESDIR}/Gemfile.local \
 		${DESTDIR}${PREFIX}/${RM_DIR}/app
+	${CHMOD} +x ${DESTDIR}${PREFIX}/share/examples/rc.d/redmine*
 .endif
 .PHONY: unicorn-post-install
 unicorn-post-install: