* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.

* Ajust new ruby package's framework.

4 files changed, 19 insertions, 24 deletions

diff --git a/devel/ruby-stream/Makefile b/devel/ruby-stream/Makefile
index 039bd13e119..1126bdab2d5 100644
--- a/devel/ruby-stream/Makefile
+++ b/devel/ruby-stream/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/07/12 19:51:16 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/10 06:28:43 taca Exp $
 
 DISTNAME=	stream-0.5
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	devel
 
@@ -10,9 +9,5 @@ HOMEPAGE=	http://rgl.rubyforge.org/stream/
 COMMENT=	Interface for external iterators
 LICENSE=	gnu-gpl-v2 # OR ruby-license
 
-.include "../../misc/rubygems/rubygem.mk"
-
-pre-configure:
-	${RM} ${WRKSRC}/Rakefile.orig
-
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-stream/distinfo b/devel/ruby-stream/distinfo
index c88a9d50543..f02dc554e83 100644
--- a/devel/ruby-stream/distinfo
+++ b/devel/ruby-stream/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/06/12 13:26:02 taca Exp $
+$NetBSD: distinfo,v 1.5 2010/09/10 06:28:43 taca Exp $
 
 SHA1 (stream-0.5.gem) = 5a6b14f9b6800003b006a98412d83b839f2c3af7
 RMD160 (stream-0.5.gem) = 74356b4724e6e3bfad85ccf871c05a9015c4d06e
 Size (stream-0.5.gem) = 19253 bytes
-SHA1 (patch-aa) = 63d0f5323b05674e6ed28f194a9aadfda020c31e
+SHA1 (patch-ab) = d0e3bdbd62e6af5b851e5e735fa5b464ab96cb7b
diff --git a/devel/ruby-stream/patches/patch-aa b/devel/ruby-stream/patches/patch-aa
deleted file mode 100644
index 38ac54a8ab4..00000000000
--- a/devel/ruby-stream/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/06/12 13:26:02 taca Exp $
-
-Correct URL which is strictly checked by RubyGems.
-
---- Rakefile.orig	2009-06-11 12:33:04.000000000 +0000
-+++ Rakefile
-@@ -110,7 +110,7 @@ else
-     #### Author and project details.
-     s.author = "Horst Duchene"
-     s.email = "hd.at.clr@hduchene.de"
--    s.homepage = "rgl.rubyforge.org"
-+    s.homepage = "http://rgl.rubyforge.org/"
-     s.rubyforge_project = "rgl"
-   end
- 
diff --git a/devel/ruby-stream/patches/patch-ab b/devel/ruby-stream/patches/patch-ab
new file mode 100644
index 00000000000..e49717ba7d0
--- /dev/null
+++ b/devel/ruby-stream/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/09/10 06:28:43 taca Exp $
+
+Correct URL which is strictly checked by RubyGems.
+
+--- ../stream-0.5.gemspec.orig	2010-09-07 04:34:21.000000000 +0000
++++ ../stream-0.5.gemspec
+@@ -27,7 +27,7 @@ files: 
+ - examples/examples.rb
+ - examples/streamtester.rb
+ has_rdoc: true
+-homepage: rgl.rubyforge.org
++homepage: http://rgl.rubyforge.org
+ licenses: 
+ post_install_message: 
+ rdoc_options: