Make ruby package to meta-package composes those package based on

ruby 1.6.4.

	databases/ruby-gdbm		GDBM module
	security/ruby-md5		MD5 module
	devel/ruby-readline		readline module
	lang/ruby-base			base installation
	x11/ruby-tcltklib		Tcl/Tk libraries
	x11/ruby-tk			Tk modules

If RUBY_VER is set to 1.4, these package become ruby 1.4 based for
backward compatibility.

	databases/ruby-gdbm		GDBM module
	security/ruby-md5		MD5 module
	devel/ruby14-readline		readline module
	x11/ruby-tcltklib		Tcl/Tk libraries
	x11/ruby14-tk			Tk modules

6 files changed, 29 insertions, 254 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index a05e6d225ac..03b65511d02 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,48 +1,29 @@
-# $NetBSD: Makefile,v 1.20 2001/03/27 03:20:03 hubertf Exp $
-#
+# $NetBSD: Makefile,v 1.21 2001/06/30 14:30:02 taca Exp $
+# FreeBSD: ports/lang/ruby/Makefile,v 1.40 2001/01/18 19:53:38 knu Exp
 
-DISTNAME=	ruby-1.4.6
+DISTNAME=	ruby-${RUBY_VERSION}
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/ \
-		ftp://ftp.netlab.co.jp/pub/lang/ruby/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/ \
-		ftp://ftp.mirror.nucba.ac.jp/mirror/ruby/ \
-		http://mirror.nucba.ac.jp/mirror/ruby/
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
-MAINTAINER=	sakamoto@netbsd.org
-HOMEPAGE=	http://www.ruby-lang.org/
-COMMENT=	the Object-Oriented Script Language
+MAINTAINER=	taca@netbsd.org
+HOMEPAGE=	http://www.ruby-lang.org/en/
+COMMENT=	Ruby, object-oriented interpreted scripting language
 
-BUILD_DEPENDS=	bison-*:../../devel/bison
-DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
-DEPENDS+=	readline>=4.0:../../devel/readline
+DEPENDS+=	${RUBY_PKGNAMEPREFIX}base>=${RUBY_VERSION}:../../lang/${RUBY_PKGNAMEPREFIX}base
+DEPENDS+=	${RUBY_PKGNAMEPREFIX}gdbm>=${RUBY_VERSION}:../../databases/ruby-gdbm
+DEPENDS+=	${RUBY_PKGNAMEPREFIX}md5>=${RUBY_VERSION}:../../security/ruby-md5
+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
 
-BUILD_DEFS+=    USE_INET6
+NO_CHECKSUM=	# defined
+NO_PATCH=	# defined
+NO_CONFIGURE=	# defined
+NO_BUILD=	# defined
 
-.include "../../mk/bsd.prefs.mk"
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+= --enable-shared
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-MAKE_ENV+=	XLDFLAGS="${LDFLAGS}" DLDFLAGS="-L${LOCALBASE}/lib -R${LOCALBASE}/lib -L${X11BASE}/lib -R${X11BASE}/lib"
-
-PLIST_SUBST=	RUBY_VERSION=1.4
-
-post-patch:
-	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
-	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-
-post-install:
-	strip ${PREFIX}/bin/ruby
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${PREFIX}/share/examples/ruby/misc
+do-install:
+	@${ECHO_MSG} This is only a meta package.
 
