Update to version 1.2.5.

PR:		10906
Submitted by:	maintainer

3 files changed, 101 insertions, 48 deletions

diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 50189764a7ed..0f7144a7daaf 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.2
+# Version required:     1.2.5
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
-# $Id: Makefile,v 1.8 1998/09/22 03:22:47 jkoshy Exp $
+# $Id: Makefile,v 1.9 1999/02/22 04:11:48 steve Exp $
 #
 
-DISTNAME=	ruby-1.2.2
+DISTNAME=	ruby-1.2.5
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -17,14 +17,29 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 
 MAINTAINER=	yasuf@big.or.jp
 
+WWW_SITE=	http://www.netlab.co.jp/ruby/
+
 GNU_CONFIGURE=	yes
 #USE_AUTOCONF=	yes
 MAN1=		ruby.1
+PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+
+RUBY_ARCH=	${ARCH}-freebsd${OSREL}
+
+# lib/mkmf.rb requires that the name of the install program will be
+# specified with absolute path.
+INSTALL=	/usr/bin/install
 
 BRANCH_NAME=	1.2
 
+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
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 9cefe2fe9fd2..b08ccbf9c196 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.2.2.tar.gz) = bf31e25ff94cfc2b3a7cae8c9f552364
+MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 5fbdeb884677..14946407aca9 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -1,52 +1,35 @@
 bin/ruby
-lib/ruby/i386-freebsd%%OSREL%%/tkutil.so
-lib/ruby/i386-freebsd%%OSREL%%/tcltklib.so
-lib/ruby/i386-freebsd%%OSREL%%/socket.so
-lib/ruby/i386-freebsd%%OSREL%%/md5.so
-lib/ruby/i386-freebsd%%OSREL%%/kconv.so
-lib/ruby/i386-freebsd%%OSREL%%/fcntl.so
-lib/ruby/i386-freebsd%%OSREL%%/etc.so
-lib/ruby/i386-freebsd%%OSREL%%/dbm.so
-lib/ruby/i386-freebsd%%OSREL%%/curses.so
-lib/ruby/i386-freebsd%%OSREL%%/defines.h
-lib/ruby/i386-freebsd%%OSREL%%/dln.h
-lib/ruby/i386-freebsd%%OSREL%%/env.h
-lib/ruby/i386-freebsd%%OSREL%%/fnmatch.h
-lib/ruby/i386-freebsd%%OSREL%%/intern.h
-lib/ruby/i386-freebsd%%OSREL%%/node.h
-lib/ruby/i386-freebsd%%OSREL%%/re.h
-lib/ruby/i386-freebsd%%OSREL%%/regex.h
-lib/ruby/i386-freebsd%%OSREL%%/ruby.h
-lib/ruby/i386-freebsd%%OSREL%%/rubyio.h
-lib/ruby/i386-freebsd%%OSREL%%/rubysig.h
-lib/ruby/i386-freebsd%%OSREL%%/st.h
-lib/ruby/i386-freebsd%%OSREL%%/util.h
-lib/ruby/i386-freebsd%%OSREL%%/version.h
-lib/ruby/i386-freebsd%%OSREL%%/config.h
-lib/ruby/i386-freebsd%%OSREL%%/rbconfig.rb
-lib/ruby/tkvirtevent.rb
-lib/ruby/tktext.rb
-lib/ruby/tkscrollbox.rb
-lib/ruby/tkpalette.rb
-lib/ruby/tkmngfocus.rb
-lib/ruby/tkmenubar.rb
-lib/ruby/tkfont.rb
-lib/ruby/tkentry.rb
-lib/ruby/tkdialog.rb
-lib/ruby/tkclass.rb
-lib/ruby/tkcanvas.rb
-lib/ruby/tkbgerror.rb
-lib/ruby/tkafter.rb
-lib/ruby/tk.rb
-lib/ruby/tcltk.rb
+lib/ruby/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_ARCH%%/fnmatch.h
+lib/ruby/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_ARCH%%/kconv.so
+lib/ruby/%%RUBY_ARCH%%/libruby.a
+lib/ruby/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_ARCH%%/node.h
+lib/ruby/%%RUBY_ARCH%%/rbconfig.rb
+lib/ruby/%%RUBY_ARCH%%/re.h
+lib/ruby/%%RUBY_ARCH%%/regex.h
+lib/ruby/%%RUBY_ARCH%%/ruby.h
+lib/ruby/%%RUBY_ARCH%%/rubyio.h
+lib/ruby/%%RUBY_ARCH%%/rubysig.h
+lib/ruby/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_ARCH%%/st.h
+lib/ruby/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_ARCH%%/y.tab.h
 lib/ruby/English.rb
 lib/ruby/Env.rb
-lib/ruby/README
 lib/ruby/base64.rb
 lib/ruby/cgi-lib.rb
 lib/ruby/complex.rb
 lib/ruby/date.rb
-lib/ruby/find.rb
 lib/ruby/date2.rb
 lib/ruby/debug.rb
 lib/ruby/delegate.rb
@@ -54,8 +37,10 @@ lib/ruby/e2mmap.rb
 lib/ruby/eregex.rb
 lib/ruby/final.rb
 lib/ruby/finalize.rb
-lib/ruby/ftplib.rb
+lib/ruby/find.rb
 lib/ruby/ftools.rb
+lib/ruby/ftplib.rb
+lib/ruby/getoptlong.rb
 lib/ruby/getopts.rb
 lib/ruby/importenv.rb
 lib/ruby/jcode.rb
@@ -71,6 +56,7 @@ lib/ruby/ostruct.rb
 lib/ruby/parsearg.rb
 lib/ruby/parsedate.rb
 lib/ruby/ping.rb
+lib/ruby/profile.rb
 lib/ruby/pstore.rb
 lib/ruby/rational.rb
 lib/ruby/readbytes.rb
@@ -85,5 +71,57 @@ lib/ruby/thwait.rb
 lib/ruby/timeout.rb
 lib/ruby/tracer.rb
 lib/ruby/weakref.rb
-@dirrm lib/ruby/i386-freebsd%%OSREL%%
+@dirrm lib/ruby/%%RUBY_ARCH%%
 @dirrm lib/ruby
+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/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/inf-ruby.el
+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/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/rbc.rb
+share/examples/ruby/rcs.awk
+share/examples/ruby/rcs.dat
+share/examples/ruby/rcs.rb
+share/examples/ruby/regx.rb
+share/examples/ruby/ruby-mode.el
+share/examples/ruby/rubydb2x.el
+share/examples/ruby/rubydb3x.el
+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
+@dirrm share/examples/ruby