4 files changed, 29 insertions, 50 deletions
diff --git a/devel/ruby-debug/Makefile b/devel/ruby-debug/Makefile
index 3d1b3c672a0..0e8e6896c3d 100644
--- a/devel/ruby-debug/Makefile
+++ b/devel/ruby-debug/Makefile
@@ -1,20 +1,24 @@
-# $NetBSD: Makefile,v 1.4 2010/09/07 17:20:25 taca Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/10 05:19:13 taca Exp $
 
-DISTNAME=	ruby-debug-0.10.2
-PKGNAME=	${RUBYGEM_PKGPREFIX}-${DISTNAME}
+DISTNAME=	ruby-debug-0.10.3
+PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
 CATEGORIES=	devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.datanoise.com/ruby-debug/
+HOMEPAGE=	http://rubyforge.org/projects/ruby-debug/
 COMMENT=	Command line interface for ruby-debug
+LICENSE=	2-clause-bsd
 
 DEPENDS+=	${RUBY_PKGPREFIX}-columnize>=0.1:../../misc/ruby-columnize
-DEPENDS+=	${RUBY_PKGPREFIX}-ruby-debug-base>=0.10.2{,nb[0-9]*}:../../devel/ruby-debug-base
+DEPENDS+=	${RUBY_PKGPREFIX}-debug-base>=0.10.3:../../devel/ruby-debug-base
 
 RUBY_VERSION_SUPPORTED= 18
 
-post-extract:
-	cd ${WRKSRC} && echo ${PKGVERSION_NOREV} > VERSION
+pre-configure:
+	cd ${WRKSRC}/cli/ruby-debug/commands && \
+		${MV} disassemble.RB disassemble.rb; \
+		${MV} source.RB source.rb; \
+		${RM} -f continue.RB.save
 
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-debug/PLIST b/devel/ruby-debug/PLIST
index 60c14d0ec30..2ce25433248 100644
--- a/devel/ruby-debug/PLIST
+++ b/devel/ruby-debug/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:09 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/09/10 05:19:13 taca Exp $
 bin/rdebug
-${GEM_HOME}/cache/ruby-debug-${PKGVERSION}.gem
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.require_paths
 ${GEM_LIBDIR}/AUTHORS
 ${GEM_LIBDIR}/CHANGES
@@ -8,7 +8,6 @@ ${GEM_LIBDIR}/ChangeLog
 ${GEM_LIBDIR}/LICENSE
 ${GEM_LIBDIR}/README
 ${GEM_LIBDIR}/Rakefile
-${GEM_LIBDIR}/VERSION
 ${GEM_LIBDIR}/bin/rdebug
 ${GEM_LIBDIR}/cli/ruby-debug.rb
 ${GEM_LIBDIR}/cli/ruby-debug/command.rb
@@ -17,6 +16,7 @@ ${GEM_LIBDIR}/cli/ruby-debug/commands/catchpoint.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/condition.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/continue.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/control.rb
+${GEM_LIBDIR}/cli/ruby-debug/commands/disassemble.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/display.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/edit.rb
 ${GEM_LIBDIR}/cli/ruby-debug/commands/enable.rb
@@ -52,6 +52,7 @@ ${GEM_LIBDIR}/test/base/load.rb
 ${GEM_LIBDIR}/test/bp_loop_issue.rb
 ${GEM_LIBDIR}/test/classes.rb
 ${GEM_LIBDIR}/test/cli/commands/catchpoint_test.rb
+${GEM_LIBDIR}/test/cli/commands/unit/regexp.rb
 ${GEM_LIBDIR}/test/data/annotate.cmd
 ${GEM_LIBDIR}/test/data/annotate.right
 ${GEM_LIBDIR}/test/data/break_bad.cmd
@@ -105,6 +106,8 @@ ${GEM_LIBDIR}/test/data/methodsig.right
 ${GEM_LIBDIR}/test/data/noquit.right
 ${GEM_LIBDIR}/test/data/output.cmd
 ${GEM_LIBDIR}/test/data/output.right
+${GEM_LIBDIR}/test/data/pm-bug.cmd
+${GEM_LIBDIR}/test/data/pm-bug.right
 ${GEM_LIBDIR}/test/data/post-mortem-next.cmd
 ${GEM_LIBDIR}/test/data/post-mortem-next.right
 ${GEM_LIBDIR}/test/data/post-mortem-osx.right
