[pkgsrc/pkgsrc-2012Q1]: pkgsrc/devel/ruby-railties31 Pullup ticket #3738 - re...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/736c1e3af746
branches:  pkgsrc-2012Q1
changeset: 602031:736c1e3af746
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Apr 15 15:25:31 2012 +0000

description:
Pullup ticket #3738 - requested by dholland
devel/ruby-railties31: build fix

Revisions pulled up:
- devel/ruby-railties31/Makefile                                1.3

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Thu Apr 12 15:03:01 UTC 2012

   Modified Files:
        pkgsrc/devel/ruby-railties31: Makefile

   Log Message:
   Reorder dependencies slightly, since ruby-actionpack requires a more
   restrictive ruby-rack version than ruby-rack-*

diffstat:

 devel/ruby-railties31/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 96b9385e401f -r 736c1e3af746 devel/ruby-railties31/Makefile
--- a/devel/ruby-railties31/Makefile    Sun Apr 15 14:40:49 2012 +0000
+++ b/devel/ruby-railties31/Makefile    Sun Apr 15 15:25:31 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/18 05:42:54 taca Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2012/04/15 15:25:31 tron Exp $
 
 DISTNAME=      railties-${RUBY_RAILS_VERSION}
 CATEGORIES=    databases
@@ -9,10 +9,11 @@
 LICENSE=       mit
 
 # Comment out dependency in gemspec but already depends indirectly one.
+# Keep this first, since it requires a more restrictive ruby-rack than the rest
+DEPENDS+=      ${RUBY_ACTIONPACK_DEPENDS}
+#DEPENDS+=     ${RUBY_ACTIVESUPPORT_DEPENDS}
 DEPENDS+=      ${RUBY_PKGPREFIX}-thor>=0.14.6<0.15:../../devel/ruby-thor
 DEPENDS+=      ${RUBY_PKGPREFIX}-rack-ssl>=1.3.2<1.4:../../www/ruby-rack-ssl
-#DEPENDS+=     ${RUBY_ACTIVESUPPORT_DEPENDS}
-DEPENDS+=      ${RUBY_ACTIONPACK_DEPENDS}
 
 RUBY_RAILS_SUPPORTED=  31
 RUBY_RDOC_REQD=                3.4