Change the default version of ruby to 1.8 for i386 as well, finally.

Always put a version suffix to the ruby name (no matter if ruby is the
default version) to avoid mess in future.

[Notes for i386 users]

If you are a ruby developer and still want to stick with ruby 1.6 as
default, please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.

If you are a ruby developer and want to keep ruby 1.6 as default,
please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.  Otherwise, please
run the following series of commands to migrate to ruby 1.8:

  1) Reinstall portupgrade manually (and ruby 1.8 will be installed)
	pkg_delete portupgrade-\*
        (cd /usr/ports/sysutils/portupgrade; make install clean)

  2) Reinstall everything that depends on ruby 1.6 (to use ruby 1.8)
	portupgrade -fr lang/ruby16

  3) Reinstall ruby 1.8 (because the previous step kills symlinks)
	portupgrade -f lang/ruby18

  4) Deinstall ruby 1.6 stuff (if you are paranoia)
        pkg_deinstall -ri lang/ruby16

1 files changed, 7 insertions, 7 deletions

diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 80c48e78faae..04b57386b200 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -1,17 +1,17 @@
 %%IF_DEFAULT%%bin/erb%%RUBY_R%%
-bin/erb%%_RUBY_SUFFIX%%
+bin/erb%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/h2rb%%RUBY_R%%
-bin/h2rb%%_RUBY_SUFFIX%%
+bin/h2rb%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/irb%%RUBY_R%%
-bin/irb%%_RUBY_SUFFIX%%
+bin/irb%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/rdoc%%RUBY_R%%
-bin/rdoc%%_RUBY_SUFFIX%%
+bin/rdoc%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ri%%RUBY_R%%
-bin/ri%%_RUBY_SUFFIX%%
+bin/ri%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby%%RUBY_R%%
-bin/ruby%%_RUBY_SUFFIX%%
+bin/ruby%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/testrb%%RUBY_R%%
-bin/testrb%%_RUBY_SUFFIX%%
+bin/testrb%%RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%-static.a
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%