CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue May 30 15:13:04 UTC 2017

Modified Files:
        pkgsrc/databases/ruby-hiera: Makefile
        pkgsrc/net/ruby-rubytter: Makefile
        pkgsrc/net/ruby-tw: Makefile
        pkgsrc/security/ruby-twitter_oauth: Makefile
        pkgsrc/sysutils/puppet: Makefile

Log Message:
Stop using RUBY_JSON_{REQD,TYPE} since all ruby2*-base pacakges contain
required version of json extension.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/ruby-hiera/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/ruby-rubytter/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/ruby-tw/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/ruby-twitter_oauth/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/puppet/Makefile

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

Modified files:

Index: pkgsrc/databases/ruby-hiera/Makefile
diff -u pkgsrc/databases/ruby-hiera/Makefile:1.7 pkgsrc/databases/ruby-hiera/Makefile:1.8
--- pkgsrc/databases/ruby-hiera/Makefile:1.7    Thu Oct 20 09:02:42 2016
+++ pkgsrc/databases/ruby-hiera/Makefile        Tue May 30 15:13:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/10/20 09:02:42 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/30 15:13:03 taca Exp $
 
 DISTNAME=      hiera-1.3.4
 PKGREVISION=   2
@@ -12,6 +12,5 @@ LICENSE=      apache-2.0
 RUBYGEM_OPTIONS+=      --format-executable
 OVERRIDE_GEMSPEC+=     json_pure:json>=1.6.0
 
-.include "../../lang/ruby/json.mk"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ruby-rubytter/Makefile
diff -u pkgsrc/net/ruby-rubytter/Makefile:1.8 pkgsrc/net/ruby-rubytter/Makefile:1.9
--- pkgsrc/net/ruby-rubytter/Makefile:1.8       Sun Sep 15 14:37:54 2013
+++ pkgsrc/net/ruby-rubytter/Makefile   Tue May 30 15:13:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/09/15 14:37:54 taca Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/30 15:13:03 taca Exp $
 
 DISTNAME=      rubytter-1.5.1
 CATEGORIES=    net
@@ -10,8 +10,5 @@ LICENSE=      mit
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-oauth>=0.3.6:../../security/ruby-oauth
 
-RUBY_JSON_REQD=        1.1.3
-
 .include "../../lang/ruby/gem.mk"
-.include "../../lang/ruby/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/ruby-tw/Makefile
diff -u pkgsrc/net/ruby-tw/Makefile:1.18 pkgsrc/net/ruby-tw/Makefile:1.19
--- pkgsrc/net/ruby-tw/Makefile:1.18    Sun Feb  5 02:29:41 2017
+++ pkgsrc/net/ruby-tw/Makefile Tue May 30 15:13:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/02/05 02:29:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2017/05/30 15:13:03 taca Exp $
 
 DISTNAME=      tw-1.0.12
 CATEGORIES=    net
@@ -15,8 +15,5 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rainbow>=2.0
 DEPENDS+=      ${RUBY_PKGPREFIX}-twitter>=5.15.0:../../net/ruby-twitter
 DEPENDS+=      ${RUBY_PKGPREFIX}-userstream>=1.4.0:../../net/ruby-userstream
 
-RUBY_JSON_REQD=        1.7.0
-
 .include "../../lang/ruby/gem.mk"
-.include "../../lang/ruby/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/ruby-twitter_oauth/Makefile
diff -u pkgsrc/security/ruby-twitter_oauth/Makefile:1.8 pkgsrc/security/ruby-twitter_oauth/Makefile:1.9
--- pkgsrc/security/ruby-twitter_oauth/Makefile:1.8     Sun Mar 15 16:56:49 2015
+++ pkgsrc/security/ruby-twitter_oauth/Makefile Tue May 30 15:13:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/03/15 16:56:49 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.9 2017/05/30 15:13:03 taca Exp $
 
 DISTNAME=      twitter_oauth-0.4.94
 CATEGORIES=    security
@@ -11,8 +11,5 @@ LICENSE=      mit
 DEPENDS+=      ${RUBY_PKGPREFIX}-mime-types>=1.16:../../mail/ruby-mime-types
 DEPENDS+=      ${RUBY_PKGPREFIX}-oauth>=0.4.7:../../security/ruby-oauth
 
-RUBY_JSON_REQD=        1.8.0
-
 .include "../../lang/ruby/gem.mk"
-.include "../../lang/ruby/json.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/puppet/Makefile
diff -u pkgsrc/sysutils/puppet/Makefile:1.29 pkgsrc/sysutils/puppet/Makefile:1.30
--- pkgsrc/sysutils/puppet/Makefile:1.29        Wed Apr 19 11:24:38 2017
+++ pkgsrc/sysutils/puppet/Makefile     Tue May 30 15:13:04 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/04/19 11:24:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2017/05/30 15:13:04 taca Exp $
 
 DISTNAME=              puppet-3.8.7
 CATEGORIES=            sysutils
@@ -14,7 +14,6 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-hiera>=1.0.0
 
 RUBY_VERSIONS_ACCEPTED=        21
 
-RUBY_JSON_REQD=                0
 OVERRIDE_GEMSPEC=      json_pure:json>0
 
 RUBYGEM_OPTIONS+=      --format-executable
@@ -114,6 +113,5 @@ post-install:
                ${DESTDIR}${PREFIX}/lib/svc/method
 .endif
 
-.include "../../lang/ruby/json.mk"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"