RF -> RG Conversion (Part III)

With Hat:       ruby@
Tested by:      make checksum

45 files changed, 53 insertions, 92 deletions

diff --git a/archivers/rubygem-archive-tar-minitar/Makefile b/archivers/rubygem-archive-tar-minitar/Makefile
index 1080d6a..68755f6 100644
--- a/archivers/rubygem-archive-tar-minitar/Makefile
+++ b/archivers/rubygem-archive-tar-minitar/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	archive-tar-minitar
 PORTVERSION=	0.5.2
 CATEGORIES=	archivers rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruwiki
+MASTER_SITES=	RG
 DISTNAME=	archive-tar-minitar-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/databases/rubygem-activerecord-jdbc-adapter/Makefile b/databases/rubygem-activerecord-jdbc-adapter/Makefile
index ab75bdc..3caa2e6 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	activerecord-jdbc-adapter
 PORTVERSION=	0.9.2
 CATEGORIES=	databases rubygems java
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	jruby-extras
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	JDBC adapter for ActiveRecord, for use within JRuby on Rails
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index a98b57d..8012826 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	activerecord-jdbcmysql-adapter
 PORTVERSION=	0.9.2
 CATEGORIES=	databases rubygems java
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	jruby-extras
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	An ActiveRecord driver for MySQL using JDBC running under JRuby
diff --git a/databases/rubygem-jdbc-mysql/Makefile b/databases/rubygem-jdbc-mysql/Makefile
index a473782..68f61c8 100644
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	jdbc-mysql
 PORTVERSION=	5.0.4
 CATEGORIES=	databases rubygems java
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	jruby-extras
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	MySQL JDBC driver for JRuby
diff --git a/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile
index 4f668aa..0cf819a 100644
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=		pg
 PORTVERSION=		0.8.0
 CATEGORIES=		databases rubygems
-MASTER_SITES=		RF
-MASTER_SITE_SUBDIR=	ruby-pg
+MASTER_SITES=		RG
 
 MAINTAINER=		ruby@FreeBSD.org
 COMMENT=		Ruby interface to PostgreSQL library
diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 9c3d231..628d648 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	postgres
 PORTVERSION=	0.7.9.2008.01.28
 PORTREVISION=	1
 CATEGORIES=	databases rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-pg
