Pullup ticket #3364 - requested by taca

misc/rubygems: build fix

Revisions pulled up:
- misc/rubygems/Makefile				1.36
- misc/rubygems/distinfo				1.27
- misc/rubygems/patches/patch-aq			delete
- misc/rubygems/patches/patch-ar			delete
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Wed Feb 23 10:32:24 UTC 2011

Modified Files:
	pkgsrc/misc/rubygems: Makefile distinfo
Removed Files:
	pkgsrc/misc/rubygems/patches: patch-aq patch-ar

Log Message:
Remove patches to make a gemspec file's format compatible as before.
Now latest ruby19-base package comes with gem supporting newer format,
so no need to keep older.

Shouold be fix build problem of newer rails3 related packages with
ruby18-base.

Bump PKGREVISION.

4 files changed, 3 insertions, 75 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index ae1d85f993f..5033345f566 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2010/09/16 12:02:05 taca Exp $
+# $NetBSD: Makefile,v 1.34.4.1 2011/02/25 09:16:07 tron Exp $
 
 DISTNAME=	rubygems-1.3.7
+PKGREVISION=	1
 CATEGORIES=	misc ruby
 MASTER_SITES=	http://rubyforge.org/frs/download.php/70696/
 EXTRACT_SUFX=	.tgz
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index 2e24ebf3a6c..6e60cc2ee2d 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2010/09/16 12:02:05 taca Exp $
+$NetBSD: distinfo,v 1.26.4.1 2011/02/25 09:16:07 tron Exp $
 
 SHA1 (rubygems-1.3.7.tgz) = 68ad2970963db9893b76acc8777be72a77c4bee4
 RMD160 (rubygems-1.3.7.tgz) = 2ea8e16d1535216045798258603d5f2f9e3dbfea
@@ -17,5 +17,3 @@ SHA1 (patch-am) = 83f22425e521ac577d91c17d9b0dcb79e086dc01
 SHA1 (patch-an) = f583e03e69aba2543a2b858a376eb81fb7a4a581
 SHA1 (patch-ao) = 672f0f4c79ef3d3aee949cc0154e7071c1437e1b
 SHA1 (patch-ap) = c70cd7cf263ef53fc4fde1fd9b499563dab1325b
-SHA1 (patch-aq) = 154447711ad03c634bb83b1764d811aea5ced96c
-SHA1 (patch-ar) = 450d5d380d4bca3600183622ace1a8bbc6e4d79b
diff --git a/misc/rubygems/patches/patch-aq b/misc/rubygems/patches/patch-aq
deleted file mode 100644
index cf65b00f9d9..00000000000
--- a/misc/rubygems/patches/patch-aq
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2010/09/16 12:02:05 taca Exp $
-
-* Keep backward compatible with 1.3.5 for "gem spec" output.
-
---- lib/rubygems/dependency.rb.orig	2010-04-20 05:57:25.000000000 +0000
-+++ lib/rubygems/dependency.rb
-@@ -58,14 +58,14 @@ class Gem::Dependency
-     end
- 
-     @name        = name
--    @requirement = Gem::Requirement.create requirements
-+    requirement = Gem::Requirement.create requirements
-     @type        = type
-     @prerelease  = false
- 
-     # This is for Marshal backwards compatability. See the comments in
-     # +requirement+ for the dirty details.
- 
--    @version_requirements = @requirement
-+    @version_requirements = requirement
-   end
- 
-   ##
-@@ -107,7 +107,10 @@ class Gem::Dependency
-   # What does this dependency require?
- 
-   def requirement
--    return @requirement if defined?(@requirement) and @requirement
-+    if defined?(@requirement) and @requirement
-+      @version_requirements = @requirement
-+      remove_instance_variable :@requirement
-+    end
- 
-     # @version_requirements and @version_requirement are legacy ivar
-     # names, and supported here because older gems need to keep
-@@ -130,7 +133,7 @@ class Gem::Dependency
-       @version_requirements = Gem::Requirement.new version
-     end
- 
--    @requirement = @version_requirements if defined?(@version_requirements)
-+    @version_requirements if defined?(@version_requirements)
-   end
- 
-   ##
-@@ -168,7 +171,7 @@ class Gem::Dependency
-          "and will be removed on or after August 2010.  " \
-          "Use Gem::Dependency.new."
- 
--    @requirement = Gem::Requirement.create requirements
-+    @version_requirements = Gem::Requirement.create requirements
-   end
- 
-   def == other # :nodoc:
diff --git a/misc/rubygems/patches/patch-ar b/misc/rubygems/patches/patch-ar
deleted file mode 100644
index 54ed27e9801..00000000000
--- a/misc/rubygems/patches/patch-ar
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2010/09/16 12:02:05 taca Exp $
-
-* Keep backward compatible with 1.3.5 for "gem spec" output.
-
---- lib/rubygems/version.rb.orig	2010-04-20 05:57:26.000000000 +0000
-+++ lib/rubygems/version.rb
-@@ -227,6 +227,11 @@ class Gem::Version
-     [version]
-   end
- 
-+  # also YAML property 
-+  def to_yaml_properties
-+    ['@version']
-+  end
-+
-   ##
-   # Load custom marshal format. It's a string for backwards (RubyGems
-   # 1.3.5 and earlier) compatibility.