- GEMS are always RUN_DEPENDS of other GEMS

- Bump PORTREVISION when something other then BUILD_DEPENDS changes
- Some minor verticle whitespace in some ports for consistency with the rest

PR:             ports/147551
Submitted by:   pgollucci@ (myself)
Reviewed by:    portmgr (pav)
With Hat:       ruby

74 files changed, 95 insertions, 148 deletions

diff --git a/benchmarks/rubygem-railsbench/Makefile b/benchmarks/rubygem-railsbench/Makefile
index fee7805d2136..9260de71fb1a 100644
--- a/benchmarks/rubygem-railsbench/Makefile
+++ b/benchmarks/rubygem-railsbench/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Scripts designed for benchmarking of Rails applications
 
-BUILD_DEPENDS=	rubygem-hoe>=1.2.0:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-hoe>=1.2.0:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index c82483e392b2..a98b57db7a0c 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	jruby-extras
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	An ActiveRecord driver for MySQL using JDBC running under JRuby
 
-BUILD_DEPENDS=	rubygem-jdbc-mysql>=5.0.4:${PORTSDIR}/databases/rubygem-jdbc-mysql \
-		rubygem-activerecord-jdbc-adapter>=0.8.2:${PORTSDIR}/databases/rubygem-activerecord-jdbc-adapter
 RUN_DEPENDS=	rubygem-jdbc-mysql>=5.0.4:${PORTSDIR}/databases/rubygem-jdbc-mysql \
 		rubygem-activerecord-jdbc-adapter>=0.8.2:${PORTSDIR}/databases/rubygem-activerecord-jdbc-adapter \
 		jruby:${PORTSDIR}/lang/jruby
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 48137f44af22..70d67462df1b 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
 
-BUILD_DEPENDS=	rubygem-activesupport>=2.3.4:${PORTSDIR}/devel/rubygem-activesupport
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-activesupport>=2.3.4:${PORTSDIR}/devel/rubygem-activesupport
 
 OPTIONS=	NATIVE_MYSQL "Use native MySQL bindings" Off\
 		NATIVE_POSTGRESQL "Use native PostgreSQL bindings" Off\
diff --git a/databases/rubygem-data_objects/Makefile b/databases/rubygem-data_objects/Makefile
index 0f581c484e1c..d2b7c82c2817 100644
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	data_objects
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RUBYFORGE/dorb
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	A unified Ruby API for popular databases
 
-BUILD_DEPENDS=	rubygem-addressable>=2.0:${PORTSDIR}/www/rubygem-addressable \
+RUN_DEPENDS=	rubygem-addressable>=2.0:${PORTSDIR}/www/rubygem-addressable \
 		rubygem-extlib>=0.9.9:${PORTSDIR}/devel/rubygem-extlib
 
 USE_RUBY=	yes
diff --git a/databases/rubygem-datamapper/Makefile b/databases/rubygem-datamapper/Makefile
index 92ad6204019e..018fd6ff3b1e 100644
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@@ -13,10 +13,6 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Fast, thread-safe, object-relational mapper
 
-BUILD_DEPENDS=	rubygem-rspec>0:${PORTSDIR}/devel/rubygem-rspec \
-		rubygem-validatable>0:${PORTSDIR}/devel/rubygem-validatable \
-		rubygem-json>0:${PORTSDIR}/devel/rubygem-json \
-		rubygem-fastthread>0:${PORTSDIR}/devel/rubygem-fastthread
 RUN_DEPENDS=	rubygem-rspec>0:${PORTSDIR}/devel/rubygem-rspec \
 		rubygem-validatable>0:${PORTSDIR}/devel/rubygem-validatable \
 		rubygem-json>0:${PORTSDIR}/devel/rubygem-json \
diff --git a/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index 40811215e0f2..ac1b18913823 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	seattlerb
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby bindings for MemCached
 
-BUILD_DEPENDS=	rubygem-zentest>=3.4.2:${PORTSDIR}/devel/rubygem-zentest \
+RUN_DEPENDS=	rubygem-zentest>=3.4.2:${PORTSDIR}/devel/rubygem-zentest \
 		rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index c6492884ab8c..310a10d91e8e 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -14,13 +14,15 @@ DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the SQLite DB engine version 3
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
-USE_RUBY=	yes
-USE_RUBYGEMS=	yes
 CONFIGURE_ARGS+=--with-sqlite3-dir=${LOCALBASE}
+
 GEM_NAME=	${DISTNAME}
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index c6492884ab8c..310a10d91e8e 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -14,13 +14,15 @@ DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the SQLite DB engine version 3
 
-BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
-USE_RUBY=	yes
-USE_RUBYGEMS=	yes
 CONFIGURE_ARGS+=--with-sqlite3-dir=${LOCALBASE}
+
 GEM_NAME=	${DISTNAME}
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-analogger/Makefile b/devel/rubygem-analogger/Makefile
index 3fad4c7949a2..4e8d4759e185 100644
--- a/devel/rubygem-analogger/Makefile
+++ b/devel/rubygem-analogger/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A fast, flexible, easy to use logging service for Ruby
 
-BUILD_DEPENDS=	rubygem-eventmachine>=0.7.0:${PORTSDIR}/devel/rubygem-eventmachine
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-eventmachine>=0.7.0:${PORTSDIR}/devel/rubygem-eventmachine
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-classifier/Makefile b/devel/rubygem-classifier/Makefile
index 7c3f0f4ff132..b30c84d4f24d 100644
--- a/devel/rubygem-classifier/Makefile
+++ b/devel/rubygem-classifier/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	${MASTER_SITE_RUBYFORGE}/${PORTNAME}/
 MAINTAINER=	peter.schuller@infidyne.com
 COMMENT=	A classifier module for Bayesian and other types of classifications
 
