Update ruby package to 1.8.1.

Now, this package isn't meta-package.

Ruby itself is provided as language/ruby18 (Ruby 1.8.1) or
language/ruby16 (Ruby 1.6.8) and Ruby's commands are
$PREFIX/bin/ruby18 or $PREFIX/bin/ruby16.

This pacakge provide commands without its version in name
as $PREFIX/bin/ruby.

Some extention libraries bundled in Ruby's distribution are
move to separate packages.  For ruby18:

	converters/ruby-iconv:		Iconv module
	databases/ruby-dbm:		DBM module
	databases/ruby-gdbm:		GDBM module
	devel/ruby-curses:		Curses module
	security/ruby-digest:		message digest module
	security/ruby-openssl:		OpenSSL module
	devel/ruby-readline:		readline module
	x11/ruby-tcltklib:		Tcl/Tk libraries
	x11/ruby-tk:			Tk modules

And for ruby16:

	databases/ruby-dbm:		DBM module
	databases/ruby-gdbm:		GDBM module
	devel/ruby16-curses:		Curses module
	security/ruby-digest:		message digest module
	devel/ruby-readline:		readline module
	x11/ruby16-tcltklib:		Tcl/Tk libraries
	x11/ruby16-tk:			Tk modules

You can specify default Ruby's version by setting
RUBY_VERSION_DEFAULT to 1.6 or 1.8 in /etc/mk.conf.

2 files changed, 29 insertions, 33 deletions

diff --git a/lang/ruby/DESCR b/lang/ruby/DESCR
index 0c65b55b9be..e356ed61e41 100644
--- a/lang/ruby/DESCR
+++ b/lang/ruby/DESCR
@@ -1,19 +1,7 @@
-Ruby is the interpreted scripting language for quick and
-easy object-oriented programming.  It has many features to
-process text files and to do system management tasks (as in
-Perl).  It is simple, straight-forward, and extensible.
+This package is wrapper for specific release of Ruby programming
+language, providing commands (ruby, irb, ...) without its release
+number information.
 
-Features of Ruby are shown below.
-
-  + Simple Syntax
-  + *Normal* Object-Oriented features (ex. class, method calls)
-  + *Advanced* Object-Oriented features (ex. Mix-in, Singleton-method)
-  + Operator Overloading
-  + Exception Handling
-  + Iterators and Closures
-  + Garbage Collection
-  + Dynamic Loading of Object files (on some architecture)
-  + Highly Portable (works on many UNIX machines, and on DOS,
-    Windows, Mac, BeOS etc.)
-
-Author:	Matsumoto "matz" Yukihiro <matz@netlab.co.jp>
+Actual Ruby programming language is provided by a package with its
+release number like ruby16 or ruby18 and no package should not
+depends on this pacakge.
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 8c0731ff653..8caa4bfc63c 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,31 +1,39 @@
-# $NetBSD: Makefile,v 1.29 2004/03/16 02:01:10 taca Exp $
+# $NetBSD: Makefile,v 1.30 2004/11/27 15:02:10 taca Exp $
 # FreeBSD: ports/lang/ruby/Makefile,v 1.40 2001/01/18 19:53:38 knu Exp
 
 DISTNAME=	ruby-${RUBY_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.ruby-lang.org/en/
-COMMENT=	Ruby, object-oriented interpreted scripting language
+COMMENT=	Ruby, object-oriented interpreted programming language
 
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}base>=${RUBY_VERSION}:../../lang/${RUBY_PKGNAMEPREFIX}base
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}digest>=${RUBY_VERSION}:../../security/ruby-digest
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}readline>=${RUBY_VERSION}:../../devel/${RUBY_PKGNAMEPREFIX}readline
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}tk>=${RUBY_VERSION}:../../x11/${RUBY_PKGNAMEPREFIX}tk
+NO_CHECKSUM=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
+NO_WRAPPER=	yes
+PLIST_SRC=	${WRKDIR}/PLIST
 
-RUBY_VER=	1.6
+.include "../../lang/ruby/rubyversion.mk"
 
-NO_CHECKSUM=	# defined
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
+DEPENDS+= 	${RUBY_PKGPREFIX}>=${RUBY_VERSION}:../${RUBY_PKGPREFIX}
+
+RUBY_COMMANDS=	irb ruby
+.if ${RUBY_VER} >= 18
+RUBY_COMMANDS+=	erb rdoc ri testrb
+.endif
 
 do-install:
-	@${ECHO_MSG} This is only a meta package.
+	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.if ${RUBY_NAME} != "ruby"
+.for file in ${RUBY_COMMANDS}
+	${LN} -sf ${file}${RUBY_VER} ${LOCALBASE}/bin/${file}
+	${ECHO} bin/${file} >> ${PLIST_SRC}
+.endfor
+	${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1
+	${ECHO} man/man1/ruby.1 >> ${PLIST_SRC}
+.endif
 
-.include "../../lang/ruby-base/Makefile.common"
 .include "../../mk/bsd.pkg.mk"