Wed Sep 14 16:51:50 2011 UTC ()
Make default Ruby on Rails version to 3; currently 3.0.10.


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

--- pkgsrc/lang/ruby/rails.mk 2011/08/17 14:11:18 1.8
+++ pkgsrc/lang/ruby/rails.mk 2011/09/14 16:51:50 1.9
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: rails.mk,v 1.8 2011/08/17 14:11:18 taca Exp $ 1# $NetBSD: rails.mk,v 1.9 2011/09/14 16:51:50 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: 3
14# 14#
15# 15#
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.
@@ -39,27 +39,27 @@ _RUBY_INSTALLED_RAILS!= \ @@ -39,27 +39,27 @@ _RUBY_INSTALLED_RAILS!= \
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 \
43 ${ECHO} 2; \ 43 ${ECHO} 2; \
44 else \ 44 else \
45 ${ECHO} "none"; \ 45 ${ECHO} "none"; \
46 fi 46 fi
47. if ${_RUBY_INSTALLED_RAILS} != "none" 47. if ${_RUBY_INSTALLED_RAILS} != "none"
48RUBY_RAILS_DEFAULT:= ${_RUBY_INSTALLED_RAILS} 48RUBY_RAILS_DEFAULT:= ${_RUBY_INSTALLED_RAILS}
49. endif 49. endif
50.endif 50.endif
51 51
52RUBY_RAILS_DEFAULT?= 2 52RUBY_RAILS_DEFAULT?= 3
53.if ${RUBY_RAILS_DEFAULT} == "2" 53.if ${RUBY_RAILS_DEFAULT} == "2"
54RUBY_RAILS_VERSION:= ${RUBY_RAILS2_VERSION} 54RUBY_RAILS_VERSION:= ${RUBY_RAILS2_VERSION}
55_RUBY_RAILS_MAJOR= 2 55_RUBY_RAILS_MAJOR= 2
56.else 56.else
57RUBY_RAILS_VERSION:= ${RUBY_RAILS3_VERSION} 57RUBY_RAILS_VERSION:= ${RUBY_RAILS3_VERSION}
58_RUBY_RAILS_MAJOR= 3 58_RUBY_RAILS_MAJOR= 3
59.endif 59.endif
60 60
61# 61#
62MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS_DEFAULT} 62MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS_DEFAULT}
63 63
64# 64#
65# _ 65# _