- Cleanup Makefile:

  - Remove USE_RAKE
  - Remove USE_RUBY_FEATURES
  - Use bsd.port.options.mk
  - Remove tab-only line
- Regenerate patch file with makepatch:

2 files changed, 18 insertions, 18 deletions

diff --git a/www/redmine/Makefile b/www/redmine/Makefile
index db1b96337f13..1ff59fbb1e7f 100644
--- a/www/redmine/Makefile
+++ b/www/redmine/Makefile
@@ -28,8 +28,7 @@ RUN_DEPENDS=	rubygem-rubytree>=0:${PORTSDIR}/devel/rubygem-rubytree \
 
 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 server
 MYSQL2_DESC=	MySQL database support (via mysql2 rubygem)
 NO_OPTIONS_SORT=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/redmine/files/patch-Gemfile b/www/redmine/files/patch-Gemfile
index f09c4a62493c..f7b91a7026fb 100644
--- a/www/redmine/files/patch-Gemfile
+++ b/www/redmine/files/patch-Gemfile
@@ -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"