- Change to use MASTER_SITE_RUBYFORGE macro to fix fetch problem.

Approved by:	portmgr (erwin)

59 files changed, 114 insertions, 66 deletions

diff --git a/audio/ruby-freedb/Makefile b/audio/ruby-freedb/Makefile
index 9b3a6d2c2f8a..d417443b2e7a 100644
--- a/audio/ruby-freedb/Makefile
+++ b/audio/ruby-freedb/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	freedb
 PORTVERSION=	0.5
 CATEGORIES=	audio net ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/69/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
diff --git a/audio/ruby-mp3info/Makefile b/audio/ruby-mp3info/Makefile
index dab6c5ba63b8..376561c15a25 100644
--- a/audio/ruby-mp3info/Makefile
+++ b/audio/ruby-mp3info/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	mp3info
 PORTVERSION=	0.3
 CATEGORIES=	audio ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/808/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/audio/ruby-ogginfo/Makefile b/audio/ruby-ogginfo/Makefile
index f2e2a438137c..75716fa622d9 100644
--- a/audio/ruby-ogginfo/Makefile
+++ b/audio/ruby-ogginfo/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	ogginfo
 PORTVERSION=	0.1
 CATEGORIES=	audio ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/821/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTFILES=	${PORTNAME}.rb
 DIST_SUBDIR=	ruby/ogginfo-0.1
diff --git a/audio/ruby-shout/Makefile b/audio/ruby-shout/Makefile
index 69e15c3999e1..c0e2bb2b3d00 100644
--- a/audio/ruby-shout/Makefile
+++ b/audio/ruby-shout/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	shout
 PORTVERSION=	2.1
 CATEGORIES=	audio ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7211/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
diff --git a/audio/rubygem-mp3info/Makefile b/audio/rubygem-mp3info/Makefile
index 4c4703c3de54..6f3dce08ac3c 100644
--- a/audio/rubygem-mp3info/Makefile
+++ b/audio/rubygem-mp3info/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	mp3info
 PORTVERSION=	0.5
 CATEGORIES=	audio rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7598/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	tha_walka@hotmail.com
diff --git a/audio/rubygem-ruby-mp3info/Makefile b/audio/rubygem-ruby-mp3info/Makefile
index 4c4703c3de54..6f3dce08ac3c 100644
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	mp3info
 PORTVERSION=	0.5
 CATEGORIES=	audio rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7598/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	tha_walka@hotmail.com
diff --git a/comms/ruby-serialport/Makefile b/comms/ruby-serialport/Makefile
index 55f22b35c7fa..11ce008d5c75 100644
--- a/comms/ruby-serialport/Makefile
+++ b/comms/ruby-serialport/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	serialport
 PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	comms ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/72/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/databases/ruby-dbi/Makefile.common b/databases/ruby-dbi/Makefile.common
index c07f45be0537..760c2966fdf9 100644
--- a/databases/ruby-dbi/Makefile.common
+++ b/databases/ruby-dbi/Makefile.common
@@ -4,7 +4,8 @@ RUBY_DBI_PORTNAME=	dbi
 # Don't forget to clear PORTREVISION's on update
 RUBY_DBI_VERSION=	0.1.0
 RUBY_DBI_PORTVERSION=	${RUBY_DBI_VERSION}
-RUBY_DBI_MASTER_SITES=	http://rubyforge.org/frs/download.php/8655/
+RUBY_DBI_MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+RUBY_DBI_MASTER_SITE_SUBDIR=	ruby-${RUBY_DBI_PORTNAME}
 RUBY_DBI_DISTNAME=	${RUBY_DBI_PORTNAME}-${PORTVERSION}
 
 RUBY_DBI_PORTDIR=	${PORTSDIR}/databases/ruby-${RUBY_DBI_PORTNAME}
