Update to version 1.4.0

PR:		13304
Submitted by:	maintainer

12 files changed, 330 insertions, 279 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 65de5028227b..2c833607cc78 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.2.5
+DISTNAME=	ruby-1.4.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -18,17 +18,14 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@big.or.jp
 
 GNU_CONFIGURE=	yes
-#USE_AUTOCONF=	yes
+CONFIGURE_ARGS+= --enable-shared
 MAN1=		ruby.1
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
+RUBY_VER=	1.4
 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
+BRANCH_NAME=	.
 
 post-patch:
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
@@ -38,6 +35,9 @@ 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
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index b08ccbf9c196..d9fe74ba01f4 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
diff --git a/lang/ruby/pkg-descr b/lang/ruby/pkg-descr
index 5800b868d6b5..2ee17e67a725 100644
--- a/lang/ruby/pkg-descr
+++ b/lang/ruby/pkg-descr
@@ -1,9 +1,9 @@
 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.
+Perl).  It is simple, straight-forward, and extensible.
 
-Features of ruby is shown below.
+Features of Ruby are shown below.
 
   + Simple Syntax
   + *Normal* Object-Oriented features(ex. class, method calls)
@@ -13,8 +13,8 @@ Features of ruby is shown below.
   + 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.)
 
-The ruby home page is at http://www.netlab.co.jp/ruby/.
-
-WWW: http://www.netlab.co.jp/ruby
+The Ruby home page is at:
+WWW: http://www.netlab.co.jp/ruby/
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 14946407aca9..ee92b52ffe77 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -1,77 +1,88 @@
 bin/ruby
-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/base64.rb
-lib/ruby/cgi-lib.rb
-lib/ruby/complex.rb
-lib/ruby/date.rb
-lib/ruby/date2.rb
-lib/ruby/debug.rb
-lib/ruby/delegate.rb
-lib/ruby/e2mmap.rb
-lib/ruby/eregex.rb
-lib/ruby/final.rb
-lib/ruby/finalize.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
-lib/ruby/mailread.rb
-lib/ruby/mathn.rb
-lib/ruby/matrix.rb
-lib/ruby/mkmf.rb
-lib/ruby/monitor.rb
-lib/ruby/mutex_m.rb
-lib/ruby/observer.rb
-lib/ruby/open3.rb
-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
-lib/ruby/shell.rb
-lib/ruby/shellwords.rb
-lib/ruby/singleton.rb
-lib/ruby/sync.rb
-lib/ruby/telnet.rb
-lib/ruby/tempfile.rb
-lib/ruby/thread.rb
-lib/ruby/thwait.rb
-lib/ruby/timeout.rb
-lib/ruby/tracer.rb
-lib/ruby/weakref.rb
-@dirrm lib/ruby/%%RUBY_ARCH%%
+lib/libruby.so
+lib/libruby.so.14
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/libruby.a
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/nkf.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/node.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/pty.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rbconfig.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/re.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/readline.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/regex.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/ruby.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubyio.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubysig.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/sdbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/st.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/y.tab.h
+lib/ruby/%%RUBY_VER%%/English.rb
+lib/ruby/%%RUBY_VER%%/Env.rb
+lib/ruby/%%RUBY_VER%%/base64.rb
+lib/ruby/%%RUBY_VER%%/cgi-lib.rb
+lib/ruby/%%RUBY_VER%%/complex.rb
+lib/ruby/%%RUBY_VER%%/date.rb
+lib/ruby/%%RUBY_VER%%/date2.rb
+lib/ruby/%%RUBY_VER%%/debug.rb
+lib/ruby/%%RUBY_VER%%/delegate.rb
+lib/ruby/%%RUBY_VER%%/e2mmap.rb
+lib/ruby/%%RUBY_VER%%/eregex.rb
+lib/ruby/%%RUBY_VER%%/expect.rb
+lib/ruby/%%RUBY_VER%%/final.rb
+lib/ruby/%%RUBY_VER%%/finalize.rb
+lib/ruby/%%RUBY_VER%%/find.rb
+lib/ruby/%%RUBY_VER%%/ftools.rb
+lib/ruby/%%RUBY_VER%%/ftplib.rb
+lib/ruby/%%RUBY_VER%%/getoptlong.rb
+lib/ruby/%%RUBY_VER%%/getopts.rb
+lib/ruby/%%RUBY_VER%%/importenv.rb
+lib/ruby/%%RUBY_VER%%/jcode.rb
+lib/ruby/%%RUBY_VER%%/kconv.rb
+lib/ruby/%%RUBY_VER%%/mailread.rb
+lib/ruby/%%RUBY_VER%%/mathn.rb
+lib/ruby/%%RUBY_VER%%/matrix.rb
+lib/ruby/%%RUBY_VER%%/mkmf.rb
+lib/ruby/%%RUBY_VER%%/monitor.rb
+lib/ruby/%%RUBY_VER%%/mutex_m.rb
+lib/ruby/%%RUBY_VER%%/observer.rb
+lib/ruby/%%RUBY_VER%%/open3.rb
+lib/ruby/%%RUBY_VER%%/ostruct.rb
+lib/ruby/%%RUBY_VER%%/parsearg.rb
+lib/ruby/%%RUBY_VER%%/parsedate.rb
+lib/ruby/%%RUBY_VER%%/ping.rb
+lib/ruby/%%RUBY_VER%%/profile.rb
+lib/ruby/%%RUBY_VER%%/pstore.rb
+lib/ruby/%%RUBY_VER%%/rational.rb
+lib/ruby/%%RUBY_VER%%/readbytes.rb
+lib/ruby/%%RUBY_VER%%/shellwords.rb
+lib/ruby/%%RUBY_VER%%/singleton.rb
+lib/ruby/%%RUBY_VER%%/sync.rb
+lib/ruby/%%RUBY_VER%%/telnet.rb
+lib/ruby/%%RUBY_VER%%/tempfile.rb
+lib/ruby/%%RUBY_VER%%/thread.rb
+lib/ruby/%%RUBY_VER%%/thwait.rb
+lib/ruby/%%RUBY_VER%%/timeout.rb
+lib/ruby/%%RUBY_VER%%/tracer.rb
+lib/ruby/%%RUBY_VER%%/weakref.rb
+@exec /bin/mkdir -p %D/lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby
+@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%
 @dirrm lib/ruby
 share/examples/ruby/README
 share/examples/ruby/biorhythm.rb