-BUILD_DEPENDS=	rubygem-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-stemmer
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-stemmer>=1.0.0:${PORTSDIR}/devel/rubygem-stemmer
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 03a34892d828..219a059aedf6 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	ditz
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RF/ditz
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Simple, light-weight distributed issue tracker
 
-BUILD_DEPENDS=	rubygem-trollop>0:${PORTSDIR}/devel/rubygem-trollop
+RUN_DEPENDS=	rubygem-trollop>0:${PORTSDIR}/devel/rubygem-trollop
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/devel/rubygem-gdata/Makefile b/devel/rubygem-gdata/Makefile
index e862be779f53..cf50a4dce8c8 100644
--- a/devel/rubygem-gdata/Makefile
+++ b/devel/rubygem-gdata/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Assist Ruby developers in working with Google Data APIs
 
-BUILD_DEPENDS=	rubygem-rails>=2.2.2:${PORTSDIR}/www/rubygem-rails
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-rails>=2.2.2:${PORTSDIR}/www/rubygem-rails
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-gem_plugin/Makefile b/devel/rubygem-gem_plugin/Makefile
index 17cda4a809f9..6c18f92c4779 100644
--- a/devel/rubygem-gem_plugin/Makefile
+++ b/devel/rubygem-gem_plugin/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gem_plugin
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=     mongrel
@@ -13,8 +14,6 @@ MASTER_SITE_SUBDIR=     mongrel
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Gem Based Plugin System
 
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_RUBY=	yes
 USE_RAKE=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-grit/Makefile b/devel/rubygem-grit/Makefile
index 48582da6bcda..bd41db325297 100644
--- a/devel/rubygem-grit/Makefile
+++ b/devel/rubygem-grit/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	RF/gems
 MAINTAINER=	daniel@roe.ch
 COMMENT=	An object-oriented ruby library to access git repositories
 
-BUILD_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
 		rubygem-mime-types>=1.15:${PORTSDIR}/misc/rubygem-mime-types
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index b303fd44e897..b1b24622ef60 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	seattlerb
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A simple rake/rubygems helper for project Rakefiles
 
-BUILD_DEPENDS=	rubygem-rubyforge>=1.3.1:${PORTSDIR}/devel/rubygem-rubyforge
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-rubyforge>=1.3.1:${PORTSDIR}/devel/rubygem-rubyforge
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/devel/rubygem-inline/Makefile b/devel/rubygem-inline/Makefile
index 140eafd35929..93b4db8f72da 100644
--- a/devel/rubygem-inline/Makefile
+++ b/devel/rubygem-inline/Makefile
@@ -15,9 +15,8 @@ DISTNAME=	RubyInline-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Inline::C allows you to embed C/Ruby directly in ruby scripts
 
-BUILD_DEPENDS=	sow:${PORTSDIR}/devel/rubygem-hoe \
+RUN_DEPENDS=	sow:${PORTSDIR}/devel/rubygem-hoe \
     		zentest:${PORTSDIR}/devel/rubygem-zentest
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/devel/rubygem-main/Makefile b/devel/rubygem-main/Makefile
index eabad44c352d..2098620297ab 100644
--- a/devel/rubygem-main/Makefile
+++ b/devel/rubygem-main/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	RF/codeforpeople
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	A Class Factory and Dsl for Generating Command Line Programs
 
-BUILD_DEPENDS=	rubygem-fattr>=1.0.3:${PORTSDIR}/devel/rubygem-fattr \
-		rubygem-arrayfields>=4.5.0:${PORTSDIR}/devel/rubygem-arrayfields
 RUN_DEPENDS=	rubygem-fattr>=1.0.3:${PORTSDIR}/devel/rubygem-fattr \
 		rubygem-arrayfields>=4.5.0:${PORTSDIR}/devel/rubygem-arrayfields
 
diff --git a/devel/rubygem-mash/Makefile b/devel/rubygem-mash/Makefile
index dea2021882dd..3ada44e0e923 100644
--- a/devel/rubygem-mash/Makefile
+++ b/devel/rubygem-mash/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	mash-hash
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Mocking Hash library for Ruby
 
-BUILD_DEPENDS=	rubygem-hoe>=1.5.1:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-hoe>=1.5.1:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-mixlib-authentication/Makefile b/devel/rubygem-mixlib-authentication/Makefile
index c1b036e22c4a..40338cc4b9fd 100644
--- a/devel/rubygem-mixlib-authentication/Makefile
+++ b/devel/rubygem-mixlib-authentication/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Mixes in simple per-request authentication
 
-BUILD_DEPENDS=	rubygem-mixlib-log>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-log
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-mixlib-log>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-log
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-newgem/Makefile b/devel/rubygem-newgem/Makefile
index c6ec3d3beeb8..07bb40fe9840 100644
--- a/devel/rubygem-newgem/Makefile
+++ b/devel/rubygem-newgem/Makefile
@@ -13,17 +13,15 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Bundle ruby libraries into gems
 
-BUILD_DEPENDS=	rubygem-activesupport>=2.0.2:${PORTSDIR}/devel/rubygem-activesupport \
+RUN_DEPENDS=	rubygem-activesupport>=2.0.2:${PORTSDIR}/devel/rubygem-activesupport \
   rubygem-rubigen>=1.5.1:${PORTSDIR}/devel/rubygem-rubigen \
   rubygem-hoe>=1.8.0:${PORTSDIR}/devel/rubygem-hoe \
   rubygem-redcloth>=4.0.0:${PORTSDIR}/www/rubygem-redcloth \
   rubygem-syntax>=1.0.0:${PORTSDIR}/textproc/rubygem-syntax
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PLIST_FILES=	bin/newgem
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
+PLIST_FILES=	bin/newgem
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-nice-ffi/Makefile b/devel/rubygem-nice-ffi/Makefile
index 136abd270911..e5e39f1d6f37 100644
--- a/devel/rubygem-nice-ffi/Makefile
+++ b/devel/rubygem-nice-ffi/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	kick.christoph@googlemail.com
 COMMENT=	Nice-FFI is a layer on top of Ruby-FFI
 