+MASTER_SITES=	RG
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ruby interface to PostgreSQL library
diff --git a/devel/rubygem-columnize/Makefile b/devel/rubygem-columnize/Makefile
index 20b1b8c..9074aea 100644
--- a/devel/rubygem-columnize/Makefile
+++ b/devel/rubygem-columnize/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	columnize
 PORTVERSION=	0.3.1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	rocky-hacks
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Sorts an Array in Column Order
diff --git a/devel/rubygem-deeptest/Makefile b/devel/rubygem-deeptest/Makefile
index 9bffe94..aabfd1e 100644
--- a/devel/rubygem-deeptest/Makefile
+++ b/devel/rubygem-deeptest/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	deep_test
 PORTVERSION=	1.2.2
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	deep-test
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Enable tests to run in parallel using multiple processes
diff --git a/devel/rubygem-echoe/Makefile b/devel/rubygem-echoe/Makefile
index 1199ed2..d749ee6 100644
--- a/devel/rubygem-echoe/Makefile
+++ b/devel/rubygem-echoe/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	echoe
 PORTVERSION=	3.2
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	fauna
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Rake tasks for docs, extension compiling, testing and deployment
diff --git a/devel/rubygem-echoe/distinfo b/devel/rubygem-echoe/distinfo
index 646a6d8..bf4ca67 100644
--- a/devel/rubygem-echoe/distinfo
+++ b/devel/rubygem-echoe/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/echoe-3.2.gem) = 24db259a85c330c9c64e95e82f01203e
-SHA256 (rubygem/echoe-3.2.gem) = 6f8594b05f323c9e0bc9b7156d78ce5bb9db0d25f472764515e0f8c266169d8f
-SIZE (rubygem/echoe-3.2.gem) = 28160
+MD5 (rubygem/echoe-3.2.gem) = 7a4a727041d7ceb1c7007aa87075e9b8
+SHA256 (rubygem/echoe-3.2.gem) = 3a0831f05a7f3eb89c2fd3415d58ad22abcedec72edaaa0471ca2101db39a70f
+SIZE (rubygem/echoe-3.2.gem) = 28672
diff --git a/devel/rubygem-fastthread/Makefile b/devel/rubygem-fastthread/Makefile
index 6cc0b7d..38db046 100644
--- a/devel/rubygem-fastthread/Makefile
+++ b/devel/rubygem-fastthread/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	fastthread
 PORTVERSION=	1.0.7
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	mongrel
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Optimized replacement for thread.rb primitives
diff --git a/devel/rubygem-gem_plugin/Makefile b/devel/rubygem-gem_plugin/Makefile
index 6c18f92..48f421b 100644
--- a/devel/rubygem-gem_plugin/Makefile
+++ b/devel/rubygem-gem_plugin/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	gem_plugin
 PORTVERSION=	0.2.3
 PORTREVISION=	1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=     mongrel
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Gem Based Plugin System
diff --git a/devel/rubygem-git/Makefile b/devel/rubygem-git/Makefile
index a21f67b..fcd0ba4 100644
--- a/devel/rubygem-git/Makefile
+++ b/devel/rubygem-git/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	git
 PORTVERSION=	1.2.5
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	gems
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A ruby wrapper library around git(1)
diff --git a/devel/rubygem-git/distinfo b/devel/rubygem-git/distinfo
index d22d127..be24ef4 100644
--- a/devel/rubygem-git/distinfo
+++ b/devel/rubygem-git/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/git-1.2.5.gem) = c623fafa9362c50ebdcf50a97a6125de
-SHA256 (rubygem/git-1.2.5.gem) = 1385001ce6c4c1c28a5e5bda3f5304ce044f226405b51e8bdc57a455259fc545
+MD5 (rubygem/git-1.2.5.gem) = 3506583cd89c17530dc1c6bf498b4e91
+SHA256 (rubygem/git-1.2.5.gem) = 130ef2894d2c63ac62491fcec8498892912349f312b726b7bda7933d9546bea5
 SIZE (rubygem/git-1.2.5.gem) = 19968
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index 066b65f..ba65866 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	hoe
 PORTVERSION=	2.6.2
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	seattlerb
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A simple rake/rubygems helper for project Rakefiles
diff --git a/devel/rubygem-inline/Makefile b/devel/rubygem-inline/Makefile
index 93b4db8..e79d89f 100644
--- a/devel/rubygem-inline/Makefile
+++ b/devel/rubygem-inline/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	inline
 PORTVERSION=	3.8.4
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby${PORTNAME}
+MASTER_SITES=	RG
 DISTNAME=	RubyInline-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/devel/rubygem-mash/Makefile b/devel/rubygem-mash/Makefile
index 3ada44e..e8d85e2 100644
--- a/devel/rubygem-mash/Makefile
+++ b/devel/rubygem-mash/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	mash
 PORTVERSION=	0.0.3
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	mash-hash
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Mocking Hash library for Ruby
diff --git a/devel/rubygem-platform/Makefile b/devel/rubygem-platform/Makefile
index 57673b5..75421f2 100644
--- a/devel/rubygem-platform/Makefile
+++ b/devel/rubygem-platform/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	platform
 PORTVERSION=	0.4.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	platform
+MASTER_SITES=	RG
 DISTNAME=	Platform-${PORTVERSION}
 
 MAINTAINER=	don@na.rim.or.jp
diff --git a/devel/rubygem-rascut/Makefile b/devel/rubygem-rascut/Makefile
index 3d13849..37af20a 100644
--- a/devel/rubygem-rascut/Makefile
+++ b/devel/rubygem-rascut/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	rascut
 PORTVERSION=	0.2.1
 PORTREVISION=	1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	hotchpotch
