* Use RUBY_VERSION_SUPPORTED.

* Correct DESCR; this is 1.9.2 release minimum base package.
* Don't remove whole gem directory but keep its own gem directory only.
* Also make MESSAGE explicitly 1.9.2.
* rubygem: Avoid to use Gem::RequirePathsBuilder now.
* Bump PKGREVISION.

7 files changed, 48 insertions, 14 deletions

diff --git a/lang/ruby19-base/DEINSTALL b/lang/ruby19-base/DEINSTALL
index 03c76235880..2025793f811 100644
--- a/lang/ruby19-base/DEINSTALL
+++ b/lang/ruby19-base/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.2 2011/02/21 14:44:11 taca Exp $
+# $NetBSD: DEINSTALL,v 1.3 2011/11/08 15:22:45 taca Exp $
 
 PREFIX="@PREFIX@"
 RUBY_GEM_BASE="${PREFIX}/@RUBY_GEM_BASE@"
@@ -9,7 +9,8 @@ DEINSTALL)
 	${RM} -f ${RUBY_SITERIDIR}/created.rid
 	;;
 POST-DEINSTALL)
-	${RM} -rf ${RUBY_GEM_BASE}
+	${RM} -rf ${GEM_HOME}
+	${RMDIR} ${RUBY_GEM_BASE} 2>/dev/null
 	;;
 esac
 exit
diff --git a/lang/ruby19-base/DESCR b/lang/ruby19-base/DESCR
index cfec9ce4aa8..3e4871f7a8a 100644
--- a/lang/ruby19-base/DESCR
+++ b/lang/ruby19-base/DESCR
@@ -16,4 +16,4 @@ Features of Ruby are shown below.
   + Highly Portable (works on many UNIX machines, and on DOS,
     Windows, Mac, BeOS etc.)
 
-This package is Ruby 1.9 based release.
+This package is Ruby 1.9.2 release minimum base package.
diff --git a/lang/ruby19-base/MESSAGE b/lang/ruby19-base/MESSAGE
index ad09c3553f8..78adad43e05 100644
--- a/lang/ruby19-base/MESSAGE
+++ b/lang/ruby19-base/MESSAGE
@@ -1,9 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2011/10/31 05:51:18 taca Exp $
+$NetBSD: MESSAGE,v 1.3 2011/11/08 15:22:45 taca Exp $
 
 Note that this is a minimal package.
 
-The original Ruby ${RUBY_VERSION} distribution includes more extension
+The original ${RUBY_DISTNAME} distribution includes more extension
 libraries, some of which are provided as separate packages:
 
 	databases/ruby-gdbm:		GDBM module
diff --git a/lang/ruby19-base/Makefile b/lang/ruby19-base/Makefile
index dae525a21a1..61c71349599 100644
--- a/lang/ruby19-base/Makefile
+++ b/lang/ruby19-base/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2011/10/31 05:51:18 taca Exp $
+# $NetBSD: Makefile,v 1.17 2011/11/08 15:22:45 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
-PKGREVISION=	3
+PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
+PKGREVISION=	4
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
-COMMENT=	Ruby 1.9 based release minimum package
+COMMENT=	Ruby  ${RUBY_VERSION} release minimum package
 LICENSE=	gnu-gpl-v2 OR ruby-license
 
-RUBY_VERSION=	${RUBY19_VERSION}
+RUBY_VERSION_SUPPORTED=	19
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/lang/ruby19-base/distinfo b/lang/ruby19-base/distinfo
index 2f95b5950a3..e92c4cb8830 100644
--- a/lang/ruby19-base/distinfo
+++ b/lang/ruby19-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2011/09/04 17:02:39 taca Exp $
+$NetBSD: distinfo,v 1.9 2011/11/08 15:22:45 taca Exp $
 
 SHA1 (ruby-1.9.2-p290.tar.bz2) = 8f25a74f50a10fdd9724e3c74ccd7bae596e198b
 RMD160 (ruby-1.9.2-p290.tar.bz2) = 9722a91445fa81a101a2a8ab5753780c4601cc5a
@@ -17,10 +17,11 @@ SHA1 (patch-ak) = ac49cec94313d22058183f1a3af520591433b726
 SHA1 (patch-al) = c4f44e897e525c13a0276a3743fd203e290f6f97
 SHA1 (patch-am) = 2136ab402ae94805c1585677eaa8cc6a83696374
 SHA1 (patch-an) = 296f5dfdad2afcbf9eca56a329a1424e5659d29c
-SHA1 (patch-ao) = 32ba4bd0eccd849f7294bc60a66d181966e472b9
+SHA1 (patch-ao) = 90789a3e4cfa020a503fda61406883c9e3a26772
 SHA1 (patch-ap) = 1fdb7563c1ee43466f47a2a98bbdc6a242a84f0f
 SHA1 (patch-aq) = 740e5231beaa1e42f464f2ec7b52c3ed69bb5f39
 SHA1 (patch-ar) = 8a4b8ae18f9bdafc1bfbbd9ec62d18caf890571e
 SHA1 (patch-as) = 2005d2b5ca10d79188e8615383b881d5c9dfb616
 SHA1 (patch-at) = 532eebfda565d78b9d7ab572b7d8539933e431a3
 SHA1 (patch-au) = 45073c6d3461ee181e89228beb088d161af3d735
+SHA1 (patch-lib_rubygems_require__paths__builder.rb) = 90c2fb05a07934f74e39995380d08cc81c81aaaf
diff --git a/lang/ruby19-base/patches/patch-ao b/lang/ruby19-base/patches/patch-ao
index 925f8594b60..1378a66e823 100644
--- a/lang/ruby19-base/patches/patch-ao
+++ b/lang/ruby19-base/patches/patch-ao
@@ -1,9 +1,19 @@
-$NetBSD: patch-ao,v 1.1.1.1 2010/09/12 03:50:06 taca Exp $
+$NetBSD: patch-ao,v 1.2 2011/11/08 15:22:45 taca Exp $
 
-Add install_root option for pkgsrc's rubygems support.
+* Add install_root option for pkgsrc's rubygems support.
+* Avoid to use Gem::RequirePathsBuilder.
 
 --- lib/rubygems/installer.rb.orig	2010-04-22 08:24:42.000000000 +0000
 +++ lib/rubygems/installer.rb
+@@ -40,7 +40,7 @@ class Gem::Installer
+ 
+   include Gem::UserInteraction
+ 
+-  include Gem::RequirePathsBuilder
++# include Gem::RequirePathsBuilder
+ 
+   ##
+   # The directory a gem's executables will be installed into
 @@ -84,6 +84,9 @@ class Gem::Installer
    #          for a signed-gems-only policy.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
@@ -34,6 +44,15 @@ Add install_root option for pkgsrc's rubygems support.
      @bin_dir             = options[:bin_dir]
      @development         = options[:development]
      @source_index        = options[:source_index]
+@@ -198,7 +207,7 @@ class Gem::Installer
+     build_extensions
+     write_spec
+ 
+-    write_require_paths_file_if_needed
++#   write_require_paths_file_if_needed
+ 
+     # HACK remove?  Isn't this done in multiple places?
+     cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
 @@ -289,7 +298,11 @@ class Gem::Installer
      # If the user has asked for the gem to be installed in a directory that is
      # the system gem directory, then use the system bin directory, else create
diff --git a/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb b/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb
new file mode 100644
index 00000000000..5237b0d65fa
--- /dev/null
+++ b/lang/ruby19-base/patches/patch-lib_rubygems_require__paths__builder.rb
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_rubygems_require__paths__builder.rb,v 1.1 2011/11/08 15:22:45 taca Exp $
+
+* Avoid to use Gem::RequirePathsBuilder.
+
+--- lib/rubygems/require_paths_builder.rb.orig	2010-06-27 01:41:40.000000000 +0000
++++ lib/rubygems/require_paths_builder.rb
+@@ -9,5 +9,4 @@ module Gem::RequirePathsBuilder
+       file.puts require_paths
+     end
+   end
+-end
+-
++end if false