diff --git a/databases/ruby-sqlite/Makefile b/databases/ruby-sqlite/Makefile
index a3ed923e533b..960f7cf39d5d 100644
--- a/databases/ruby-sqlite/Makefile
+++ b/databases/ruby-sqlite/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sqlite
 PORTVERSION=	2.2.3
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/2819/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}-ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/databases/ruby-sqlite3/Makefile b/databases/ruby-sqlite3/Makefile
index b94b49750f3e..4176a611117a 100644
--- a/databases/ruby-sqlite3/Makefile
+++ b/databases/ruby-sqlite3/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sqlite3
 PORTVERSION=	1.1.0
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3089/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	sqlite-ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 2e1f5e4f3961..c7c4137d8e3b 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	activerecord
 PORTVERSION=	1.14.2
 CATEGORIES=	databases rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9680/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
diff --git a/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index 4c40697138da..a08138fc13a6 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	memcache-client
 PORTVERSION=	1.0.3
 CATEGORIES=	databases rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/8110/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	rctools
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Ruby bindings for MemCached
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index b94b49750f3e..4176a611117a 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sqlite3
 PORTVERSION=	1.1.0
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3089/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	sqlite-ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index b94b49750f3e..4176a611117a 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	sqlite3
 PORTVERSION=	1.1.0
 CATEGORIES=	databases ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3089/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	sqlite-ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/deskutils/alexandria/Makefile b/deskutils/alexandria/Makefile
index 68f02f5cb37a..801e3fdc2e65 100644
--- a/deskutils/alexandria/Makefile
+++ b/deskutils/alexandria/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	alexandria
 PORTVERSION=	0.5.0
 PORTREVISION=	2
 CATEGORIES=	deskutils ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3445/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/freeride/Makefile b/devel/freeride/Makefile
index 5c314bafeb24..e0bab65d2f9c 100644
--- a/devel/freeride/Makefile
+++ b/devel/freeride/Makefile
@@ -8,8 +8,8 @@
 PORTNAME?=	${MASTERPORTNAME}
 PORTVERSION=	0.9.6
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.rubyuser.de/${MASTERPORTNAME}/ \
-				http://files.rubyforge.vm.bytemark.co.uk/${MASTERPORTNAME}/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/devel/ruby-flexmock/Makefile b/devel/ruby-flexmock/Makefile
index 3cdc3a356b32..96fc877e1e5d 100644
--- a/devel/ruby-flexmock/Makefile
+++ b/devel/ruby-flexmock/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	flexmock
 PORTVERSION=	0.2.1
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9301/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ecal
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 90b5725bcfee..80a665a2ea6f 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gems
 PORTVERSION=	0.8.11
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/5207/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/devel/ruby-gettext/Makefile b/devel/ruby-gettext/Makefile
index 55edd03ad1ec..80a6b44a3e7a 100644
--- a/devel/ruby-gettext/Makefile
+++ b/devel/ruby-gettext/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gettext
 PORTVERSION=	1.5.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/10363/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-package-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/ruby-zoom/Makefile b/devel/ruby-zoom/Makefile
index 100cd39a5f91..6f9fae498033 100644
--- a/devel/ruby-zoom/Makefile
+++ b/devel/ruby-zoom/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	zoom
 PORTVERSION=	0.2.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/5601/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index fbf937832b3a..1a03ec76428e 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	activesupport
 PORTVERSION=	1.3.1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9562/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Utility classes and extension that are required by Rails MVC Framework
diff --git a/devel/rubygem-daemons/Makefile b/devel/rubygem-daemons/Makefile
index bd056911dbd4..30424ca0b7a4 100644
--- a/devel/rubygem-daemons/Makefile
+++ b/devel/rubygem-daemons/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	daemons
 PORTVERSION=	0.4.4
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9598/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	A toolkit to convert your script to a controllable daemon
diff --git a/devel/rubygem-gem_plugin/Makefile b/devel/rubygem-gem_plugin/Makefile
index 06ca7225d98d..4186d6867626 100644
--- a/devel/rubygem-gem_plugin/Makefile
+++ b/devel/rubygem-gem_plugin/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	gem_plugin
 PORTVERSION=	0.2.1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9199/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=     mongrel
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	Gem Based Plugin System
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 55edd03ad1ec..80a6b44a3e7a 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gettext
 PORTVERSION=	1.5.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/10363/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-package-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index 55edd03ad1ec..80a6b44a3e7a 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	gettext
 PORTVERSION=	1.5.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/10363/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-package-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/devel/rubygem-needle/Makefile b/devel/rubygem-needle/Makefile