+MASTER_SITES=	RG
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Ruby ActionSCript UTility
diff --git a/devel/rubygem-ruby-debug-base/Makefile b/devel/rubygem-ruby-debug-base/Makefile
index 7e1fae6..471ec56 100644
--- a/devel/rubygem-ruby-debug-base/Makefile
+++ b/devel/rubygem-ruby-debug-base/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	ruby-debug-base
 PORTVERSION=	0.10.3
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-debug
+MASTER_SITES=	RG
 
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Fast implementation of the standard Ruby debugger
diff --git a/devel/rubygem-ruby-debug-ide/Makefile b/devel/rubygem-ruby-debug-ide/Makefile
index b9c2826..103672c 100644
--- a/devel/rubygem-ruby-debug-ide/Makefile
+++ b/devel/rubygem-ruby-debug-ide/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	ruby-debug-ide
 PORTVERSION=	0.4.10
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	debug-commons
+MASTER_SITES=	RG
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	IDE interface for ruby-debug
diff --git a/devel/rubygem-ruby2ruby/Makefile b/devel/rubygem-ruby2ruby/Makefile
index 61012c6..28454ee 100644
--- a/devel/rubygem-ruby2ruby/Makefile
+++ b/devel/rubygem-ruby2ruby/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ruby2ruby
 PORTVERSION=	1.2.4
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	seattlerb
+MASTER_SITES=	RG
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	A pure ruby code generator easily from ParseTree's Sexps # '
diff --git a/devel/rubygem-rubyforge/Makefile b/devel/rubygem-rubyforge/Makefile
index 0b4a1cf..8edfacf 100644
--- a/devel/rubygem-rubyforge/Makefile
+++ b/devel/rubygem-rubyforge/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	rubyforge
 PORTVERSION=	2.0.4
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	codeforpeople
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simplistic script which automates rubyforge operations
diff --git a/devel/rubygem-sexp_processor/Makefile b/devel/rubygem-sexp_processor/Makefile
index e4ad410..b94c6db 100644
--- a/devel/rubygem-sexp_processor/Makefile
+++ b/devel/rubygem-sexp_processor/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	sexp_processor
 PORTVERSION=	3.0.4
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	parsetree
+MASTER_SITES=	RG
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Generic sexp processing tools
diff --git a/devel/rubygem-stream/Makefile b/devel/rubygem-stream/Makefile
index 79284b0..af54e6a 100644
--- a/devel/rubygem-stream/Makefile
+++ b/devel/rubygem-stream/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	stream
 PORTVERSION=	0.5
 PORTREVISION=	2
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	rgl
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Interface for external iterators
diff --git a/devel/rubygem-stream/distinfo b/devel/rubygem-stream/distinfo
index 295a3e8..40df477 100644
--- a/devel/rubygem-stream/distinfo
+++ b/devel/rubygem-stream/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/stream-0.5.gem) = 4b3d01d8424e306b3e19c46af3e2eae4
-SHA256 (rubygem/stream-0.5.gem) = 76e0784d3e26c57192dfb46f80e9c939fa9945af46e0d1f80ff3f64d426552f3
-SIZE (rubygem/stream-0.5.gem) = 19253
+MD5 (rubygem/stream-0.5.gem) = 3e9dca987b799b1db4bd59dc713df8e9
+SHA256 (rubygem/stream-0.5.gem) = 8c5edc44ce44f8d71abbf3e99bb132b967104722f852a2641c0936025cce1fc0
+SIZE (rubygem/stream-0.5.gem) = 14848
diff --git a/devel/rubygem-transactionsimple/Makefile b/devel/rubygem-transactionsimple/Makefile
index 2196159..166180a 100644
--- a/devel/rubygem-transactionsimple/Makefile
+++ b/devel/rubygem-transactionsimple/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	transactionsimple
 PORTVERSION=	1.4.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	trans-simple
+MASTER_SITES=	RG
 DISTNAME=	transaction-simple-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/devel/rubygem-zoom/Makefile b/devel/rubygem-zoom/Makefile
index 9d50e0b..3039bbc 100644
--- a/devel/rubygem-zoom/Makefile
+++ b/devel/rubygem-zoom/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	zoom
 PORTVERSION=	0.4.1
 PORTREVISION=	2
 CATEGORIES=	devel rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