@@ -80,6 +91,8 @@ 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
@@ -94,7 +107,6 @@ 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
@@ -113,10 +125,9 @@ share/examples/ruby/rbc.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/ruby-mode.el
-share/examples/ruby/rubydb2x.el
-share/examples/ruby/rubydb3x.el
+share/examples/ruby/rename.rb
 share/examples/ruby/sieve.rb
 share/examples/ruby/svr.rb
 share/examples/ruby/test.rb
@@ -124,4 +135,10 @@ share/examples/ruby/time.rb
 share/examples/ruby/trojan.rb
 share/examples/ruby/tsvr.rb
 share/examples/ruby/uumerge.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
+@dirrm share/examples/ruby/misc
 @dirrm share/examples/ruby
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index 65de5028227b..2c833607cc78 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.2.5
+DISTNAME=	ruby-1.4.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -18,17 +18,14 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@big.or.jp
 
 GNU_CONFIGURE=	yes
-#USE_AUTOCONF=	yes
+CONFIGURE_ARGS+= --enable-shared
 MAN1=		ruby.1
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
+RUBY_VER=	1.4
 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
+BRANCH_NAME=	.
 
 post-patch:
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
@@ -38,6 +35,9 @@ 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
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/ruby14/distinfo b/lang/ruby14/distinfo
index b08ccbf9c196..d9fe74ba01f4 100644
--- a/lang/ruby14/distinfo
+++ b/lang/ruby14/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
diff --git a/lang/ruby14/pkg-descr b/lang/ruby14/pkg-descr
index 5800b868d6b5..2ee17e67a725 100644
--- a/lang/ruby14/pkg-descr
+++ b/lang/ruby14/pkg-descr
@@ -1,9 +1,9 @@
 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.
+Perl).  It is simple, straight-forward, and extensible.
 
-Features of ruby is shown below.
+Features of Ruby are shown below.
 
   + Simple Syntax
   + *Normal* Object-Oriented features(ex. class, method calls)
@@ -13,8 +13,8 @@ Features of ruby is shown below.
   + 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.)
 
