5 files changed, 48 insertions, 12 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index 5f1423de2d04..0891071953b5 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -1,20 +1,18 @@
 # New ports collection makefile for:	redmine
 # Date created:		2009-02-24
-# Whom:			Bernahrd Froehlich <decke@bluelife.at>
+# Whom:			Bernhard Froehlich <decke@bluelife.at>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	redmine
-PORTVERSION=	0.8.4
+PORTVERSION=	0.8.5
 CATEGORIES=	www
 MASTER_SITES=	RF
 
 MAINTAINER=	decke@bluelife.at
 COMMENT=	A flexible project management web application
 
-RUN_DEPENDS=	${LOCALBASE}/bin/rails:${PORTSDIR}/www/rubygem-rails
-
 USE_RUBY=	yes
 USE_RUBY_FEATURES=	iconv
 USE_RAKE=	yes
@@ -22,12 +20,16 @@ NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${WWWDIR}
-	${CP} -pR ${WRKSRC}/ ${WWWDIR}
+	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} "*" ${WWWDIR} "! -name *.orig")
+
 	${MKDIR} ${WWWDIR}/public/plugin_assets
 	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
 
-	for f in files log tmp public/plugin_assets; do \
-		${CHMOD} -R 755 ${WWWDIR}/$$f; \
-	done
+.for f in files log tmp public/plugin_assets
+	${CHMOD} -R 755 ${WWWDIR}/${f}
+.endfor
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/redmine/distinfo b/www/redmine/distinfo
index 7c644fb992f0..bf4e96cb527f 100644
--- a/www/redmine/distinfo
+++ b/www/redmine/distinfo
@@ -1,3 +1,3 @@
-MD5 (redmine-0.8.4.tar.gz) = 17dbce6aac36c5ed157798e0500cb32d
-SHA256 (redmine-0.8.4.tar.gz) = 521b3617018141b325fc772ff17f4a208bd4194220e7861de34fb4e8537f8429
-SIZE (redmine-0.8.4.tar.gz) = 3169166
+MD5 (redmine-0.8.5.tar.gz) = d921a77c0ab0af69ca79f4d16107d506
+SHA256 (redmine-0.8.5.tar.gz) = fba81b177d16a7fd27ca0ca0019882fea83ca1160fd324b83e6069af61de48f7
+SIZE (redmine-0.8.5.tar.gz) = 3174242
diff --git a/www/redmine/files/patch-lib-redmine-version.rb b/www/redmine/files/patch-lib-redmine-version.rb
new file mode 100644
index 000000000000..5d167056dca0
--- /dev/null
+++ b/www/redmine/files/patch-lib-redmine-version.rb
@@ -0,0 +1,11 @@
+--- lib/redmine/version.rb.orig	2009-09-13 14:10:18.000000000 +0200
++++ lib/redmine/version.rb	2009-09-15 09:30:33.000000000 +0200
+@@ -4,7 +4,7 @@
+   module VERSION #:nodoc:
+     MAJOR = 0
+     MINOR = 8
+-    TINY  = 4
++    TINY  = 5
+     
+     # Branch values:
+     # * official release: nil
diff --git a/www/redmine/pkg-message b/www/redmine/pkg-message
new file mode 100644
index 000000000000..f3b39a7e7a22
--- /dev/null
+++ b/www/redmine/pkg-message
@@ -0,0 +1,16 @@
+=============================================================================
+
+Redmine was installed.
+
+You now need to setup your Redmine installation so
+please have a look at the Installation Guide.
+
+http://www.redmine.org/wiki/redmine/RedmineInstall
+
+
+If you are upgrading please read the Upgrading Guide
+before starting the new version.
+
+http://www.redmine.org/wiki/redmine/RedmineUpgrade
+
+=============================================================================
diff --git a/www/redmine/pkg-plist b/www/redmine/pkg-plist
index 3b76f4dbec01..54f18093d5ea 100644
--- a/www/redmine/pkg-plist
+++ b/www/redmine/pkg-plist
@@ -371,6 +371,7 @@
 %%WWWDIR%%/config/initializers/20-mime_types.rb
 %%WWWDIR%%/config/initializers/30-redmine.rb
 %%WWWDIR%%/config/initializers/40-email.rb
