pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel Use OVERRIDE_GEMSPEC instead of modifying gemspe...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a54055330cd
branches:  trunk
changeset: 615522:2a54055330cd
user:      taca <taca%pkgsrc.org@localhost>
date:      Thu Mar 07 15:08:11 2013 +0000

description:
Use OVERRIDE_GEMSPEC instead of modifying gemspec file.

diffstat:

 devel/ruby-cmd/Makefile                |   4 ++-
 devel/ruby-cmd/distinfo                |   3 +-
 devel/ruby-cmd/patches/patch-aa        |  13 ----------
 devel/ruby-debug-base/Makefile         |   5 +++-
 devel/ruby-debug-base/distinfo         |   3 +-
 devel/ruby-debug-base/patches/patch-ab |  17 -------------
 devel/ruby-debug-ide/Makefile          |   4 ++-
 devel/ruby-debug-ide/distinfo          |   3 +-
 devel/ruby-debug-ide/patches/patch-aa  |  26 --------------------
 devel/ruby-debug/Makefile              |   9 ++++++-
 devel/ruby-debug/patches/patch-ab      |  43 ----------------------------------
 11 files changed, 21 insertions(+), 109 deletions(-)

diffs (224 lines):

diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-cmd/Makefile
--- a/devel/ruby-cmd/Makefile   Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-cmd/Makefile   Thu Mar 07 15:08:11 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/11/08 15:42:27 taca Exp $
+# $NetBSD: Makefile,v 1.10 2013/03/07 15:08:11 taca Exp $
 
 DISTNAME=      cmd-0.7.2
 PKGREVISION=   1
@@ -11,5 +11,7 @@
 
 DEPENDS+=      ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION}:../../devel/ruby-readline
 
+OVERRIDE_GEMSPEC=      :files download= rdoc=
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-cmd/distinfo
--- a/devel/ruby-cmd/distinfo   Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-cmd/distinfo   Thu Mar 07 15:08:11 2013 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2010/09/10 05:13:12 taca Exp $
+$NetBSD: distinfo,v 1.7 2013/03/07 15:08:11 taca Exp $
 
 SHA1 (cmd-0.7.2.gem) = e4287548ca684184268278bcdbe7f501396a403b
 RMD160 (cmd-0.7.2.gem) = 69230cdd29b99ad78ac33533d9da4107d2abfea2
 Size (cmd-0.7.2.gem) = 28672 bytes
-SHA1 (patch-aa) = 52fd480fbbc72777d51dff72135f9c6646adaaf4
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-cmd/patches/patch-aa
--- a/devel/ruby-cmd/patches/patch-aa   Thu Mar 07 15:07:03 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/09/10 05:13:13 taca Exp $
-
---- ../cmd-0.7.2.gemspec.orig  2010-09-07 01:02:18.000000000 +0000
-+++ ../cmd-0.7.2.gemspec
-@@ -35,8 +35,6 @@ files: 
- - MIT-LICENSE
- - THANKS
- - Rakefile
--- download
--- rdoc
- - setup.rb
- - TODO
- - CHANGELOG
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-base/Makefile
--- a/devel/ruby-debug-base/Makefile    Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-debug-base/Makefile    Thu Mar 07 15:08:11 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/02/21 16:01:13 taca Exp $
+# $NetBSD: Makefile,v 1.8 2013/03/07 15:09:31 taca Exp $
 
 DISTNAME=      ruby-debug-base-0.10.4
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -14,5 +14,8 @@
 
 RUBY_VERSION_SUPPORTED= 18
 
+OVERRIDE_GEMSPEC=      :files ext/win32/Makefile= ext/win32/breakpoint.o= \
+       ext/win32/ruby_debug.o= ext/win32/ruby_debug.so=
+
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-base/distinfo
--- a/devel/ruby-debug-base/distinfo    Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-debug-base/distinfo    Thu Mar 07 15:08:11 2013 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2010/12/04 03:52:26 taca Exp $
+$NetBSD: distinfo,v 1.6 2013/03/07 15:09:31 taca Exp $
 
 SHA1 (ruby-debug-base-0.10.4.gem) = cb27b2a2de005082387076e50b82ba47a83529b8
 RMD160 (ruby-debug-base-0.10.4.gem) = 4b13f251405698f482440c8be538a036c6d15711
 Size (ruby-debug-base-0.10.4.gem) = 115200 bytes
-SHA1 (patch-ab) = 2ddffc8d8288bad95e022888340e8a7bfe1c73db
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-base/patches/patch-ab
--- a/devel/ruby-debug-base/patches/patch-ab    Thu Mar 07 15:07:03 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2010/12/04 03:52:26 taca Exp $
-
-- Avoid to install win32 binaries.
-
---- ../ruby-debug-base-0.10.4.gemspec.orig     2010-12-01 01:31:41.000000000 +0000
-+++ ../ruby-debug-base-0.10.4.gemspec
-@@ -47,10 +47,6 @@ files: 
- - ext/extconf.rb
- - ext/ruby_debug.c
- - ext/ruby_debug.h
--- ext/win32/breakpoint.o
--- ext/win32/ruby_debug.o
--- ext/win32/ruby_debug.so
--- ext/win32/Makefile
- - lib/ChangeLog
- - lib/ruby-debug-base.rb
- - test/base/base.rb
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-ide/Makefile
--- a/devel/ruby-debug-ide/Makefile     Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-debug-ide/Makefile     Thu Mar 07 15:08:11 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/12/04 03:55:29 taca Exp $
+# $NetBSD: Makefile,v 1.8 2013/03/07 15:09:45 taca Exp $
 
 DISTNAME=      ruby-debug-ide-0.4.16
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -16,6 +16,8 @@
 #
 RUBY_VERSION_SUPPORTED= 18
 
+OVERRIDE_GEMSPEC=      :extensions ext/mkrf_conf.rb= :files ext/mkrf_conf.rb=
+
 pre-configure:
        ${RM} -fr ${WRKSRC}/ext
 
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-ide/distinfo
--- a/devel/ruby-debug-ide/distinfo     Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-debug-ide/distinfo     Thu Mar 07 15:08:11 2013 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2011/08/12 16:26:48 taca Exp $
+$NetBSD: distinfo,v 1.8 2013/03/07 15:09:45 taca Exp $
 
 SHA1 (ruby-debug-ide-0.4.16.gem) = 81568a7dc096663e598c13c6764d2a3bbca42a97
 RMD160 (ruby-debug-ide-0.4.16.gem) = 142d6638202eb87132449d76efd199ad95e610ca
 Size (ruby-debug-ide-0.4.16.gem) = 20480 bytes
-SHA1 (patch-aa) = 8d00ad0dd67a41297872a5a35e12da77f5d68540
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug-ide/patches/patch-aa
--- a/devel/ruby-debug-ide/patches/patch-aa     Thu Mar 07 15:07:03 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2011/08/12 16:26:48 taca Exp $
-
-Extension is included in ruby-debug-base package and it should be
-installed by pkgsrc's dependency.
-
---- ../ruby-debug-ide-0.4.16.gemspec.orig      2011-08-08 02:08:52.000000000 +0000
-+++ ../ruby-debug-ide-0.4.16.gemspec
-@@ -39,8 +39,8 @@ description: |
- email: rubymine-feedback%jetbrains.com@localhost
- executables: 
- - rdebug-ide
--extensions: 
--- ext/mkrf_conf.rb
-+extensions: []
-+
- extra_rdoc_files: []
- 
- files: 
-@@ -71,7 +71,6 @@ files: 
- - lib/ruby-debug/version.rb
- - lib/ruby-debug/xml_printer.rb
- - lib/ruby-debug-ide.rb
--- ext/mkrf_conf.rb
- homepage: http://rubyforge.org/projects/debug-commons/
- licenses: []
- 
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug/Makefile
--- a/devel/ruby-debug/Makefile Thu Mar 07 15:07:03 2013 +0000
+++ b/devel/ruby-debug/Makefile Thu Mar 07 15:08:11 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/11/08 15:37:33 taca Exp $
+# $NetBSD: Makefile,v 1.10 2013/03/07 15:09:14 taca Exp $
 
 DISTNAME=      ruby-debug-0.10.4
 PKGREVISION=   3
@@ -15,6 +15,13 @@
 
 RUBY_VERSION_SUPPORTED= 18
 
+OVERRIDE_GEMSPEC= :files \
+       cli/ruby-debug/processor.RB=cli/ruby-debug/processor.rb \
+       cli/ruby-debug/commands/raise.RB=cli/ruby-debug/commands/raise.rb \
+       cli/ruby-debug/commands/disassemble.RB= \
+       cli/ruby-debug/commands/source.RB= \
+       cli/ruby-debug/commands/continue.RB=cli/ruby-debug/commands/continue.rb
+
 pre-configure:
        ${RM} -f ${WRKSRC}/cli/ruby-debug/processor.RB
        ${RM} -f ${WRKSRC}/cli/ruby-debug/disassemble.RB
diff -r e15d349cb8f9 -r 2a54055330cd devel/ruby-debug/patches/patch-ab
--- a/devel/ruby-debug/patches/patch-ab Thu Mar 07 15:07:03 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/05/28 16:32:10 bad Exp $
-
-- Try to correct some name of files.
-- disassemble.rb relies on pre-requisites that do not work on 1.8.7
-
---- ../ruby-debug-0.10.4.gemspec.orig  2011-05-28 15:27:41.000000000 +0000
-+++ ../ruby-debug-0.10.4.gemspec       2011-05-28 15:28:55.000000000 +0000
-@@ -67,23 +67,22 @@
- - VERSION
- - Rakefile
- - cli/ruby-debug.rb
--- cli/ruby-debug/processor.RB
-+- cli/ruby-debug/processor.rb
- - cli/ruby-debug/helper.rb
- - cli/ruby-debug/debugger.rb
- - cli/ruby-debug/commands/source.rb
- - cli/ruby-debug/commands/set.rb
--- cli/ruby-debug/commands/raise.RB
-+- cli/ruby-debug/commands/raise.rb
- - cli/ruby-debug/commands/breakpoints.rb
- - cli/ruby-debug/commands/list.rb
- - cli/ruby-debug/commands/display.rb
--- cli/ruby-debug/commands/continue.RB
-+- cli/ruby-debug/commands/continue.rb
- - cli/ruby-debug/commands/trace.rb
- - cli/ruby-debug/commands/frame.rb
- - cli/ruby-debug/commands/show.rb
- - cli/ruby-debug/commands/save.rb
- - cli/ruby-debug/commands/variables.rb
- - cli/ruby-debug/commands/threads.rb
--- cli/ruby-debug/commands/disassemble.RB
- - cli/ruby-debug/commands/irb.rb
- - cli/ruby-debug/commands/tmate.rb
- - cli/ruby-debug/commands/kill.rb
-@@ -99,7 +98,7 @@
- - cli/ruby-debug/commands/eval.rb
- - cli/ruby-debug/commands/info.rb
- - cli/ruby-debug/commands/continue.rb
--- cli/ruby-debug/commands/source.RB
-+- cli/ruby-debug/commands/source.rb
- - cli/ruby-debug/commands/control.rb
- - cli/ruby-debug/commands/condition.rb
- - cli/ruby-debug/interface.rb



Home | Main Index | Thread Index | Old Index