Update to 1.6.0-preview3.

Utilize bsd.ruby.mk.

8 files changed, 454 insertions, 416 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 794ac7c996f2..d69dc5b26316 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	ruby
-PORTVERSION=	1.4.6
+PORTVERSION=	${RUBY_VERSION}.p3
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	1.4
+MASTER_SITE_SUBDIR=	# ${RUBY_VER}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-preview/}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
 
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
-MAN1=		ruby.1
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
+MAN1=		${RUBY_NAME}.1
 
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
-DOCDIR=		${PREFIX}/share/doc/ruby
-EXAMPLESDIR=	${PREFIX}/share/examples/ruby
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 ELISP_FILES=	inf-ruby.el ruby-mode.el rubydb3x.el
 
@@ -32,6 +28,12 @@ EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+
+.if !empty(RUBY_SUFFIX)
+CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
+MLINKS=		${RUBY_NAME}.1 ruby.1
+.endif
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+= --enable-ipv6
@@ -41,35 +43,35 @@ post-patch:
 	${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-	${RM} -rf ${WRKSRC}/lib/irb ${WRKSRC}/sample/irb.rb
 
 post-install:
-	strip ${PREFIX}/bin/ruby
+	strip ${RUBY}
+	${LN} -fs ${RUBY} ${PREFIX}/ruby
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}
-	${MKDIR} ${EXAMPLESDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${EXAMPLESDIR}/misc
+	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
+	${MKDIR} ${RUBY_EXAMPLESDIR}/misc
+	${INSTALL_DATA} ${WRKSRC}/misc/* ${RUBY_EXAMPLESDIR}/misc
 	${MKDIR} ${EMACSLISPDIR}
 	${MKDIR} ${XEMACSLISPDIR}
 .for f in ${ELISP_FILES}
-	${LN} -sf ${EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
-	${LN} -sf ${EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
+	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
+	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
 .endfor
-	${MKDIR} ${EXAMPLESDIR}/curses
-	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${EXAMPLESDIR}/curses
-	${MKDIR} ${EXAMPLESDIR}/pty
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${EXAMPLESDIR}/pty
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
-	${MKDIR} ${DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${DOCDIR}/etc
-	${MKDIR} ${DOCDIR}/md5
-	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${DOCDIR}/md5
-	${MKDIR} ${DOCDIR}/pty
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${DOCDIR}/pty
-	${MKDIR} ${DOCDIR}/readline
-	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${DOCDIR}/readline
+	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
+	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
+	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${RUBY_EXAMPLESDIR}/pty
+	${MKDIR} ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
+	${MKDIR} ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${MKDIR} ${RUBY_DOCDIR}/md5
+	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${RUBY_DOCDIR}/md5
+	${MKDIR} ${RUBY_DOCDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
+	${MKDIR} ${RUBY_DOCDIR}/readline
+	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 69b467fa2cd0..bb24aba206df 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.4.6.tar.gz) = 3c910657b164749d9b98d7448df17f9a
+MD5 (ruby/ruby-1.6.0-preview3.tar.gz) = 22b0c65d4bbc71232f07265ad0a4a0c4
diff --git a/lang/ruby/pkg-message b/lang/ruby/pkg-message
index c59892a2e980..321b1ac049ac 100644
--- a/lang/ruby/pkg-message
+++ b/lang/ruby/pkg-message
@@ -25,7 +25,6 @@ Note that some stuff that comes with the standard Ruby distribution is
 provided as separate ports:
 
 	databases/ruby-gdbm:	GDBM module
-	lang/irb:		Interactive Ruby
 	japanese/rubytk or
 	x11-toolkits/rubytk:	TclTkLib & Ruby/Tk modules
 
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index d9c15f35c7a9..28525df2d3b7 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -1,179 +1,197 @@
-bin/ruby
-lib/libruby.so
-lib/libruby.so.14
-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%%/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%%/cgi.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
-lib/ruby/%%RUBY_VER%%/cgi/session.rb
-lib/ruby/%%RUBY_VER%%/net/ftp.rb
-lib/ruby/%%RUBY_VER%%/net/http.rb
-lib/ruby/%%RUBY_VER%%/net/pop.rb
-lib/ruby/%%RUBY_VER%%/net/protocol.rb
-lib/ruby/%%RUBY_VER%%/net/smtp.rb
-lib/ruby/%%RUBY_VER%%/net/telnet.rb
-@exec /bin/mkdir -p %D/lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%
+bin/irb
+bin/%%RUBY_NAME%%
+@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi
+lib/lib%%RUBY_NAME%%.so
+lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+%%RUBY_ARCHLIBDIR%%/config.h
+%%RUBY_ARCHLIBDIR%%/curses.so
+%%RUBY_ARCHLIBDIR%%/dbm.so
+%%RUBY_ARCHLIBDIR%%/defines.h
+%%RUBY_ARCHLIBDIR%%/dln.h
+%%RUBY_ARCHLIBDIR%%/env.h
+%%RUBY_ARCHLIBDIR%%/etc.so
+%%RUBY_ARCHLIBDIR%%/fcntl.so
+%%RUBY_ARCHLIBDIR%%/intern.h
+%%RUBY_ARCHLIBDIR%%/lib%%RUBY_NAME%%.a
+%%RUBY_ARCHLIBDIR%%/md5.so
+%%RUBY_ARCHLIBDIR%%/nkf.so
+%%RUBY_ARCHLIBDIR%%/node.h
+%%RUBY_ARCHLIBDIR%%/pty.so
+%%RUBY_ARCHLIBDIR%%/rbconfig.rb
+%%RUBY_ARCHLIBDIR%%/re.h
+%%RUBY_ARCHLIBDIR%%/readline.so
+%%RUBY_ARCHLIBDIR%%/regex.h
+%%RUBY_ARCHLIBDIR%%/ruby.h
+%%RUBY_ARCHLIBDIR%%/rubyio.h
+%%RUBY_ARCHLIBDIR%%/rubysig.h
+%%RUBY_ARCHLIBDIR%%/sdbm.so
+%%RUBY_ARCHLIBDIR%%/socket.so
+%%RUBY_ARCHLIBDIR%%/st.h
+%%RUBY_ARCHLIBDIR%%/util.h
+%%RUBY_ARCHLIBDIR%%/version.h
+%%RUBY_LIBDIR%%/English.rb
+%%RUBY_LIBDIR%%/Env.rb
+%%RUBY_LIBDIR%%/base64.rb
+%%RUBY_LIBDIR%%/cgi-lib.rb
+%%RUBY_LIBDIR%%/cgi.rb
+%%RUBY_LIBDIR%%/complex.rb
+%%RUBY_LIBDIR%%/date.rb
+%%RUBY_LIBDIR%%/date2.rb
+%%RUBY_LIBDIR%%/debug.rb
+%%RUBY_LIBDIR%%/delegate.rb
+%%RUBY_LIBDIR%%/e2mmap.rb
+%%RUBY_LIBDIR%%/eregex.rb
+%%RUBY_LIBDIR%%/expect.rb
+%%RUBY_LIBDIR%%/final.rb
+%%RUBY_LIBDIR%%/finalize.rb
+%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/ftools.rb
+%%RUBY_LIBDIR%%/ftplib.rb
+%%RUBY_LIBDIR%%/getoptlong.rb
+%%RUBY_LIBDIR%%/getopts.rb
+%%RUBY_LIBDIR%%/importenv.rb
+%%RUBY_LIBDIR%%/jcode.rb
+%%RUBY_LIBDIR%%/kconv.rb
+%%RUBY_LIBDIR%%/mailread.rb
+%%RUBY_LIBDIR%%/mathn.rb
+%%RUBY_LIBDIR%%/matrix.rb
+%%RUBY_LIBDIR%%/mkmf.rb
+%%RUBY_LIBDIR%%/monitor.rb
+%%RUBY_LIBDIR%%/mutex_m.rb
+%%RUBY_LIBDIR%%/observer.rb
+%%RUBY_LIBDIR%%/open3.rb
+%%RUBY_LIBDIR%%/ostruct.rb
+%%RUBY_LIBDIR%%/parsearg.rb
+%%RUBY_LIBDIR%%/parsedate.rb
+%%RUBY_LIBDIR%%/ping.rb
+%%RUBY_LIBDIR%%/profile.rb
+%%RUBY_LIBDIR%%/pstore.rb
+%%RUBY_LIBDIR%%/rational.rb
+%%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shellwords.rb
+%%RUBY_LIBDIR%%/singleton.rb
+%%RUBY_LIBDIR%%/sync.rb
+%%RUBY_LIBDIR%%/telnet.rb
+%%RUBY_LIBDIR%%/tempfile.rb
+%%RUBY_LIBDIR%%/thread.rb
+%%RUBY_LIBDIR%%/thwait.rb
+%%RUBY_LIBDIR%%/timeout.rb
+%%RUBY_LIBDIR%%/tracer.rb
+%%RUBY_LIBDIR%%/weakref.rb
+%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBY_LIBDIR%%/irb/xmp.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding-2.rb
+%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBY_LIBDIR%%/irb/multi-irb.rb
+%%RUBY_LIBDIR%%/irb/main.rb
+%%RUBY_LIBDIR%%/irb/loader.rb
+%%RUBY_LIBDIR%%/irb/irb.rb
+%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/net/ftp.rb
+%%RUBY_LIBDIR%%/net/http.rb
+%%RUBY_LIBDIR%%/net/pop.rb
+%%RUBY_LIBDIR%%/net/protocol.rb
+%%RUBY_LIBDIR%%/net/smtp.rb
+%%RUBY_LIBDIR%%/net/telnet.rb
+@exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITELIBDIR%%
 @dirrm lib/ruby/site_ruby
-@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/%%RUBY_VER%%/cgi
-@dirrm lib/ruby/%%RUBY_VER%%/net
-@dirrm lib/ruby/%%RUBY_VER%%
+@dirrm %%RUBY_ARCHLIBDIR%%
+@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/irb
+@dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%
 @dirrm lib/ruby
-share/doc/ruby/README
-share/doc/ruby/README.EXT
-share/doc/ruby/README.EXT.jp
-share/doc/ruby/README.jp
-share/doc/ruby/etc/etc.txt
-share/doc/ruby/etc/etc.txt.jp
-share/doc/ruby/md5/md5.txt
-share/doc/ruby/md5/md5.txt.jp
-share/doc/ruby/pty/README
-share/doc/ruby/pty/README.expect
-share/doc/ruby/pty/README.expect.jp
-share/doc/ruby/pty/README.jp
-share/doc/ruby/readline/README
-@dirrm share/doc/ruby/etc
-@dirrm share/doc/ruby/md5
-@dirrm share/doc/ruby/pty
-@dirrm share/doc/ruby/readline
-@unexec rmdir %D/share/doc/ruby 2>/dev/null || true
-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/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/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
-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/curses/hello.rb
-share/examples/ruby/curses/rain.rb
-share/examples/ruby/curses/view.rb
-share/examples/ruby/pty/expect_sample.rb
-share/examples/ruby/pty/script.rb
-share/examples/ruby/pty/shl.rb
-@dirrm share/examples/ruby/misc
-@dirrm share/examples/ruby/curses
-@dirrm share/examples/ruby/pty
-@dirrm share/examples/ruby
+%%RUBY_DOCDIR%%/README
+%%RUBY_DOCDIR%%/README.EXT
+%%RUBY_DOCDIR%%/README.EXT.jp
+%%RUBY_DOCDIR%%/README.jp
+%%RUBY_DOCDIR%%/etc/etc.txt
+%%RUBY_DOCDIR%%/etc/etc.txt.jp
+%%RUBY_DOCDIR%%/md5/md5.txt
+%%RUBY_DOCDIR%%/md5/md5.txt.jp
+%%RUBY_DOCDIR%%/pty/README
+%%RUBY_DOCDIR%%/pty/README.expect
+%%RUBY_DOCDIR%%/pty/README.expect.jp
+%%RUBY_DOCDIR%%/pty/README.jp
+%%RUBY_DOCDIR%%/readline/README
+@dirrm %%RUBY_DOCDIR%%/etc
+@dirrm %%RUBY_DOCDIR%%/md5
+@dirrm %%RUBY_DOCDIR%%/pty
+@dirrm %%RUBY_DOCDIR%%/readline
+@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+%%RUBY_EXAMPLESDIR%%/README
+%%RUBY_EXAMPLESDIR%%/biorhythm.rb
+%%RUBY_EXAMPLESDIR%%/cal.rb
+%%RUBY_EXAMPLESDIR%%/cbreak.rb
+%%RUBY_EXAMPLESDIR%%/clnt.rb
+%%RUBY_EXAMPLESDIR%%/dbmtest.rb
+%%RUBY_EXAMPLESDIR%%/dir.rb
+%%RUBY_EXAMPLESDIR%%/dualstack-fetch.rb
+%%RUBY_EXAMPLESDIR%%/dualstack-httpd.rb
+%%RUBY_EXAMPLESDIR%%/eval.rb
+%%RUBY_EXAMPLESDIR%%/export.rb
+%%RUBY_EXAMPLESDIR%%/exyacc.rb
+%%RUBY_EXAMPLESDIR%%/fact.rb
+%%RUBY_EXAMPLESDIR%%/fib.awk
+%%RUBY_EXAMPLESDIR%%/fib.pl
+%%RUBY_EXAMPLESDIR%%/fib.py
+%%RUBY_EXAMPLESDIR%%/fib.rb
+%%RUBY_EXAMPLESDIR%%/fib.scm
+%%RUBY_EXAMPLESDIR%%/freq.rb
+%%RUBY_EXAMPLESDIR%%/from.rb
+%%RUBY_EXAMPLESDIR%%/fullpath.rb
+%%RUBY_EXAMPLESDIR%%/getopts.test
+%%RUBY_EXAMPLESDIR%%/goodfriday.rb
+%%RUBY_EXAMPLESDIR%%/irb.rb
+%%RUBY_EXAMPLESDIR%%/less.rb
+%%RUBY_EXAMPLESDIR%%/list.rb
+%%RUBY_EXAMPLESDIR%%/list2.rb
+%%RUBY_EXAMPLESDIR%%/list3.rb
+%%RUBY_EXAMPLESDIR%%/mine.rb
+%%RUBY_EXAMPLESDIR%%/mkproto.rb
+%%RUBY_EXAMPLESDIR%%/mpart.rb
+%%RUBY_EXAMPLESDIR%%/mrshtest.rb
+%%RUBY_EXAMPLESDIR%%/observ.rb
+%%RUBY_EXAMPLESDIR%%/occur.pl
+%%RUBY_EXAMPLESDIR%%/occur.rb
+%%RUBY_EXAMPLESDIR%%/occur2.rb
+%%RUBY_EXAMPLESDIR%%/philos.rb
+%%RUBY_EXAMPLESDIR%%/pi.rb
+%%RUBY_EXAMPLESDIR%%/rcs.awk
+%%RUBY_EXAMPLESDIR%%/rcs.dat
+%%RUBY_EXAMPLESDIR%%/rcs.rb
+%%RUBY_EXAMPLESDIR%%/regx.rb
+%%RUBY_EXAMPLESDIR%%/rename.rb
+%%RUBY_EXAMPLESDIR%%/sieve.rb
+%%RUBY_EXAMPLESDIR%%/svr.rb
+%%RUBY_EXAMPLESDIR%%/test.rb
+%%RUBY_EXAMPLESDIR%%/time.rb
+%%RUBY_EXAMPLESDIR%%/trojan.rb
+%%RUBY_EXAMPLESDIR%%/tsvr.rb
+%%RUBY_EXAMPLESDIR%%/uumerge.rb
+%%RUBY_EXAMPLESDIR%%/misc/README
+%%RUBY_EXAMPLESDIR%%/misc/inf-ruby.el
+%%RUBY_EXAMPLESDIR%%/misc/ruby-mode.el
+%%RUBY_EXAMPLESDIR%%/misc/rubydb2x.el
+%%RUBY_EXAMPLESDIR%%/misc/rubydb3x.el
+%%RUBY_EXAMPLESDIR%%/curses/hello.rb
+%%RUBY_EXAMPLESDIR%%/curses/rain.rb
+%%RUBY_EXAMPLESDIR%%/curses/view.rb
+%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
+%%RUBY_EXAMPLESDIR%%/pty/script.rb
+%%RUBY_EXAMPLESDIR%%/pty/shl.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/misc
+@dirrm %%RUBY_EXAMPLESDIR%%/curses
+@dirrm %%RUBY_EXAMPLESDIR%%/pty
+@dirrm %%RUBY_EXAMPLESDIR%%
 share/emacs/site-lisp/inf-ruby.el
 share/emacs/site-lisp/ruby-mode.el
 share/emacs/site-lisp/rubydb3x.el
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 794ac7c996f2..d69dc5b26316 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -6,25 +6,21 @@
 #
 
 PORTNAME=	ruby
-PORTVERSION=	1.4.6
+PORTVERSION=	${RUBY_VERSION}.p3
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=	${MASTER_SITE_RUBY}
-MASTER_SITE_SUBDIR=	1.4
+MASTER_SITE_SUBDIR=	# ${RUBY_VER}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/-preview/}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
 
-GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-shared
-MAN1=		ruby.1
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
+MAN1=		${RUBY_NAME}.1
 
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
-DOCDIR=		${PREFIX}/share/doc/ruby
-EXAMPLESDIR=	${PREFIX}/share/examples/ruby
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 ELISP_FILES=	inf-ruby.el ruby-mode.el rubydb3x.el
 
@@ -32,6 +28,12 @@ EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+
+.if !empty(RUBY_SUFFIX)
+CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
+MLINKS=		${RUBY_NAME}.1 ruby.1
+.endif
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+= --enable-ipv6
@@ -41,35 +43,35 @@ post-patch:
 	${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-	${RM} -rf ${WRKSRC}/lib/irb ${WRKSRC}/sample/irb.rb
 
 post-install:
-	strip ${PREFIX}/bin/ruby
+	strip ${RUBY}
+	${LN} -fs ${RUBY} ${PREFIX}/ruby
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR}
-	${MKDIR} ${EXAMPLESDIR}/misc
-	${INSTALL_DATA} ${WRKSRC}/misc/* ${EXAMPLESDIR}/misc
+	${MKDIR} ${RUBY_EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
+	${MKDIR} ${RUBY_EXAMPLESDIR}/misc
+	${INSTALL_DATA} ${WRKSRC}/misc/* ${RUBY_EXAMPLESDIR}/misc
 	${MKDIR} ${EMACSLISPDIR}
 	${MKDIR} ${XEMACSLISPDIR}
 .for f in ${ELISP_FILES}
-	${LN} -sf ${EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
-	${LN} -sf ${EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
+	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${EMACSLISPDIR}/
+	${LN} -sf ${RUBY_EXAMPLESDIR}/misc/${f} ${XEMACSLISPDIR}/
 .endfor
-	${MKDIR} ${EXAMPLESDIR}/curses
-	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${EXAMPLESDIR}/curses
-	${MKDIR} ${EXAMPLESDIR}/pty
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${EXAMPLESDIR}/pty
-	${MKDIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
-	${MKDIR} ${DOCDIR}/etc
-	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${DOCDIR}/etc
-	${MKDIR} ${DOCDIR}/md5
-	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${DOCDIR}/md5
-	${MKDIR} ${DOCDIR}/pty
-	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${DOCDIR}/pty
-	${MKDIR} ${DOCDIR}/readline
-	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${DOCDIR}/readline
+	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
+	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
+	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${RUBY_EXAMPLESDIR}/pty
+	${MKDIR} ${RUBY_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
+	${MKDIR} ${RUBY_DOCDIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
+	${MKDIR} ${RUBY_DOCDIR}/md5
+	${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${RUBY_DOCDIR}/md5
+	${MKDIR} ${RUBY_DOCDIR}/pty
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
+	${MKDIR} ${RUBY_DOCDIR}/readline
+	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 69b467fa2cd0..bb24aba206df 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.4.6.tar.gz) = 3c910657b164749d9b98d7448df17f9a
+MD5 (ruby/ruby-1.6.0-preview3.tar.gz) = 22b0c65d4bbc71232f07265ad0a4a0c4
diff --git a/lang/ruby16/pkg-message b/lang/ruby16/pkg-message
index c59892a2e980..321b1ac049ac 100644
--- a/lang/ruby16/pkg-message
+++ b/lang/ruby16/pkg-message
@@ -25,7 +25,6 @@ Note that some stuff that comes with the standard Ruby distribution is
 provided as separate ports:
 
 	databases/ruby-gdbm:	GDBM module
-	lang/irb:		Interactive Ruby
 	japanese/rubytk or
 	x11-toolkits/rubytk:	TclTkLib & Ruby/Tk modules
 
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index d9c15f35c7a9..28525df2d3b7 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -1,179 +1,197 @@
-bin/ruby
-lib/libruby.so
-lib/libruby.so.14
-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%%/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%%/cgi.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
-lib/ruby/%%RUBY_VER%%/cgi/session.rb
-lib/ruby/%%RUBY_VER%%/net/ftp.rb
-lib/ruby/%%RUBY_VER%%/net/http.rb
-lib/ruby/%%RUBY_VER%%/net/pop.rb
-lib/ruby/%%RUBY_VER%%/net/protocol.rb
-lib/ruby/%%RUBY_VER%%/net/smtp.rb
-lib/ruby/%%RUBY_VER%%/net/telnet.rb
-@exec /bin/mkdir -p %D/lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%
+bin/irb
+bin/%%RUBY_NAME%%
+@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi
+lib/lib%%RUBY_NAME%%.so
+lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
+%%RUBY_ARCHLIBDIR%%/config.h
+%%RUBY_ARCHLIBDIR%%/curses.so
+%%RUBY_ARCHLIBDIR%%/dbm.so
+%%RUBY_ARCHLIBDIR%%/defines.h
+%%RUBY_ARCHLIBDIR%%/dln.h
+%%RUBY_ARCHLIBDIR%%/env.h
+%%RUBY_ARCHLIBDIR%%/etc.so
+%%RUBY_ARCHLIBDIR%%/fcntl.so
+%%RUBY_ARCHLIBDIR%%/intern.h
+%%RUBY_ARCHLIBDIR%%/lib%%RUBY_NAME%%.a
+%%RUBY_ARCHLIBDIR%%/md5.so
+%%RUBY_ARCHLIBDIR%%/nkf.so
+%%RUBY_ARCHLIBDIR%%/node.h
+%%RUBY_ARCHLIBDIR%%/pty.so
+%%RUBY_ARCHLIBDIR%%/rbconfig.rb
+%%RUBY_ARCHLIBDIR%%/re.h
+%%RUBY_ARCHLIBDIR%%/readline.so
+%%RUBY_ARCHLIBDIR%%/regex.h
+%%RUBY_ARCHLIBDIR%%/ruby.h
+%%RUBY_ARCHLIBDIR%%/rubyio.h
+%%RUBY_ARCHLIBDIR%%/rubysig.h
+%%RUBY_ARCHLIBDIR%%/sdbm.so
+%%RUBY_ARCHLIBDIR%%/socket.so
+%%RUBY_ARCHLIBDIR%%/st.h
+%%RUBY_ARCHLIBDIR%%/util.h
+%%RUBY_ARCHLIBDIR%%/version.h
+%%RUBY_LIBDIR%%/English.rb
+%%RUBY_LIBDIR%%/Env.rb
+%%RUBY_LIBDIR%%/base64.rb
+%%RUBY_LIBDIR%%/cgi-lib.rb
+%%RUBY_LIBDIR%%/cgi.rb
+%%RUBY_LIBDIR%%/complex.rb
+%%RUBY_LIBDIR%%/date.rb
+%%RUBY_LIBDIR%%/date2.rb
+%%RUBY_LIBDIR%%/debug.rb
+%%RUBY_LIBDIR%%/delegate.rb
+%%RUBY_LIBDIR%%/e2mmap.rb
+%%RUBY_LIBDIR%%/eregex.rb
+%%RUBY_LIBDIR%%/expect.rb
+%%RUBY_LIBDIR%%/final.rb
+%%RUBY_LIBDIR%%/finalize.rb
+%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/ftools.rb
+%%RUBY_LIBDIR%%/ftplib.rb
+%%RUBY_LIBDIR%%/getoptlong.rb
+%%RUBY_LIBDIR%%/getopts.rb
+%%RUBY_LIBDIR%%/importenv.rb
+%%RUBY_LIBDIR%%/jcode.rb
+%%RUBY_LIBDIR%%/kconv.rb
+%%RUBY_LIBDIR%%/mailread.rb
+%%RUBY_LIBDIR%%/mathn.rb
+%%RUBY_LIBDIR%%/matrix.rb
+%%RUBY_LIBDIR%%/mkmf.rb
+%%RUBY_LIBDIR%%/monitor.rb
+%%RUBY_LIBDIR%%/mutex_m.rb
+%%RUBY_LIBDIR%%/observer.rb
+%%RUBY_LIBDIR%%/open3.rb
+%%RUBY_LIBDIR%%/ostruct.rb
+%%RUBY_LIBDIR%%/parsearg.rb
+%%RUBY_LIBDIR%%/parsedate.rb
+%%RUBY_LIBDIR%%/ping.rb
+%%RUBY_LIBDIR%%/profile.rb
+%%RUBY_LIBDIR%%/pstore.rb
+%%RUBY_LIBDIR%%/rational.rb
+%%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shellwords.rb
+%%RUBY_LIBDIR%%/singleton.rb
+%%RUBY_LIBDIR%%/sync.rb
+%%RUBY_LIBDIR%%/telnet.rb
+%%RUBY_LIBDIR%%/tempfile.rb
+%%RUBY_LIBDIR%%/thread.rb
+%%RUBY_LIBDIR%%/thwait.rb
+%%RUBY_LIBDIR%%/timeout.rb
+%%RUBY_LIBDIR%%/tracer.rb
+%%RUBY_LIBDIR%%/weakref.rb
+%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBY_LIBDIR%%/irb/xmp.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding.rb
+%%RUBY_LIBDIR%%/irb/workspace-binding-2.rb
+%%RUBY_LIBDIR%%/irb/version.rb
+%%RUBY_LIBDIR%%/irb/slex.rb
+%%RUBY_LIBDIR%%/irb/ruby-token.rb
+%%RUBY_LIBDIR%%/irb/ruby-lex.rb
+%%RUBY_LIBDIR%%/irb/multi-irb.rb
+%%RUBY_LIBDIR%%/irb/main.rb
+%%RUBY_LIBDIR%%/irb/loader.rb
+%%RUBY_LIBDIR%%/irb/irb.rb
+%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/net/ftp.rb
+%%RUBY_LIBDIR%%/net/http.rb
+%%RUBY_LIBDIR%%/net/pop.rb
+%%RUBY_LIBDIR%%/net/protocol.rb
+%%RUBY_LIBDIR%%/net/smtp.rb
+%%RUBY_LIBDIR%%/net/telnet.rb
+@exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITELIBDIR%%
 @dirrm lib/ruby/site_ruby
-@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
-@dirrm lib/ruby/%%RUBY_VER%%/cgi
-@dirrm lib/ruby/%%RUBY_VER%%/net
-@dirrm lib/ruby/%%RUBY_VER%%
+@dirrm %%RUBY_ARCHLIBDIR%%
+@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/irb
+@dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%
 @dirrm lib/ruby
-share/doc/ruby/README
-share/doc/ruby/README.EXT
-share/doc/ruby/README.EXT.jp
-share/doc/ruby/README.jp
-share/doc/ruby/etc/etc.txt
-share/doc/ruby/etc/etc.txt.jp
-share/doc/ruby/md5/md5.txt
-share/doc/ruby/md5/md5.txt.jp
-share/doc/ruby/pty/README
-share/doc/ruby/pty/README.expect
-share/doc/ruby/pty/README.expect.jp
-share/doc/ruby/pty/README.jp
-share/doc/ruby/readline/README
-@dirrm share/doc/ruby/etc
-@dirrm share/doc/ruby/md5
-@dirrm share/doc/ruby/pty
-@dirrm share/doc/ruby/readline
-@unexec rmdir %D/share/doc/ruby 2>/dev/null || true
-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/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/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
-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/curses/hello.rb
-share/examples/ruby/curses/rain.rb
-share/examples/ruby/curses/view.rb
-share/examples/ruby/pty/expect_sample.rb
-share/examples/ruby/pty/script.rb
-share/examples/ruby/pty/shl.rb
-@dirrm share/examples/ruby/misc
-@dirrm share/examples/ruby/curses
-@dirrm share/examples/ruby/pty
-@dirrm share/examples/ruby
+%%RUBY_DOCDIR%%/README
+%%RUBY_DOCDIR%%/README.EXT
+%%RUBY_DOCDIR%%/README.EXT.jp
+%%RUBY_DOCDIR%%/README.jp
+%%RUBY_DOCDIR%%/etc/etc.txt
+%%RUBY_DOCDIR%%/etc/etc.txt.jp
+%%RUBY_DOCDIR%%/md5/md5.txt
+%%RUBY_DOCDIR%%/md5/md5.txt.jp
+%%RUBY_DOCDIR%%/pty/README
+%%RUBY_DOCDIR%%/pty/README.expect
+%%RUBY_DOCDIR%%/pty/README.expect.jp
+%%RUBY_DOCDIR%%/pty/README.jp
+%%RUBY_DOCDIR%%/readline/README
+@dirrm %%RUBY_DOCDIR%%/etc
+@dirrm %%RUBY_DOCDIR%%/md5
+@dirrm %%RUBY_DOCDIR%%/pty
+@dirrm %%RUBY_DOCDIR%%/readline
+@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+%%RUBY_EXAMPLESDIR%%/README
+%%RUBY_EXAMPLESDIR%%/biorhythm.rb
+%%RUBY_EXAMPLESDIR%%/cal.rb
+%%RUBY_EXAMPLESDIR%%/cbreak.rb
+%%RUBY_EXAMPLESDIR%%/clnt.rb
+%%RUBY_EXAMPLESDIR%%/dbmtest.rb
+%%RUBY_EXAMPLESDIR%%/dir.rb
+%%RUBY_EXAMPLESDIR%%/dualstack-fetch.rb
+%%RUBY_EXAMPLESDIR%%/dualstack-httpd.rb
+%%RUBY_EXAMPLESDIR%%/eval.rb
+%%RUBY_EXAMPLESDIR%%/export.rb
+%%RUBY_EXAMPLESDIR%%/exyacc.rb
+%%RUBY_EXAMPLESDIR%%/fact.rb
+%%RUBY_EXAMPLESDIR%%/fib.awk
+%%RUBY_EXAMPLESDIR%%/fib.pl
+%%RUBY_EXAMPLESDIR%%/fib.py
+%%RUBY_EXAMPLESDIR%%/fib.rb
+%%RUBY_EXAMPLESDIR%%/fib.scm
+%%RUBY_EXAMPLESDIR%%/freq.rb
+%%RUBY_EXAMPLESDIR%%/from.rb
+%%RUBY_EXAMPLESDIR%%/fullpath.rb
+%%RUBY_EXAMPLESDIR%%/getopts.test
+%%RUBY_EXAMPLESDIR%%/goodfriday.rb
+%%RUBY_EXAMPLESDIR%%/irb.rb
+%%RUBY_EXAMPLESDIR%%/less.rb
+%%RUBY_EXAMPLESDIR%%/list.rb
+%%RUBY_EXAMPLESDIR%%/list2.rb
+%%RUBY_EXAMPLESDIR%%/list3.rb
+%%RUBY_EXAMPLESDIR%%/mine.rb
+%%RUBY_EXAMPLESDIR%%/mkproto.rb
+%%RUBY_EXAMPLESDIR%%/mpart.rb
+%%RUBY_EXAMPLESDIR%%/mrshtest.rb
+%%RUBY_EXAMPLESDIR%%/observ.rb
+%%RUBY_EXAMPLESDIR%%/occur.pl
+%%RUBY_EXAMPLESDIR%%/occur.rb
+%%RUBY_EXAMPLESDIR%%/occur2.rb
+%%RUBY_EXAMPLESDIR%%/philos.rb
+%%RUBY_EXAMPLESDIR%%/pi.rb
+%%RUBY_EXAMPLESDIR%%/rcs.awk
+%%RUBY_EXAMPLESDIR%%/rcs.dat
+%%RUBY_EXAMPLESDIR%%/rcs.rb
+%%RUBY_EXAMPLESDIR%%/regx.rb
+%%RUBY_EXAMPLESDIR%%/rename.rb
+%%RUBY_EXAMPLESDIR%%/sieve.rb
+%%RUBY_EXAMPLESDIR%%/svr.rb
+%%RUBY_EXAMPLESDIR%%/test.rb
+%%RUBY_EXAMPLESDIR%%/time.rb
+%%RUBY_EXAMPLESDIR%%/trojan.rb
+%%RUBY_EXAMPLESDIR%%/tsvr.rb
+%%RUBY_EXAMPLESDIR%%/uumerge.rb
+%%RUBY_EXAMPLESDIR%%/misc/README
+%%RUBY_EXAMPLESDIR%%/misc/inf-ruby.el
+%%RUBY_EXAMPLESDIR%%/misc/ruby-mode.el
+%%RUBY_EXAMPLESDIR%%/misc/rubydb2x.el
+%%RUBY_EXAMPLESDIR%%/misc/rubydb3x.el
+%%RUBY_EXAMPLESDIR%%/curses/hello.rb
+%%RUBY_EXAMPLESDIR%%/curses/rain.rb
+%%RUBY_EXAMPLESDIR%%/curses/view.rb
+%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
+%%RUBY_EXAMPLESDIR%%/pty/script.rb
+%%RUBY_EXAMPLESDIR%%/pty/shl.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/misc
+@dirrm %%RUBY_EXAMPLESDIR%%/curses
+@dirrm %%RUBY_EXAMPLESDIR%%/pty
+@dirrm %%RUBY_EXAMPLESDIR%%
 share/emacs/site-lisp/inf-ruby.el
 share/emacs/site-lisp/ruby-mode.el
 share/emacs/site-lisp/rubydb3x.el