[pkgsrc/trunk]: pkgsrc Switch most of Ruby on Rails related packages to updat...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b49562a8445
branches:  trunk
changeset: 364135:0b49562a8445
user:      taca <taca%pkgsrc.org@localhost>
date:      Wed Jun 21 13:12:20 2017 +0000

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

diffstat:

 databases/ruby-activerecord32/Makefile       |  5 +++--
 databases/ruby-activerecord42/Makefile       |  5 +++--
 databases/ruby-awesome_nested_set/Makefile   |  4 ++--
 devel/ruby-activejob42/Makefile              |  5 +++--
 devel/ruby-activemodel32/Makefile            |  6 +++---
 devel/ruby-activemodel42/Makefile            |  5 +++--
 devel/ruby-activesupport32/Makefile          |  5 +++--
 devel/ruby-activesupport42/Makefile          |  5 +++--
 devel/ruby-globalid/Makefile                 |  4 ++--
 mail/ruby-actionmailer32/Makefile            |  5 +++--
 mail/ruby-actionmailer42/Makefile            |  5 +++--
 textproc/ruby-rails-dom-testing/Makefile     |  5 +++--
 www/ruby-actionpack32/Makefile               |  6 +++---
 www/ruby-actionpack42/Makefile               |  6 +++---
 www/ruby-actionview42/Makefile               |  5 +++--
 www/ruby-activeresource32/Makefile           |  5 +++--
 www/ruby-rails-deprecated_sanitizer/Makefile |  6 ++++--
 www/ruby-rails32/Makefile                    |  5 +++--
 www/ruby-rails42/Makefile                    |  5 +++--
 19 files changed, 56 insertions(+), 41 deletions(-)

diffs (277 lines):

diff -r db5d2b2f6d1f -r 0b49562a8445 databases/ruby-activerecord32/Makefile
--- a/databases/ruby-activerecord32/Makefile    Wed Jun 21 13:11:19 2017 +0000
+++ b/databases/ruby-activerecord32/Makefile    Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 databases/ruby-activerecord42/Makefile
--- a/databases/ruby-activerecord42/Makefile    Wed Jun 21 13:11:19 2017 +0000
+++ b/databases/ruby-activerecord42/Makefile    Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 databases/ruby-awesome_nested_set/Makefile
--- a/databases/ruby-awesome_nested_set/Makefile        Wed Jun 21 13:11:19 2017 +0000
+++ b/databases/ruby-awesome_nested_set/Makefile        Wed Jun 21 13:12:20 2017 +0000
@@ -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 @@
 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 -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-activejob42/Makefile
--- a/devel/ruby-activejob42/Makefile   Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-activejob42/Makefile   Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-activemodel32/Makefile
--- a/devel/ruby-activemodel32/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-activemodel32/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-activemodel42/Makefile
--- a/devel/ruby-activemodel42/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-activemodel42/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-activesupport32/Makefile
--- a/devel/ruby-activesupport32/Makefile       Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-activesupport32/Makefile       Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-activesupport42/Makefile
--- a/devel/ruby-activesupport42/Makefile       Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-activesupport42/Makefile       Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 devel/ruby-globalid/Makefile
--- a/devel/ruby-globalid/Makefile      Wed Jun 21 13:11:19 2017 +0000
+++ b/devel/ruby-globalid/Makefile      Wed Jun 21 13:12:20 2017 +0000
@@ -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 @@
 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 -r db5d2b2f6d1f -r 0b49562a8445 mail/ruby-actionmailer32/Makefile
--- a/mail/ruby-actionmailer32/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/mail/ruby-actionmailer32/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 mail/ruby-actionmailer42/Makefile
--- a/mail/ruby-actionmailer42/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/mail/ruby-actionmailer42/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 textproc/ruby-rails-dom-testing/Makefile
--- a/textproc/ruby-rails-dom-testing/Makefile  Wed Jun 21 13:11:19 2017 +0000
+++ b/textproc/ruby-rails-dom-testing/Makefile  Wed Jun 21 13:12:20 2017 +0000
@@ -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 @@
 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 -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-actionpack32/Makefile
--- a/www/ruby-actionpack32/Makefile    Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-actionpack32/Makefile    Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-actionpack42/Makefile
--- a/www/ruby-actionpack42/Makefile    Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-actionpack42/Makefile    Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-actionview42/Makefile
--- a/www/ruby-actionview42/Makefile    Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-actionview42/Makefile    Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-activeresource32/Makefile
--- a/www/ruby-activeresource32/Makefile        Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-activeresource32/Makefile        Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-rails-deprecated_sanitizer/Makefile
--- a/www/ruby-rails-deprecated_sanitizer/Makefile      Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-rails-deprecated_sanitizer/Makefile      Wed Jun 21 13:12:20 2017 +0000
@@ -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 @@
 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 -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-rails32/Makefile
--- a/www/ruby-rails32/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-rails32/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost
diff -r db5d2b2f6d1f -r 0b49562a8445 www/ruby-rails42/Makefile
--- a/www/ruby-rails42/Makefile Wed Jun 21 13:11:19 2017 +0000
+++ b/www/ruby-rails42/Makefile Wed Jun 21 13:12:20 2017 +0000
@@ -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@localhost