index 901709927292..0eeae0b5973d 100644
--- a/devel/rubygem-needle/Makefile
+++ b/devel/rubygem-needle/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	needle
 PORTVERSION=	1.3.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7842/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	r.s.a.vandomburg@student.utwente.nl
 COMMENT=	Dependency-injection/inversion-of-control container
diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile
index 33ed81e1543e..037241c67f88 100644
--- a/devel/rubygem-rake/Makefile
+++ b/devel/rubygem-rake/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	rake
 PORTVERSION=	0.7.1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9498/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Ruby Make
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index 15435d513951..57c774c87708 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	rgl
 PORTVERSION=	0.2.3
 PORTREVISION=	1
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/3958/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Framework for graph datastructures and algorithms implemented in Ruby
diff --git a/devel/rubygem-rscm/Makefile b/devel/rubygem-rscm/Makefile
index 59ebb6f8566a..351727a81115 100644
--- a/devel/rubygem-rscm/Makefile
+++ b/devel/rubygem-rscm/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	rscm
 PORTVERSION=	0.3.16
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7244/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	daniel@roe.ch
 COMMENT=	Ruby SCM, an SCM-independent API for accessing SCMs
diff --git a/devel/rubygem-transactionsimple/Makefile b/devel/rubygem-transactionsimple/Makefile
index 008e7380c1e1..6df278011d7b 100644
--- a/devel/rubygem-transactionsimple/Makefile
+++ b/devel/rubygem-transactionsimple/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	transactionsimple
 PORTVERSION=	1.3.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4334/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	trans-simple
 DISTNAME=	transaction-simple-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index 6b4fae3b8425..b383e3c617a6 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -8,10 +8,8 @@
 PORTNAME=	tzinfo
 PORTVERSION=	0.3.0
 CATEGORIES=	devel rubygems
-MASTER_SITES=	http://rubyforge.rubyuser.de/tzinfo/ \
-		http://rubyforge.iasi.roedu.net/files/tzinfo/ \
-		http://rubyforge.halostatue.info/tzinfo/ \
-		http://files.rubyforge.vm.bytemark.co.uk/tzinfo/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	Daylight-savings aware timezone support for Ruby
diff --git a/devel/rubygem-zoom/Makefile b/devel/rubygem-zoom/Makefile
index 100cd39a5f91..6f9fae498033 100644
--- a/devel/rubygem-zoom/Makefile
+++ b/devel/rubygem-zoom/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	zoom
 PORTVERSION=	0.2.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/5601/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 7c9e91e597c0..c7ae12d0dc1a 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	rmagick
 PORTVERSION=	1.12.0
 CATEGORIES=	graphics ruby
-MASTER_SITES=	http://rubyforge.lauschmusik.de/rmagick/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	RMagick-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index f129365cbfd5..bebf1b49cb88 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	actionmailer
 PORTVERSION=	1.2.1
 CATEGORIES=	mail rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9571/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Easy email delivery and testing for Ruby
diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile
index 6301b29e5835..437befeff18b 100644
--- a/math/ruby-gsl/Makefile
+++ b/math/ruby-gsl/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	gsl
 PORTVERSION=	1.5.4
 PORTREVISION=	2
 CATEGORIES=	math ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/2108/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	rb-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	rb-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/net-mgmt/rubygem-snmp/Makefile b/net-mgmt/rubygem-snmp/Makefile
index df41f59de5cf..f82be2f70492 100644
--- a/net-mgmt/rubygem-snmp/Makefile
+++ b/net-mgmt/rubygem-snmp/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	snmp
 PORTVERSION=	0.6.0
 CATEGORIES=	net-mgmt rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7662/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}lib
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	SNMP library for Ruby
diff --git a/print/rubygem-colortools/Makefile b/print/rubygem-colortools/Makefile
index b6a1fb3fac49..f12d3b8eebbd 100644
--- a/print/rubygem-colortools/Makefile
+++ b/print/rubygem-colortools/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	colortools
 PORTVERSION=	1.3.0
 CATEGORIES=	print rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/5476/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-pdf
 DISTNAME=	color-tools-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/print/rubygem-pdfwriter/Makefile b/print/rubygem-pdfwriter/Makefile