-BUILD_DEPENDS=	rubygem-ffi>=0.5.3:${PORTSDIR}/devel/rubygem-ffi
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-ffi>=0.5.3:${PORTSDIR}/devel/rubygem-ffi
 
 USE_RUBY=		yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-parsetree/Makefile b/devel/rubygem-parsetree/Makefile
index 1398dffd2b7f..0883d4ac34ae 100644
--- a/devel/rubygem-parsetree/Makefile
+++ b/devel/rubygem-parsetree/Makefile
@@ -13,10 +13,9 @@ DISTNAME=	ParseTree-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Ruby parse tree tools
 
-BUILD_DEPENDS=	rubygem-inline>=3.7.0:${PORTSDIR}/devel/rubygem-inline \
+RUN_DEPENDS=	rubygem-inline>=3.7.0:${PORTSDIR}/devel/rubygem-inline \
 		rubygem-sexp_processor>=3.0.1:${PORTSDIR}/devel/rubygem-sexp_processor \
 		rubygem-hoe>=1.8.2:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile
index be15da8d11bb..778a724c1cb6 100644
--- a/devel/rubygem-ptreloaded/Makefile
+++ b/devel/rubygem-ptreloaded/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	ParseTreeReloaded-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	A reimplementation of ParseTree using RubyInlineAcceleration
 
-BUILD_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:${PORTSDIR}/devel/rubygem-rubyinlineaccel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.0.1:${PORTSDIR}/devel/rubygem-rubyinlineaccel
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/devel/rubygem-rascut/Makefile b/devel/rubygem-rascut/Makefile
index c5fc76fb1781..3d13849ecf26 100644
--- a/devel/rubygem-rascut/Makefile
+++ b/devel/rubygem-rascut/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rascut
 PORTVERSION=	0.2.1
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	hotchpotch
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	hotchpotch
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Ruby ActionSCript UTility
 
-BUILD_DEPENDS=	mongrel_rails:${PORTSDIR}/www/rubygem-mongrel \
+RUN_DEPENDS=	mongrel_rails:${PORTSDIR}/www/rubygem-mongrel \
 		edit_json.rb:${PORTSDIR}/devel/rubygem-json_pure \
 		rackup:${PORTSDIR}/www/rubygem-rack \
 		fcsh:${PORTSDIR}/devel/flex-sdk
diff --git a/devel/rubygem-rubigen/Makefile b/devel/rubygem-rubigen/Makefile
index 26b34e13b4ee..cee0c363dcc2 100644
--- a/devel/rubygem-rubigen/Makefile
+++ b/devel/rubygem-rubigen/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A Ruby generic generator framework
 
-BUILD_DEPENDS=	rubygem-activesupport>=2.2.2:${PORTSDIR}/devel/rubygem-activesupport
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-activesupport>=2.2.2:${PORTSDIR}/devel/rubygem-activesupport
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ruby-sdl-ffi/Makefile b/devel/rubygem-ruby-sdl-ffi/Makefile
index a8f836fa82eb..3f3babb34fec 100644
--- a/devel/rubygem-ruby-sdl-ffi/Makefile
+++ b/devel/rubygem-ruby-sdl-ffi/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=		RG
 MAINTAINER=	kick.christoph@googlemail.com
 COMMENT=	Low-level binding to SDL and related libraries using Ruby-FFI
 
-BUILD_DEPENDS=	rubygem-nice-ffi>=0.3:${PORTSDIR}/devel/rubygem-nice-ffi
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-nice-ffi>=0.3:${PORTSDIR}/devel/rubygem-nice-ffi
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-ruby_parser/Makefile b/devel/rubygem-ruby_parser/Makefile
index f72966208596..6dc0362b0468 100644
--- a/devel/rubygem-ruby_parser/Makefile
+++ b/devel/rubygem-ruby_parser/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	ruby_parser
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RUBYFORGE/parsetree
 
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	A ruby parser written in pure ruby
 
-BUILD_DEPENDS=	rubygem-sexp_processor>=3.0.1:${PORTSDIR}/devel/rubygem-sexp_processor \
+RUN_DEPENDS=	rubygem-sexp_processor>=3.0.1:${PORTSDIR}/devel/rubygem-sexp_processor \
 		rubygem-parsetree>=0:${PORTSDIR}/devel/rubygem-parsetree \
 		rubygem-hoe>=1.8.2:${PORTSDIR}/devel/rubygem-hoe
 
diff --git a/devel/rubygem-rubyforge/Makefile b/devel/rubygem-rubyforge/Makefile
index be40cc647c8e..0b4a1cf0283b 100644
--- a/devel/rubygem-rubyforge/Makefile
+++ b/devel/rubygem-rubyforge/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	codeforpeople
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simplistic script which automates rubyforge operations
 
-BUILD_DEPENDS=	rubygem-json_pure>=1.1.7:${PORTSDIR}/devel/rubygem-json_pure
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-json_pure>=1.1.7:${PORTSDIR}/devel/rubygem-json_pure
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index 85864a448475..acf793898ff8 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	kick.christoph@googlemail.com
 COMMENT=	A game-development extension and library for the ruby language
 
-BUILD_DEPENDS=	rubygem-ruby-sdl-ffi>=0.2:${PORTSDIR}/devel/rubygem-ruby-sdl-ffi
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-ruby-sdl-ffi>=0.2:${PORTSDIR}/devel/rubygem-ruby-sdl-ffi
 
 USE_SDL=		gfx image mixer ttf
 USE_RUBY=		yes
diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile
index 51300305d315..d8c21e329998 100644
--- a/devel/rubygem-rubyinlineaccel/Makefile
+++ b/devel/rubygem-rubyinlineaccel/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	RubyInlineAcceleration-${PORTVERSION}
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	An extension to RubyInline
 
-BUILD_DEPENDS=	rubygem-inline>=3.6.3:${PORTSDIR}/devel/rubygem-inline
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-inline>=3.6.3:${PORTSDIR}/devel/rubygem-inline
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/devel/rubygem-sexp_processor/Makefile b/devel/rubygem-sexp_processor/Makefile
index 6b919e70d40e..e4ad4107d938 100644
--- a/devel/rubygem-sexp_processor/Makefile
+++ b/devel/rubygem-sexp_processor/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	parsetree
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Generic sexp processing tools
 
-BUILD_DEPENDS=	rubygem-hoe>=1.8.2:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-hoe>=1.8.2:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-templater/Makefile b/devel/rubygem-templater/Makefile
index 551f68b78f85..1083eae7a90b 100644
--- a/devel/rubygem-templater/Makefile
+++ b/devel/rubygem-templater/Makefile
@@ -13,10 +13,9 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Ruby code generation framework
 
-BUILD_DEPENDS=	rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline \
+RUN_DEPENDS=	rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline \
 		rubygem-extlib>=0.9.5:${PORTSDIR}/devel/rubygem-extlib \
 		rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-transactionsimple/Makefile b/devel/rubygem-transactionsimple/Makefile
index 085bd3776c7d..2196159b6ad0 100644
--- a/devel/rubygem-transactionsimple/Makefile
+++ b/devel/rubygem-transactionsimple/Makefile
@@ -14,12 +14,12 @@ DISTNAME=	transaction-simple-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Simple object transaction support
 
-BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
+
+GEM_NAME=	${DISTNAME}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${DISTNAME}
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-treetop/Makefile b/devel/rubygem-treetop/Makefile
index 06c21ea067a9..ff1b4d031d0a 100644
--- a/devel/rubygem-treetop/Makefile
+++ b/devel/rubygem-treetop/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	treetop
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Ruby-based DSL for text parsing and interpretation
 
-BUILD_DEPENDS=	rubygem-polyglot>=0.3.1:${PORTSDIR}/devel/rubygem-polyglot
+RUN_DEPENDS=	rubygem-polyglot>=0.3.1:${PORTSDIR}/devel/rubygem-polyglot
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/devel/rubygem-uuid/Makefile b/devel/rubygem-uuid/Makefile
index a9cc8e6a8f1a..f79dcda06c09 100644
--- a/devel/rubygem-uuid/Makefile
+++ b/devel/rubygem-uuid/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	RF/reliable-msg
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	UUID Generator for Ruby
 
-BUILD_DEPENDS=	rubygem-macaddr>=1.0.0:${PORTSDIR}/net/rubygem-macaddr
 RUN_DEPENDS=	rubygem-macaddr>=1.0.0:${PORTSDIR}/net/rubygem-macaddr
 
 USE_RUBY=	yes
diff --git a/devel/rubygem-webby/Makefile b/devel/rubygem-webby/Makefile
index 38931040ecef..c80cbf530b87 100644
--- a/devel/rubygem-webby/Makefile
+++ b/devel/rubygem-webby/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	rpsfa@rit.edu
 COMMENT=	A small website management system
 
-BUILD_DEPENDS=	rubygem-redcloth>=4.2:${PORTSDIR}/www/rubygem-redcloth \
+RUN_DEPENDS=	rubygem-redcloth>=4.2:${PORTSDIR}/www/rubygem-redcloth \
 		rubygem-launchy>=0.3.3:${PORTSDIR}/devel/rubygem-launchy \
 		rubygem-logging>=1.2.2:${PORTSDIR}/devel/rubygem-logging \
 		rubygem-flexmock>=0.2.1:${PORTSDIR}/devel/ruby-flexmock \
@@ -23,8 +23,6 @@ BUILD_DEPENDS=	rubygem-redcloth>=4.2:${PORTSDIR}/www/rubygem-redcloth \
 		rubygem-hpricot>=0.6.0:${PORTSDIR}/www/rubygem-hpricot \
 		rubygem-directory_watcher>=1.1.2:${PORTSDIR}/devel/rubygem-directory_watcher
 
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
diff --git a/devel/rubygem-zentest/Makefile b/devel/rubygem-zentest/Makefile
index 283c8b83a6ad..29a2a25b5ab8 100644
--- a/devel/rubygem-zentest/Makefile
+++ b/devel/rubygem-zentest/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	ZenTest-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Ruby Unit Testing Utility
 
-BUILD_DEPENDS=	rubygem-hoe>=1.5.0:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-hoe>=1.5.0:${PORTSDIR}/devel/rubygem-hoe
 
 GEM_NAME=	${DISTNAME}
 
diff --git a/graphics/rubygem-graphviz/Makefile b/graphics/rubygem-graphviz/Makefile
index 194a76852735..df8e73a203c2 100644
--- a/graphics/rubygem-graphviz/Makefile
+++ b/graphics/rubygem-graphviz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	0.9.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics ruby
 MASTER_SITES=	RF
 MASTER_SITE_SUBDIR=	ruby-asp
@@ -16,12 +16,13 @@ DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Ruby Interface to the GraphViz Graphing Tool
 
-BUILD_DEPENDS=	rubygem-treetop>=1.4.2:${PORTSDIR}/devel/rubygem-treetop
-RUN_DEPENDS=	${LOCALBASE}/bin/gxl2dot:${PORTSDIR}/graphics/graphviz
+RUN_DEPENDS=	${LOCALBASE}/bin/gxl2dot:${PORTSDIR}/graphics/graphviz \
+	rubygem-treetop>=1.4.2:${PORTSDIR}/devel/rubygem-treetop
+
+GEM_NAME=	${DISTNAME}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${DISTNAME}
 RUBYGEM_AUTOPLIST=	yes
 PLIST_FILES=	bin/ruby2gv bin/gem2gv
 
