4 files changed, 32 insertions, 3 deletions

diff --git a/devel/ruby-setup.rb/Makefile b/devel/ruby-setup.rb/Makefile
index c96590ff9802..87b057c5e70d 100644
--- a/devel/ruby-setup.rb/Makefile
+++ b/devel/ruby-setup.rb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	setup.rb
 PORTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/ \
 		http://www.ruby-lang.org/~knu/backup/
@@ -21,11 +22,23 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
+_SCRIPTS=	install.rb setup.rb
+
+RUBY_SHEBANG_FILES=	${_SCRIPTS:S:^:${WRKSRC}/ruby-:}
+
 DOCS_EN=	doc.en/* usage-en.txt
 DOCS_JA=	doc.ja/* usage-ja.txt
 
+post-extract:
+.for f in ${_SCRIPTS}
+	${CP} -p ${WRKSRC}/${f} ${WRKSRC}/ruby-${f}
+.endfor
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/install.rb ${WRKSRC}/setup.rb ${PREFIX}/bin/
+.for f in ${_SCRIPTS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/ruby-${f} ${PREFIX}/bin/
+.endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
 .for f in ${DOCS_EN}
diff --git a/devel/ruby-setup.rb/files/patch-ruby-install.rb b/devel/ruby-setup.rb/files/patch-ruby-install.rb
new file mode 100644
index 000000000000..d2ebf39a17a0
--- /dev/null
+++ b/devel/ruby-setup.rb/files/patch-ruby-install.rb
@@ -0,0 +1,7 @@
+--- ruby-install.rb.orig	Tue May  7 13:52:44 2002
++++ ruby-install.rb	Sat May 25 11:06:48 2002
+@@ -1006,3 +1006,3 @@
+   begin
+-    installer = ToplevelInstaller.new( File.dirname($0) )
++    installer = ToplevelInstaller.new( Dir.pwd )
+     installer.execute
diff --git a/devel/ruby-setup.rb/files/patch-ruby-setup.rb b/devel/ruby-setup.rb/files/patch-ruby-setup.rb
new file mode 100644
index 000000000000..87c369bea99b
--- /dev/null
+++ b/devel/ruby-setup.rb/files/patch-ruby-setup.rb
@@ -0,0 +1,7 @@
+--- ruby-setup.rb.orig	Tue May  7 13:52:44 2002
++++ ruby-setup.rb	Sat May 25 11:06:36 2002
+@@ -1121,3 +1121,3 @@
+   begin
+-    installer = PackageManager.new( File.dirname($0) )
++    installer = PackageManager.new( Dir.pwd )
+     installer.execute
diff --git a/devel/ruby-setup.rb/pkg-plist b/devel/ruby-setup.rb/pkg-plist
index 4bcbf6427286..1126a65a0433 100644
--- a/devel/ruby-setup.rb/pkg-plist
+++ b/devel/ruby-setup.rb/pkg-plist
@@ -1,5 +1,7 @@
-bin/install.rb
-bin/setup.rb
+bin/ruby-install.rb
+bin/ruby-setup.rb
+%%RUBY_SITELIBDIR%%/install.rb
+%%RUBY_SITELIBDIR%%/setup.rb
 %%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/changes.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/devel.html
 %%PORTDOCS%%%%RUBY_DOCDIR%%/setup.rb/hookapi.html