index 3021374a475d..323cf26dae97 100644
--- a/print/rubygem-pdfwriter/Makefile
+++ b/print/rubygem-pdfwriter/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	pdfwriter
 PORTVERSION=	1.1.3
 CATEGORIES=	print rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/5993/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-pdf
 DISTNAME=	pdf-writer-${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index 2cbe4f8e08b5..70c1419fd95d 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	net-sftp
 PORTVERSION=	1.1.0
 CATEGORIES=	security rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7928/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	net-ssh
 
 MAINTAINER=	r.s.a.vandomburg@student.utwente.nl
 COMMENT=	Implementation of the SFTP client protocol
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index e68e3c6c83c6..adfe7f30e695 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	net-ssh
 PORTVERSION=	1.0.9
 CATEGORIES=	security rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9816/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	r.s.a.vandomburg@student.utwente.nl
 COMMENT=	Non-interactive SSH processing
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index dbf5153b0fca..f4841e6c5030 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	capistrano
 PORTVERSION=	1.1.0
 CATEGORIES=	sysutils rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9039/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	r.s.a.vandomburg@student.utwente.nl
 COMMENT=	A utility for executing commands in parallel on multiple machines
diff --git a/textproc/py-syck/Makefile b/textproc/py-syck/Makefile
index a6b05a9af859..62a56ac32115 100644
--- a/textproc/py-syck/Makefile
+++ b/textproc/py-syck/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	syck
 PORTVERSION=	0.55
 CATEGORIES=	textproc devel
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4492/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dd@FreeBSD.org
diff --git a/textproc/ruby-amatch/Makefile b/textproc/ruby-amatch/Makefile
index 99b317b88148..ae62d5ccc451 100644
--- a/textproc/ruby-amatch/Makefile
+++ b/textproc/ruby-amatch/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	amatch
 PORTVERSION=	0.2.2
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7008/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
diff --git a/textproc/ruby-htmltools/Makefile b/textproc/ruby-htmltools/Makefile
index 2aa776c8837f..b994dcaccf12 100644
--- a/textproc/ruby-htmltools/Makefile
+++ b/textproc/ruby-htmltools/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	htmltools
 PORTVERSION=	1.09
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/1340/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
diff --git a/textproc/ruby-quixml/Makefile b/textproc/ruby-quixml/Makefile
index 36a553171646..245f3cf561b0 100644
--- a/textproc/ruby-quixml/Makefile
+++ b/textproc/ruby-quixml/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	quixml
 PORTVERSION=	0.2.1
 PORTREVISION=	2
 CATEGORIES=	textproc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/89/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/textproc/rubygem-syntax/Makefile b/textproc/rubygem-syntax/Makefile
index fcc69aac6ba0..ff7dfcc35b87 100644
--- a/textproc/rubygem-syntax/Makefile
+++ b/textproc/rubygem-syntax/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	syntax
 PORTVERSION=	1.0.0
 CATEGORIES=	textproc rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4953/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	rubygem-
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/textproc/syck/Makefile b/textproc/syck/Makefile
index fb24114ce417..9ce2d8945013 100644
--- a/textproc/syck/Makefile
+++ b/textproc/syck/Makefile
@@ -8,13 +8,12 @@
 PORTNAME=	syck
 PORTVERSION=	0.55
 CATEGORIES=	textproc devel
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4492/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dd@FreeBSD.org
 COMMENT=	Syck is an extension for reading and writing YAML swiftly
 
-BROKEN=		fails to fetch
-
 GNU_CONFIGURE=	yes
 USE_BISON=	yes
 CFLAGS+=	-fPIC
diff --git a/www/instiki/Makefile b/www/instiki/Makefile
index 8b7eb7ee33c1..c76884dee153 100644
--- a/www/instiki/Makefile
+++ b/www/instiki/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	instiki
 PORTVERSION=	0.11.0
 PORTREVISION=	1
 CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.rubyuser.de/instiki/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	arsptr@internode.on.net
diff --git a/www/ruby-borges/Makefile b/www/ruby-borges/Makefile
index 15e7d8edc6e1..d56db638114c 100644
--- a/www/ruby-borges/Makefile
+++ b/www/ruby-borges/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	borges
 PORTVERSION=	1.1.0
 CATEGORIES=	www ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/574/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index cd91504921d5..9470c65ef9c3 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -7,8 +7,8 @@
 PORTNAME=	actionpack
 PORTVERSION=	1.12.1
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9568/ \
-		http://rubyforge.rubyuser.de/actionpack/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Action Controller and Action View of Rails MVC Framework
diff --git a/www/rubygem-actionwebservice/Makefile b/www/rubygem-actionwebservice/Makefile
index 0e65afe76d77..223392b4e147 100644
--- a/www/rubygem-actionwebservice/Makefile
+++ b/www/rubygem-actionwebservice/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	actionwebservice
 PORTVERSION=	1.1.2
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9681/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	aws
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Simple support for publishing Web Service APIs for Rails applications
diff --git a/www/rubygem-mongrel/Makefile b/www/rubygem-mongrel/Makefile
index 659a8f2a8465..59e1442b1fe2 100644
--- a/www/rubygem-mongrel/Makefile
+++ b/www/rubygem-mongrel/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	mongrel
 PORTVERSION=	0.3.13.1
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/11186/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	Fast HTTP 1.1 library and server for Ruby web applications
diff --git a/www/rubygem-mongrel_cluster/Makefile b/www/rubygem-mongrel_cluster/Makefile
index fdf03caabefb..d658bddc34a5 100644
--- a/www/rubygem-mongrel_cluster/Makefile
+++ b/www/rubygem-mongrel_cluster/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	mongrel_cluster
 PORTVERSION=	0.2.0
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/11160/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	railsmachine
 
 MAINTAINER=	rgl@ruilopes.com
 COMMENT=	Manages multiple Mongrel processes
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index 1c6d755ca8f4..c31f26689a8f 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -7,7 +7,8 @@
 PORTNAME=	rails
 PORTVERSION=	1.1.2
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/9684/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	MVC web application framework
diff --git a/www/rubygem-redcloth/Makefile b/www/rubygem-redcloth/Makefile
index f0c25fee9ef9..9258667e56c0 100644
--- a/www/rubygem-redcloth/Makefile
+++ b/www/rubygem-redcloth/Makefile
@@ -9,7 +9,8 @@ PORTVERSION=	3.0.3
 PORTREVISION=	1
 DISTNAME=	RedCloth-${PORTVERSION}
 CATEGORIES=	www rubygems
-MASTER_SITES=	http://rubyforge.org/frs/download.php/2898/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jw@innerewut.de
 COMMENT=	A module for using Textile in Ruby
diff --git a/www/typo/Makefile b/www/typo/Makefile
index 3d1ed14278ef..76a1495fe6c8 100644
--- a/www/typo/Makefile
+++ b/www/typo/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	typo
 PORTVERSION=	2.6.0
 CATEGORIES=	www
-MASTER_SITES=	http://rubyforge.org/frs/download.php/7005/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jw@innerewut.de
diff --git a/x11-toolkits/ruby-fox-devel/Makefile b/x11-toolkits/ruby-fox-devel/Makefile
index 4b3ba29f30bc..b167b7236118 100644
--- a/x11-toolkits/ruby-fox-devel/Makefile
+++ b/x11-toolkits/ruby-fox-devel/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	fox
 PORTVERSION=	1.2.6
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4003/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	fxruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile
index 4b3ba29f30bc..b167b7236118 100644
--- a/x11-toolkits/ruby-fox12/Makefile
+++ b/x11-toolkits/ruby-fox12/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	fox
 PORTVERSION=	1.2.6
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/4003/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	fxruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
diff --git a/x11-toolkits/ruby-wx/Makefile b/x11-toolkits/ruby-wx/Makefile
index 95a7ca150aed..ee4a650ff95b 100644
--- a/x11-toolkits/ruby-wx/Makefile
+++ b/x11-toolkits/ruby-wx/Makefile
@@ -9,7 +9,8 @@ PORTNAME=	wx
 PORTVERSION=	0.6.0
 PORTREVISION=	3
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/1983/
+MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	wxruby-${PORTVERSION:S/.0$//}-src
 DIST_SUBDIR=	ruby