CVS commit: pkgsrc/www

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Wed Feb  6 14:43:21 UTC 2019

Modified Files:
        pkgsrc/www/ruby-rails32: Makefile
        pkgsrc/www/ruby-rails42: Makefile
        pkgsrc/www/ruby-rails51: Makefile

Log Message:
www/ruby-rails*: restrict ruby-bunlder dependency

Restrict ruby-bunlder dependency with ruby26.
No bump PKGREVISION since these were broken with ruby26.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ruby-rails32/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/ruby-rails42/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/ruby-rails51/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/ruby-rails32/Makefile
diff -u pkgsrc/www/ruby-rails32/Makefile:1.4 pkgsrc/www/ruby-rails32/Makefile:1.5
--- pkgsrc/www/ruby-rails32/Makefile:1.4        Sun Mar 18 14:21:22 2018
+++ pkgsrc/www/ruby-rails32/Makefile    Wed Feb  6 14:43:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/03/18 14:21:22 taca Exp $
+# $NetBSD: Makefile,v 1.5 2019/02/06 14:43:20 taca Exp $
 
 DISTNAME=      rails-${RAILS_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-rails${RUBY_RAILS}-${RAILS_VERSION}
@@ -15,7 +15,6 @@ DEPENDS+=     ${RUBY_ACTIVERECORD_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIVERESOURCE_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIONMAILER_DEPENDS}
 DEPENDS+=      ${RUBY_RAILTIES_DEPENDS}
-DEPENDS+=       ${RUBY_PKGPREFIX}-bundler>=1.0<2:../../misc/ruby-bundler
 
 CONFLICTS+=    ruby[1-9][0-9]-rails-[0-9]*
 
@@ -27,4 +26,7 @@ post-build:
        ${MKDIR} ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR}/lib
 
 .include "../../lang/ruby/gem.mk"
+.if ${RUBY_VER} != 26
+DEPENDS+=      ${RUBY_PKGPREFIX}-bundler>=1.0<2:../../misc/ruby-bundler
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ruby-rails42/Makefile
diff -u pkgsrc/www/ruby-rails42/Makefile:1.5 pkgsrc/www/ruby-rails42/Makefile:1.6
--- pkgsrc/www/ruby-rails42/Makefile:1.5        Sun Mar 18 14:21:22 2018
+++ pkgsrc/www/ruby-rails42/Makefile    Wed Feb  6 14:43:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/03/18 14:21:22 taca Exp $
+# $NetBSD: Makefile,v 1.6 2019/02/06 14:43:20 taca Exp $
 
 DISTNAME=      rails-${RAILS_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-rails${RUBY_RAILS}-${RAILS_VERSION}
@@ -17,7 +17,6 @@ DEPENDS+=     ${RUBY_ACTIVEMODEL_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIVERECORD_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIVESUPPORT_DEPENDS}
 DEPENDS+=      ${RUBY_RAILTIES_DEPENDS}
-DEPENDS+=      ${RUBY_PKGPREFIX}-bundler>=1.3.0<2:../../misc/ruby-bundler
 DEPENDS+=      ${RUBY_PKGPREFIX}-sprockets-rails-[0-9]*:../../misc/ruby-sprockets-rails
 
 CONFLICTS+=    ruby[1-9][0-9]-rails-[0-9]*
@@ -26,4 +25,7 @@ RUBY_RAILS_ACCEPTED=  42
 RUBY_RAILS_STRICT_DEP= yes
 
 .include "../../lang/ruby/gem.mk"
+.if ${RUBY_VER} != 26
+DEPENDS+=      ${RUBY_PKGPREFIX}-bundler>=1.3.0<2:../../misc/ruby-bundler
+.endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ruby-rails51/Makefile
diff -u pkgsrc/www/ruby-rails51/Makefile:1.1 pkgsrc/www/ruby-rails51/Makefile:1.2
--- pkgsrc/www/ruby-rails51/Makefile:1.1        Wed Mar 21 10:07:41 2018
+++ pkgsrc/www/ruby-rails51/Makefile    Wed Feb  6 14:43:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/03/21 10:07:41 taca Exp $
+# $NetBSD: Makefile,v 1.2 2019/02/06 14:43:21 taca Exp $
 
 DISTNAME=      rails-${RAILS_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-rails${RUBY_RAILS}-${RAILS_VERSION}
@@ -18,11 +18,13 @@ DEPENDS+=   ${RUBY_ACTIVEMODEL_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIVERECORD_DEPENDS}
 DEPENDS+=      ${RUBY_ACTIVESUPPORT_DEPENDS}
 DEPENDS+=      ${RUBY_RAILTIES_DEPENDS}
-DEPENDS+=      ${RUBY_PKGPREFIX}-bundler>=1.3.0:../../misc/ruby-bundler
 DEPENDS+=      ${RUBY_PKGPREFIX}-sprockets-rails>2.0.0*:../../misc/ruby-sprockets-rails
 
 RUBY_RAILS_ACCEPTED=   51
 RUBY_RAILS_STRICT_DEP= yes
 
 .include "../../lang/ruby/gem.mk"
+.if ${RUBY_VER} != 26
+DEPENDS+=      ${RUBY_PKGPREFIX}-bundler>=1.3.0:../../misc/ruby-bundler
+.endif
 .include "../../mk/bsd.pkg.mk"