+.include "../../lang/ruby-base/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
deleted file mode 100644
index 3e2d4e58a54..00000000000
--- a/lang/ruby/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:56 agc Exp $
-
-SHA1 (ruby-1.4.6.tar.gz) = 662e21cd2f6bf521a77ab179e11b669738579cc5
-Size (ruby-1.4.6.tar.gz) = 775123 bytes
-SHA1 (patch-ae) = a4fa00b51a09a0dc4e2c7ebe2109a65688e9471a
-SHA1 (patch-af) = c424f1263ca6ecb91aca37ada959f9c04aabc06b
diff --git a/lang/ruby/patches/patch-ae b/lang/ruby/patches/patch-ae
deleted file mode 100644
index 1cbea7ee249..00000000000
--- a/lang/ruby/patches/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/07/03 07:31:36 sakamoto Exp $
-
---- ext/extmk.rb.in.orig	Tue Jun 20 01:23:36 2000
-+++ ext/extmk.rb.in	Mon Jul  3 12:48:17 2000
-@@ -79,5 +79,5 @@
-   cfile.print src
-   cfile.close
--  xsystem(format(LINK, $CFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))
-+  xsystem(format(LINK, $CFLAGS, $DLDFLAGS, opt, $LOCAL_LIBS))
- end
- 
diff --git a/lang/ruby/patches/patch-af b/lang/ruby/patches/patch-af
deleted file mode 100644
index ba0afa6dd5e..00000000000
--- a/lang/ruby/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.2 2000/07/03 07:31:36 sakamoto Exp $
-
---- ext/curses/extconf.rb.orig	Tue Oct 12 18:11:25 1999
-+++ ext/curses/extconf.rb	Mon Jul  3 12:48:17 2000
-@@ -3,15 +3,7 @@
- make=false
- have_library("mytinfo", "tgetent") if /bow/ =~ PLATFORM
--if have_header("ncurses.h") and have_library("ncurses", "initscr")
-+have_library("termcap", "tgetent") 
-+if have_library("curses", "initscr")
-   make=true
--elsif have_header("ncurses/curses.h") and have_library("ncurses", "initscr")
--  make=true
--elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr")
--  make=true
--else
--  have_library("termcap", "tgetent") 
--  if have_library("curses", "initscr")
--    make=true
--  end
- end
- 
diff --git a/lang/ruby/pkg/DESCR b/lang/ruby/pkg/DESCR
index 2f0fcacf7b7..373446e6eef 100644
--- a/lang/ruby/pkg/DESCR
+++ b/lang/ruby/pkg/DESCR
@@ -1,13 +1,9 @@
-From the distribution README:
-
-* What's Ruby
-
 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.
 
-* Features of Ruby
+Features of Ruby are shown below.
 
   + Simple Syntax
   + *Normal* Object-Oriented features(ex. class, method calls)
@@ -17,4 +13,8 @@ Perl).  It is simple, straight-forward, and extensible.
   + Iterators and Closures
   + Garbage Collection
   + Dynamic Loading of Object files(on some architecture)
