4 files changed, 57 insertions, 29 deletions

diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 89c595276ce9..65940fed29f6 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	gems
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.4
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/1399/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/2412/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	alecn2002@yandex.ru
+MAINTAINER=	chero7@telus.net
 COMMENT=	Package management framework for the Ruby language
 
 USE_RUBY=	yes
-RUBY_SETUP=	install.rb
+RUBY_SETUP=	setup.rb
+RUBY_VER=	1.8
 
 NO_BUILD=	yes
 
-BROKEN=		Incorrect pkg-plist
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 do-install:
 	cd ${WRKSRC}; ${RUBY} ${RUBY_SETUP}
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
index 69c19d0803c7..41e642931808 100644
--- a/devel/ruby-gems/distinfo
+++ b/devel/ruby-gems/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/rubygems-0.8.1.tgz) = 6276d268b420c0d61796cdbf6d28dae4
-SIZE (ruby/rubygems-0.8.1.tgz) = 108276
+MD5 (ruby/rubygems-0.8.4.tgz) = a2ad2d03dae8a98002c2a7cd6c3ed352
+SIZE (ruby/rubygems-0.8.4.tgz) = 136163
diff --git a/devel/ruby-gems/pkg-message b/devel/ruby-gems/pkg-message
new file mode 100644
index 000000000000..bcd9e2fb4341
--- /dev/null
+++ b/devel/ruby-gems/pkg-message
@@ -0,0 +1,9 @@
+
+************************************************************
+
+  RubyGems has been successfully installed.
+
+  If you deinstall the ruby-gems package, any gems installed
+  using: gem install <gem_name>, will not be removed.
+
+************************************************************
diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist
index 79a33b0e39f6..0f79f01c424a 100644
--- a/devel/ruby-gems/pkg-plist
+++ b/devel/ruby-gems/pkg-plist
@@ -1,22 +1,41 @@
-%%RUBY_SITELIBDIR%%/rubygems/version.rb
-%%RUBY_SITELIBDIR%%/rubygems/validator.rb
-%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
-%%RUBY_SITELIBDIR%%/rubygems/specification.rb
-%%RUBY_SITELIBDIR%%/rubygems/remote_installer.rb
-%%RUBY_SITELIBDIR%%/rubygems/package.rb
-%%RUBY_SITELIBDIR%%/rubygems/open-uri.rb
-%%RUBY_SITELIBDIR%%/rubygems/old_format.rb
-%%RUBY_SITELIBDIR%%/rubygems/loadpath_manager.rb
-%%RUBY_SITELIBDIR%%/rubygems/installer.rb
-%%RUBY_SITELIBDIR%%/rubygems/gem_runner.rb
-%%RUBY_SITELIBDIR%%/rubygems/gem_commands.rb
-%%RUBY_SITELIBDIR%%/rubygems/format.rb
-%%RUBY_SITELIBDIR%%/rubygems/doc_manager.rb
-%%RUBY_SITELIBDIR%%/rubygems/config_file.rb
-%%RUBY_SITELIBDIR%%/rubygems/command.rb
-%%RUBY_SITELIBDIR%%/rubygems/cmd_manager.rb
-%%RUBY_SITELIBDIR%%/rubygems/cache.rb
+bin/gem
+bin/gem_server
+bin/generate_yaml_index.rb
+bin/update_rubygems
+lib/ruby/gems/%%RUBY_VER%%/cache/sources-0.0.1.gem
+lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.1/lib/sources.rb
+lib/ruby/gems/%%RUBY_VER%%/specifications/sources-0.0.1.gemspec
+@unexec rm %D/lib/ruby/gems/%%RUBY_VER%%/source_cache 2>/dev/null || true
 %%RUBY_SITELIBDIR%%/rubygems/builder.rb
-%%RUBY_SITELIBDIR%%/ubygems.rb
+%%RUBY_SITELIBDIR%%/rubygems/cmd_manager.rb
+%%RUBY_SITELIBDIR%%/rubygems/command.rb
+%%RUBY_SITELIBDIR%%/rubygems/config_file.rb
+%%RUBY_SITELIBDIR%%/rubygems/custom_require.rb
+%%RUBY_SITELIBDIR%%/rubygems/doc_manager.rb
+%%RUBY_SITELIBDIR%%/rubygems/format.rb
+%%RUBY_SITELIBDIR%%/rubygems/gem_commands.rb
+%%RUBY_SITELIBDIR%%/rubygems/gem_runner.rb
+%%RUBY_SITELIBDIR%%/rubygems/installer.rb
+%%RUBY_SITELIBDIR%%/rubygems/loadpath_manager.rb
+%%RUBY_SITELIBDIR%%/rubygems/old_format.rb
+%%RUBY_SITELIBDIR%%/rubygems/open-uri.rb
+%%RUBY_SITELIBDIR%%/rubygems/package.rb
+%%RUBY_SITELIBDIR%%/rubygems/remote_installer.rb
+%%RUBY_SITELIBDIR%%/rubygems/rubygems_version.rb
+%%RUBY_SITELIBDIR%%/rubygems/source_index.rb
+%%RUBY_SITELIBDIR%%/rubygems/specification.rb
+%%RUBY_SITELIBDIR%%/rubygems/timer.rb
+%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
+%%RUBY_SITELIBDIR%%/rubygems/validator.rb
+%%RUBY_SITELIBDIR%%/rubygems/version.rb
 %%RUBY_SITELIBDIR%%/rubygems.rb
+%%RUBY_SITELIBDIR%%/ubygems.rb
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/cache 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/doc 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.1/lib 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/gems/sources-0.0.1 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/gems 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%%/specifications 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems/%%RUBY_VER%% 2>/dev/null || true
+@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true
 @dirrm %%RUBY_SITELIBDIR%%/rubygems