Remove Ruby on Rails 2 support.

1 files changed, 6 insertions, 34 deletions

diff --git a/lang/ruby/rails.mk b/lang/ruby/rails.mk
index 44c939e4211..2cf3143fded 100644
--- a/lang/ruby/rails.mk
+++ b/lang/ruby/rails.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rails.mk,v 1.15 2012/03/18 06:43:54 taca Exp $
+# $NetBSD: rails.mk,v 1.16 2012/03/18 08:12:30 taca Exp $
 
 .if !defined(_RUBY_RAILS_MK)
 _RUBY_RAILS_MK=	# defined
@@ -9,7 +9,7 @@ _RUBY_RAILS_MK=	# defined
 # RUBY_RAILS_DEFAULT
 #	Select default Ruby on Rails version.
 #
-#	Possible values: 2 3 31 32
+#	Possible values: 3 31 32
 #	Default: 3 31 32
 #
 #
@@ -18,7 +18,7 @@ _RUBY_RAILS_MK=	# defined
 # RUBY_RAILS_SUPPORTED
 #	The Ruby on Rails versions that are acceptable for the package.
 #
-#	Possible values: 2 3 31 32
+#	Possible values: 3 31 32
 #	Default: (empty)
 #
 # === Defined variables ===
@@ -26,13 +26,12 @@ _RUBY_RAILS_MK=	# defined
 # RUBY_RAILS
 #	Selected Ruby on Rails version.
 #
-#	Possible values: 2 3 31 32
+#	Possible values: 3 31 32
 #
 
 #
 # current Ruby on Rails versions.
 #
-RUBY_RAILS2_VERSION?=	2.3.14
 RUBY_RAILS3_VERSION?=	3.0.12
 RUBY_RAILS31_VERSION?=	3.1.4
 RUBY_RAILS32_VERSION?=	3.2.2
@@ -56,9 +55,6 @@ _RUBY_INSTALLED_RAILS!= \
 	elif ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack>=1.2" || \
 		${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport>=3.0<3.1"; then \
 		${ECHO} 3; \
-	elif ${PKG_INFO} -qe "${RUBY_PKGPREFIX}-rack<1.2" || \
-		${PKG_INFO} -qe "${RUBY_PKGPREFIX}-activesupport<3"; then \
-		${ECHO} 2; \
 	else \
 		${ECHO} "none"; \
 	fi
@@ -69,9 +65,7 @@ RUBY_RAILS:=	${RUBY_RAILS_DEFAULT}
 . endif
 .endif
 
-.if ${RUBY_RAILS} == "2"
-RUBY_RAILS_VERSION:=	${RUBY_RAILS2_VERSION}
-.elif ${RUBY_RAILS} == "3"
+.if ${RUBY_RAILS} == "3"
 RUBY_RAILS_VERSION:=	${RUBY_RAILS3_VERSION}
 .elif ${RUBY_RAILS} == "31"
 RUBY_RAILS_VERSION:=	${RUBY_RAILS31_VERSION}
@@ -110,13 +104,6 @@ RUBY_ACTIVERESOURCE?=	${RUBY_RAILS_VERSION}
 RUBY_ACTIONMAILER?=	${RUBY_RAILS_VERSION}
 RUBY_RAILTIES?=		${RUBY_RAILS_VERSION}
 
-RUBY_RAILS2_ACTIVESUPPORT=	../../devel/ruby-activesupport
-RUBY_RAILS2_ACTIONPACK=		../../www/ruby-actionpack
-RUBY_RAILS2_ACTIVERECORD=	../../databases/ruby-activerecord
-RUBY_RAILS2_ACTIVERESOURCE=	../../www/ruby-activeresource
-RUBY_RAILS2_ACTIONMAILER=	../../mail/ruby-actionmailer
-RUBY_RAILS2_RAILS=		../../www/ruby-rails
-
 RUBY_RAILS3_ACTIVESUPPORT=	../../devel/ruby-activesupport3
 RUBY_RAILS3_ACTIVEMODEL=	../../devel/ruby-activemodel
 RUBY_RAILS3_ACTIONPACK=		../../www/ruby-actionpack3
@@ -144,22 +131,7 @@ RUBY_RAILS32_ACTIONMAILER=	../../mail/ruby-actionmailer32
 RUBY_RAILS32_RAILTIES=		../../devel/ruby-railties32
 RUBY_RAILS32_RAILS=		../../www/ruby-rails32
 
-.if ${RUBY_RAILS} == "2"
-RUBY_ACTIVESUPPORT_DEPENDS= \
-	${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS2_ACTIVESUPPORT}
-RUBY_ACTIONPACK_DEPENDS= \
-	${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:${RUBY_RAILS2_ACTIONPACK}
-RUBY_ACTIVERECORD_DEPENDS= \
-	${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERECORD}
-RUBY_ACTIVERESOURCE_DEPENDS= \
-	${RUBY_PKGPREFIX}-activeresource${_RAILS_DEP}:${RUBY_RAILS2_ACTIVERESOURCE}
-RUBY_ACTIONMAILER_DEPENDS= \
-	${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:${RUBY_RAILS2_ACTIONMAILER}
-RUBY_RAILTIES_DEPENDS= # empty
-RUBY_RAILTIES_DEPENDS= # empty
-RUBY_RAILS_DEPENDS= \
-	${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:${RUBY_RAILS2_RAILS}
-.elif ${RUBY_RAILS} == "3"
+.if ${RUBY_RAILS} == "3"
 RUBY_ACTIVESUPPORT_DEPENDS= \
 	${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:${RUBY_RAILS3_ACTIVESUPPORT}
 RUBY_ACTIVEMODEL_DEPENDS= \