-  + Highly Portable(works on many UNIX machines)
+  + Highly Portable(works on many UNIX machines, and on DOS,
+    Windows, Mac, BeOS etc.)
+
+Author:	Matsumoto "matz" Yukihiro <matz@netlab.co.jp>
+WWW:	http://www.ruby-lang.org/en/
diff --git a/lang/ruby/pkg/PLIST b/lang/ruby/pkg/PLIST
index ed31ab7a43e..6e44e4aef57 100644
--- a/lang/ruby/pkg/PLIST
+++ b/lang/ruby/pkg/PLIST
@@ -1,169 +1,2 @@
-@comment $NetBSD: PLIST,v 1.7 2001/01/04 15:10:46 agc Exp $
-bin/ruby
-lib/libruby.so
-lib/libruby.so.1
-lib/libruby.so.1.4
-lib/ruby/${RUBY_VERSION}/English.rb
-lib/ruby/${RUBY_VERSION}/Env.rb
-lib/ruby/${RUBY_VERSION}/base64.rb
-lib/ruby/${RUBY_VERSION}/cgi-lib.rb
-lib/ruby/${RUBY_VERSION}/cgi.rb
-lib/ruby/${RUBY_VERSION}/cgi/session.rb
-lib/ruby/${RUBY_VERSION}/complex.rb
-lib/ruby/${RUBY_VERSION}/date.rb
-lib/ruby/${RUBY_VERSION}/date2.rb
-lib/ruby/${RUBY_VERSION}/debug.rb
-lib/ruby/${RUBY_VERSION}/delegate.rb
-lib/ruby/${RUBY_VERSION}/e2mmap.rb
-lib/ruby/${RUBY_VERSION}/eregex.rb
-lib/ruby/${RUBY_VERSION}/expect.rb
-lib/ruby/${RUBY_VERSION}/final.rb
-lib/ruby/${RUBY_VERSION}/finalize.rb
-lib/ruby/${RUBY_VERSION}/find.rb
-lib/ruby/${RUBY_VERSION}/ftools.rb
-lib/ruby/${RUBY_VERSION}/ftplib.rb
-lib/ruby/${RUBY_VERSION}/getoptlong.rb
-lib/ruby/${RUBY_VERSION}/getopts.rb
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/config.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/curses.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/dbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/defines.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/dln.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/env.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/etc.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/fcntl.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/gdbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/intern.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/libruby.a
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/md5.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/nkf.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/node.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/pty.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rbconfig.rb
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/re.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/readline.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/regex.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/ruby.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rubyio.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/rubysig.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/sdbm.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/socket.so
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/st.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/util.h
-lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}/version.h
-lib/ruby/${RUBY_VERSION}/importenv.rb
-lib/ruby/${RUBY_VERSION}/irb/completion.rb
-lib/ruby/${RUBY_VERSION}/irb/frame.rb
-lib/ruby/${RUBY_VERSION}/irb/input-method.rb
-lib/ruby/${RUBY_VERSION}/irb/loader.rb
-lib/ruby/${RUBY_VERSION}/irb/main.rb
-lib/ruby/${RUBY_VERSION}/irb/multi-irb.rb
-lib/ruby/${RUBY_VERSION}/irb/ruby-lex.rb
-lib/ruby/${RUBY_VERSION}/irb/ruby-token.rb
-lib/ruby/${RUBY_VERSION}/irb/slex.rb
-lib/ruby/${RUBY_VERSION}/irb/version.rb
-lib/ruby/${RUBY_VERSION}/irb/workspace-binding-2.rb
-lib/ruby/${RUBY_VERSION}/irb/workspace-binding.rb
-lib/ruby/${RUBY_VERSION}/irb/xmp.rb
-lib/ruby/${RUBY_VERSION}/jcode.rb
-lib/ruby/${RUBY_VERSION}/kconv.rb
-lib/ruby/${RUBY_VERSION}/mailread.rb
-lib/ruby/${RUBY_VERSION}/mathn.rb
-lib/ruby/${RUBY_VERSION}/matrix.rb
-lib/ruby/${RUBY_VERSION}/mkmf.rb
-lib/ruby/${RUBY_VERSION}/monitor.rb
-lib/ruby/${RUBY_VERSION}/mutex_m.rb
-lib/ruby/${RUBY_VERSION}/net/ftp.rb
-lib/ruby/${RUBY_VERSION}/net/http.rb
-lib/ruby/${RUBY_VERSION}/net/pop.rb
-lib/ruby/${RUBY_VERSION}/net/protocol.rb
-lib/ruby/${RUBY_VERSION}/net/smtp.rb
-lib/ruby/${RUBY_VERSION}/net/telnet.rb
-lib/ruby/${RUBY_VERSION}/observer.rb
-lib/ruby/${RUBY_VERSION}/open3.rb
-lib/ruby/${RUBY_VERSION}/ostruct.rb
-lib/ruby/${RUBY_VERSION}/parsearg.rb
-lib/ruby/${RUBY_VERSION}/parsedate.rb
-lib/ruby/${RUBY_VERSION}/ping.rb
-lib/ruby/${RUBY_VERSION}/profile.rb
-lib/ruby/${RUBY_VERSION}/pstore.rb
-lib/ruby/${RUBY_VERSION}/rational.rb
-lib/ruby/${RUBY_VERSION}/readbytes.rb
-lib/ruby/${RUBY_VERSION}/shellwords.rb
-lib/ruby/${RUBY_VERSION}/singleton.rb
-lib/ruby/${RUBY_VERSION}/sync.rb
-lib/ruby/${RUBY_VERSION}/telnet.rb
-lib/ruby/${RUBY_VERSION}/tempfile.rb
-lib/ruby/${RUBY_VERSION}/thread.rb
-lib/ruby/${RUBY_VERSION}/thwait.rb
-lib/ruby/${RUBY_VERSION}/timeout.rb
-lib/ruby/${RUBY_VERSION}/tracer.rb
-lib/ruby/${RUBY_VERSION}/weakref.rb
-man/man1/ruby.1
-share/examples/ruby/README
-share/examples/ruby/biorhythm.rb
-share/examples/ruby/cal.rb
-share/examples/ruby/cbreak.rb
-share/examples/ruby/clnt.rb
-share/examples/ruby/dbmtest.rb
-share/examples/ruby/dir.rb
-share/examples/ruby/dualstack-fetch.rb
-share/examples/ruby/dualstack-httpd.rb
-share/examples/ruby/eval.rb
-share/examples/ruby/export.rb
-share/examples/ruby/exyacc.rb
-share/examples/ruby/fact.rb
-share/examples/ruby/fib.awk
-share/examples/ruby/fib.pl
-share/examples/ruby/fib.py
-share/examples/ruby/fib.rb
-share/examples/ruby/fib.scm
-share/examples/ruby/freq.rb
-share/examples/ruby/from.rb
-share/examples/ruby/fullpath.rb
-share/examples/ruby/getopts.test
-share/examples/ruby/goodfriday.rb
-share/examples/ruby/irb.rb
-share/examples/ruby/less.rb
-share/examples/ruby/list.rb
-share/examples/ruby/list2.rb
-share/examples/ruby/list3.rb
-share/examples/ruby/mine.rb
-share/examples/ruby/misc/README
-share/examples/ruby/misc/inf-ruby.el
-share/examples/ruby/misc/ruby-mode.el
-share/examples/ruby/misc/rubydb2x.el
-share/examples/ruby/misc/rubydb3x.el
-share/examples/ruby/mkproto.rb
-share/examples/ruby/mpart.rb
-share/examples/ruby/mrshtest.rb
-share/examples/ruby/observ.rb
-share/examples/ruby/occur.pl
-share/examples/ruby/occur.rb
-share/examples/ruby/occur2.rb
-share/examples/ruby/philos.rb
-share/examples/ruby/pi.rb
-share/examples/ruby/rcs.awk
-share/examples/ruby/rcs.dat
-share/examples/ruby/rcs.rb
-share/examples/ruby/regx.rb
-share/examples/ruby/rename.rb
-share/examples/ruby/sieve.rb
-share/examples/ruby/svr.rb
-share/examples/ruby/test.rb
-share/examples/ruby/time.rb
-share/examples/ruby/trojan.rb
-share/examples/ruby/tsvr.rb
-share/examples/ruby/uumerge.rb
-@exec mkdir -p %D/lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
-@dirrm share/examples/ruby/misc
-@dirrm share/examples/ruby
-@dirrm lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
-@dirrm lib/ruby/site_ruby/${RUBY_VERSION}
-@dirrm lib/ruby/site_ruby
-@dirrm lib/ruby/${RUBY_VERSION}/net
-@dirrm lib/ruby/${RUBY_VERSION}/irb
-@dirrm lib/ruby/${RUBY_VERSION}/${MACHINE_GNU_ARCH}-${LOWER_OPSYS}
-@dirrm lib/ruby/${RUBY_VERSION}/cgi
-@dirrm lib/ruby/${RUBY_VERSION}
-@dirrm lib/ruby
+@comment $NetBSD: PLIST,v 1.8 2001/06/30 14:30:04 taca Exp $
+@comment this plist intentionally left empty