+MASTER_SITES=	RG
 
 MAINTAINER=	mitsuru@riken.jp
 COMMENT=	A Ruby binding to the Z39.50 Object-Orientation Model (ZOOM)
diff --git a/graphics/rubygem-graphviz/Makefile b/graphics/rubygem-graphviz/Makefile
index 69a9190..27c8087 100644
--- a/graphics/rubygem-graphviz/Makefile
+++ b/graphics/rubygem-graphviz/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	graphviz
 PORTVERSION=	0.9.8
 PORTREVISION=	3
 CATEGORIES=	graphics ruby
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-asp
+MASTER_SITES=	RG
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ruby@FreeBSD.org
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index 67843bf..712ca5d 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	knu@FreeBSD.org
-COMMENT=	A RFC2822/MIME compliant mail manipulating library for Ruby
+COMMENT=	A RG
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net-mgmt/rubygem-snmp/Makefile b/net-mgmt/rubygem-snmp/Makefile
index 228e7f7..6db607d 100644
--- a/net-mgmt/rubygem-snmp/Makefile
+++ b/net-mgmt/rubygem-snmp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	snmp
 PORTVERSION=	1.0.2
 CATEGORIES=	net-mgmt rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	${PORTNAME}lib
+MASTER_SITES=	RG
 
 MAINTAINER=	mhjacks@swbell.net
 COMMENT=	SNMP library for Ruby
diff --git a/net/rubygem-openid/Makefile b/net/rubygem-openid/Makefile
index 5ec386c..1cc529a 100644
--- a/net/rubygem-openid/Makefile
+++ b/net/rubygem-openid/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	openid
 PORTVERSION=	2.1.8
 CATEGORIES=	net rubygems
 MASTER_SITES=	http://www.openidenabled.com/files/ruby-openid/packages/ \
-		RF
-MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
+		RG
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	clsung@FreeBSD.org
diff --git a/net/rubygem-openid/distinfo b/net/rubygem-openid/distinfo
index 26ab205..99627ec 100644
--- a/net/rubygem-openid/distinfo
+++ b/net/rubygem-openid/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/ruby-openid-2.1.8.gem) = a06c7afe8d09dabec78fa424c223f482
-SHA256 (rubygem/ruby-openid-2.1.8.gem) = 3552c2814e1a066aae64be64846d059b1dea371c8c3a26a2d1f05209aab6a889
-SIZE (rubygem/ruby-openid-2.1.8.gem) = 268800
+MD5 (rubygem/ruby-openid-2.1.8.gem) = 340b1285827ee577ed070e670bd3dcaa
+SHA256 (rubygem/ruby-openid-2.1.8.gem) = 4be369cff3b077b18a5b6ef9c27cc31af6e077252c23103fc49a2399862d04ec
+SIZE (rubygem/ruby-openid-2.1.8.gem) = 272384
diff --git a/print/rubygem-colortools/Makefile b/print/rubygem-colortools/Makefile
index 4de4a0b..ca99eff 100644
--- a/print/rubygem-colortools/Makefile
+++ b/print/rubygem-colortools/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	colortools
 PORTVERSION=	1.3.0
 CATEGORIES=	print rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-pdf
+MASTER_SITES=	RG
 DISTNAME=	color-tools-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/print/rubygem-pdfwriter/Makefile b/print/rubygem-pdfwriter/Makefile
index f8c2999..981f1aa 100644
--- a/print/rubygem-pdfwriter/Makefile
+++ b/print/rubygem-pdfwriter/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	pdfwriter
 PORTVERSION=	1.1.8
 CATEGORIES=	print rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-pdf
+MASTER_SITES=	RG
 DISTNAME=	pdf-writer-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/security/rubygem-net-scp/Makefile b/security/rubygem-net-scp/Makefile
