CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Jan  8 14:34:41 UTC 2018

Modified Files:
        pkgsrc/misc/ruby-ohai: Makefile
        pkgsrc/www/ruby-sinatra: Makefile
        pkgsrc/www/ruby-sinatra-contrib: Makefile

Log Message:
pkgsrc: allow ruby25

Allow build with ruby25-base.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/misc/ruby-ohai/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/ruby-sinatra/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/ruby-sinatra-contrib/Makefile

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

Modified files:

Index: pkgsrc/misc/ruby-ohai/Makefile
diff -u pkgsrc/misc/ruby-ohai/Makefile:1.21 pkgsrc/misc/ruby-ohai/Makefile:1.22
--- pkgsrc/misc/ruby-ohai/Makefile:1.21 Mon Sep 18 04:18:34 2017
+++ pkgsrc/misc/ruby-ohai/Makefile      Mon Jan  8 14:34:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/09/18 04:18:34 taca Exp $
+# $NetBSD: Makefile,v 1.22 2018/01/08 14:34:41 taca Exp $
 
 DISTNAME=      ohai-13.4.0
 CATEGORIES=    misc
@@ -20,7 +20,7 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-ipaddress>=0
 DEPENDS+=      ${RUBY_PKGPREFIX}-wmi-lite>=1.0<2:../../devel/ruby-wmi-lite
 DEPENDS+=      ${RUBY_PKGPREFIX}-chef-config<14:../../sysutils/ruby-chef-config
 
-RUBY_VERSIONS_ACCEPTED=        23 24
+RUBY_VERSIONS_ACCEPTED=        23 24 25
 
 RUBYGEM_OPTIONS+=      --format-executable
 

Index: pkgsrc/www/ruby-sinatra/Makefile
diff -u pkgsrc/www/ruby-sinatra/Makefile:1.23 pkgsrc/www/ruby-sinatra/Makefile:1.24
--- pkgsrc/www/ruby-sinatra/Makefile:1.23       Sun Jun 18 13:48:54 2017
+++ pkgsrc/www/ruby-sinatra/Makefile    Mon Jan  8 14:34:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/06/18 13:48:54 taca Exp $
+# $NetBSD: Makefile,v 1.24 2018/01/08 14:34:41 taca Exp $
 
 DISTNAME=      sinatra-2.0.0
 CATEGORIES=    www
@@ -13,7 +13,5 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rack-protect
 DEPENDS+=      ${RUBY_PKGPREFIX}-mustermann>=1.0<2:../../www/ruby-mustermann
 DEPENDS+=      ${RUBY_PKGPREFIX}-tilt>=2.0<3:../../textproc/ruby-tilt
 
-RUBY_VERSIONS_ACCEPTED=        23 22 24
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/ruby-sinatra-contrib/Makefile
diff -u pkgsrc/www/ruby-sinatra-contrib/Makefile:1.10 pkgsrc/www/ruby-sinatra-contrib/Makefile:1.11
--- pkgsrc/www/ruby-sinatra-contrib/Makefile:1.10       Sun Jun 18 13:48:54 2017
+++ pkgsrc/www/ruby-sinatra-contrib/Makefile    Mon Jan  8 14:34:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/18 13:48:54 taca Exp $
+# $NetBSD: Makefile,v 1.11 2018/01/08 14:34:41 taca Exp $
 
 DISTNAME=      sinatra-contrib-2.0.0
 CATEGORIES=    www
@@ -12,7 +12,5 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-sinatra>=2.0
 DEPENDS+=      ${RUBY_PKGPREFIX}-backports>=2.0:../../devel/ruby-backports
 DEPENDS+=      ${RUBY_PKGPREFIX}-multi_json-[0-9]*:../../textproc/ruby-multi_json
 
-RUBY_VERSIONS_ACCEPTED=        23 22 24
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"