Wed Apr 6 13:23:03 2011 UTC ()
Start update of Ruby on Rails 3.0.6.


(taca)
diff -r1.2 -r1.3 pkgsrc/lang/ruby/rails.mk
cvs diff -r1.2 -r1.3 pkgsrc/lang/ruby/rails.mk (expand / switch to unified diff)

--- pkgsrc/lang/ruby/rails.mk 2011/03/27 15:54:43 1.2
+++ pkgsrc/lang/ruby/rails.mk 2011/04/06 13:23:03 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rails.mk,v 1.2 2011/03/27 15:54:43 taca Exp $ 1# $NetBSD: rails.mk,v 1.3 2011/04/06 13:23:03 taca Exp $
2 2
3.if !defined(_RUBY_RAILS_MK) 3.if !defined(_RUBY_RAILS_MK)
4_RUBY_RAILS_MK= # defined 4_RUBY_RAILS_MK= # defined
5 5
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# RUBY_RAILS_DEFAULT 9# RUBY_RAILS_DEFAULT
10# Select default Ruby on Rails version. 10# Select default Ruby on Rails version.
11# 11#
12# Possible values: 2 3 12# Possible values: 2 3
13# Default: 2 13# Default: 2
14# 14#
@@ -16,27 +16,27 @@ _RUBY_RAILS_MK= # defined @@ -16,27 +16,27 @@ _RUBY_RAILS_MK= # defined
16# === Package-settable variables === 16# === Package-settable variables ===
17# 17#
18# RUBY_RAILS 18# RUBY_RAILS
19# Force sepecify RUBY_RAILS_DEFAULT. It is only for packages of 19# Force sepecify RUBY_RAILS_DEFAULT. It is only for packages of
20# rails components. 20# rails components.
21# 21#
22# Possible values: 2 3 (empty) 22# Possible values: 2 3 (empty)
23# 23#
24 24
25# 25#
26# current Ruby on Rails versions. 26# current Ruby on Rails versions.
27# 27#
28RUBY_RAILS2_VERSION?= 2.3.11 28RUBY_RAILS2_VERSION?= 2.3.11
29RUBY_RAILS3_VERSION?= 3.0.5 29RUBY_RAILS3_VERSION?= 3.0.6
30 30
31.if !empty(RUBY_RAILS) 31.if !empty(RUBY_RAILS)
32RUBY_RAILS_DEFAULT= ${RUBY_RAILS} 32RUBY_RAILS_DEFAULT= ${RUBY_RAILS}
33_RUBY_RAILS_DEPENDS_EXACT= yes 33_RUBY_RAILS_DEPENDS_EXACT= yes
34.endif 34.endif
35 35
36.if empty(RUBY_RAILS_DEFAULT) 36.if empty(RUBY_RAILS_DEFAULT)
37_RUBY_INSTALLED_RAILS!= \ 37_RUBY_INSTALLED_RAILS!= \
38 if ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack>=1.2" || \ 38 if ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack>=1.2" || \
39 ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport>=3.0"; then \ 39 ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport>=3.0"; then \
40 ${ECHO} 3; \ 40 ${ECHO} 3; \
41 elif ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack<1.2" || \ 41 elif ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack<1.2" || \
42 ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport<3"; then \ 42 ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport<3"; then \