diff --git a/graphics/rubygem-turing/Makefile b/graphics/rubygem-turing/Makefile
index 5c5aef04989e..1c219cc7ed56 100644
--- a/graphics/rubygem-turing/Makefile
+++ b/graphics/rubygem-turing/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Easy to use and customize/extend implementation of captcha
 
-BUILD_DEPENDS=	rubygem-gd2>=1.0.0:${PORTSDIR}/graphics/rubygem-gd2
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-gd2>=1.0.0:${PORTSDIR}/graphics/rubygem-gd2
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index a60798d29342..cae5994390ba 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Easy email delivery and testing for Ruby
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-${PORTVERSION}.gemspec:${PORTSDIR}/www/rubygem-actionpack
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-${PORTVERSION}.gemspec:${PORTSDIR}/www/rubygem-actionpack
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/mail/rubygem-mailfactory/Makefile b/mail/rubygem-mailfactory/Makefile
index 0f3745348ffd..2664e5814fa4 100644
--- a/mail/rubygem-mailfactory/Makefile
+++ b/mail/rubygem-mailfactory/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A simple to use module for generating RGC compliant MIME mail
 
-BUILD_DEPENDS=	rubygem-mime-types>=1.13.1:${PORTSDIR}/misc/rubygem-mime-types
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-mime-types>=1.13.1:${PORTSDIR}/misc/rubygem-mime-types
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/misc/rubygem-ohcount/Makefile b/misc/rubygem-ohcount/Makefile
index 8b4b66532986..3ad2ca3258bb 100644
--- a/misc/rubygem-ohcount/Makefile
+++ b/misc/rubygem-ohcount/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	http://labs.ohloh.net/download/
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	Ohcount is the source code line counter that powers Ohloh
 
-BUILD_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
+RUN_DEPENDS=	rubygem-diff-lcs>=1.1.2:${PORTSDIR}/textproc/rubygem-diff-lcs \
 		ragel:${PORTSDIR}/devel/ragel
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net-im/rubygem-termtter/Makefile b/net-im/rubygem-termtter/Makefile
index b42b9a286393..c63fb9a5fb80 100644
--- a/net-im/rubygem-termtter/Makefile
+++ b/net-im/rubygem-termtter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A terminal based twitter client
 
-BUILD_DEPENDS=	rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \
+RUN_DEPENDS=	rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \
 		rubygem-termcolor>=1.0.0:${PORTSDIR}/textproc/rubygem-termcolor \
 		rubygem-rubytter>=0.11.0:${PORTSDIR}/net/rubygem-rubytter \
 		rubygem-highline>1.5.0:${PORTSDIR}/devel/rubygem-highline \
diff --git a/net/rubygem-net-netrc/Makefile b/net/rubygem-net-netrc/Makefile
index 34eba958bdbe..04a7af8cdffd 100644
--- a/net/rubygem-net-netrc/Makefile
+++ b/net/rubygem-net-netrc/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RG
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Net::Netrc provides ftp(1)-style .netrc parsing
 
-BUILD_DEPENDS=	rubygem-platform>=0.3.0:${PORTSDIR}/devel/rubygem-platform
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-platform>=0.3.0:${PORTSDIR}/devel/rubygem-platform
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-oauth/Makefile b/net/rubygem-oauth/Makefile
index 13777a474d43..385da4a8c903 100644
--- a/net/rubygem-oauth/Makefile
+++ b/net/rubygem-oauth/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	RF/oauth
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Rubygem for Creating both OAuth Consumers and Service Providers
 
-BUILD_DEPENDS=	${RUBY_PKGNAMEPREFIX}hmac>=0.3.2:${PORTSDIR}/security/ruby-hmac
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}hmac>=0.3.2:${PORTSDIR}/security/ruby-hmac
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/net/rubygem-openid/Makefile b/net/rubygem-openid/Makefile
index 36b7c3c43c89..5ec386c2e220 100644
--- a/net/rubygem-openid/Makefile
+++ b/net/rubygem-openid/Makefile
@@ -16,12 +16,12 @@ DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	An OpenID library written in pure Ruby
 
-BUILD_DEPENDS=	rubygem-yadis>=0.3.4:${PORTSDIR}/net/rubygem-yadis
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-yadis>=0.3.4:${PORTSDIR}/net/rubygem-yadis
+
+GEM_NAME=	${DISTNAME}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${DISTNAME}
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-rubytter/Makefile b/net/rubygem-rubytter/Makefile
index acbd7d7d4b0c..72a9ec0ad845 100644
--- a/net/rubygem-rubytter/Makefile
+++ b/net/rubygem-rubytter/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	rubytter
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A simple twitter library
 
-BUILD_DEPENDS=	rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \
+RUN_DEPENDS=	rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \
 		rubygem-oauth>=0.3.6:${PORTSDIR}/net/rubygem-oauth
 
 USE_RUBY=	yes
diff --git a/net/rubygem-twitter4r/Makefile b/net/rubygem-twitter4r/Makefile
index e02dc8d09873..e5852cce9fe2 100644
--- a/net/rubygem-twitter4r/Makefile
+++ b/net/rubygem-twitter4r/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Twitter client API in pure Ruby
 
-BUILD_DEPENDS=	rubygem-json>=0.4.3:${PORTSDIR}/devel/rubygem-json
 RUN_DEPENDS=	rubygem-json>=0.4.3:${PORTSDIR}/devel/rubygem-json
 
 USE_RUBY=	yes
