pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www www/ruby-rails*: restrict ruby-bunlder dependency
details: https://anonhg.NetBSD.org/pkgsrc/rev/5f1b36b92c68
branches: trunk
changeset: 319155:5f1b36b92c68
user: taca <taca%pkgsrc.org@localhost>
date: Wed Feb 06 14:43:20 2019 +0000
description:
www/ruby-rails*: restrict ruby-bunlder dependency
Restrict ruby-bunlder dependency with ruby26.
No bump PKGREVISION since these were broken with ruby26.
diffstat:
www/ruby-rails32/Makefile | 6 ++++--
www/ruby-rails42/Makefile | 6 ++++--
www/ruby-rails51/Makefile | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diffs (74 lines):
diff -r ff8652ed23e0 -r 5f1b36b92c68 www/ruby-rails32/Makefile
--- a/www/ruby-rails32/Makefile Wed Feb 06 14:41:14 2019 +0000
+++ b/www/ruby-rails32/Makefile Wed Feb 06 14:43:20 2019 +0000
@@ -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_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 @@
${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 -r ff8652ed23e0 -r 5f1b36b92c68 www/ruby-rails42/Makefile
--- a/www/ruby-rails42/Makefile Wed Feb 06 14:41:14 2019 +0000
+++ b/www/ruby-rails42/Makefile Wed Feb 06 14:43:20 2019 +0000
@@ -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_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_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 -r ff8652ed23e0 -r 5f1b36b92c68 www/ruby-rails51/Makefile
--- a/www/ruby-rails51/Makefile Wed Feb 06 14:41:14 2019 +0000
+++ b/www/ruby-rails51/Makefile Wed Feb 06 14:43:20 2019 +0000
@@ -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_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"
Home |
Main Index |
Thread Index |
Old Index