index d1fe299..11b7efa 100644
--- a/security/rubygem-net-scp/Makefile
+++ b/security/rubygem-net-scp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	net-scp
 PORTVERSION=	1.0.2
 CATEGORIES=	security rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	net-ssh
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Non-interactive SCP processing
diff --git a/security/rubygem-net-scp/distinfo b/security/rubygem-net-scp/distinfo
index 2c58e82..2d0c7eb 100644
--- a/security/rubygem-net-scp/distinfo
+++ b/security/rubygem-net-scp/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/net-scp-1.0.2.gem) = 910d268dec23197cda4d0803a1575a56
-SHA256 (rubygem/net-scp-1.0.2.gem) = 061d90d5f7519e035f57fdeda52c86e4d3c14bd4ce465d4f39a6afc1631da4ed
+MD5 (rubygem/net-scp-1.0.2.gem) = 329c93e6ef2256760dd3af2c60a46899
+SHA256 (rubygem/net-scp-1.0.2.gem) = 63f734630318c90bb4721e1d59ed724674e1fd60ca2c98129bd497f608a36e7e
 SIZE (rubygem/net-scp-1.0.2.gem) = 25600
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index 205098e..7ae0b67 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	net-sftp
 PORTVERSION=	2.0.3
 CATEGORIES=	security rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	net-ssh
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Implementation of the SFTP client protocol
diff --git a/security/rubygem-net-ssh-gateway/Makefile b/security/rubygem-net-ssh-gateway/Makefile
index d14f1e0..8d04e78 100644
--- a/security/rubygem-net-ssh-gateway/Makefile
+++ b/security/rubygem-net-ssh-gateway/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	net-ssh-gateway
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES=	security rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	net-ssh
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Establish Net::SSH connections through firewalls
diff --git a/textproc/rubygem-htmltools/Makefile b/textproc/rubygem-htmltools/Makefile
index cefcfe9..b925480 100644
--- a/textproc/rubygem-htmltools/Makefile
+++ b/textproc/rubygem-htmltools/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	htmltools
 PORTVERSION=	1.10
 CATEGORIES=	textproc www rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	ruby-htmltools
+MASTER_SITES=	RG
 DISTNAME=	htmltools-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/textproc/rubygem-ini/Makefile b/textproc/rubygem-ini/Makefile
index c142823..1f2b616 100644
--- a/textproc/rubygem-ini/Makefile
+++ b/textproc/rubygem-ini/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	ini
 PORTVERSION=	0.1.1
 CATEGORIES=	textproc rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	${PORTNAME}file
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby INI File Parser and Writer
diff --git a/www/rubygem-hpricot/Makefile b/www/rubygem-hpricot/Makefile
index b072a0fa..c1ef591 100644
--- a/www/rubygem-hpricot/Makefile
+++ b/www/rubygem-hpricot/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	hpricot
 PORTVERSION=	0.8.2
 CATEGORIES=	www rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	gems
+MASTER_SITES=	RG
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Fast, Enjoyable HTML Parser for Ruby
diff --git a/www/rubygem-htauth/Makefile b/www/rubygem-htauth/Makefile
index 4311356..0a55515 100644
--- a/www/rubygem-htauth/Makefile
+++ b/www/rubygem-htauth/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	htauth
 PORTVERSION=	1.0.3
 CATEGORIES=	www rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	copiousfreetime
+MASTER_SITES=	RG
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Replacement for the Apache htdigest and htpasswd
diff --git a/www/rubygem-httpclient/Makefile b/www/rubygem-httpclient/Makefile
index e8334bd..7a258da 100644
--- a/www/rubygem-httpclient/Makefile
+++ b/www/rubygem-httpclient/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	httpclient
 PORTVERSION=	2.1.5.2
 CATEGORIES=	www rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	soap4r
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Yet another HTTP client implementation by NaHi
diff --git a/www/rubygem-rails-app-installer/Makefile b/www/rubygem-rails-app-installer/Makefile
index b4c91c1..07fffe9 100644
--- a/www/rubygem-rails-app-installer/Makefile
+++ b/www/rubygem-rails-app-installer/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	rails-app-installer
 PORTVERSION=	0.2.0
 CATEGORIES=	www rubygems
-MASTER_SITES=	RF
-MASTER_SITE_SUBDIR=	rails-installer
+MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	An installer for Rails apps