diff --git a/print/rubygem-color/Makefile b/print/rubygem-color/Makefile
index 0ccd9ecd3d50..5483c63b6dc2 100644
--- a/print/rubygem-color/Makefile
+++ b/print/rubygem-color/Makefile
@@ -14,9 +14,8 @@ DISTNAME=	color-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Provides colour space definition and manpiulation
 
-BUILD_DEPENDS=	rubygem-archive-tar-minitar>=0.5.1:${PORTSDIR}/archivers/rubygem-archive-tar-minitar \
+RUN_DEPENDS=	rubygem-archive-tar-minitar>=0.5.1:${PORTSDIR}/archivers/rubygem-archive-tar-minitar \
 		rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/print/rubygem-pdfwriter/Makefile b/print/rubygem-pdfwriter/Makefile
index 0637ab1309a6..f8c29996da7d 100644
--- a/print/rubygem-pdfwriter/Makefile
+++ b/print/rubygem-pdfwriter/Makefile
@@ -14,13 +14,13 @@ DISTNAME=	pdf-writer-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A pure Ruby PDF document creation library
 
-BUILD_DEPENDS=	rubygem-color>=1.4.0:${PORTSDIR}/print/rubygem-color \
+RUN_DEPENDS=	rubygem-color>=1.4.0:${PORTSDIR}/print/rubygem-color \
 		rubygem-transactionsimple>=1.4.0:${PORTSDIR}/devel/rubygem-transactionsimple
-RUN_DEPENDS=	${BUILD_DEPENDS}
+
+GEM_NAME=	${DISTNAME}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${DISTNAME}
 RUBYGEM_AUTOPLIST=	yes
 PLIST_FILES=	bin/techbook
 
diff --git a/print/rubygem-prawn-format/Makefile b/print/rubygem-prawn-format/Makefile
index e3bdf4881b08..682b567d78da 100644
--- a/print/rubygem-prawn-format/Makefile
+++ b/print/rubygem-prawn-format/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RF/prawn
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	An extension of Prawn that allows inline formatting
 
-BUILD_DEPENDS=	rubygem-prawn-core>=0:${PORTSDIR}/print/rubygem-prawn-core
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-prawn-core>=0:${PORTSDIR}/print/rubygem-prawn-core
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/print/rubygem-prawn/Makefile b/print/rubygem-prawn/Makefile
index b0b689501399..d73bad164651 100644
--- a/print/rubygem-prawn/Makefile
+++ b/print/rubygem-prawn/Makefile
@@ -12,11 +12,10 @@ MASTER_SITES=	RF/prawn
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Fast pure Ruby PDF generator
 
-BUILD_DEPENDS=	rubygem-prawn-layout>=0.3.1:${PORTSDIR}/print/rubygem-prawn-layout \
+RUN_DEPENDS=	rubygem-prawn-layout>=0.3.1:${PORTSDIR}/print/rubygem-prawn-layout \
 		rubygem-prawn-format>=0.2.2:${PORTSDIR}/print/rubygem-prawn-format \
 		rubygem-prawn-security>=0.1.1:${PORTSDIR}/print/rubygem-prawn-security \
 		rubygem-prawn-core>=0.6.1:${PORTSDIR}/print/rubygem-prawn-core
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile
index 8deb4775ab96..65fc3a208918 100644
--- a/sysutils/rubygem-god/Makefile
+++ b/sysutils/rubygem-god/Makefile
@@ -6,13 +6,14 @@
 
 PORTNAME=	god
 PORTVERSION=	0.7.18
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	Monitoring framework written in Ruby
 
-BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
+RUN_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/sysutils/rubygem-ohai/Makefile b/sysutils/rubygem-ohai/Makefile
index 45d321f676cb..f3b7c0b89302 100644
--- a/sysutils/rubygem-ohai/Makefile
+++ b/sysutils/rubygem-ohai/Makefile
@@ -13,13 +13,12 @@ MASTER_SITES=	RG
 MAINTAINER=	renchap@cocoa-x.com
 COMMENT=	Ohai profiles your system and emits JSON
 
-BUILD_DEPENDS=	rubygem-mixlib-log>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-log \
+RUN_DEPENDS=	rubygem-mixlib-log>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-log \
 		rubygem-mixlib-config>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-config \
 		rubygem-mixlib-cli>=1.1.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
 		rubygem-systemu>=1.2.0:${PORTSDIR}/devel/rubygem-systemu \
 		rubygem-extlib>=0.9.14:${PORTSDIR}/devel/rubygem-extlib \
 		rubygem-json>=1.1.9:${PORTSDIR}/devel/rubygem-json
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/textproc/rubygem-markaby/Makefile b/textproc/rubygem-markaby/Makefile
index 1932736d2138..a8b12597c823 100644
--- a/textproc/rubygem-markaby/Makefile
+++ b/textproc/rubygem-markaby/Makefile
@@ -13,7 +13,6 @@ MASTER_SITES=	RG
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	HTML Markup as Ruby
 
-BUILD_DEPENDS=	rubygem-builder>0:${PORTSDIR}/devel/rubygem-builder
 RUN_DEPENDS=	rubygem-builder>0:${PORTSDIR}/devel/rubygem-builder
 
 USE_RUBY=	yes
diff --git a/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile
index 6fff109512cb..b1e06fefc080 100644
--- a/textproc/rubygem-nokogiri/Makefile
+++ b/textproc/rubygem-nokogiri/Makefile
@@ -12,16 +12,15 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	An HTML, XML, SAX, and Reader parser
 
