mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00
Code Issues Releases Activity

- Add fix for incompatibilities with rubygem-i18n >= 0.5.0

Browse Source 
- Readd patch to remove i18n check for 0.4.2
- Warn users of 3rd party plugins in UPDATING about possible incompatibilities
- Do not install .bak files

Feature safe:	yes
This commit is contained in:
Bernhard Froehlich 2011-01-14 13:36:47 +00:00
parent 1fe906161d
commit db868f2abc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=267778
4 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UPDATING
View File

@ -9,8 +9,9 @@ you update your ports collection, before attempting any port upgrades.
AFFECTS: users of www/redmine
AUTHOR: decke@FreeBSD.org
Redmine explicitly requires i18n with version 0.4.2. You need to install
that manually until a better solution is available.
If you use 3rd party plugins that are incompatible with i18n >= 0.5.0
(eg. variables in yml files as {{variable}}) then you need to
install an older i18n version manually.
# gem install -v=0.4.2 i18n

11
www/redmine/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= redmine
PORTVERSION= 1.1.0
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -14,7 +15,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= decke@FreeBSD.org
COMMENT= A flexible project management web application
RUN_DEPENDS= rackup:${PORTSDIR}/www/rubygem-rack
RUN_DEPENDS= rackup:${PORTSDIR}/www/rubygem-rack \
rubygem-i18n>=0.4.2:${PORTSDIR}/devel/rubygem-i18n
USE_RUBY= yes
USE_RUBY_FEATURES= iconv
@ -56,9 +58,14 @@ IGNORE= either Thin or Apache/Nginx WEB server option required. \
Please 'make config' again.
.endif
post-patch:
# hack to fix template syntax for rubygem-i18n >= 0.5.0
${FIND} ${WRKSRC} -name "*.yml" -type f | ${XARGS} ${REINPLACE_CMD} -e \
's|{{|%{|g ; s|}}|}|g'
do-install:
${MKDIR} ${WWWDIR}
(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig")
(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig ! -name *.bak")
${MKDIR} ${WWWDIR}/public/plugin_assets
${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}

23
www/redmine/files/patch-config-boot.rb Normal file
View File

@ -0,0 +1,23 @@
--- config/boot.rb.orig 2010-12-23 11:22:21.000000000 +0100
+++ config/boot.rb 2010-12-23 14:14:20.000000000 +0100
@@ -110,13 +110,13 @@
# Loads i18n 0.4.2 before Rails loads any more recent gem
# 0.5.0 is not compatible with the old interpolation syntax
# Plugins will have to migrate to the new syntax for 1.2.0
-require 'rubygems'
-begin
- gem 'i18n', '0.4.2'
-rescue Gem::LoadError => load_error
- $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
- exit 1
-end
+#require 'rubygems'
+#begin
+# gem 'i18n', '0.4.2'
+#rescue Gem::LoadError => load_error
+# $stderr.puts %(Missing the i18n 0.4.2 gem. Please `gem install -v=0.4.2 i18n`)
+# exit 1
+#end
# All that for this:
Rails.boot!

1
www/redmine/pkg-plist
View File

@ -1780,7 +1780,6 @@
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.html.haml
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/custom_templating_extension.text.plain.haml
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb~
%%WWWDIR%%/vendor/rails/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb