Wed Jun 21 13:13:48 2017 UTC ()
* Update ruby-railties32 and ruby-railties42 package to updated rails
  framework.
* Add support of pkg_alternatives to coexist of ruby-rails32 and
  ruby-rails42.


(taca)
diff -r0 -r1.1 pkgsrc/devel/ruby-railties32/ALTERNATIVES
diff -r1.12 -r1.13 pkgsrc/devel/ruby-railties32/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/ruby-railties32/PLIST
diff -r0 -r1.1 pkgsrc/devel/ruby-railties42/ALTERNATIVES
diff -r1.2 -r1.3 pkgsrc/devel/ruby-railties42/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/ruby-railties42/PLIST

File Added: pkgsrc/devel/ruby-railties32/Attic/ALTERNATIVES
bin/rails @PREFIX@/bin/rails32@RUBY_SUFFIX@

cvs diff -r1.12 -r1.13 pkgsrc/devel/ruby-railties32/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-railties32/Attic/Makefile 2016/11/19 14:38:03 1.12
+++ pkgsrc/devel/ruby-railties32/Attic/Makefile 2017/06/21 13:13:48 1.13
@@ -1,23 +1,30 @@ @@ -1,23 +1,30 @@
1# $NetBSD: Makefile,v 1.12 2016/11/19 14:38:03 taca Exp $ 1# $NetBSD: Makefile,v 1.13 2017/06/21 13:13:48 taca Exp $
2 2
3DISTNAME= railties-${RUBY_RAILS_VERSION} 3DISTNAME= railties-${RAILS_VERSION}
 4PKGNAME= ${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
4CATEGORIES= databases 5CATEGORIES= databases
5 6
6MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.rubyonrails.org/ 8HOMEPAGE= http://www.rubyonrails.org/
8COMMENT= Tools for creating, working with, and running Rails 3.2 9COMMENT= Tools for creating, working with, and running Rails 3.2
9LICENSE= mit 10LICENSE= mit
10 11
11# Comment out dependency in gemspec but already depends indirectly one. 12# Comment out dependency in gemspec but already depends indirectly one.
12DEPENDS+= ${RUBY_PKGPREFIX}-thor<2.0:../../devel/ruby-thor 13DEPENDS+= ${RUBY_PKGPREFIX}-thor<2.0:../../devel/ruby-thor
13DEPENDS+= ${RUBY_PKGPREFIX}-rack-ssl>=1.3.2<1.5:../../www/ruby-rack-ssl 14DEPENDS+= ${RUBY_PKGPREFIX}-rack-ssl>=1.3.2<1.5:../../www/ruby-rack-ssl
14#DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS} 15#DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS}
15DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS} 16DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS}
16 17
17RUBY_RAILS_SUPPORTED= 32 18RUBY_RAILS_SUPPORTED= 32
18RUBY_RAILS_STRICT_DEP= yes 19RUBY_RAILS_STRICT_DEP= yes
19USE_RAKE= RUN 20RUBYGEM_OPTIONS+= --format-executable
20OVERRIDE_GEMSPEC+= rack-ssl>=1.3.2 rdoc>=3.4 21OVERRIDE_GEMSPEC+= rack-ssl>=1.3.2 rdoc>=3.4 \
 22 :executables rails=rails32 :files bin/rails=bin/rails32
 23
 24pre-configure:
 25 ${TEST} ! -f ${WRKSRC}/bin/rails || \
 26 ${MV} ${WRKSRC}/bin/rails ${WRKSRC}/bin/rails32
 27 ${CHMOD} ${BINMODE} ${WRKSRC}/bin/rails32
