4 files changed, 8 insertions, 83 deletions

diff --git a/lang/ruby-ri/Makefile b/lang/ruby-ri/Makefile
index 5c494f894038..d6c666bd7285 100644
--- a/lang/ruby-ri/Makefile
+++ b/lang/ruby-ri/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ri
-PORTVERSION=	0.7a
-PORTREVISION=	2
+PORTVERSION=	0.8a
 CATEGORIES=	lang ruby
 MASTER_SITES=	ftp://www.pragmaticprogrammer.com/ruby/downloads/files/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
diff --git a/lang/ruby-ri/distinfo b/lang/ruby-ri/distinfo
index ca2c610c607d..244714de78eb 100644
--- a/lang/ruby-ri/distinfo
+++ b/lang/ruby-ri/distinfo
@@ -1 +1 @@
-MD5 (ruby/ri-0.7a.tgz) = 861acd6785f9c49b302c0e0704f3c08f
+MD5 (ruby/ri-0.8a.tgz) = 98f42fd2c43158d5e1359f3418b5ac91
diff --git a/lang/ruby-ri/files/patch-contrib::dblack::emacs::ri.el b/lang/ruby-ri/files/patch-contrib::dblack::emacs::ri.el
deleted file mode 100644
index b5112b8e5757..000000000000
--- a/lang/ruby-ri/files/patch-contrib::dblack::emacs::ri.el
+++ /dev/null
@@ -1,52 +0,0 @@
---- contrib/dblack/emacs/ri.el.orig	Fri Mar 16 12:25:28 2001
-+++ contrib/dblack/emacs/ri.el	Sat Apr  7 02:55:55 2001
-@@ -82,7 +82,10 @@
- ;;; <ENTER> for convenience)
- ;;;
- ;;; (setq ri-key-quit "q")
--;;; bound to function ri-quit, which is probably quit-window)
-+;;; bound to function ri-quit, which is probably delete-window)
-+;;;
-+;;; (setq ri-key-kill "Q")
-+;;; bound to function ri-kill, which is probably kill-buffer & delete-window)
- ;;;
- ;;; (setq ri-key-fnt "\C-i")
- ;;; find-next-term (TAB)
-@@ -233,9 +236,14 @@
- (defvar ri-switch-to-ri-buffer t)
- (defvar ri-read-only t)
- 
-+;; Locations
-+(defvar ri-ri-command "/usr/local/bin/ri")
-+(defvar ri-emacsrb "Emacs")
-+
- ;; Key bindings
- (defvar ri-key-stcap "\C-m")
- (defvar ri-key-quit "q")
-+(defvar ri-key-kill "Q")
- (defvar ri-key-fnt "\C-i")
- (defvar ri-key-fpt "\M-\C-i")
- 
-@@ -276,6 +284,7 @@
-        (and ri-read-only
- 	    (setq buffer-read-only t))
-        (local-set-key ri-key-quit 'ri-quit)
-+       (local-set-key ri-key-kill 'ri-kill)
-        (local-set-key ri-key-stcap 'ri-show-term-composite-at-point)
-        (local-set-key ri-key-fnt 'ri-find-next-term)
-        (local-set-key ri-key-fpt 'ri-find-previous-term))
-@@ -365,7 +374,13 @@
- (defun ri-quit()
-   "Function bound to 'q' key in ri output buffer(s)"
-   (interactive)
--  (quit-window))
-+  (delete-window))
-+
-+(defun ri-kill()
-+  "Function bound to 'Q' key in ri output buffer(s)"
-+  (interactive)
-+  (kill-buffer nil)
-+  (delete-window))
- 
- ;;; Functions to find and show terms at or beyond point
- 
diff --git a/lang/ruby-ri/files/patch-install.rb b/lang/ruby-ri/files/patch-install.rb
index 2f60a3018f6a..d07190028572 100644
--- a/lang/ruby-ri/files/patch-install.rb
+++ b/lang/ruby-ri/files/patch-install.rb
@@ -1,33 +1,11 @@
---- install.rb.orig	Sun Mar 25 11:48:54 2001
-+++ install.rb	Thu Apr  5 21:49:24 2001
-@@ -16,16 +16,18 @@
- # This sets up a standard environment for any sub-installs as well
- 
- $version = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
--$libdir = File.join(CONFIG["libdir"], "ruby", $version)
-+#$libdir = File.join(CONFIG["libdir"], "ruby", $version)
+--- install.rb.orig	Tue Aug 14 12:57:38 2001
++++ install.rb	Sun Nov 24 16:33:13 2002
+@@ -19,7 +19,7 @@
+ $libdir = File.join(CONFIG["libdir"], "ruby", $version)
  
  $bindir =  CONFIG["bindir"]
 -$sitedir = CONFIG["sitedir"] || File.join($libdir, "site_ruby")
-+#$sitedir = CONFIG["sitedir"] || File.join($libdir, "site_ruby")
-+$sitedir = File.join(CONFIG["sitedir"], $version)
- $ri_dest = File.join($sitedir, "ri")
- $ri_op = File.join($ri_dest, "op")
- 
- 
- # This is old stuff, but we need it to get tidy up a previous installation
- 
-+=begin
- $site_libdir = $:.find {|x| x =~ /site_ruby$/}
- 
- if !$site_libdir
-@@ -33,7 +35,9 @@
- elsif $site_libdir !~ Regexp.quote($version)
-   $site_libdir = File.join($site_libdir, $version)
- end
-+=end
++$sitedir = File.join(CONFIG["sitedir"] || File.join($libdir, "site_ruby"), $version)
  
-+$site_libdir = $sitedir
+ $realbindir = $bindir
  
- ##
- # Install an output formatter