@@ -127,6 +130,7 @@ ${GEM_LIBDIR}/test/data/test-init-osx.right
 ${GEM_LIBDIR}/test/data/test-init.right
 ${GEM_LIBDIR}/test/data/trace.right
 ${GEM_LIBDIR}/test/dollar-0.rb
+${GEM_LIBDIR}/test/except-bug2.rb
 ${GEM_LIBDIR}/test/gcd-dbg-nox.rb
 ${GEM_LIBDIR}/test/gcd-dbg.rb
 ${GEM_LIBDIR}/test/gcd.rb
@@ -136,8 +140,10 @@ ${GEM_LIBDIR}/test/info-var-bug2.rb
 ${GEM_LIBDIR}/test/null.rb
 ${GEM_LIBDIR}/test/output.rb
 ${GEM_LIBDIR}/test/pm-base.rb
+${GEM_LIBDIR}/test/pm-bug.rb
 ${GEM_LIBDIR}/test/pm.rb
 ${GEM_LIBDIR}/test/raise.rb
+${GEM_LIBDIR}/test/scope-test.rb
 ${GEM_LIBDIR}/test/tdebug.rb
 ${GEM_LIBDIR}/test/test-annotate.rb
 ${GEM_LIBDIR}/test/test-break-bad.rb
@@ -170,4 +176,6 @@ ${GEM_LIBDIR}/test/test-source.rb
 ${GEM_LIBDIR}/test/test-stepping.rb
 ${GEM_LIBDIR}/test/test-trace.rb
 ${GEM_LIBDIR}/test/thread1.rb
-${GEM_HOME}/specifications/ruby-debug-${PKGVERSION}.gemspec
+${GEM_LIBDIR}/test/trunc-call.rb
+${GEM_LIBDIR}/test/tvar.rb
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/devel/ruby-debug/distinfo b/devel/ruby-debug/distinfo
index da14ddc11b1..22124dc3883 100644
--- a/devel/ruby-debug/distinfo
+++ b/devel/ruby-debug/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/09/15 09:02:55 taca Exp $
+$NetBSD: distinfo,v 1.4 2010/09/10 05:19:13 taca Exp $
 
-SHA1 (ruby-debug-0.10.2.gem) = e1638c6e4045f1b6742ef26c157ae172351ea0e3
-RMD160 (ruby-debug-0.10.2.gem) = 0d7a1eedfb8b8b5ef3cefb69b94ea57f0a1dd883
-Size (ruby-debug-0.10.2.gem) = 111616 bytes
-SHA1 (patch-aa) = 33957ce762aea50eb9ec3135e875ba91187a81ea
+SHA1 (ruby-debug-0.10.3.gem) = 6252e41dd99249381ebf3e19b8284e963b5bf46f
+RMD160 (ruby-debug-0.10.3.gem) = 587346990b9a4dc535284fbb52401d950e910109
+Size (ruby-debug-0.10.3.gem) = 117760 bytes
+SHA1 (patch-ab) = 9d3739e1d3dec1206ce81cabbb7b27815933491f
diff --git a/devel/ruby-debug/patches/patch-aa b/devel/ruby-debug/patches/patch-aa
deleted file mode 100644
index aadacb26b77..00000000000
--- a/devel/ruby-debug/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/09/15 09:02:55 taca Exp $
-
---- Rakefile.orig	2008-09-15 13:39:49.000000000 +0900
-+++ Rakefile
-@@ -8,8 +8,8 @@ require 'rake/testtask'
- SO_NAME = "ruby_debug.so"
- 
- # ------- Default Package ----------
--RUBY_DEBUG_VERSION = open("ext/ruby_debug.c") do |f| 
--  f.grep(/^#define DEBUG_VERSION/).first[/"(.+)"/,1]
-+RUBY_DEBUG_VERSION = open(File.join(File.dirname(__FILE__), 'VERSION')) do |f|
-+  f.readlines[0].chomp
- end
- 
- COMMON_FILES = FileList[
-@@ -18,6 +18,7 @@ COMMON_FILES = FileList[
-   'LICENSE',
-   'README',
-   'Rakefile',
-+  'VERSION',
- ]                        
- 
- CLI_TEST_FILE_LIST = FileList['test/test-*.rb', 'test/cli/**/*_test.rb']
-@@ -158,9 +159,6 @@ EOF
- end
- 
- # Rake task to build the default package
--Rake::GemPackageTask.new(base_spec) do |pkg|
--  pkg.need_tar = true
--end
- Rake::GemPackageTask.new(cli_spec) do |pkg|
-   pkg.need_tar = true
- end