21 28
22.include "../../lang/ruby/gem.mk" 29.include "../../lang/ruby/gem.mk"
23.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/devel/ruby-railties32/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ruby-railties32/Attic/PLIST 2013/09/11 13:38:19 1.5
+++ pkgsrc/devel/ruby-railties32/Attic/PLIST 2017/06/21 13:13:48 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1@comment $NetBSD: PLIST,v 1.5 2013/09/11 13:38:19 taca Exp $ 1@comment $NetBSD: PLIST,v 1.6 2017/06/21 13:13:48 taca Exp $
2bin/rails 2bin/rails32${RUBY_SUFFIX}
3${GEM_HOME}/cache/${GEM_NAME}.gem 3${GEM_HOME}/cache/${GEM_NAME}.gem
4${GEM_LIBDIR}/CHANGELOG.md 4${GEM_LIBDIR}/CHANGELOG.md
5${GEM_LIBDIR}/README.rdoc 5${GEM_LIBDIR}/README.rdoc
6${GEM_LIBDIR}/bin/rails 6${GEM_LIBDIR}/bin/rails32
7${GEM_LIBDIR}/guides/assets/images/belongs_to.png 7${GEM_LIBDIR}/guides/assets/images/belongs_to.png
8${GEM_LIBDIR}/guides/assets/images/book_icon.gif 8${GEM_LIBDIR}/guides/assets/images/book_icon.gif
9${GEM_LIBDIR}/guides/assets/images/bullet.gif 9${GEM_LIBDIR}/guides/assets/images/bullet.gif
10${GEM_LIBDIR}/guides/assets/images/challenge.png 10${GEM_LIBDIR}/guides/assets/images/challenge.png
11${GEM_LIBDIR}/guides/assets/images/chapters_icon.gif 11${GEM_LIBDIR}/guides/assets/images/chapters_icon.gif
12${GEM_LIBDIR}/guides/assets/images/check_bullet.gif 12${GEM_LIBDIR}/guides/assets/images/check_bullet.gif
13${GEM_LIBDIR}/guides/assets/images/credits_pic_blank.gif 13${GEM_LIBDIR}/guides/assets/images/credits_pic_blank.gif
14${GEM_LIBDIR}/guides/assets/images/csrf.png 14${GEM_LIBDIR}/guides/assets/images/csrf.png
15${GEM_LIBDIR}/guides/assets/images/customized_error_messages.png 15${GEM_LIBDIR}/guides/assets/images/customized_error_messages.png
16${GEM_LIBDIR}/guides/assets/images/edge_badge.png 16${GEM_LIBDIR}/guides/assets/images/edge_badge.png
17${GEM_LIBDIR}/guides/assets/images/error_messages.png 17${GEM_LIBDIR}/guides/assets/images/error_messages.png
18${GEM_LIBDIR}/guides/assets/images/feature_tile.gif 18${GEM_LIBDIR}/guides/assets/images/feature_tile.gif
19${GEM_LIBDIR}/guides/assets/images/footer_tile.gif 19${GEM_LIBDIR}/guides/assets/images/footer_tile.gif

File Added: pkgsrc/devel/ruby-railties42/Attic/ALTERNATIVES
bin/rails @PREFIX@/bin/rails42@RUBY_SUFFIX@

cvs diff -r1.2 -r1.3 pkgsrc/devel/ruby-railties42/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-railties42/Attic/Makefile 2017/05/04 07:37:09 1.2
+++ pkgsrc/devel/ruby-railties42/Attic/Makefile 2017/06/21 13:13:48 1.3
@@ -1,21 +1,29 @@ @@ -1,21 +1,29 @@
1# $NetBSD: Makefile,v 1.2 2017/05/04 07:37:09 taca Exp $ 1# $NetBSD: Makefile,v 1.3 2017/06/21 13:13:48 taca Exp $
2 2
3DISTNAME= railties-${RUBY_RAILS_VERSION} 3DISTNAME= railties-${RAILS_VERSION}
 4PKGNAME= ${RUBY_PKGPREFIX}-railties${RUBY_RAILS}-${RAILS_VERSION}
