Sun Apr 15 15:25:31 2012 UTC ()
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-*


(tron)
diff -r1.2 -r1.2.2.1 pkgsrc/devel/ruby-railties31/Makefile
cvs diff -r1.2 -r1.2.2.1 pkgsrc/devel/ruby-railties31/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-railties31/Attic/Makefile 2012/03/18 05:42:54 1.2
+++ pkgsrc/devel/ruby-railties31/Attic/Makefile 2012/04/15 15:25:31 1.2.2.1
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.2 2012/03/18 05:42:54 taca Exp $ 1# $NetBSD: Makefile,v 1.2.2.1 2012/04/15 15:25:31 tron Exp $
2 2
3DISTNAME= railties-${RUBY_RAILS_VERSION} 3DISTNAME= railties-${RUBY_RAILS_VERSION}
4CATEGORIES= databases 4CATEGORIES= databases
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.rubyonrails.org/ 7HOMEPAGE= http://www.rubyonrails.org/
8COMMENT= Tools for creating, working with, and running Rails 3.1 8COMMENT= Tools for creating, working with, and running Rails 3.1
9LICENSE= mit 9LICENSE= mit
10 10
11# Comment out dependency in gemspec but already depends indirectly one. 11# Comment out dependency in gemspec but already depends indirectly one.
 12# Keep this first, since it requires a more restrictive ruby-rack than the rest
 13DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS}
 14#DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS}
12DEPENDS+= ${RUBY_PKGPREFIX}-thor>=0.14.6<0.15:../../devel/ruby-thor 15DEPENDS+= ${RUBY_PKGPREFIX}-thor>=0.14.6<0.15:../../devel/ruby-thor
13DEPENDS+= ${RUBY_PKGPREFIX}-rack-ssl>=1.3.2<1.4:../../www/ruby-rack-ssl 16DEPENDS+= ${RUBY_PKGPREFIX}-rack-ssl>=1.3.2<1.4:../../www/ruby-rack-ssl
14#DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS} 
15DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS} 
16 17
17RUBY_RAILS_SUPPORTED= 31 18RUBY_RAILS_SUPPORTED= 31
18RUBY_RDOC_REQD= 3.4 19RUBY_RDOC_REQD= 3.4
19 20
20.include "../../lang/ruby/gem.mk" 21.include "../../lang/ruby/gem.mk"
21.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"