summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ruby.mk2
-rw-r--r--lang/ruby/Makefile3
-rw-r--r--lang/ruby/distinfo2
-rw-r--r--lang/ruby/pkg-plist21
-rw-r--r--lang/ruby16/Makefile3
-rw-r--r--lang/ruby16/distinfo2
-rw-r--r--lang/ruby16/pkg-plist21
7 files changed, 45 insertions, 9 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 34f3b3076947..83585605a2f2 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -100,7 +100,7 @@ RUBY_SUFFIX?= # empty
.endif
RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2
-RUBY_SNAPSHOTVERSION?= 2001.04.24
+RUBY_SNAPSHOTVERSION?= 2001.05.01
RUBY_DISTVER= ${RUBY_DISTVERSION:S/-preview/.p/}
.if !defined(RUBY_SNAPSHOTVERSION) || empty(RUBY_SNAPSHOTVERSION)
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 9836eeb323f2..b77cf78edef5 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -55,7 +55,9 @@ post-patch:
.endfor
post-install:
+.if ${STRIP} == -s
strip ${RUBY}
+.endif
.if empty(RUBY_SUFFIX)
${MV} -f ${RUBY} ${RUBY}${_RUBY_SUFFIX}
${LN} -fs ${RUBY}${_RUBY_SUFFIX} ${RUBY}
@@ -88,6 +90,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
+ ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 3f62c4fc234f..fdbab05c5857 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.04.24.patch.gz) = 5bd4ba9e4e6d8b47efe5226ebbccb26a
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.01.patch.gz) = 03bc0b64379e112d4a81d9dc24562bc6
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index e92da1a9197e..138a50acd3f5 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -50,6 +50,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/getoptlong.rb
%%RUBY_LIBDIR%%/getopts.rb
%%RUBY_LIBDIR%%/importenv.rb
+%%RUBY_LIBDIR%%/irb.rb
%%RUBY_LIBDIR%%/jcode.rb
%%RUBY_LIBDIR%%/kconv.rb
%%RUBY_LIBDIR%%/mailread.rb
@@ -80,19 +81,27 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%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/ws-for-case-2.rb
+%%RUBY_LIBDIR%%/irb/workspace.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/locale.rb
%%RUBY_LIBDIR%%/irb/loader.rb
%%RUBY_LIBDIR%%/irb/irb.rb
%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/init.rb
+%%RUBY_LIBDIR%%/irb/help.rb
%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/extend-command.rb
+%%RUBY_LIBDIR%%/irb/context.rb
%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/irb/lc/error.rb
+%%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
+%%RUBY_LIBDIR%%/irb/lc/ja/help-message
%%RUBY_LIBDIR%%/net/ftp.rb
%%RUBY_LIBDIR%%/net/http.rb
%%RUBY_LIBDIR%%/net/imap.rb
@@ -106,6 +115,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
+@dirrm %%RUBY_LIBDIR%%/irb/lc
@dirrm %%RUBY_LIBDIR%%/irb
@dirrm %%RUBY_LIBDIR%%/net
@dirrm %%RUBY_LIBDIR%%
@@ -116,6 +127,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
@@ -124,6 +138,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%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
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 9836eeb323f2..b77cf78edef5 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -55,7 +55,9 @@ post-patch:
.endfor
post-install:
+.if ${STRIP} == -s
strip ${RUBY}
+.endif
.if empty(RUBY_SUFFIX)
${MV} -f ${RUBY} ${RUBY}${_RUBY_SUFFIX}
${LN} -fs ${RUBY}${_RUBY_SUFFIX} ${RUBY}
@@ -88,6 +90,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
+ ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 3f62c4fc234f..fdbab05c5857 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.04.24.patch.gz) = 5bd4ba9e4e6d8b47efe5226ebbccb26a
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.01.patch.gz) = 03bc0b64379e112d4a81d9dc24562bc6
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index e92da1a9197e..138a50acd3f5 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -50,6 +50,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/getoptlong.rb
%%RUBY_LIBDIR%%/getopts.rb
%%RUBY_LIBDIR%%/importenv.rb
+%%RUBY_LIBDIR%%/irb.rb
%%RUBY_LIBDIR%%/jcode.rb
%%RUBY_LIBDIR%%/kconv.rb
%%RUBY_LIBDIR%%/mailread.rb
@@ -80,19 +81,27 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%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/ws-for-case-2.rb
+%%RUBY_LIBDIR%%/irb/workspace.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/locale.rb
%%RUBY_LIBDIR%%/irb/loader.rb
%%RUBY_LIBDIR%%/irb/irb.rb
%%RUBY_LIBDIR%%/irb/input-method.rb
+%%RUBY_LIBDIR%%/irb/init.rb
+%%RUBY_LIBDIR%%/irb/help.rb
%%RUBY_LIBDIR%%/irb/frame.rb
+%%RUBY_LIBDIR%%/irb/extend-command.rb
+%%RUBY_LIBDIR%%/irb/context.rb
%%RUBY_LIBDIR%%/irb/completion.rb
+%%RUBY_LIBDIR%%/irb/lc/error.rb
+%%RUBY_LIBDIR%%/irb/lc/help-message
+%%RUBY_LIBDIR%%/irb/lc/ja/error.rb
+%%RUBY_LIBDIR%%/irb/lc/ja/help-message
%%RUBY_LIBDIR%%/net/ftp.rb
%%RUBY_LIBDIR%%/net/http.rb
%%RUBY_LIBDIR%%/net/imap.rb
@@ -106,6 +115,8 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
@dirrm %%RUBY_LIBDIR%%/cgi
+@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
+@dirrm %%RUBY_LIBDIR%%/irb/lc
@dirrm %%RUBY_LIBDIR%%/irb
@dirrm %%RUBY_LIBDIR%%/net
@dirrm %%RUBY_LIBDIR%%
@@ -116,6 +127,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
@@ -124,6 +138,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%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