-The ruby home page is at http://www.netlab.co.jp/ruby/.
-
-WWW: http://www.netlab.co.jp/ruby
+The Ruby home page is at:
+WWW: http://www.netlab.co.jp/ruby/
diff --git a/lang/ruby14/pkg-plist b/lang/ruby14/pkg-plist
index 14946407aca9..ee92b52ffe77 100644
--- a/lang/ruby14/pkg-plist
+++ b/lang/ruby14/pkg-plist
@@ -1,77 +1,88 @@
 bin/ruby
-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/base64.rb
-lib/ruby/cgi-lib.rb
-lib/ruby/complex.rb
-lib/ruby/date.rb
-lib/ruby/date2.rb
-lib/ruby/debug.rb
-lib/ruby/delegate.rb
-lib/ruby/e2mmap.rb
-lib/ruby/eregex.rb
-lib/ruby/final.rb
-lib/ruby/finalize.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
-lib/ruby/mailread.rb
-lib/ruby/mathn.rb
-lib/ruby/matrix.rb
-lib/ruby/mkmf.rb
-lib/ruby/monitor.rb
-lib/ruby/mutex_m.rb
-lib/ruby/observer.rb
-lib/ruby/open3.rb
-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
-lib/ruby/shell.rb
-lib/ruby/shellwords.rb
-lib/ruby/singleton.rb
-lib/ruby/sync.rb
-lib/ruby/telnet.rb
-lib/ruby/tempfile.rb
-lib/ruby/thread.rb
-lib/ruby/thwait.rb
-lib/ruby/timeout.rb
-lib/ruby/tracer.rb
-lib/ruby/weakref.rb
-@dirrm lib/ruby/%%RUBY_ARCH%%
+lib/libruby.so
+lib/libruby.so.14
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/libruby.a
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/nkf.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/node.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/pty.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rbconfig.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/re.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/readline.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/regex.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/ruby.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubyio.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubysig.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/sdbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/st.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/y.tab.h
+lib/ruby/%%RUBY_VER%%/English.rb
+lib/ruby/%%RUBY_VER%%/Env.rb
+lib/ruby/%%RUBY_VER%%/base64.rb
+lib/ruby/%%RUBY_VER%%/cgi-lib.rb
+lib/ruby/%%RUBY_VER%%/complex.rb
+lib/ruby/%%RUBY_VER%%/date.rb
+lib/ruby/%%RUBY_VER%%/date2.rb
+lib/ruby/%%RUBY_VER%%/debug.rb
+lib/ruby/%%RUBY_VER%%/delegate.rb
+lib/ruby/%%RUBY_VER%%/e2mmap.rb
+lib/ruby/%%RUBY_VER%%/eregex.rb
+lib/ruby/%%RUBY_VER%%/expect.rb
+lib/ruby/%%RUBY_VER%%/final.rb
+lib/ruby/%%RUBY_VER%%/finalize.rb
+lib/ruby/%%RUBY_VER%%/find.rb
+lib/ruby/%%RUBY_VER%%/ftools.rb
+lib/ruby/%%RUBY_VER%%/ftplib.rb
+lib/ruby/%%RUBY_VER%%/getoptlong.rb
+lib/ruby/%%RUBY_VER%%/getopts.rb
+lib/ruby/%%RUBY_VER%%/importenv.rb
+lib/ruby/%%RUBY_VER%%/jcode.rb
+lib/ruby/%%RUBY_VER%%/kconv.rb
+lib/ruby/%%RUBY_VER%%/mailread.rb
+lib/ruby/%%RUBY_VER%%/mathn.rb
+lib/ruby/%%RUBY_VER%%/matrix.rb
+lib/ruby/%%RUBY_VER%%/mkmf.rb
+lib/ruby/%%RUBY_VER%%/monitor.rb
+lib/ruby/%%RUBY_VER%%/mutex_m.rb
+lib/ruby/%%RUBY_VER%%/observer.rb
+lib/ruby/%%RUBY_VER%%/open3.rb
+lib/ruby/%%RUBY_VER%%/ostruct.rb
+lib/ruby/%%RUBY_VER%%/parsearg.rb
+lib/ruby/%%RUBY_VER%%/parsedate.rb
+lib/ruby/%%RUBY_VER%%/ping.rb
+lib/ruby/%%RUBY_VER%%/profile.rb
+lib/ruby/%%RUBY_VER%%/pstore.rb
+lib/ruby/%%RUBY_VER%%/rational.rb
+lib/ruby/%%RUBY_VER%%/readbytes.rb
+lib/ruby/%%RUBY_VER%%/shellwords.rb
+lib/ruby/%%RUBY_VER%%/singleton.rb
+lib/ruby/%%RUBY_VER%%/sync.rb
+lib/ruby/%%RUBY_VER%%/telnet.rb
+lib/ruby/%%RUBY_VER%%/tempfile.rb
+lib/ruby/%%RUBY_VER%%/thread.rb
+lib/ruby/%%RUBY_VER%%/thwait.rb
+lib/ruby/%%RUBY_VER%%/timeout.rb
+lib/ruby/%%RUBY_VER%%/tracer.rb
+lib/ruby/%%RUBY_VER%%/weakref.rb
+@exec /bin/mkdir -p %D/lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby
+@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%
 @dirrm lib/ruby
 share/examples/ruby/README
 share/examples/ruby/biorhythm.rb