+%%WWWDIR%%/config/initializers/bigdecimal-segfault-fix.rb
 %%WWWDIR%%/config/routes.rb
 %%WWWDIR%%/config/settings.yml
 %%WWWDIR%%/db/migrate/001_setup.rb
@@ -562,6 +563,7 @@
 %%WWWDIR%%/lib/generators/redmine_plugin_model/templates/unit_test.rb.erb
 %%WWWDIR%%/lib/redcloth3.rb
 %%WWWDIR%%/lib/redmine.rb
+%%WWWDIR%%/lib/redmine/about.rb
 %%WWWDIR%%/lib/redmine/access_control.rb
 %%WWWDIR%%/lib/redmine/access_keys.rb
 %%WWWDIR%%/lib/redmine/activity.rb
@@ -867,6 +869,7 @@
 %%WWWDIR%%/test/fixtures/mail_handler/ticket_with_attributes.eml
 %%WWWDIR%%/test/fixtures/mail_handler/ticket_with_cc.eml
 %%WWWDIR%%/test/fixtures/mail_handler/ticket_with_custom_fields.eml
+%%WWWDIR%%/test/fixtures/mail_handler/ticket_with_spaces_between_attribute_and_separator.eml
 %%WWWDIR%%/test/fixtures/mail_handler/ticket_without_from_header.eml
 %%WWWDIR%%/test/fixtures/members.yml
 %%WWWDIR%%/test/fixtures/messages.yml
@@ -1275,6 +1278,8 @@
 %%WWWDIR%%/vendor/plugins/ruby-net-ldap-0.0.4/tests/testldif.rb
 %%WWWDIR%%/vendor/plugins/ruby-net-ldap-0.0.4/tests/testpsw.rb
 %%WWWDIR%%/vendor/rails/.gitignore
+%%WWWDIR%%/vendor/rails/2-1-CVE-2009-3009-diff1.patch
+%%WWWDIR%%/vendor/rails/2-1-CVE-2009-3009-diff2.patch
 %%WWWDIR%%/vendor/rails/actionmailer/CHANGELOG
 %%WWWDIR%%/vendor/rails/actionmailer/MIT-LICENSE
 %%WWWDIR%%/vendor/rails/actionmailer/README
@@ -2212,6 +2217,7 @@
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/multibyte/handlers/passthru_handler.rb
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/multibyte/handlers/utf8_handler_proc.rb
+%%WWWDIR%%/vendor/rails/activesupport/lib/active_support/multibyte/utils.rb
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/option_merger.rb
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/ordered_hash.rb
 %%WWWDIR%%/vendor/rails/activesupport/lib/active_support/ordered_options.rb
@@ -2454,6 +2460,7 @@
 %%WWWDIR%%/vendor/rails/activesupport/test/multibyte_chars_test.rb
 %%WWWDIR%%/vendor/rails/activesupport/test/multibyte_conformance.rb
 %%WWWDIR%%/vendor/rails/activesupport/test/multibyte_handler_test.rb
+%%WWWDIR%%/vendor/rails/activesupport/test/multibyte_utils_test.rb
 %%WWWDIR%%/vendor/rails/activesupport/test/option_merger_test.rb
 %%WWWDIR%%/vendor/rails/activesupport/test/ordered_hash_test.rb
 %%WWWDIR%%/vendor/rails/activesupport/test/ordered_options_test.rb
@@ -3126,7 +3133,7 @@
 @dirrm %%WWWDIR%%/public/themes/alternate
 @dirrmtry %%WWWDIR%%/public/themes
 @dirrm %%WWWDIR%%/public/stylesheets
-@dirrm %%WWWDIR%%/public/plugin_assets
+@dirrmtry %%WWWDIR%%/public/plugin_assets
 @dirrm %%WWWDIR%%/public/javascripts/jstoolbar/lang
 @dirrm %%WWWDIR%%/public/javascripts/jstoolbar
 @dirrm %%WWWDIR%%/public/javascripts/calendar/lang