[pkgsrc/pkgsrc-2009Q4]: pkgsrc/misc/rubygems Pullup ticket 3005 - requested b...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ad2d578fb6c
branches:  pkgsrc-2009Q4
changeset: 569258:6ad2d578fb6c
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Feb 15 07:54:22 2010 +0000

description:
Pullup ticket 3005 - requested by taca
functionality fix

Revisions pulled up:
- pkgsrc/misc/rubygems/Makefile         1.30
- pkgsrc/misc/rubygems/distinfo         1.24
- pkgsrc/misc/rubygems/patches/patch-ag 1.6

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   fhajny
   Date:           Wed Jan 27 13:21:58 UTC 2010

   Modified Files:
           pkgsrc/misc/rubygems: Makefile distinfo
           pkgsrc/misc/rubygems/patches: patch-ag

   Log Message:
   Fix (finally) the typo in patch-ag. Previous fix wasn't correct.


   To generate a diff of this commit:
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/misc/rubygems/Makefile
   cvs rdiff -u -r1.23 -r1.24 pkgsrc/misc/rubygems/distinfo
   cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/rubygems/patches/patch-ag

diffstat:

 misc/rubygems/Makefile         |  4 ++--
 misc/rubygems/distinfo         |  4 ++--
 misc/rubygems/patches/patch-ag |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 4c4c269891a0 -r 6ad2d578fb6c misc/rubygems/Makefile
--- a/misc/rubygems/Makefile    Mon Feb 15 07:49:48 2010 +0000
+++ b/misc/rubygems/Makefile    Mon Feb 15 07:54:22 2010 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2009/09/25 16:09:00 minskim Exp $
+# $NetBSD: Makefile,v 1.29.4.1 2010/02/15 07:54:22 spz Exp $
 
 DISTNAME=      rubygems-1.3.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc ruby
 MASTER_SITES=  http://rubyforge.org/frs/download.php/60718/
 EXTRACT_SUFX=  .tgz
diff -r 4c4c269891a0 -r 6ad2d578fb6c misc/rubygems/distinfo
--- a/misc/rubygems/distinfo    Mon Feb 15 07:49:48 2010 +0000
+++ b/misc/rubygems/distinfo    Mon Feb 15 07:54:22 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2009/09/25 16:09:00 minskim Exp $
+$NetBSD: distinfo,v 1.23.4.1 2010/02/15 07:54:22 spz Exp $
 
 SHA1 (rubygems-1.3.5.tgz) = 8545f25d00c757a310b879a2580e56d6012fc981
 RMD160 (rubygems-1.3.5.tgz) = 2d17f0de2d387bd2a034916cb79531110f3be196
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = 30ff76c661575d9c51051bb207363f3d2d8b5283
 SHA1 (patch-ad) = 9e6b11f5edae0656a59d623f4dae05ca7ecbdfaf
 SHA1 (patch-af) = a89a1e21fa6389359653c21ed5eac02d84114b51
-SHA1 (patch-ag) = deaf4ee53542a9bb83073863a2c48cc80b08c302
+SHA1 (patch-ag) = 2892adb1fdfeac0d50b7ffea8b1f802094195ba3
 SHA1 (patch-ah) = 015aaccf066333d057997404f43b126e648ff379
 SHA1 (patch-aj) = fa2192319a01e7a9dc50e497de5d3d52ab9f5768
 SHA1 (patch-ak) = 999b52ab6f61dd1c81608d08418b9bb34bdc8aa6
diff -r 4c4c269891a0 -r 6ad2d578fb6c misc/rubygems/patches/patch-ag
--- a/misc/rubygems/patches/patch-ag    Mon Feb 15 07:49:48 2010 +0000
+++ b/misc/rubygems/patches/patch-ag    Mon Feb 15 07:54:22 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.5 2009/09/25 16:09:00 minskim Exp $
+$NetBSD: patch-ag,v 1.5.4.1 2010/02/15 07:54:22 spz Exp $
 
 --- lib/rubygems/uninstaller.rb.orig   2009-05-15 11:32:23.000000000 -0700
 +++ lib/rubygems/uninstaller.rb
@@ -19,7 +19,7 @@
  
      unless spec.executables.empty? then
        bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
-+      bindir = @bin_dir ? @bin_dir : Gem.bindir(spec_installation_path, @install_root)
++      bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path, @install_root)
 +
 +      unless @install_root.nil? or @install_root == ""
 +        bindir = File.join(@install_root, bindir)