@@ -80,6 +91,8 @@ 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
@@ -94,7 +107,6 @@ 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
@@ -113,10 +125,9 @@ share/examples/ruby/rbc.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/ruby-mode.el
-share/examples/ruby/rubydb2x.el
-share/examples/ruby/rubydb3x.el
+share/examples/ruby/rename.rb
 share/examples/ruby/sieve.rb
 share/examples/ruby/svr.rb
 share/examples/ruby/test.rb
@@ -124,4 +135,10 @@ share/examples/ruby/time.rb
 share/examples/ruby/trojan.rb
 share/examples/ruby/tsvr.rb
 share/examples/ruby/uumerge.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
+@dirrm share/examples/ruby/misc
 @dirrm share/examples/ruby
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 65de5028227b..2c833607cc78 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.2.5
+DISTNAME=	ruby-1.4.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -18,17 +18,14 @@ MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 MAINTAINER=	yasuf@big.or.jp
 
 GNU_CONFIGURE=	yes
-#USE_AUTOCONF=	yes
+CONFIGURE_ARGS+= --enable-shared
 MAN1=		ruby.1
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
+RUBY_VER=	1.4
 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
+BRANCH_NAME=	.
 
 post-patch:
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
@@ -38,6 +35,9 @@ 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
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 test:
 	@(cd ${WRKSRC}; make test)
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index b08ccbf9c196..d9fe74ba01f4 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
diff --git a/lang/ruby16/pkg-descr b/lang/ruby16/pkg-descr
index 5800b868d6b5..2ee17e67a725 100644
--- a/lang/ruby16/pkg-descr
+++ b/lang/ruby16/pkg-descr
@@ -1,9 +1,9 @@
 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.
+Perl).  It is simple, straight-forward, and extensible.
 
-Features of ruby is shown below.
+Features of Ruby are shown below.
 
   + Simple Syntax
   + *Normal* Object-Oriented features(ex. class, method calls)
@@ -13,8 +13,8 @@ Features of ruby is shown below.
   + 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.)
 
-The ruby home page is at http://www.netlab.co.jp/ruby/.
-
-WWW: http://www.netlab.co.jp/ruby
+The Ruby home page is at:
+WWW: http://www.netlab.co.jp/ruby/
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 14946407aca9..ee92b52ffe77 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -1,77 +1,88 @@
 bin/ruby
