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 (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,136 +1,136 @@ @@ -1,136 +1,136 @@
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#
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.
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 \
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?= 2
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# _
66# If defined, match exact version. Otherwise allow greater minor version. 66# If defined, match exact version. Otherwise allow greater minor version.
67# 67#
68.if empty(_RUBY_RAILS_DEPENDS_EXACT) 68.if empty(_RUBY_RAILS_DEPENDS_EXACT)
69_RUBY_RAILS_NEXT!= ${EXPR} ${_RUBY_RAILS_MAJOR} + 1 69_RUBY_RAILS_NEXT!= ${EXPR} ${_RUBY_RAILS_MAJOR} + 1
70_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RUBY_RAILS_NEXT} 70_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RUBY_RAILS_NEXT}
71.else 71.else
72_RUBY_RAILS_VERS= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2/} 72_RUBY_RAILS_VERS= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2/}
73_RUBY_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/} 73_RUBY_RAILS_TEENY= ${RUBY_RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
74 74
75_RUBY_RAILS_NEXT!= ${EXPR} ${_RUBY_RAILS_TEENY} + 1 75_RUBY_RAILS_NEXT!= ${EXPR} ${_RUBY_RAILS_TEENY} + 1
76_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RUBY_RAILS_VERS}.${_RUBY_RAILS_NEXT} 76_RAILS_DEP= >=${RUBY_RAILS_VERSION}<${_RUBY_RAILS_VERS}.${_RUBY_RAILS_NEXT}
77.endif 77.endif
78 78
79RUBY_ACTIVESUPPORT?= ${RUBY_RAILS_VERSION} 79RUBY_ACTIVESUPPORT?= ${RUBY_RAILS_VERSION}
80RUBY_ACTIONPACK?= ${RUBY_RAILS_VERSION} 80RUBY_ACTIONPACK?= ${RUBY_RAILS_VERSION}
81RUBY_ACTIVERECORD?= ${RUBY_RAILS_VERSION} 81RUBY_ACTIVERECORD?= ${RUBY_RAILS_VERSION}
82RUBY_ACTIVERESOURCE?= ${RUBY_RAILS_VERSION} 82RUBY_ACTIVERESOURCE?= ${RUBY_RAILS_VERSION}
83RUBY_ACTIONMAILER?= ${RUBY_RAILS_VERSION} 83RUBY_ACTIONMAILER?= ${RUBY_RAILS_VERSION}
84RUBY_RAILTIES?= ${RUBY_RAILS_VERSION} 84RUBY_RAILTIES?= ${RUBY_RAILS_VERSION}
85 85
86RUBY_RAILS2_ACTIVESUPPORT= ../../devel/ruby-activesupport 86RUBY_RAILS2_ACTIVESUPPORT= ../../devel/ruby-activesupport
87RUBY_RAILS2_ACTIONPACK= ../../www/ruby-actionpack 87RUBY_RAILS2_ACTIONPACK= ../../www/ruby-actionpack
88RUBY_RAILS2_ACTIVERECORD= ../../databases/ruby-activerecord 88RUBY_RAILS2_ACTIVERECORD= ../../databases/ruby-activerecord
89RUBY_RAILS2_ACTIVERESOURCE= ../../www/ruby-activeresource 89RUBY_RAILS2_ACTIVERESOURCE= ../../www/ruby-activeresource
90RUBY_RAILS2_ACTIONMAILER= ../../mail/ruby-actionmailer 90RUBY_RAILS2_ACTIONMAILER= ../../mail/ruby-actionmailer
91RUBY_RAILS2_RAILS= ../../www/ruby-rails 91RUBY_RAILS2_RAILS= ../../www/ruby-rails
92 92
93RUBY_RAILS3_ACTIVESUPPORT= ../../devel/ruby-activesupport3 93RUBY_RAILS3_ACTIVESUPPORT= ../../devel/ruby-activesupport3
94RUBY_RAILS3_ACTIVEMODEL= ../../devel/ruby-activemodel 94RUBY_RAILS3_ACTIVEMODEL= ../../devel/ruby-activemodel
95RUBY_RAILS3_ACTIONPACK= ../../www/ruby-actionpack3 95RUBY_RAILS3_ACTIONPACK= ../../www/ruby-actionpack3
96RUBY_RAILS3_ACTIVERECORD= ../../databases/ruby-activerecord3 96RUBY_RAILS3_ACTIVERECORD= ../../databases/ruby-activerecord3
97RUBY_RAILS3_ACTIVERESOURCE= ../../www/ruby-activeresource3 97RUBY_RAILS3_ACTIVERESOURCE= ../../www/ruby-activeresource3
98RUBY_RAILS3_ACTIONMAILER= ../../mail/ruby-actionmailer3 98RUBY_RAILS3_ACTIONMAILER= ../../mail/ruby-actionmailer3
99RUBY_RAILS3_RAILTIES= ../../devel/ruby-railties 99RUBY_RAILS3_RAILTIES= ../../devel/ruby-railties
100RUBY_RAILS3_RAILS= ../../www/ruby-rails3 100RUBY_RAILS3_RAILS= ../../www/ruby-rails3
101 101
102.if ${_RUBY_RAILS_MAJOR} == "2" 102.if ${_RUBY_RAILS_MAJOR} == "2"
103RUBY_ACTIVESUPPORT_DEPENDS= \ 103RUBY_ACTIVESUPPORT_DEPENDS= \
104 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS2_ACTIVESUPPORT} 104 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS2_ACTIVESUPPORT}
105RUBY_ACTIONPACK_DEPENDS= \ 105RUBY_ACTIONPACK_DEPENDS= \
106 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:${RUBY_RAILS2_ACTIONPACK} 106 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:${RUBY_RAILS2_ACTIONPACK}
107RUBY_ACTIVERECORD_DEPENDS= \ 107RUBY_ACTIVERECORD_DEPENDS= \
108 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERECORD} 108 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERECORD}
109RUBY_ACTIVERESOURCE_DEPENDS= \ 109RUBY_ACTIVERESOURCE_DEPENDS= \
110 ${RUBY_PKGPREFIX}-activeresource${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERESOURCE} 110 ${RUBY_PKGPREFIX}-activeresource${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERESOURCE}
111RUBY_ACTIONMAILER_DEPENDS= \ 111RUBY_ACTIONMAILER_DEPENDS= \
112 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:${RUBY_RAILS2_ACTIONMAILER} 112 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:${RUBY_RAILS2_ACTIONMAILER}
113RUBY_RAILTIES_DEPENDS= # empty 113RUBY_RAILTIES_DEPENDS= # empty
114RUBY_RAILTIES_DEPENDS= # empty 114RUBY_RAILTIES_DEPENDS= # empty
115RUBY_RAILS_DEPENDS= \ 115RUBY_RAILS_DEPENDS= \
116 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:${RUBY_RAILS2_RAILS} 116 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:${RUBY_RAILS2_RAILS}
117.else 117.else
118RUBY_ACTIVESUPPORT_DEPENDS= \ 118RUBY_ACTIVESUPPORT_DEPENDS= \
119 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS3_ACTIVESUPPORT} 119 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS3_ACTIVESUPPORT}
120RUBY_ACTIVEMODEL_DEPENDS= \ 120RUBY_ACTIVEMODEL_DEPENDS= \
121 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:${RUBY_RAILS3_ACTIVEMODEL} 121 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:${RUBY_RAILS3_ACTIVEMODEL}
122RUBY_ACTIONPACK_DEPENDS= \ 122RUBY_ACTIONPACK_DEPENDS= \
123 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:${RUBY_RAILS3_ACTIONPACK} 123 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:${RUBY_RAILS3_ACTIONPACK}
124RUBY_ACTIVERECORD_DEPENDS= \ 124RUBY_ACTIVERECORD_DEPENDS= \
125 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:${RUBY_RAILS3_ACTIVERECORD} 125 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:${RUBY_RAILS3_ACTIVERECORD}
126RUBY_ACTIVERESOURCE_DEPENDS= \ 126RUBY_ACTIVERESOURCE_DEPENDS= \
127 ${RUBY_PKGPREFIX}-activeresource${_RAILS_DEP}:${RUBY_RAILS3_ACRIVERESOURCE} 127 ${RUBY_PKGPREFIX}-activeresource${_RAILS_DEP}:${RUBY_RAILS3_ACRIVERESOURCE}
128RUBY_ACTIONMAILER_DEPENDS= \ 128RUBY_ACTIONMAILER_DEPENDS= \
129 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:${RUBY_RAILS3_ACTIONMAILER} 129 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:${RUBY_RAILS3_ACTIONMAILER}
130RUBY_RAILTIES_DEPENDS= \ 130RUBY_RAILTIES_DEPENDS= \
131 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:${RUBY_RAILS3_RAILTIES} 131 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:${RUBY_RAILS3_RAILTIES}
132RUBY_RAILS_DEPENDS= \ 132RUBY_RAILS_DEPENDS= \
133 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:${RUBY_RAILS3_RAILS} 133 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:${RUBY_RAILS3_RAILS}
134.endif 134.endif
135 135
136.endif 136.endif