Update lang/ruby and lang/ruby-devel to the latest snapshots.

Remove shells/ruby-shell as it is now part of the standard distribution.
(in both Ruby 1.6.4 and 1.7.0)

Mark security/ruby-sha1 broken for Ruby >= 1.7.0, as it is also part of the
standard distribution now.

10 files changed, 60 insertions, 4 deletions

diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 2edf8f0cbe46..9750862c02ce 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -101,6 +101,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
+	${MKDIR} ${RUBY_DOCDIR}/sha1
+	${INSTALL_DATA} ${WRKSRC}/ext/sha1/sha1.txt* ${RUBY_DOCDIR}/sha1
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index bf5b5f5b6163..eeeb3961ae57 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.7.0-alpha-2001.05.08.tar.gz) = 8c691df68e049d1e9cee3d3fb2af2562
-MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.12.patch.gz) = fe79bb7083dc3272bde0c39e2a97afde
+MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.18.patch.gz) = 570ab8584c4f0a2cd92387aaedacada0
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index 23ebb4ef5c47..0f05fa69d213 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -26,6 +26,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/rubyio.h
 %%RUBY_ARCHLIBDIR%%/rubysig.h
 %%RUBY_ARCHLIBDIR%%/sdbm.so
+%%RUBY_ARCHLIBDIR%%/sha1.so
 %%RUBY_ARCHLIBDIR%%/socket.so
 %%RUBY_ARCHLIBDIR%%/st.h
 %%RUBY_ARCHLIBDIR%%/util.h
@@ -71,6 +72,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/pstore.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shell.rb
 %%RUBY_LIBDIR%%/shellwords.rb
 %%RUBY_LIBDIR%%/singleton.rb
 %%RUBY_LIBDIR%%/sync.rb
@@ -110,6 +112,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBY_LIBDIR%%/shell/version.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITELIBDIR%%
@@ -120,6 +129,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @dirrm %%RUBY_LIBDIR%%/irb/lc
 @dirrm %%RUBY_LIBDIR%%/irb
 @dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/shell
 @dirrm %%RUBY_LIBDIR%%
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -128,6 +138,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -140,11 +152,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt.jp
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/md5
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sha1
 %%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 3204b8219f59..6e91d9485df4 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e
-MD5 (ruby/ruby-1.6.4-preview2-2001.05.12.patch.gz) = 8246d41dd1f0687048bde01ea4f2178e
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.18.patch.gz) = 3fedf7ed6652151fb915681a6d4e5aad
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 5ce72bdb3919..c43d59806fe3 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -71,6 +71,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/pstore.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shell.rb
 %%RUBY_LIBDIR%%/shellwords.rb
 %%RUBY_LIBDIR%%/singleton.rb
 %%RUBY_LIBDIR%%/sync.rb
@@ -110,6 +111,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBY_LIBDIR%%/shell/version.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITELIBDIR%%
@@ -120,6 +128,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @dirrm %%RUBY_LIBDIR%%/irb/lc
 @dirrm %%RUBY_LIBDIR%%/irb
 @dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/shell
 @dirrm %%RUBY_LIBDIR%%
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -128,6 +137,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 3204b8219f59..6e91d9485df4 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e
-MD5 (ruby/ruby-1.6.4-preview2-2001.05.12.patch.gz) = 8246d41dd1f0687048bde01ea4f2178e
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.18.patch.gz) = 3fedf7ed6652151fb915681a6d4e5aad
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 5ce72bdb3919..c43d59806fe3 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -71,6 +71,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/pstore.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shell.rb
 %%RUBY_LIBDIR%%/shellwords.rb
 %%RUBY_LIBDIR%%/singleton.rb
 %%RUBY_LIBDIR%%/sync.rb
@@ -110,6 +111,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBY_LIBDIR%%/shell/version.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITELIBDIR%%
@@ -120,6 +128,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @dirrm %%RUBY_LIBDIR%%/irb/lc
 @dirrm %%RUBY_LIBDIR%%/irb
 @dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/shell
 @dirrm %%RUBY_LIBDIR%%
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -128,6 +137,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 2edf8f0cbe46..9750862c02ce 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -101,6 +101,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
 	${MKDIR} ${RUBY_DOCDIR}/readline
 	${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
+	${MKDIR} ${RUBY_DOCDIR}/sha1
+	${INSTALL_DATA} ${WRKSRC}/ext/sha1/sha1.txt* ${RUBY_DOCDIR}/sha1
 	${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index bf5b5f5b6163..eeeb3961ae57 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,2 @@
 MD5 (ruby/ruby-1.7.0-alpha-2001.05.08.tar.gz) = 8c691df68e049d1e9cee3d3fb2af2562
-MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.12.patch.gz) = fe79bb7083dc3272bde0c39e2a97afde
+MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.18.patch.gz) = 570ab8584c4f0a2cd92387aaedacada0
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index 23ebb4ef5c47..0f05fa69d213 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -26,6 +26,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/rubyio.h
 %%RUBY_ARCHLIBDIR%%/rubysig.h
 %%RUBY_ARCHLIBDIR%%/sdbm.so
+%%RUBY_ARCHLIBDIR%%/sha1.so
 %%RUBY_ARCHLIBDIR%%/socket.so
 %%RUBY_ARCHLIBDIR%%/st.h
 %%RUBY_ARCHLIBDIR%%/util.h
@@ -71,6 +72,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/pstore.rb
 %%RUBY_LIBDIR%%/rational.rb
 %%RUBY_LIBDIR%%/readbytes.rb
+%%RUBY_LIBDIR%%/shell.rb
 %%RUBY_LIBDIR%%/shellwords.rb
 %%RUBY_LIBDIR%%/singleton.rb
 %%RUBY_LIBDIR%%/sync.rb
@@ -110,6 +112,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_LIBDIR%%/net/protocol.rb
 %%RUBY_LIBDIR%%/net/smtp.rb
 %%RUBY_LIBDIR%%/net/telnet.rb
+%%RUBY_LIBDIR%%/shell/builtin-command.rb
+%%RUBY_LIBDIR%%/shell/command-processor.rb
+%%RUBY_LIBDIR%%/shell/error.rb
+%%RUBY_LIBDIR%%/shell/filter.rb
+%%RUBY_LIBDIR%%/shell/process-controller.rb
+%%RUBY_LIBDIR%%/shell/system-command.rb
+%%RUBY_LIBDIR%%/shell/version.rb
 @exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITEARCHLIBDIR%%
 @dirrm %%RUBY_SITELIBDIR%%
@@ -120,6 +129,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 @dirrm %%RUBY_LIBDIR%%/irb/lc
 @dirrm %%RUBY_LIBDIR%%/irb
 @dirrm %%RUBY_LIBDIR%%/net
+@dirrm %%RUBY_LIBDIR%%/shell
 @dirrm %%RUBY_LIBDIR%%
 @unexec rmdir %D/lib/ruby 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README
@@ -128,6 +138,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
 %%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -140,11 +152,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
 %%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
 %%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt
+%%PORTDOCS%%%%RUBY_DOCDIR%%/sha1/sha1.txt.jp
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/md5
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/readline
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/sha1
 %%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/README
 %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/biorhythm.rb