-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/base64.rb
-lib/ruby/cgi-lib.rb
-lib/ruby/complex.rb
-lib/ruby/date.rb
-lib/ruby/date2.rb
-lib/ruby/debug.rb
-lib/ruby/delegate.rb
-lib/ruby/e2mmap.rb
-lib/ruby/eregex.rb
-lib/ruby/final.rb
-lib/ruby/finalize.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
-lib/ruby/mailread.rb
-lib/ruby/mathn.rb
-lib/ruby/matrix.rb
-lib/ruby/mkmf.rb
-lib/ruby/monitor.rb
-lib/ruby/mutex_m.rb
-lib/ruby/observer.rb
-lib/ruby/open3.rb
-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
-lib/ruby/shell.rb
-lib/ruby/shellwords.rb
-lib/ruby/singleton.rb
-lib/ruby/sync.rb
-lib/ruby/telnet.rb
-lib/ruby/tempfile.rb
-lib/ruby/thread.rb
-lib/ruby/thwait.rb
-lib/ruby/timeout.rb
-lib/ruby/tracer.rb
-lib/ruby/weakref.rb
-@dirrm lib/ruby/%%RUBY_ARCH%%
+lib/libruby.so
+lib/libruby.so.14
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/libruby.a
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/nkf.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/node.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/pty.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rbconfig.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/re.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/readline.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/regex.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/ruby.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubyio.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubysig.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/sdbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/st.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/y.tab.h
+lib/ruby/%%RUBY_VER%%/English.rb
+lib/ruby/%%RUBY_VER%%/Env.rb
+lib/ruby/%%RUBY_VER%%/base64.rb
+lib/ruby/%%RUBY_VER%%/cgi-lib.rb
+lib/ruby/%%RUBY_VER%%/complex.rb
+lib/ruby/%%RUBY_VER%%/date.rb
+lib/ruby/%%RUBY_VER%%/date2.rb
+lib/ruby/%%RUBY_VER%%/debug.rb
+lib/ruby/%%RUBY_VER%%/delegate.rb
+lib/ruby/%%RUBY_VER%%/e2mmap.rb
+lib/ruby/%%RUBY_VER%%/eregex.rb
+lib/ruby/%%RUBY_VER%%/expect.rb
+lib/ruby/%%RUBY_VER%%/final.rb
+lib/ruby/%%RUBY_VER%%/finalize.rb
+lib/ruby/%%RUBY_VER%%/find.rb
+lib/ruby/%%RUBY_VER%%/ftools.rb
+lib/ruby/%%RUBY_VER%%/ftplib.rb
+lib/ruby/%%RUBY_VER%%/getoptlong.rb
+lib/ruby/%%RUBY_VER%%/getopts.rb
+lib/ruby/%%RUBY_VER%%/importenv.rb
+lib/ruby/%%RUBY_VER%%/jcode.rb
+lib/ruby/%%RUBY_VER%%/kconv.rb
+lib/ruby/%%RUBY_VER%%/mailread.rb
+lib/ruby/%%RUBY_VER%%/mathn.rb
+lib/ruby/%%RUBY_VER%%/matrix.rb
+lib/ruby/%%RUBY_VER%%/mkmf.rb
+lib/ruby/%%RUBY_VER%%/monitor.rb
+lib/ruby/%%RUBY_VER%%/mutex_m.rb
+lib/ruby/%%RUBY_VER%%/observer.rb
+lib/ruby/%%RUBY_VER%%/open3.rb
+lib/ruby/%%RUBY_VER%%/ostruct.rb
+lib/ruby/%%RUBY_VER%%/parsearg.rb
+lib/ruby/%%RUBY_VER%%/parsedate.rb
+lib/ruby/%%RUBY_VER%%/ping.rb
+lib/ruby/%%RUBY_VER%%/profile.rb
+lib/ruby/%%RUBY_VER%%/pstore.rb
+lib/ruby/%%RUBY_VER%%/rational.rb
+lib/ruby/%%RUBY_VER%%/readbytes.rb
+lib/ruby/%%RUBY_VER%%/shellwords.rb
+lib/ruby/%%RUBY_VER%%/singleton.rb
+lib/ruby/%%RUBY_VER%%/sync.rb
+lib/ruby/%%RUBY_VER%%/telnet.rb
+lib/ruby/%%RUBY_VER%%/tempfile.rb
+lib/ruby/%%RUBY_VER%%/thread.rb
+lib/ruby/%%RUBY_VER%%/thwait.rb
+lib/ruby/%%RUBY_VER%%/timeout.rb
+lib/ruby/%%RUBY_VER%%/tracer.rb
+lib/ruby/%%RUBY_VER%%/weakref.rb
+@exec /bin/mkdir -p %D/lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby
+@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%
 @dirrm lib/ruby
 share/examples/ruby/README
 share/examples/ruby/biorhythm.rb
@@ -80,6 +91,8 @@ 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
@@ -94,7 +107,6 @@ 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
@@ -113,10 +125,9 @@ share/examples/ruby/rbc.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/ruby-mode.el
-share/examples/ruby/rubydb2x.el
-share/examples/ruby/rubydb3x.el
+share/examples/ruby/rename.rb
 share/examples/ruby/sieve.rb
 share/examples/ruby/svr.rb
 share/examples/ruby/test.rb
@@ -124,4 +135,10 @@ share/examples/ruby/time.rb
 share/examples/ruby/trojan.rb
 share/examples/ruby/tsvr.rb
 share/examples/ruby/uumerge.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
+@dirrm share/examples/ruby/misc
 @dirrm share/examples/ruby