-BUILD_DEPENDS=	${RUBY_PKGNAMEPREFIX}iconv>=0:${PORTSDIR}/converters/ruby-iconv \
+BUILD_DEPENDS=	${RUBY_PKGNAMEPREFIX}iconv>=0:${PORTSDIR}/converters/ruby-iconv
+RUN_DEPENDS=	${BUILD_DEPENDS} \
 				rubygem-hoe>=2.3.3:${PORTSDIR}/devel/rubygem-hoe
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GNOME=	libxml2 libxslt
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
-
 PLIST_FILES=	bin/nokogiri
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-rak/Makefile b/textproc/rubygem-rak/Makefile
index 98a13a64ada6..ffb72abb875c 100644
--- a/textproc/rubygem-rak/Makefile
+++ b/textproc/rubygem-rak/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	RG
 MAINTAINER=	gogo@cs.uni-sb.de
 COMMENT=	A grep replacement in pure Ruby
 
-BUILD_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 RUN_DEPENDS=	rubygem-hoe>=1.3.0:${PORTSDIR}/devel/rubygem-hoe
 
 USE_RUBY=	yes
diff --git a/textproc/rubygem-termcolor/Makefile b/textproc/rubygem-termcolor/Makefile
index 4b942be0f5a2..8059718c2f7c 100644
--- a/textproc/rubygem-termcolor/Makefile
+++ b/textproc/rubygem-termcolor/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	RF/termcolor
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A library for ANSII color formatting like HTML for output in terminal
 
-BUILD_DEPENDS=	rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
+RUN_DEPENDS=	rubygem-highline>=1.4.0:${PORTSDIR}/devel/rubygem-highline
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index 3ecff66d5231..f465e206bcdc 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -12,9 +12,8 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Action Controller and Action View of Rails MVC Framework
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
+RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
   				rubygem-rack>=1.1.0:${PORTSDIR}/www/rubygem-rack
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-activeresource/Makefile b/www/rubygem-activeresource/Makefile
index af397648ac5e..96f5aa51fecb 100644
--- a/www/rubygem-activeresource/Makefile
+++ b/www/rubygem-activeresource/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A coherent wrapper object-relational mapping for REST web services
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-amazon-ecs/Makefile b/www/rubygem-amazon-ecs/Makefile
index 078b1d79e6f7..ec5fcba481d0 100644
--- a/www/rubygem-amazon-ecs/Makefile
+++ b/www/rubygem-amazon-ecs/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	RG
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	A generic Amazon E-commerce REST API written in Ruby
 
-BUILD_DEPENDS=	rubygem-hpricot>=0.4:${PORTSDIR}/www/rubygem-hpricot \
+RUN_DEPENDS=	rubygem-hpricot>=0.4:${PORTSDIR}/www/rubygem-hpricot \
 		${RUBY_PKGNAMEPREFIX}hmac>=0.3.2:${PORTSDIR}/security/ruby-hmac
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-erubis/Makefile b/www/rubygem-erubis/Makefile
index bb233f90fbbf..c3e10ae258f8 100644
--- a/www/rubygem-erubis/Makefile
+++ b/www/rubygem-erubis/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@freebsd.org
 COMMENT=	A fast, secure, and very extensible implementation of eRuby
 
-BUILD_DEPENDS=	rubygem-abstract>=1.0.0:${PORTSDIR}/devel/rubygem-abstract
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-abstract>=1.0.0:${PORTSDIR}/devel/rubygem-abstract
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-htauth/Makefile b/www/rubygem-htauth/Makefile
index e39c2a516326..4311356ed7a0 100644
--- a/www/rubygem-htauth/Makefile
+++ b/www/rubygem-htauth/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	copiousfreetime
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Replacement for the Apache htdigest and htpasswd
 
-BUILD_DEPENDS=	rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-httparty/Makefile b/www/rubygem-httparty/Makefile
index 198feab44b4e..24fcae878652 100644
--- a/www/rubygem-httparty/Makefile
+++ b/www/rubygem-httparty/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RF
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Ruby Library that Makes HTTP Fun Again
 
-BUILD_DEPENDS=	rubygem-crack>=0.1.1:${PORTSDIR}/devel/rubygem-crack
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-crack>=0.1.1:${PORTSDIR}/devel/rubygem-crack
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-maruku/Makefile b/www/rubygem-maruku/Makefile
index 33458e27caa6..e66c0228c152 100644
--- a/www/rubygem-maruku/Makefile
+++ b/www/rubygem-maruku/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	RG
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	A Markdown and PHP Markdown extra interpreter for Ruby
 
-BUILD_DEPENDS=	rubygem-syntax>=1.0.0:${PORTSDIR}/textproc/rubygem-syntax
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-syntax>=1.0.0:${PORTSDIR}/textproc/rubygem-syntax
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-mechanize/Makefile b/www/rubygem-mechanize/Makefile
index 4a0fb7f19aab..eec6fdd7c9c6 100644
--- a/www/rubygem-mechanize/Makefile
+++ b/www/rubygem-mechanize/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	WWW::Mechanize, a handy web browsing ruby object
 
