* Add ${RUBY_VER} under ${GEM_HOME}/gems/*/bin comamnds to avoid

  conflict with outside gem.
* Fix shared library's name on FreeBSD (tested with 8.2-STABLE).

Bump PKGREVISION.

7 files changed, 62 insertions, 11 deletions

diff --git a/lang/ruby193-base/Makefile b/lang/ruby193-base/Makefile
index 4e0da35076b..074d22e4d74 100644
--- a/lang/ruby193-base/Makefile
+++ b/lang/ruby193-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2011/11/13 15:45:49 taca Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/04 02:31:54 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 #PKGREVISION=
@@ -129,6 +129,7 @@ pre-configure:
 	${RM} -f ${WRKSRC}/ext/tk/extconf.rb
 
 pre-install:
+	cd ${WRKSRC}/bin; for f in *; do ${LN} -f $$f $${f}${RUBY_VER}; done
 	cd ${WRKSRC}/lib; \
 		${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \
 		-exec ${RM} -f {} \;
diff --git a/lang/ruby193-base/PLIST b/lang/ruby193-base/PLIST
index 2372fde0720..4813b3c1480 100644
--- a/lang/ruby193-base/PLIST
+++ b/lang/ruby193-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/12/04 02:31:54 taca Exp $
 bin/erb${RUBY_VER}
 bin/gem${RUBY_VER}
 bin/irb${RUBY_VER}
@@ -764,9 +764,9 @@ ${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/syck.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT}
 ${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT}
-${GEM_HOME}/gems/rake-0.9.2.2/bin/rake
-${GEM_HOME}/gems/rdoc-3.9.4/bin/rdoc
-${GEM_HOME}/gems/rdoc-3.9.4/bin/ri
+${GEM_HOME}/gems/rake-0.9.2.2/bin/rake${RUBY_VER}
+${GEM_HOME}/gems/rdoc-3.9.4/bin/rdoc${RUBY_VER}
+${GEM_HOME}/gems/rdoc-3.9.4/bin/ri${RUBY_VER}
 ${GEM_HOME}/specifications/bigdecimal-1.1.0.gemspec
 ${GEM_HOME}/specifications/io-console-0.3.gemspec
 ${GEM_HOME}/specifications/json-1.5.4.gemspec
diff --git a/lang/ruby193-base/distinfo b/lang/ruby193-base/distinfo
index 22c9a36f5d3..c83b8df8b50 100644
--- a/lang/ruby193-base/distinfo
+++ b/lang/ruby193-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+$NetBSD: distinfo,v 1.2 2011/12/04 02:31:54 taca Exp $
 
 SHA1 (ruby-1.9.3-p0.tar.bz2) = f63c116411b981ef54c2caeefb9ccc4d71a5d2cf
 RMD160 (ruby-1.9.3-p0.tar.bz2) = 92e95f1d41f89864e2e4791b522a815e6bf51711
 Size (ruby-1.9.3-p0.tar.bz2) = 9554576 bytes
-SHA1 (patch-configure) = 95d397b26a6244f3515f69f616917994b7aa445b
-SHA1 (patch-configure.in) = b499168bbf1eab93cd98737d766db3b2c0460472
+SHA1 (patch-configure) = 3045588df7baca5e100363eaef64567d6a59d527
+SHA1 (patch-configure.in) = c6671d30e11dfb2d5e4b253b6f3e53cf32af0152
+SHA1 (patch-defs_default__gems) = fb24111736f1a76a05e853aa068024dbdd24e5a5
 SHA1 (patch-lib_rdoc_ri_driver.rb) = acb4cb022893eb8dea2adf7564f5e5e1a0f1e9c8
 SHA1 (patch-lib_rubygems.rb) = cc02e3a296d88605ef8444d64ca805ddebb524c6
 SHA1 (patch-lib_rubygems_commands_install__command.rb) = ff637f39f3fd76b7550fd7f8c32fe303eec6f8c3
@@ -20,4 +21,5 @@ SHA1 (patch-lib_rubygems_installer.rb) = cec82bd0c5255a2a23799273c7a2835e2bef7e3
 SHA1 (patch-lib_rubygems_specification.rb) = 187e290d3b1d05dee348960391240b1a8d6b21cc
 SHA1 (patch-lib_rubygems_uninstaller.rb) = bde19710968f80e56760288d09870a08f3a4ec52
 SHA1 (patch-test_rubygems_test__gem.rb) = bb6946eceed2112a7b3d8df84f59c793bdb73bb0
+SHA1 (patch-tool_rbinstall.rb) = f0497085a09b31145f57028b30e335b09acabcff
 SHA1 (patch-vsnprintf.c) = 7bb4ca07381536717518143ef7803634168ca9fa
diff --git a/lang/ruby193-base/patches/patch-configure b/lang/ruby193-base/patches/patch-configure
index e273e1a099c..a1a882372ea 100644
--- a/lang/ruby193-base/patches/patch-configure
+++ b/lang/ruby193-base/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+$NetBSD: patch-configure,v 1.2 2011/12/04 02:31:54 taca Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
@@ -28,6 +28,15 @@ $NetBSD: patch-configure,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
  			rb_cv_dlopen=yes ;; #(
    freebsd*|dragonfly*) :
  
+@@ -16548,7 +16555,7 @@ case "$enable_shared" in #(
+   freebsd*|dragonfly*) :
+ 
+ 	SOLIBS='$(LIBS)'
+-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)'
+ 	if test "$rb_cv_binary_elf" != "yes" ; then
+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+ 	    LIBRUBY_ALIASES=''
 @@ -16626,7 +16633,12 @@ esac
  	 ;; #(
    interix*) :
diff --git a/lang/ruby193-base/patches/patch-configure.in b/lang/ruby193-base/patches/patch-configure.in
index b343c1fb170..6ae02850d6f 100644
--- a/lang/ruby193-base/patches/patch-configure.in
+++ b/lang/ruby193-base/patches/patch-configure.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.in,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
+$NetBSD: patch-configure.in,v 1.2 2011/12/04 02:31:54 taca Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
@@ -24,6 +24,15 @@ $NetBSD: patch-configure.in,v 1.1.1.1 2011/11/08 16:10:51 taca Exp $
  			rb_cv_dlopen=yes],
  	[freebsd*|dragonfly*], [
  			: ${LDSHARED='$(CC) -shared'}
+@@ -2354,7 +2358,7 @@ AS_CASE("$enable_shared", [yes], [
+ 	],
+     [freebsd*|dragonfly*], [
+ 	SOLIBS='$(LIBS)'
+-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
++	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)\$(TEENY)'
+ 	if test "$rb_cv_binary_elf" != "yes" ; then
+ 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
+ 	    LIBRUBY_ALIASES=''
 @@ -2420,7 +2424,12 @@ AS_CASE("$enable_shared", [yes], [
  	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
  	],
diff --git a/lang/ruby193-base/patches/patch-defs_default__gems b/lang/ruby193-base/patches/patch-defs_default__gems
new file mode 100644
index 00000000000..63bc9896e1b
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-defs_default__gems
@@ -0,0 +1,15 @@
+$NetBSD: patch-defs_default__gems,v 1.1 2011/12/04 02:31:54 taca Exp $
+
+Add suffix to default gem's executables files.
+
+--- defs/default_gems.orig	2011-07-30 14:19:11.000000000 +0000
++++ defs/default_gems
+@@ -1,6 +1,6 @@
+ # gem		versioning file			[executable files under bin]
+-rake		lib/rake/version.rb		[rake]
+-rdoc		lib/rdoc.rb			[rdoc ri]
++rake		lib/rake/version.rb		[rake193]
++rdoc		lib/rdoc.rb			[rdoc193 ri193]
+ minitest	lib/minitest/unit.rb
+ json		ext/json/lib/json/version.rb
+ io-console	ext/io/console/io-console.gemspec
diff --git a/lang/ruby193-base/patches/patch-tool_rbinstall.rb b/lang/ruby193-base/patches/patch-tool_rbinstall.rb
new file mode 100644
index 00000000000..6f10d3cb54b
--- /dev/null
+++ b/lang/ruby193-base/patches/patch-tool_rbinstall.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-tool_rbinstall.rb,v 1.1 2011/12/04 02:31:54 taca Exp $
+
+Don't install which has already ${RUBY_VER} suffix.
+
+--- tool/rbinstall.rb.orig	2011-07-30 14:19:11.000000000 +0000
++++ tool/rbinstall.rb
+@@ -211,7 +211,7 @@ def install_recursive(srcdir, dest, opti
+       end
+     end
+   end
+-  skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core"
++  skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core *193"
+   prune = path_matcher(prune)
+   skip = path_matcher(skip)
+   File.directory?(srcdir) or return rescue return