pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/ruby-treetop Stop patching gemspec file and u...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8542d0967796
branches:  trunk
changeset: 355043:8542d0967796
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Nov 19 15:24:45 2016 +0000

description:
Stop patching gemspec file and use OVERRIDE_GEMSPEC with updated
update-gemspec.rb script.

diffstat:

 textproc/ruby-treetop/Makefile                                |   3 +-
 textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec |  30 -----------
 2 files changed, 2 insertions(+), 31 deletions(-)

diffs (51 lines):

diff -r afabcf8ea8ca -r 8542d0967796 textproc/ruby-treetop/Makefile
--- a/textproc/ruby-treetop/Makefile    Sat Nov 19 15:07:28 2016 +0000
+++ b/textproc/ruby-treetop/Makefile    Sat Nov 19 15:24:45 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/15 15:15:06 taca Exp $
+# $NetBSD: Makefile,v 1.8 2016/11/19 15:24:45 taca Exp $
 
 DISTNAME=      treetop-1.4.15
 CATEGORIES=    textproc
@@ -11,6 +11,7 @@
 DEPENDS+=      ${RUBY_PKGPREFIX}-polyglot>=0.3.1:../../devel/ruby-polyglot
 
 CONFLICTS=     ruby[1-9][0-9]-treetop-[0-9]*
+OVERRIDE_GEMSPEC+=     polyglot:
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r afabcf8ea8ca -r 8542d0967796 textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec
--- a/textproc/ruby-treetop/patches/patch-.._treetop-1.4.15.gemspec     Sat Nov 19 15:07:28 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-.._treetop-1.4.15.gemspec,v 1.1 2015/05/19 12:32:55 ryoon Exp $
-
-* Fix build with Ruby 2.2.
-
---- ../treetop-1.4.15.gemspec.orig     2015-05-19 12:27:49.000000000 +0000
-+++ ../treetop-1.4.15.gemspec
-@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
-       s.add_development_dependency(%q<rr>, ["~> 1.0"])
-       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-       s.add_development_dependency(%q<rake>, [">= 0"])
--      s.add_runtime_dependency(%q<polyglot>, [">= 0.3.1"])
-     else
-       s.add_dependency(%q<polyglot>, [">= 0"])
-       s.add_dependency(%q<jeweler>, [">= 0"])
-@@ -39,7 +38,6 @@ Gem::Specification.new do |s|
-       s.add_dependency(%q<rr>, ["~> 1.0"])
-       s.add_dependency(%q<rspec>, [">= 2.0.0"])
-       s.add_dependency(%q<rake>, [">= 0"])
--      s.add_dependency(%q<polyglot>, [">= 0.3.1"])
-     end
-   else
-     s.add_dependency(%q<polyglot>, [">= 0"])
-@@ -49,7 +47,6 @@ Gem::Specification.new do |s|
-     s.add_dependency(%q<rr>, ["~> 1.0"])
-     s.add_dependency(%q<rspec>, [">= 2.0.0"])
-     s.add_dependency(%q<rake>, [">= 0"])
--    s.add_dependency(%q<polyglot>, [">= 0.3.1"])
-   end
- end
- 



Home | Main Index | Thread Index | Old Index