Update ruby to 1.4.2

DEPENDS+= gdbm,ncurses
install examples.

Changes: Fixed some bugs, improved stability.

3 files changed, 180 insertions, 101 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 9f781362cb7..d69441535e4 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1999/08/24 14:14:28 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/09/17 03:43:23 sakamoto Exp $
 #
 
-DISTNAME=	ruby-1.4.0
+DISTNAME=	ruby-1.4.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
 		ftp://ftp.iij.ad.jp/pub/lang/ruby/ \
@@ -11,11 +11,28 @@ MASTER_SITES=	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
 		ftp://ftp.mirror.nucba.ac.jp/mirror/ruby/ \
 		http://mirror.nucba.ac.jp/mirror/ruby/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.netlab.co.jp/ruby/index.html
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
+DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --enable-shared
+MAKE_ENV+=	DLDFLAGS="-L${LOCALBASE}/lib -R${LOCALBASE}/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
+	${MKDIR} ${PREFIX}/share/examples/ruby
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby
+	${MKDIR} ${PREFIX}/share/examples/ruby/misc
+	${INSTALL_DATA} ${WRKSRC}/misc/* ${PREFIX}/share/examples/ruby/misc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby/files/md5 b/lang/ruby/files/md5
index cd87990c30c..5355ca84a18 100644
--- a/lang/ruby/files/md5
+++ b/lang/ruby/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/08/17 02:16:44 sakamoto Exp $
+$NetBSD: md5,v 1.3 1999/09/17 03:43:24 sakamoto Exp $
 
-MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
+MD5 (ruby-1.4.2.tar.gz) = 96078396b6185273337195e8b067794e
diff --git a/lang/ruby/pkg/PLIST b/lang/ruby/pkg/PLIST
index 189d95c5149..2d65dc99f16 100644
--- a/lang/ruby/pkg/PLIST
+++ b/lang/ruby/pkg/PLIST
@@ -1,99 +1,161 @@
-@comment $NetBSD: PLIST,v 1.1 1999/08/17 02:16:45 sakamoto Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/09/17 03:43:24 sakamoto Exp $
 bin/ruby
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/config.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/curses.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/dbm.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/defines.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/dln.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/env.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/etc.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/fcntl.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/intern.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/libruby.a
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/md5.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/nkf.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/node.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/pty.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/rbconfig.rb
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/re.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/regex.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/ruby.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/rubyio.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/rubysig.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/sdbm.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/socket.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/st.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/tkutil.so
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/util.h
-lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}/version.h
-lib/ruby/1.4/English.rb
-lib/ruby/1.4/Env.rb
-lib/ruby/1.4/base64.rb
-lib/ruby/1.4/cgi-lib.rb
-lib/ruby/1.4/complex.rb
-lib/ruby/1.4/date.rb
-lib/ruby/1.4/date2.rb
-lib/ruby/1.4/debug.rb
-lib/ruby/1.4/delegate.rb
-lib/ruby/1.4/e2mmap.rb
-lib/ruby/1.4/eregex.rb
-lib/ruby/1.4/expect.rb
-lib/ruby/1.4/final.rb
-lib/ruby/1.4/finalize.rb
-lib/ruby/1.4/find.rb
-lib/ruby/1.4/ftools.rb
-lib/ruby/1.4/ftplib.rb
-lib/ruby/1.4/getoptlong.rb
-lib/ruby/1.4/getopts.rb
-lib/ruby/1.4/importenv.rb
-lib/ruby/1.4/jcode.rb
-lib/ruby/1.4/kconv.rb
-lib/ruby/1.4/mailread.rb
-lib/ruby/1.4/mathn.rb
-lib/ruby/1.4/matrix.rb
-lib/ruby/1.4/mkmf.rb
-lib/ruby/1.4/monitor.rb
-lib/ruby/1.4/mutex_m.rb
-lib/ruby/1.4/observer.rb
-lib/ruby/1.4/open3.rb
-lib/ruby/1.4/ostruct.rb
-lib/ruby/1.4/parsearg.rb
-lib/ruby/1.4/parsedate.rb
-lib/ruby/1.4/ping.rb
-lib/ruby/1.4/profile.rb
-lib/ruby/1.4/pstore.rb
-lib/ruby/1.4/rational.rb
-lib/ruby/1.4/readbytes.rb
-lib/ruby/1.4/shellwords.rb
-lib/ruby/1.4/singleton.rb
-lib/ruby/1.4/sync.rb
-lib/ruby/1.4/telnet.rb
-lib/ruby/1.4/tempfile.rb
-lib/ruby/1.4/thread.rb
-lib/ruby/1.4/thwait.rb
-lib/ruby/1.4/timeout.rb
-lib/ruby/1.4/tk.rb
-lib/ruby/1.4/tkafter.rb
-lib/ruby/1.4/tkbgerror.rb
-lib/ruby/1.4/tkcanvas.rb
-lib/ruby/1.4/tkclass.rb
-lib/ruby/1.4/tkdialog.rb
-lib/ruby/1.4/tkentry.rb
-lib/ruby/1.4/tkfont.rb
-lib/ruby/1.4/tkmenubar.rb
-lib/ruby/1.4/tkmngfocus.rb
-lib/ruby/1.4/tkpalette.rb
-lib/ruby/1.4/tkscrollbox.rb
-lib/ruby/1.4/tktext.rb
-lib/ruby/1.4/tkvirtevent.rb
-lib/ruby/1.4/tracer.rb
-lib/ruby/1.4/weakref.rb
+lib/libruby.so.${RUBY_VERSION}
+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}/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_ARCH}-${LOWER_OPSYS}/config.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/curses.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/dbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/defines.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/dln.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/env.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/etc.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/fcntl.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/gdbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/intern.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/libruby.a
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/md5.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/nkf.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/node.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/pty.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rbconfig.rb
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/re.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/readline.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/regex.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/ruby.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rubyio.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/rubysig.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/sdbm.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/socket.so
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/st.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/util.h
+lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}/version.h
+lib/ruby/${RUBY_VERSION}/importenv.rb
+lib/ruby/${RUBY_VERSION}/irb/bind.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/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/pop.rb
+lib/ruby/${RUBY_VERSION}/net/session.rb
+lib/ruby/${RUBY_VERSION}/net/smtp.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
-@exec mkdir -p %D/lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}
-@exec mkdir -p %D/lib/ruby/1.4/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS}
-@unexec mkdir -p %D/lib/ruby/1.4/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS} 2> /dev/null || true
-@dirrm lib/ruby/1.4/${MACHINE_ARCH}-${LOWER_OPSYS}
-@dirrm lib/ruby/1.4/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS}
-@dirrm lib/ruby/1.4/site_ruby
-@dirrm lib/ruby/1.4
+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/rd2html.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/${RUBY_VERSION}/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS}
+@dirrm share/examples/ruby/misc
+@dirrm share/examples/ruby
+@dirrm lib/ruby/${RUBY_VERSION}/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS}
+@dirrm lib/ruby/${RUBY_VERSION}/site_ruby
+@dirrm lib/ruby/${RUBY_VERSION}/net
+@dirrm lib/ruby/${RUBY_VERSION}/irb
+@dirrm lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS}
+@dirrm lib/ruby/${RUBY_VERSION}
 @dirrm lib/ruby