diff options
| author | taca <taca@pkgsrc.org> | 2019-02-06 14:43:20 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2019-02-06 14:43:20 +0000 |
| commit | 8f015dc7697c5f4328799a47c94b0a6357c74da6 (patch) | |
| tree | 7ef1f9474cdf6c1787275b8f2290f443cf47d84a /www | |
| parent | 0bc97f1ade5ebec94316e976c2fcd7f74a2205d9 (diff) | |
| download | pkgsrc-8f015dc7697c5f4328799a47c94b0a6357c74da6.tar.gz | |
www/ruby-rails*: restrict ruby-bunlder dependency
Restrict ruby-bunlder dependency with ruby26.
No bump PKGREVISION since these were broken with ruby26.
Diffstat (limited to 'www')
| -rw-r--r-- | www/ruby-rails32/Makefile | 6 | ||||
| -rw-r--r-- | www/ruby-rails42/Makefile | 6 | ||||
| -rw-r--r-- | www/ruby-rails51/Makefile | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/www/ruby-rails32/Makefile b/www/ruby-rails32/Makefile index 87f7b4ce9f2..1fec031208e 100644 --- a/www/ruby-rails32/Makefile +++ b/www/ruby-rails32/Makefile @@ -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" diff --git a/www/ruby-rails42/Makefile b/www/ruby-rails42/Makefile index 4206f6c7358..5b4e63998ca 100644 --- a/www/ruby-rails42/Makefile +++ b/www/ruby-rails42/Makefile @@ -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" diff --git a/www/ruby-rails51/Makefile b/www/ruby-rails51/Makefile index 2ee8620c8f3..f2643fc2470 100644 --- a/www/ruby-rails51/Makefile +++ b/www/ruby-rails51/Makefile @@ -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" |