5 files changed, 19 insertions, 26 deletions

diff --git a/devel/ruby-setup.rb/Makefile b/devel/ruby-setup.rb/Makefile
index 427924284bd8..750e19a75876 100644
--- a/devel/ruby-setup.rb/Makefile
+++ b/devel/ruby-setup.rb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	setup.rb
-PORTVERSION=	3.1.5
+PORTVERSION=	3.2.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME:R}
@@ -21,12 +21,12 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-_SCRIPTS=	install.rb setup.rb
+_SCRIPTS=	setup.rb
 
 RUBY_SHEBANG_FILES=	${_SCRIPTS:S:^:${WRKSRC}/ruby-:}
 
-DOCS_EN=	doc.en/* NEWS.en Usage_en.txt ChangeLog TODO
-DOCS_JA=	doc.ja/* NEWS.ja Usage_ja.txt
+DOCS_EN=	doc.en/* NEWS.en Usage_en.txt README.en ChangeLog TODO
+DOCS_JA=	doc.ja/* NEWS.ja Usage_ja.txt README.ja
 
 post-extract:
 .for f in ${_SCRIPTS}
@@ -39,6 +39,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ruby-${f} ${PREFIX}/bin/
 .endfor
 .if !defined(NOPORTDOCS)
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	${MKDIR} ${RUBY_MODDOCDIR}/ja
 .for f in ${DOCS_EN}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-setup.rb/distinfo b/devel/ruby-setup.rb/distinfo
index 6d6709067c27..14f89eb2f80f 100644
--- a/devel/ruby-setup.rb/distinfo
+++ b/devel/ruby-setup.rb/distinfo
@@ -1 +1 @@
-MD5 (ruby/setup-3.1.5.tar.gz) = 6869151a91420353ee949860575ee722
+MD5 (ruby/setup-3.2.0.tar.gz) = 3af2287fe16d591d802cc784dd51b07f
diff --git a/devel/ruby-setup.rb/files/patch-ruby-install.rb b/devel/ruby-setup.rb/files/patch-ruby-install.rb
deleted file mode 100644
index a64e7e16fce2..000000000000
--- a/devel/ruby-setup.rb/files/patch-ruby-install.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby-install.rb.orig	Tue Feb 25 15:33:48 2003
-+++ ruby-install.rb	Tue Feb 25 15:34:14 2003
-@@ -857,7 +857,7 @@
- class ToplevelInstaller < Installer
- 
-   def self.invoke
--    new(File.dirname($0)).invoke
-+    new(Dir.pwd).invoke
-   end
- 
- 
diff --git a/devel/ruby-setup.rb/files/patch-ruby-setup.rb b/devel/ruby-setup.rb/files/patch-ruby-setup.rb
index 9b49e100e345..4e6380baf73e 100644
--- a/devel/ruby-setup.rb/files/patch-ruby-setup.rb
+++ b/devel/ruby-setup.rb/files/patch-ruby-setup.rb
@@ -1,11 +1,11 @@
---- ruby-setup.rb.orig	Tue Feb 25 15:33:48 2003
-+++ ruby-setup.rb	Tue Feb 25 15:34:25 2003
-@@ -857,7 +857,7 @@
- class ToplevelInstaller < Installer
+--- ruby-setup.rb.orig	Wed Aug 27 13:03:01 2003
++++ ruby-setup.rb	Thu Aug 28 01:16:03 2003
+@@ -908,7 +908,7 @@
+   @singleton = nil
  
-   def self.invoke
--    new(File.dirname($0)).invoke
-+    new(Dir.pwd).invoke
+   def ToplevelInstaller.instance
+-    @singleton = new(File.dirname($0)) unless defined?(@singleton)
++    @singleton = new(File.pwd) unless defined?(@singleton)
+     @singleton
    end
  
- 
diff --git a/devel/ruby-setup.rb/pkg-plist b/devel/ruby-setup.rb/pkg-plist
index f132cf59596f..2aef47d6f4f4 100644
--- a/devel/ruby-setup.rb/pkg-plist
+++ b/devel/ruby-setup.rb/pkg-plist
@@ -1,9 +1,8 @@
-bin/ruby-install.rb
 bin/ruby-setup.rb
-%%RUBY_SITELIBDIR%%/install.rb
 %%RUBY_SITELIBDIR%%/setup.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/NEWS.en
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/Usage_en.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/devel.html
@@ -12,6 +11,7 @@ bin/ruby-setup.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/metaconfapi.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/NEWS.ja
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Usage_ja.txt
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/devel.html
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/hookapi.html
@@ -20,3 +20,5 @@ bin/ruby-setup.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/add-task.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%