-BUILD_DEPENDS=	rubygem-hpricot>=0.5.0:${PORTSDIR}/www/rubygem-hpricot \
+RUN_DEPENDS=	rubygem-hpricot>=0.5.0:${PORTSDIR}/www/rubygem-hpricot \
 		rubygem-hoe>=1.5.0:${PORTSDIR}/devel/rubygem-hoe \
 		rubygem-nokogiri>=1.2.1:${PORTSDIR}/textproc/rubygem-nokogiri
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-mongrel/Makefile b/www/rubygem-mongrel/Makefile
index d5ad6726368f..1059e0253c09 100644
--- a/www/rubygem-mongrel/Makefile
+++ b/www/rubygem-mongrel/Makefile
@@ -13,10 +13,9 @@ DISTFILES=	${PATCHNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Fast HTTP 1.1 library and server for Ruby web applications
 
-BUILD_DEPENDS=	gpgen:${PORTSDIR}/devel/rubygem-gem_plugin \
+RUN_DEPENDS=	gpgen:${PORTSDIR}/devel/rubygem-gem_plugin \
 		rubygem-daemons>=1.0.3:${PORTSDIR}/devel/rubygem-daemons \
 		rubygem-fastthread>=1.0.1:${PORTSDIR}/devel/rubygem-fastthread
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-mongrel_cluster/Makefile b/www/rubygem-mongrel_cluster/Makefile
index 9b838439a534..99e4612b2468 100644
--- a/www/rubygem-mongrel_cluster/Makefile
+++ b/www/rubygem-mongrel_cluster/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	mongrel
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	Manages multiple Mongrel processes
 
-BUILD_DEPENDS=	rubygem-mongrel>=1.0.2:${PORTSDIR}/www/rubygem-mongrel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-mongrel>=1.0.2:${PORTSDIR}/www/rubygem-mongrel
 
 USE_RC_SUBR=	mongrel_cluster
 USE_RUBY=	yes
diff --git a/www/rubygem-rails-app-installer/Makefile b/www/rubygem-rails-app-installer/Makefile
index 84b563af0dca..25374e40fc8b 100644
--- a/www/rubygem-rails-app-installer/Makefile
+++ b/www/rubygem-rails-app-installer/Makefile
@@ -14,10 +14,9 @@ MASTER_SITE_SUBDIR=	rails-installer
 MAINTAINER=	geraud@gcu.info
 COMMENT=	An installer for Rails apps
 
-BUILD_DEPENDS=	rubygem-sqlite3>=1.1.0:${PORTSDIR}/databases/rubygem-sqlite3 \
+RUN_DEPENDS=	rubygem-sqlite3>=1.1.0:${PORTSDIR}/databases/rubygem-sqlite3 \
 		rubygem-mongrel>=0.3.13:${PORTSDIR}/www/rubygem-mongrel \
 		rubygem-mongrel_cluster>=0.2.0:${PORTSDIR}/www/rubygem-mongrel_cluster
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RAKE=	yes
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index b87c972de044..0f05b55212a4 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -12,12 +12,11 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	MVC web application framework
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
+RUN_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-${PORTVERSION}.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
 		${LOCALBASE}/${SPEC_DIR}/activerecord-${PORTVERSION}.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
 		${LOCALBASE}/${SPEC_DIR}/actionpack-${PORTVERSION}.gemspec:${PORTSDIR}/www/rubygem-actionpack \
 		${LOCALBASE}/${SPEC_DIR}/actionmailer-${PORTVERSION}.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
 		${LOCALBASE}/${SPEC_DIR}/activeresource-${PORTVERSION}.gemspec:${PORTSDIR}/www/rubygem-activeresource
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	FCGI "FastCGI support" Off\
 		MEMCACHE_CLIENT "MemCache-Client support" Off
diff --git a/www/rubygem-rfacebook/Makefile b/www/rubygem-rfacebook/Makefile
index 5a4331896a8c..355a3003edf7 100644
--- a/www/rubygem-rfacebook/Makefile
+++ b/www/rubygem-rfacebook/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES=	RG
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Ruby interface to the Facebook API
 
-BUILD_DEPENDS=	rubygem-hpricot>=0.6:${PORTSDIR}/www/rubygem-hpricot \
+RUN_DEPENDS=	rubygem-hpricot>=0.6:${PORTSDIR}/www/rubygem-hpricot \
 		rubygem-mocha>=0.5.3:${PORTSDIR}/devel/rubygem-mocha
-RUN_DEPENDS=	${BUILD_REQUIRES}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/www/rubygem-rubyfulsoup/Makefile b/www/rubygem-rubyfulsoup/Makefile
index cc2f16affe74..824f8fef8c98 100644
--- a/www/rubygem-rubyfulsoup/Makefile
+++ b/www/rubygem-rubyfulsoup/Makefile
@@ -13,12 +13,12 @@ DISTNAME=	rubyful_soup-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ruby port of the HTML/XML parser Beautiful Soup
 
-BUILD_DEPENDS=	rubygem-htmltools>=1.10:${PORTSDIR}/textproc/rubygem-htmltools
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	rubygem-htmltools>=1.10:${PORTSDIR}/textproc/rubygem-htmltools
+
+GEM_NAME=	${DISTNAME}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
-GEM_NAME=	${DISTNAME}
 RUBYGEM_AUTOPLIST=	yes
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-sinatra/Makefile b/www/rubygem-sinatra/Makefile
index 179c8b8c8571..3bc481605bcb 100644
--- a/www/rubygem-sinatra/Makefile
+++ b/www/rubygem-sinatra/Makefile
@@ -12,7 +12,6 @@ MASTER_SITES=	RG
 MAINTAINER=	daniel@roe.ch
 COMMENT=	A classy web development framework in ruby
 
-BUILD_DEPENDS=	rubygem-rack>=0.9.1:${PORTSDIR}/www/rubygem-rack
 RUN_DEPENDS=	rubygem-rack>=0.9.1:${PORTSDIR}/www/rubygem-rack
 
 USE_RUBY=	yes
diff --git a/www/rubygem-thin/Makefile b/www/rubygem-thin/Makefile
index c230e2ba9549..3e9bc22b6d22 100644
--- a/www/rubygem-thin/Makefile
+++ b/www/rubygem-thin/Makefile
@@ -12,10 +12,9 @@ MASTER_SITES=	RG
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A fast and very simple Ruby web server
 
-BUILD_DEPENDS=	rubygem-rack>=1.0.0:${PORTSDIR}/www/rubygem-rack \
+RUN_DEPENDS=	rubygem-rack>=1.0.0:${PORTSDIR}/www/rubygem-rack \
 		rubygem-eventmachine>=0.8.1:${PORTSDIR}/devel/rubygem-eventmachine \
 		rubygem-daemons>=1.0.9:${PORTSDIR}/devel/rubygem-daemons
-RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes