Switch most of Ruby on Rails related packages to updated frame work.

19 files changed, 56 insertions, 41 deletions

diff --git a/databases/ruby-activerecord32/Makefile b/databases/ruby-activerecord32/Makefile
index 2ea09b6a43a..f1b400864a7 100644
--- a/databases/ruby-activerecord32/Makefile
+++ b/databases/ruby-activerecord32/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2016/02/01 13:46:12 taca Exp $
+# $NetBSD: Makefile,v 1.9 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activerecord-${RUBY_RAILS_VERSION}
+DISTNAME=	activerecord-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activerecord${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/databases/ruby-activerecord42/Makefile b/databases/ruby-activerecord42/Makefile
index 7190ff39aca..9f913780b8e 100644
--- a/databases/ruby-activerecord42/Makefile
+++ b/databases/ruby-activerecord42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/21 00:12:19 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activerecord-${RUBY_RAILS_VERSION}
+DISTNAME=	activerecord-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activerecord${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	databases
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/databases/ruby-awesome_nested_set/Makefile b/databases/ruby-awesome_nested_set/Makefile
index e611a6f78ee..284dee7e194 100644
--- a/databases/ruby-awesome_nested_set/Makefile
+++ b/databases/ruby-awesome_nested_set/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/05/04 15:10:34 taca Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/21 13:12:20 taca Exp $
 
 DISTNAME=	awesome_nested_set-2.1.6
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -9,7 +9,7 @@ HOMEPAGE=	http://github.com/collectiveidea/awesome_nested_set
 COMMENT=	Awesome nested set implementation for Active Record
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activerecord>=3.0.0:${RUBY_RAILS32_ACTIVERECORD}
+DEPENDS+=	${RUBY_ACTIVERECORD_DEPENDS}
 
 RUBY_RAILS_SUPPORTED=	32
 USE_LANGUAGES=	# none
diff --git a/devel/ruby-activejob42/Makefile b/devel/ruby-activejob42/Makefile
index 7667123ebf1..19900c82eb5 100644
--- a/devel/ruby-activejob42/Makefile
+++ b/devel/ruby-activejob42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/21 21:20:33 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activejob-${RUBY_RAILS_VERSION}
+DISTNAME=	activejob-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activejob${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/devel/ruby-activemodel32/Makefile b/devel/ruby-activemodel32/Makefile
index f58b2a692f1..8050450b190 100644
--- a/devel/ruby-activemodel32/Makefile
+++ b/devel/ruby-activemodel32/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/03/13 09:42:24 taca Exp $
+# $NetBSD: Makefile,v 1.5 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activemodel-${RUBY_RAILS_VERSION}
-PKGREVISION=	1
+DISTNAME=	activemodel-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activemodel${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-activemodel42/Makefile b/devel/ruby-activemodel42/Makefile
index 5f994b03814..1b253c3f654 100644
--- a/devel/ruby-activemodel42/Makefile
+++ b/devel/ruby-activemodel42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/18 02:05:27 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activemodel-${RUBY_RAILS_VERSION}
+DISTNAME=	activemodel-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activemodel${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-activesupport32/Makefile b/devel/ruby-activesupport32/Makefile
index 0496427c9b1..6a22671eede 100644
--- a/devel/ruby-activesupport32/Makefile
+++ b/devel/ruby-activesupport32/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 15:12:15 taca Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activesupport-${RUBY_RAILS_VERSION}
+DISTNAME=	activesupport-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activesupport${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ruby-activesupport42/Makefile b/devel/ruby-activesupport42/Makefile
index 77891b8183b..b90d890c9bc 100644
--- a/devel/ruby-activesupport42/Makefile
+++ b/devel/ruby-activesupport42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/14 08:00:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	activesupport-${RUBY_RAILS_VERSION}
+DISTNAME=	activesupport-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activesupport${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	devel
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/devel/ruby-globalid/Makefile b/devel/ruby-globalid/Makefile
index 121489fe713..88f94ce681c 100644
--- a/devel/ruby-globalid/Makefile
+++ b/devel/ruby-globalid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/04 15:11:25 taca Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/21 13:12:20 taca Exp $
 
 DISTNAME=	globalid-0.4.0
 CATEGORIES=	devel
@@ -8,7 +8,7 @@ HOMEPAGE=	http://www.rubyonrails.org/
 COMMENT=	Reference models by URI
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=4.2.0:${RUBY_RAILS42_ACTIVESUPPORT}
+DEPENDS+=	${RUBY_ACTIVESUPPORT_DEPENDS}
 
 RUBY_RAILS_SUPPORTED=	42
 
diff --git a/mail/ruby-actionmailer32/Makefile b/mail/ruby-actionmailer32/Makefile
index b88a96aa1e7..b138a3a44a5 100644
--- a/mail/ruby-actionmailer32/Makefile
+++ b/mail/ruby-actionmailer32/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2015/06/22 13:54:26 taca Exp $
+# $NetBSD: Makefile,v 1.9 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	actionmailer-${RUBY_RAILS_VERSION}
+DISTNAME=	actionmailer-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-actionmailer${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	mail devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/mail/ruby-actionmailer42/Makefile b/mail/ruby-actionmailer42/Makefile
index 1f1ac918338..abb56ab58df 100644
--- a/mail/ruby-actionmailer42/Makefile
+++ b/mail/ruby-actionmailer42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/22 00:41:20 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:20 taca Exp $
 
-DISTNAME=	actionmailer-${RUBY_RAILS_VERSION}
+DISTNAME=	actionmailer-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-actionmailer${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	mail devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/textproc/ruby-rails-dom-testing/Makefile b/textproc/ruby-rails-dom-testing/Makefile
index 31ae3a8fd7b..4b3539d4f6f 100644
--- a/textproc/ruby-rails-dom-testing/Makefile
+++ b/textproc/ruby-rails-dom-testing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/04/19 06:12:41 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:21 taca Exp $
 
 DISTNAME=	rails-dom-testing-1.0.8
 CATEGORIES=	textproc
@@ -8,11 +8,12 @@ HOMEPAGE=	https://github.com/rails/rails-dom-testing
 COMMENT=	Ruby module to compare DOMs
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=4.2.0<5.0:../../devel/ruby-activesupport42
+DEPENDS+=	${RUBY_ACTIVESUPPORT_DEPENDS}
 DEPENDS+=	${RUBY_PKGPREFIX}-nokogiri>=1.6.0:../../textproc/ruby-nokogiri
 DEPENDS+=	${RUBY_PKGPREFIX}-rails-deprecated_sanitizer>=1.0.1:../../www/ruby-rails-deprecated_sanitizer
 
 OVERRIDE_GEMSPEC+=	nokogiri>=1.6.0
+RUBY_RAILS_SUPPORTED=	42
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-actionpack32/Makefile b/www/ruby-actionpack32/Makefile
index 486528357ab..740b69b3861 100644
--- a/www/ruby-actionpack32/Makefile
+++ b/www/ruby-actionpack32/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/03/13 09:42:24 taca Exp $
+# $NetBSD: Makefile,v 1.11 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	actionpack-${RUBY_RAILS_VERSION}
-PKGREVISION=	1
+DISTNAME=	actionpack-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-actionpack${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/ruby-actionpack42/Makefile b/www/ruby-actionpack42/Makefile
index 4f265be76f1..89d898a1c81 100644
--- a/www/ruby-actionpack42/Makefile
+++ b/www/ruby-actionpack42/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/06/04 14:46:29 taca Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	actionpack-${RUBY_RAILS_VERSION}
-PKGREVISION=	1
+DISTNAME=	actionpack-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-actionpack${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/ruby-actionview42/Makefile b/www/ruby-actionview42/Makefile
index a3f876ba984..23da0691e97 100644
--- a/www/ruby-actionview42/Makefile
+++ b/www/ruby-actionview42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/19 22:36:13 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	actionview-${RUBY_RAILS_VERSION}
+DISTNAME=	actionview-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-actionview${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/ruby-activeresource32/Makefile b/www/ruby-activeresource32/Makefile
index 293b188ff22..f9a64e9e217 100644
--- a/www/ruby-activeresource32/Makefile
+++ b/www/ruby-activeresource32/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 15:12:15 taca Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	activeresource-${RUBY_RAILS_VERSION}
+DISTNAME=	activeresource-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-activeresource${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/ruby-rails-deprecated_sanitizer/Makefile b/www/ruby-rails-deprecated_sanitizer/Makefile
index 050e1f1443e..cb8ef6d3802 100644
--- a/www/ruby-rails-deprecated_sanitizer/Makefile
+++ b/www/ruby-rails-deprecated_sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/04/19 00:11:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:21 taca Exp $
 
 DISTNAME=	rails-deprecated_sanitizer-1.0.3
 CATEGORIES=	www
@@ -8,7 +8,9 @@ HOMEPAGE=	https://github.com/rails/rails-deprecated_sanitizer
 COMMENT=	Deprecated sanitizer API extracted from Action View
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-activesupport>=4.2.0:../../devel/ruby-activesupport42
+DEPENDS+=	${RUBY_ACTIVESUPPORT_DEPENDS}
+
+RUBY_RAILS_SUPPORTED=	42
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ruby-rails32/Makefile b/www/ruby-rails32/Makefile
index 86b1a4b05d6..865480ee83f 100644
--- a/www/ruby-rails32/Makefile
+++ b/www/ruby-rails32/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/06/14 15:12:16 taca Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	rails-${RUBY_RAILS_VERSION}
+DISTNAME=	rails-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-rails${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/www/ruby-rails42/Makefile b/www/ruby-rails42/Makefile
index 8c9faa76460..8c80e1d1010 100644
--- a/www/ruby-rails42/Makefile
+++ b/www/ruby-rails42/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/04/22 10:44:40 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/06/21 13:12:21 taca Exp $
 
-DISTNAME=	rails-${RUBY_RAILS_VERSION}
+DISTNAME=	rails-${RAILS_VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-rails${RUBY_RAILS}-${RAILS_VERSION}
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org