4CATEGORIES= databases 5CATEGORIES= databases
5 6
6MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= http://www.rubyonrails.org/ 8HOMEPAGE= http://www.rubyonrails.org/
8COMMENT= Tools for creating, working with, and running Rails 4.2 9COMMENT= Tools for creating, working with, and running Rails 4.2
9LICENSE= mit 10LICENSE= mit
10 11
11DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS} 12DEPENDS+= ${RUBY_ACTIONPACK_DEPENDS}
12DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS} 13DEPENDS+= ${RUBY_ACTIVESUPPORT_DEPENDS}
13DEPENDS+= ${RUBY_PKGPREFIX}-thor>=0.18.1<2.0:../../devel/ruby-thor 14DEPENDS+= ${RUBY_PKGPREFIX}-thor>=0.18.1<2.0:../../devel/ruby-thor
14 15
15RUBY_RAILS_SUPPORTED= 42 16RUBY_RAILS_SUPPORTED= 42
16RUBY_RAILS_STRICT_DEP= yes 17RUBY_RAILS_STRICT_DEP= yes
17USE_RAKE= RUN 18RUBYGEM_OPTIONS+= --format-executable
18OVERRIDE_GEMSPEC+= rack-ssl>=1.3.2 rdoc>=3.4 19RUBYGEM_OPTIONS+= --format-executable
 20OVERRIDE_GEMSPEC+= rack-ssl>=1.3.2 rdoc>=3.4 \
 21 :executables rails=rails42 :files bin/rails=bin/rails42
 22
 23pre-configure:
 24 ${TEST} ! -f ${WRKSRC}/bin/rails || \
 25 ${MV} ${WRKSRC}/bin/rails ${WRKSRC}/bin/rails42
 26 ${CHMOD} ${BINMODE} ${WRKSRC}/bin/rails42
19 27
20.include "../../lang/ruby/gem.mk" 28.include "../../lang/ruby/gem.mk"
21.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"

cvs diff -r1.1 -r1.2 pkgsrc/devel/ruby-railties42/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ruby-railties42/Attic/PLIST 2017/04/22 10:17:30 1.1
+++ pkgsrc/devel/ruby-railties42/Attic/PLIST 2017/06/21 13:13:48 1.2
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1@comment $NetBSD: PLIST,v 1.1 2017/04/22 10:17:30 minskim Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/06/21 13:13:48 taca Exp $
2bin/rails 2bin/rails42${RUBY_SUFFIX}
3${GEM_HOME}/cache/${GEM_NAME}.gem 3${GEM_HOME}/cache/${GEM_NAME}.gem
4${GEM_LIBDIR}/CHANGELOG.md 4${GEM_LIBDIR}/CHANGELOG.md
5${GEM_LIBDIR}/RDOC_MAIN.rdoc 5${GEM_LIBDIR}/RDOC_MAIN.rdoc
6${GEM_LIBDIR}/README.rdoc 6${GEM_LIBDIR}/README.rdoc
7${GEM_LIBDIR}/bin/rails 7${GEM_LIBDIR}/bin/rails42
8${GEM_LIBDIR}/lib/rails.rb 8${GEM_LIBDIR}/lib/rails.rb
9${GEM_LIBDIR}/lib/rails/all.rb 9${GEM_LIBDIR}/lib/rails/all.rb
10${GEM_LIBDIR}/lib/rails/api/task.rb 10${GEM_LIBDIR}/lib/rails/api/task.rb
11${GEM_LIBDIR}/lib/rails/app_rails_loader.rb 11${GEM_LIBDIR}/lib/rails/app_rails_loader.rb
12${GEM_LIBDIR}/lib/rails/application.rb 12${GEM_LIBDIR}/lib/rails/application.rb
13${GEM_LIBDIR}/lib/rails/application/bootstrap.rb 13${GEM_LIBDIR}/lib/rails/application/bootstrap.rb
14${GEM_LIBDIR}/lib/rails/application/configuration.rb 14${GEM_LIBDIR}/lib/rails/application/configuration.rb
15${GEM_LIBDIR}/lib/rails/application/default_middleware_stack.rb 15${GEM_LIBDIR}/lib/rails/application/default_middleware_stack.rb
16${GEM_LIBDIR}/lib/rails/application/finisher.rb 16${GEM_LIBDIR}/lib/rails/application/finisher.rb
17${GEM_LIBDIR}/lib/rails/application/routes_reloader.rb 17${GEM_LIBDIR}/lib/rails/application/routes_reloader.rb
18${GEM_LIBDIR}/lib/rails/application_controller.rb 18${GEM_LIBDIR}/lib/rails/application_controller.rb
19${GEM_LIBDIR}/lib/rails/backtrace_cleaner.rb 19${GEM_LIBDIR}/lib/rails/backtrace_cleaner.rb
20${GEM_LIBDIR}/lib/rails/cli.rb 20${GEM_LIBDIR}/lib/rails/cli.rb