aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authorswills <swills@FreeBSD.org>2016-04-28 00:36:41 +0800
committerswills <swills@FreeBSD.org>2016-04-28 00:36:41 +0800
commit900b8428054e4288c9669f4f17359be2ae8a45c3 (patch)
tree146c1b1aad08357a95df3348dea477d956cd3816 /www
parentc5f5d48270cbe2ede4cb24ba577ced5ea769dd2f (diff)
downloadfreebsd-ports-graphics-900b8428054e4288c9669f4f17359be2ae8a45c3.tar.gz
freebsd-ports-graphics-900b8428054e4288c9669f4f17359be2ae8a45c3.tar.zst
freebsd-ports-graphics-900b8428054e4288c9669f4f17359be2ae8a45c3.zip
create USES=gem and update rubygem- ports to use it
Note that for now ports still have to have USE_RUBY=yes to use USES=gem PR: 209041 Differential Revision: https://reviews.freebsd.org/D6070
Diffstat (limited to 'www')
-rw-r--r--www/rubygem-ace-rails-ap/Makefile4
-rw-r--r--www/rubygem-actionpack/Makefile3
-rw-r--r--www/rubygem-actionpack4/Makefile3
-rw-r--r--www/rubygem-activeresource/Makefile3
-rw-r--r--www/rubygem-activeresource4/Makefile3
-rw-r--r--www/rubygem-acts-as-taggable-on/Makefile3
-rw-r--r--www/rubygem-acts-as-taggable-on3/Makefile3
-rw-r--r--www/rubygem-acts_as_taggable/Makefile3
-rw-r--r--www/rubygem-addressable/Makefile3
-rw-r--r--www/rubygem-akami/Makefile3
-rw-r--r--www/rubygem-amazon-ecs/Makefile3
-rw-r--r--www/rubygem-anemone/Makefile3
-rw-r--r--www/rubygem-asana/Makefile3
-rw-r--r--www/rubygem-async_sinatra/Makefile3
-rw-r--r--www/rubygem-bluecloth/Makefile4
-rw-r--r--www/rubygem-bootstrap-sass/Makefile3
-rw-r--r--www/rubygem-browser/Makefile3
-rw-r--r--www/rubygem-cal-heatmap-rails-rails4/Makefile3
-rw-r--r--www/rubygem-cal-heatmap-rails/Makefile3
-rw-r--r--www/rubygem-carrierwave/Makefile3
-rw-r--r--www/rubygem-cgi_multipart_eof_fix/Makefile3
-rw-r--r--www/rubygem-chosen-rails/Makefile3
-rw-r--r--www/rubygem-cookiejar/Makefile3
-rw-r--r--www/rubygem-crass/Makefile3
-rw-r--r--www/rubygem-cuba/Makefile3
-rw-r--r--www/rubygem-d3_rails-rails4/Makefile3
-rw-r--r--www/rubygem-d3_rails/Makefile3
-rw-r--r--www/rubygem-dashing/Makefile3
-rw-r--r--www/rubygem-davclient/Makefile3
-rw-r--r--www/rubygem-domainatrix/Makefile3
-rw-r--r--www/rubygem-dropzonejs-rails/Makefile3
-rw-r--r--www/rubygem-em-http-request/Makefile3
-rw-r--r--www/rubygem-em-socksify/Makefile3
-rw-r--r--www/rubygem-em-twitter/Makefile3
-rw-r--r--www/rubygem-em-websocket/Makefile3
-rw-r--r--www/rubygem-emk-sinatra-url-for/Makefile3
-rw-r--r--www/rubygem-erubis/Makefile3
-rw-r--r--www/rubygem-ethon/Makefile3
-rw-r--r--www/rubygem-eventmachine_httpserver/Makefile3
-rw-r--r--www/rubygem-faraday/Makefile3
-rw-r--r--www/rubygem-faraday_middleware/Makefile3
-rw-r--r--www/rubygem-fcgi/Makefile3
-rw-r--r--www/rubygem-feed-normalizer/Makefile3
-rw-r--r--www/rubygem-feedjira/Makefile3
-rw-r--r--www/rubygem-flowdock/Makefile3
-rw-r--r--www/rubygem-geminabox/Makefile3
-rw-r--r--www/rubygem-gitlab-flowdock-git-hook/Makefile3
-rw-r--r--www/rubygem-gitlab-gollum-lib/Makefile3
-rw-r--r--www/rubygem-gitlab-grack/Makefile3
-rw-r--r--www/rubygem-gollum-grit_adapter/Makefile3
-rw-r--r--www/rubygem-gollum-lib/Makefile3
-rw-r--r--www/rubygem-gollum-rugged_adapter/Makefile3
-rw-r--r--www/rubygem-gon-rails4/Makefile3
-rw-r--r--www/rubygem-gon/Makefile3
-rw-r--r--www/rubygem-hackpad-cli/Makefile3
-rw-r--r--www/rubygem-haml-coderay/Makefile3
-rw-r--r--www/rubygem-haml-contrib/Makefile3
-rw-r--r--www/rubygem-haml-rails-rails4/Makefile3
-rw-r--r--www/rubygem-haml-rails/Makefile3
-rw-r--r--www/rubygem-haml/Makefile3
-rw-r--r--www/rubygem-hashicorp-checkpoint/Makefile3
-rw-r--r--www/rubygem-heroku-api/Makefile3
-rw-r--r--www/rubygem-heroku-nav/Makefile3
-rw-r--r--www/rubygem-heroku/Makefile3
-rw-r--r--www/rubygem-hpricot/Makefile3
-rw-r--r--www/rubygem-html2haml/Makefile3
-rw-r--r--www/rubygem-http-cookie/Makefile3
-rw-r--r--www/rubygem-http-form_data/Makefile3
-rw-r--r--www/rubygem-http/Makefile3
-rw-r--r--www/rubygem-http_router/Makefile3
-rw-r--r--www/rubygem-httparty/Makefile3
-rw-r--r--www/rubygem-httpclient/Makefile3
-rw-r--r--www/rubygem-httpi/Makefile3
-rw-r--r--www/rubygem-innate/Makefile4
-rw-r--r--www/rubygem-jekyll-watch/Makefile3
-rw-r--r--www/rubygem-jekyll/Makefile3
-rw-r--r--www/rubygem-jekyll2/Makefile3
-rw-r--r--www/rubygem-journey/Makefile3
-rw-r--r--www/rubygem-jquery-atwho-rails-rails4/Makefile3
-rw-r--r--www/rubygem-jquery-atwho-rails/Makefile3
-rw-r--r--www/rubygem-jquery-rails/Makefile3
-rw-r--r--www/rubygem-jquery-rails4/Makefile3
-rw-r--r--www/rubygem-jquery-scrollto-rails/Makefile3
-rw-r--r--www/rubygem-jquery-turbolinks/Makefile3
-rw-r--r--www/rubygem-jquery-ui-rails-rails4/Makefile3
-rw-r--r--www/rubygem-jquery-ui-rails/Makefile3
-rw-r--r--www/rubygem-jruby-rack/Makefile3
-rw-r--r--www/rubygem-jsobfu/Makefile3
-rw-r--r--www/rubygem-jwt/Makefile3
-rw-r--r--www/rubygem-kaminari-rails4/Makefile3
-rw-r--r--www/rubygem-kaminari/Makefile3
-rw-r--r--www/rubygem-kensa/Makefile3
-rw-r--r--www/rubygem-layout_yullio_generator/Makefile3
-rw-r--r--www/rubygem-less/Makefile3
-rw-r--r--www/rubygem-lighthouse-api/Makefile3
-rw-r--r--www/rubygem-maruku/Makefile3
-rw-r--r--www/rubygem-mechanize/Makefile3
-rw-r--r--www/rubygem-mechanize26/Makefile3
-rw-r--r--www/rubygem-merb-assets/Makefile3
-rw-r--r--www/rubygem-merb-core/Makefile4
-rw-r--r--www/rubygem-merb-haml/Makefile3
-rw-r--r--www/rubygem-merb-helpers/Makefile3
-rw-r--r--www/rubygem-merb-param-protection/Makefile3
-rw-r--r--www/rubygem-mousetrap-rails/Makefile3
-rw-r--r--www/rubygem-multipart-post/Makefile3
-rw-r--r--www/rubygem-nanoc/Makefile3
-rw-r--r--www/rubygem-nested_form/Makefile3
-rw-r--r--www/rubygem-net-http-digest_auth/Makefile3
-rw-r--r--www/rubygem-net-http-digest_auth11/Makefile3
-rw-r--r--www/rubygem-net-http-persistent/Makefile3
-rw-r--r--www/rubygem-net-http-persistent25/Makefile3
-rw-r--r--www/rubygem-net-http-pipeline/Makefile3
-rw-r--r--www/rubygem-nicovideo/Makefile3
-rw-r--r--www/rubygem-ntlm-http/Makefile3
-rw-r--r--www/rubygem-octopress/Makefile3
-rw-r--r--www/rubygem-pagerduty/Makefile4
-rw-r--r--www/rubygem-passenger/Makefile5
-rw-r--r--www/rubygem-puma/Makefile4
-rw-r--r--www/rubygem-pusher-client/Makefile3
-rw-r--r--www/rubygem-rabbirack/Makefile4
-rw-r--r--www/rubygem-rack-accept/Makefile3
-rw-r--r--www/rubygem-rack-attack/Makefile3
-rw-r--r--www/rubygem-rack-cache/Makefile3
-rw-r--r--www/rubygem-rack-contrib/Makefile3
-rw-r--r--www/rubygem-rack-cors/Makefile3
-rw-r--r--www/rubygem-rack-mount/Makefile3
-rw-r--r--www/rubygem-rack-openid/Makefile3
-rw-r--r--www/rubygem-rack-protection/Makefile3
-rw-r--r--www/rubygem-rack-ssl/Makefile3
-rw-r--r--www/rubygem-rack-test/Makefile3
-rw-r--r--www/rubygem-rack/Makefile4
-rw-r--r--www/rubygem-rack15/Makefile4
-rw-r--r--www/rubygem-rack16/Makefile4
-rw-r--r--www/rubygem-rails/Makefile5
-rw-r--r--www/rubygem-rails4/Makefile4
-rw-r--r--www/rubygem-rails_autolink/Makefile3
-rw-r--r--www/rubygem-railties/Makefile3
-rw-r--r--www/rubygem-railties4/Makefile3
-rw-r--r--www/rubygem-raindrops/Makefile4
-rw-r--r--www/rubygem-ramaze/Makefile3
-rw-r--r--www/rubygem-raphael-rails/Makefile3
-rw-r--r--www/rubygem-redcloth/Makefile3
-rw-r--r--www/rubygem-redis-rack/Makefile3
-rw-r--r--www/rubygem-redis-rails/Makefile3
-rw-r--r--www/rubygem-redmine_acts_as_taggable_on/Makefile3
-rw-r--r--www/rubygem-responders-rails3/Makefile3
-rw-r--r--www/rubygem-responders/Makefile3
-rw-r--r--www/rubygem-rest-client/Makefile3
-rw-r--r--www/rubygem-rfacebook/Makefile3
-rw-r--r--www/rubygem-rfeedfinder/Makefile3
-rw-r--r--www/rubygem-rinku/Makefile3
-rw-r--r--www/rubygem-rkelly-remix/Makefile3
-rw-r--r--www/rubygem-robotex/Makefile3
-rw-r--r--www/rubygem-robots/Makefile3
-rw-r--r--www/rubygem-rqrcode-rails3/Makefile3
-rw-r--r--www/rubygem-rqrcode/Makefile3
-rw-r--r--www/rubygem-rtlit/Makefile3
-rw-r--r--www/rubygem-ruby-readability/Makefile3
-rw-r--r--www/rubygem-savon/Makefile3
-rw-r--r--www/rubygem-sawyer/Makefile3
-rw-r--r--www/rubygem-scrapi/Makefile3
-rw-r--r--www/rubygem-select2-rails/Makefile3
-rw-r--r--www/rubygem-selenium-webdriver/Makefile3
-rw-r--r--www/rubygem-semantic-ui-sass/Makefile3
-rw-r--r--www/rubygem-simple-rss/Makefile3
-rw-r--r--www/rubygem-sinatra-contrib/Makefile3
-rw-r--r--www/rubygem-sinatra-r18n/Makefile3
-rw-r--r--www/rubygem-sinatra-respond_to/Makefile3
-rw-r--r--www/rubygem-sinatra/Makefile3
-rw-r--r--www/rubygem-task_list/Makefile3
-rw-r--r--www/rubygem-thin/Makefile3
-rw-r--r--www/rubygem-tinyatom/Makefile3
-rw-r--r--www/rubygem-tinymce-rails/Makefile3
-rw-r--r--www/rubygem-totoridipjp/Makefile3
-rw-r--r--www/rubygem-tumblr_client/Makefile3
-rw-r--r--www/rubygem-turbolinks/Makefile3
-rw-r--r--www/rubygem-typhoeus/Makefile3
-rw-r--r--www/rubygem-uglifier/Makefile3
-rw-r--r--www/rubygem-underscore-rails/Makefile3
-rw-r--r--www/rubygem-unicorn-worker-killer/Makefile3
-rw-r--r--www/rubygem-unicorn/Makefile4
-rw-r--r--www/rubygem-url-mount/Makefile3
-rw-r--r--www/rubygem-url_escape/Makefile3
-rw-r--r--www/rubygem-wasabi/Makefile3
-rw-r--r--www/rubygem-webkit-gtk/Makefile3
-rw-r--r--www/rubygem-webkit-gtk2/Makefile3
-rw-r--r--www/rubygem-webmock/Makefile3
-rw-r--r--www/rubygem-webrobots/Makefile3
-rw-r--r--www/rubygem-websocket/Makefile3
-rw-r--r--www/rubygem-yapra/Makefile3
190 files changed, 190 insertions, 397 deletions
diff --git a/www/rubygem-ace-rails-ap/Makefile b/www/rubygem-ace-rails-ap/Makefile
index 84e7f33b89e..9a40267381c 100644
--- a/www/rubygem-ace-rails-ap/Makefile
+++ b/www/rubygem-ace-rails-ap/Makefile
@@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= update.sh
diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index 0b2d9d7c137..7e32e5aa539 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -24,7 +24,6 @@ RUN_DEPENDS= rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-actionpack4/Makefile b/www/rubygem-actionpack4/Makefile
index 7566bf734e4..52311bcb2e7 100644
--- a/www/rubygem-actionpack4/Makefile
+++ b/www/rubygem-actionpack4/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-actionview>=${PORTVERSION}:devel/rubygem-actionview \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-activeresource/Makefile b/www/rubygem-activeresource/Makefile
index d767ae0cc55..25cee76438a 100644
--- a/www/rubygem-activeresource/Makefile
+++ b/www/rubygem-activeresource/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-activeresource4/Makefile b/www/rubygem-activeresource4/Makefile
index 40a8bed4935..9799b6673a8 100644
--- a/www/rubygem-activeresource4/Makefile
+++ b/www/rubygem-activeresource4/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-acts-as-taggable-on/Makefile b/www/rubygem-acts-as-taggable-on/Makefile
index 48d0fe693a2..c836082f2e9 100644
--- a/www/rubygem-acts-as-taggable-on/Makefile
+++ b/www/rubygem-acts-as-taggable-on/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-rails>=3.0:www/rubygem-rails
NO_ARCH= yes
USE_RUBY= YES
-USE_RUBYGEMS= YES
-RUBYGEM_AUTOPLIST= YES
+USES= gem:autoplist
BROKEN_RUBY23= yes
diff --git a/www/rubygem-acts-as-taggable-on3/Makefile b/www/rubygem-acts-as-taggable-on3/Makefile
index 78d36fe7d00..1c2cf90e5ce 100644
--- a/www/rubygem-acts-as-taggable-on3/Makefile
+++ b/www/rubygem-acts-as-taggable-on3/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1.6:databases/rubygem-activerecord4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-acts_as_taggable/Makefile b/www/rubygem-acts_as_taggable/Makefile
index 9f0aa0f2d19..103cdfc39bb 100644
--- a/www/rubygem-acts_as_taggable/Makefile
+++ b/www/rubygem-acts_as_taggable/Makefile
@@ -12,7 +12,6 @@ COMMENT= Add tagging capabilities to your ActiveRecord objects
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-addressable/Makefile b/www/rubygem-addressable/Makefile
index 507660c2292..7a08b786f60 100644
--- a/www/rubygem-addressable/Makefile
+++ b/www/rubygem-addressable/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-akami/Makefile b/www/rubygem-akami/Makefile
index 3009ded306a..429bea5c1d6 100644
--- a/www/rubygem-akami/Makefile
+++ b/www/rubygem-akami/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gyoku>=0.4.6:devel/rubygem-gyoku
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-amazon-ecs/Makefile b/www/rubygem-amazon-ecs/Makefile
index f81b7873b7c..0ab3afb460e 100644
--- a/www/rubygem-amazon-ecs/Makefile
+++ b/www/rubygem-amazon-ecs/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-anemone/Makefile b/www/rubygem-anemone/Makefile
index 9347d136d7c..0561d1257e2 100644
--- a/www/rubygem-anemone/Makefile
+++ b/www/rubygem-anemone/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-nokogiri>=1.3.0:textproc/rubygem-nokogiri \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/anemone
diff --git a/www/rubygem-asana/Makefile b/www/rubygem-asana/Makefile
index 7feb331982f..85fb4ac4efa 100644
--- a/www/rubygem-asana/Makefile
+++ b/www/rubygem-asana/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-faraday>=0.9:www/rubygem-faraday \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-async_sinatra/Makefile b/www/rubygem-async_sinatra/Makefile
index 2f729c6e739..61c6763b6ee 100644
--- a/www/rubygem-async_sinatra/Makefile
+++ b/www/rubygem-async_sinatra/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rack16>=1.4.1:www/rubygem-rack16 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-bluecloth/Makefile b/www/rubygem-bluecloth/Makefile
index 851aa28a1c3..bb573962101 100644
--- a/www/rubygem-bluecloth/Makefile
+++ b/www/rubygem-bluecloth/Makefile
@@ -12,9 +12,7 @@ COMMENT= Ruby implementation of Markdown, a text-to-HTML conversion tool
LICENSE= BSD3CLAUSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/bluecloth
PLIST_FILES= bin/bluecloth
diff --git a/www/rubygem-bootstrap-sass/Makefile b/www/rubygem-bootstrap-sass/Makefile
index 215714476db..7852f36a213 100644
--- a/www/rubygem-bootstrap-sass/Makefile
+++ b/www/rubygem-bootstrap-sass/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-autoprefixer-rails>=5.2.1:textproc/rubygem-autoprefixer-rai
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-browser/Makefile b/www/rubygem-browser/Makefile
index 08b532337aa..51285abb8af 100644
--- a/www/rubygem-browser/Makefile
+++ b/www/rubygem-browser/Makefile
@@ -12,7 +12,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-cal-heatmap-rails-rails4/Makefile b/www/rubygem-cal-heatmap-rails-rails4/Makefile
index df6326f01f7..344dde30ce9 100644
--- a/www/rubygem-cal-heatmap-rails-rails4/Makefile
+++ b/www/rubygem-cal-heatmap-rails-rails4/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-d3_rails-rails4>=3.4.6:www/rubygem-d3_rails-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-cal-heatmap-rails/Makefile b/www/rubygem-cal-heatmap-rails/Makefile
index e583528b3ec..7d990644f7d 100644
--- a/www/rubygem-cal-heatmap-rails/Makefile
+++ b/www/rubygem-cal-heatmap-rails/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-d3_rails>=3.4.6:www/rubygem-d3_rails
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-carrierwave/Makefile b/www/rubygem-carrierwave/Makefile
index dad642f4f8f..f89f9358373 100644
--- a/www/rubygem-carrierwave/Makefile
+++ b/www/rubygem-carrierwave/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activemodel4>=3.2.0:databases/rubygem-activemodel4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-cgi_multipart_eof_fix/Makefile b/www/rubygem-cgi_multipart_eof_fix/Makefile
index 3e7640ee90d..b18f90065dc 100644
--- a/www/rubygem-cgi_multipart_eof_fix/Makefile
+++ b/www/rubygem-cgi_multipart_eof_fix/Makefile
@@ -14,7 +14,6 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-chosen-rails/Makefile b/www/rubygem-chosen-rails/Makefile
index ace9513e4d0..1812204df75 100644
--- a/www/rubygem-chosen-rails/Makefile
+++ b/www/rubygem-chosen-rails/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-coffee-rails4>=3.2:devel/rubygem-coffee-rails4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-cookiejar/Makefile b/www/rubygem-cookiejar/Makefile
index f33f2179686..a97c15fb557 100644
--- a/www/rubygem-cookiejar/Makefile
+++ b/www/rubygem-cookiejar/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-crass/Makefile b/www/rubygem-crass/Makefile
index 08c8bdfbc5c..95ab18d3292 100644
--- a/www/rubygem-crass/Makefile
+++ b/www/rubygem-crass/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-cuba/Makefile b/www/rubygem-cuba/Makefile
index 077ac2d74a0..18050f9d74e 100644
--- a/www/rubygem-cuba/Makefile
+++ b/www/rubygem-cuba/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=1.6.0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-d3_rails-rails4/Makefile b/www/rubygem-d3_rails-rails4/Makefile
index c35fbf4fc71..3939389574e 100644
--- a/www/rubygem-d3_rails-rails4/Makefile
+++ b/www/rubygem-d3_rails-rails4/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-railties4>=3.1.0:www/rubygem-railties4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-d3_rails/Makefile b/www/rubygem-d3_rails/Makefile
index 2407bbb36ce..d1c1665739f 100644
--- a/www/rubygem-d3_rails/Makefile
+++ b/www/rubygem-d3_rails/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-railties>=3.1.0:www/rubygem-railties
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-dashing/Makefile b/www/rubygem-dashing/Makefile
index 948a4632551..931fb564d4c 100644
--- a/www/rubygem-dashing/Makefile
+++ b/www/rubygem-dashing/Makefile
@@ -28,8 +28,7 @@ RUN_DEPENDS= rubygem-sass32>=3.2.12:textproc/rubygem-sass32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/dashing
diff --git a/www/rubygem-davclient/Makefile b/www/rubygem-davclient/Makefile
index 73ab2613154..4d55119016e 100644
--- a/www/rubygem-davclient/Makefile
+++ b/www/rubygem-davclient/Makefile
@@ -14,8 +14,7 @@ LICENSE= GPLv2
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/dav
diff --git a/www/rubygem-domainatrix/Makefile b/www/rubygem-domainatrix/Makefile
index 5685406973e..0031dda600d 100644
--- a/www/rubygem-domainatrix/Makefile
+++ b/www/rubygem-domainatrix/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-addressable>=0:www/rubygem-addressable
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-dropzonejs-rails/Makefile b/www/rubygem-dropzonejs-rails/Makefile
index 5192e29b362..e8e5ed48dca 100644
--- a/www/rubygem-dropzonejs-rails/Makefile
+++ b/www/rubygem-dropzonejs-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rails4>=3.1:www/rubygem-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-em-http-request/Makefile b/www/rubygem-em-http-request/Makefile
index f1f9a775606..6dc9af94d3c 100644
--- a/www/rubygem-em-http-request/Makefile
+++ b/www/rubygem-em-http-request/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-addressable>=2.3.4:www/rubygem-addressable \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-em-socksify/Makefile b/www/rubygem-em-socksify/Makefile
index 1d4dcaab4ab..2a42278de7a 100644
--- a/www/rubygem-em-socksify/Makefile
+++ b/www/rubygem-em-socksify/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-eventmachine>=1.0.0:devel/rubygem-eventmachine
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-em-twitter/Makefile b/www/rubygem-em-twitter/Makefile
index 19530287470..2c034e94804 100644
--- a/www/rubygem-em-twitter/Makefile
+++ b/www/rubygem-em-twitter/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-buftok>=0.2:devel/rubygem-buftok \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-em-websocket/Makefile b/www/rubygem-em-websocket/Makefile
index 9950396ebd7..b3455091965 100644
--- a/www/rubygem-em-websocket/Makefile
+++ b/www/rubygem-em-websocket/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-eventmachine>=0.12.9:devel/rubygem-eventmachine \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-emk-sinatra-url-for/Makefile b/www/rubygem-emk-sinatra-url-for/Makefile
index d116ba6f78a..1e7e9efa82e 100644
--- a/www/rubygem-emk-sinatra-url-for/Makefile
+++ b/www/rubygem-emk-sinatra-url-for/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-sinatra>=0.9.1.1:www/rubygem-sinatra
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-erubis/Makefile b/www/rubygem-erubis/Makefile
index 58190bc12c0..265aa6f2306 100644
--- a/www/rubygem-erubis/Makefile
+++ b/www/rubygem-erubis/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/erubis
diff --git a/www/rubygem-ethon/Makefile b/www/rubygem-ethon/Makefile
index 6df82009a04..eaef6b4db18 100644
--- a/www/rubygem-ethon/Makefile
+++ b/www/rubygem-ethon/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-ffi>=1.3.0:devel/rubygem-ffi
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-eventmachine_httpserver/Makefile b/www/rubygem-eventmachine_httpserver/Makefile
index 85b7d691d32..62ea9949679 100644
--- a/www/rubygem-eventmachine_httpserver/Makefile
+++ b/www/rubygem-eventmachine_httpserver/Makefile
@@ -12,7 +12,6 @@ COMMENT= EventMachine HTTP Server
LICENSE= GPLv2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-faraday/Makefile b/www/rubygem-faraday/Makefile
index 555d4083c85..25c180d9e26 100644
--- a/www/rubygem-faraday/Makefile
+++ b/www/rubygem-faraday/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-multipart-post>=1.2:www/rubygem-multipart-post
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-faraday_middleware/Makefile b/www/rubygem-faraday_middleware/Makefile
index f83fb3d865e..ebef90dd934 100644
--- a/www/rubygem-faraday_middleware/Makefile
+++ b/www/rubygem-faraday_middleware/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-faraday>=0.7.4:www/rubygem-faraday
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-fcgi/Makefile b/www/rubygem-fcgi/Makefile
index 63e5968a98b..43937cdfb72 100644
--- a/www/rubygem-fcgi/Makefile
+++ b/www/rubygem-fcgi/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LIB_DEPENDS= libfcgi.so:www/fcgi
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-feed-normalizer/Makefile b/www/rubygem-feed-normalizer/Makefile
index 1119a52f97a..2965c590cfc 100644
--- a/www/rubygem-feed-normalizer/Makefile
+++ b/www/rubygem-feed-normalizer/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-hpricot>=0.6:www/rubygem-hpricot \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-feedjira/Makefile b/www/rubygem-feedjira/Makefile
index a6ffd1ad3ad..8c04a7cb446 100644
--- a/www/rubygem-feedjira/Makefile
+++ b/www/rubygem-feedjira/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-faraday>=0.9:www/rubygem-faraday \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-flowdock/Makefile b/www/rubygem-flowdock/Makefile
index 9021b51be94..21d1d936e68 100644
--- a/www/rubygem-flowdock/Makefile
+++ b/www/rubygem-flowdock/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-httparty>=0.7:www/rubygem-httparty \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-geminabox/Makefile b/www/rubygem-geminabox/Makefile
index 2d0067e0085..a89559af622 100644
--- a/www/rubygem-geminabox/Makefile
+++ b/www/rubygem-geminabox/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-builder32>=0:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-flowdock-git-hook/Makefile b/www/rubygem-gitlab-flowdock-git-hook/Makefile
index 201e21b722c..f98319bab59 100644
--- a/www/rubygem-gitlab-flowdock-git-hook/Makefile
+++ b/www/rubygem-gitlab-flowdock-git-hook/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-flowdock>=0.7:www/rubygem-flowdock \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-gollum-lib/Makefile b/www/rubygem-gitlab-gollum-lib/Makefile
index b9beee06efc..77c266e28af 100644
--- a/www/rubygem-gitlab-gollum-lib/Makefile
+++ b/www/rubygem-gitlab-gollum-lib/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-github-markdown>=0.5.3:textproc/rubygem-github-markdown \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-grack/Makefile b/www/rubygem-gitlab-grack/Makefile
index f387663bd37..bf108b8c412 100644
--- a/www/rubygem-gitlab-grack/Makefile
+++ b/www/rubygem-gitlab-grack/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rack15>=1.5.1:www/rubygem-rack15
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gollum-grit_adapter/Makefile b/www/rubygem-gollum-grit_adapter/Makefile
index 9a5c2aac5f4..40154e942b1 100644
--- a/www/rubygem-gollum-grit_adapter/Makefile
+++ b/www/rubygem-gollum-grit_adapter/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-gitlab-grit>=2.7.1:textproc/rubygem-gitlab-grit
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gollum-lib/Makefile b/www/rubygem-gollum-lib/Makefile
index d0bf386628a..afd58a28c18 100644
--- a/www/rubygem-gollum-lib/Makefile
+++ b/www/rubygem-gollum-lib/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-github-markup>=1.4.0:textproc/rubygem-github-markup \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gollum-rugged_adapter/Makefile b/www/rubygem-gollum-rugged_adapter/Makefile
index cf4b16d2ea7..ebfe3652fdf 100644
--- a/www/rubygem-gollum-rugged_adapter/Makefile
+++ b/www/rubygem-gollum-rugged_adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-mime-types>=1.1.5:misc/rubygem-mime-types \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gon-rails4/Makefile b/www/rubygem-gon-rails4/Makefile
index c0bf50e65ad..3f83c82cd1e 100644
--- a/www/rubygem-gon-rails4/Makefile
+++ b/www/rubygem-gon-rails4/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-gon/Makefile b/www/rubygem-gon/Makefile
index 9235e06a484..d68609788de 100644
--- a/www/rubygem-gon/Makefile
+++ b/www/rubygem-gon/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-actionpack4>=3.0:www/rubygem-actionpack4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-hackpad-cli/Makefile b/www/rubygem-hackpad-cli/Makefile
index 4e38939e863..0a8f4637b12 100644
--- a/www/rubygem-hackpad-cli/Makefile
+++ b/www/rubygem-hackpad-cli/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-cliprompt>=0.1.2:devel/rubygem-cliprompt \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/hpcli
.include <bsd.port.mk>
diff --git a/www/rubygem-haml-coderay/Makefile b/www/rubygem-haml-coderay/Makefile
index 1cc2067ddf1..e30a41e8aed 100644
--- a/www/rubygem-haml-coderay/Makefile
+++ b/www/rubygem-haml-coderay/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-coderay>=0:textproc/rubygem-coderay \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-haml-contrib/Makefile b/www/rubygem-haml-contrib/Makefile
index 4938df06667..18273e85471 100644
--- a/www/rubygem-haml-contrib/Makefile
+++ b/www/rubygem-haml-contrib/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-haml>=4.0.0:www/rubygem-haml
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-haml-rails-rails4/Makefile b/www/rubygem-haml-rails-rails4/Makefile
index bb4dfe608f7..1bb627a3ef2 100644
--- a/www/rubygem-haml-rails-rails4/Makefile
+++ b/www/rubygem-haml-rails-rails4/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-actionpack4>=4.0.1:www/rubygem-actionpack4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-haml-rails/Makefile b/www/rubygem-haml-rails/Makefile
index 62b563d0d7a..30d666fbfdd 100644
--- a/www/rubygem-haml-rails/Makefile
+++ b/www/rubygem-haml-rails/Makefile
@@ -20,7 +20,6 @@ PORTSCOUT= limit:0.4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-haml/Makefile b/www/rubygem-haml/Makefile
index a674821cfdd..67a88b8ff50 100644
--- a/www/rubygem-haml/Makefile
+++ b/www/rubygem-haml/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-tilt>=0:devel/rubygem-tilt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/haml
diff --git a/www/rubygem-hashicorp-checkpoint/Makefile b/www/rubygem-hashicorp-checkpoint/Makefile
index 31eecd2f0fb..e176feb1470 100644
--- a/www/rubygem-hashicorp-checkpoint/Makefile
+++ b/www/rubygem-hashicorp-checkpoint/Makefile
@@ -14,7 +14,6 @@ LICENSE= MPL
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-heroku-api/Makefile b/www/rubygem-heroku-api/Makefile
index 05b405b580a..623e6c39c50 100644
--- a/www/rubygem-heroku-api/Makefile
+++ b/www/rubygem-heroku-api/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-heroku-nav/Makefile b/www/rubygem-heroku-nav/Makefile
index 9bfc74abfb6..60bcc809039 100644
--- a/www/rubygem-heroku-nav/Makefile
+++ b/www/rubygem-heroku-nav/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
RUN_DEPENDS+= rubygem-sinatra>=0:www/rubygem-sinatra
diff --git a/www/rubygem-heroku/Makefile b/www/rubygem-heroku/Makefile
index ae4c388b114..337cdd659eb 100644
--- a/www/rubygem-heroku/Makefile
+++ b/www/rubygem-heroku/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/heroku
diff --git a/www/rubygem-hpricot/Makefile b/www/rubygem-hpricot/Makefile
index 7fe525f0324..b6b7d5b61d6 100644
--- a/www/rubygem-hpricot/Makefile
+++ b/www/rubygem-hpricot/Makefile
@@ -12,7 +12,6 @@ COMMENT= Fast, Enjoyable HTML Parser for Ruby
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-html2haml/Makefile b/www/rubygem-html2haml/Makefile
index 1b287d47b29..ab62c3a366f 100644
--- a/www/rubygem-html2haml/Makefile
+++ b/www/rubygem-html2haml/Makefile
@@ -18,10 +18,9 @@ RUN_DEPENDS= rubygem-erubis>=2.7.0:www/rubygem-erubis \
rubygem-ruby_parser>=3.5:devel/rubygem-ruby_parser
USE_RUBY= yes
-USE_RUBYGEMS= yes
NO_ARCH= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/html2haml
.include <bsd.port.mk>
diff --git a/www/rubygem-http-cookie/Makefile b/www/rubygem-http-cookie/Makefile
index a6d69212aaa..0afaf62f8e3 100644
--- a/www/rubygem-http-cookie/Makefile
+++ b/www/rubygem-http-cookie/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-domain_name>=0.5.1:net/rubygem-domain_name
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-http-form_data/Makefile b/www/rubygem-http-form_data/Makefile
index 74360b90b90..ab3bac05b41 100644
--- a/www/rubygem-http-form_data/Makefile
+++ b/www/rubygem-http-form_data/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-http/Makefile b/www/rubygem-http/Makefile
index eb454ef7acd..c56e5cc8c4c 100644
--- a/www/rubygem-http/Makefile
+++ b/www/rubygem-http/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-http_router/Makefile b/www/rubygem-http_router/Makefile
index 6aed86feecb..8f4a06be1cf 100644
--- a/www/rubygem-http_router/Makefile
+++ b/www/rubygem-http_router/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rack16>=1.0.0:www/rubygem-rack16 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-httparty/Makefile b/www/rubygem-httparty/Makefile
index 8d31a1716a6..fc5e4a421dd 100644
--- a/www/rubygem-httparty/Makefile
+++ b/www/rubygem-httparty/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-json>=1.8:devel/rubygem-json \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/httparty
diff --git a/www/rubygem-httpclient/Makefile b/www/rubygem-httpclient/Makefile
index 6cab0d77287..870e856499f 100644
--- a/www/rubygem-httpclient/Makefile
+++ b/www/rubygem-httpclient/Makefile
@@ -13,8 +13,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/httpclient
diff --git a/www/rubygem-httpi/Makefile b/www/rubygem-httpi/Makefile
index 68906fd912d..4de4438f64f 100644
--- a/www/rubygem-httpi/Makefile
+++ b/www/rubygem-httpi/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rack>=1.4.5:www/rubygem-rack
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^0\.9\.
diff --git a/www/rubygem-innate/Makefile b/www/rubygem-innate/Makefile
index 6f775bef9b9..aab78f6f1cf 100644
--- a/www/rubygem-innate/Makefile
+++ b/www/rubygem-innate/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-rack15>=1.5.2:www/rubygem-rack15
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist shebangfix
SHEBANG_FILES= .load_gemset
-USES= shebangfix
.include <bsd.port.mk>
diff --git a/www/rubygem-jekyll-watch/Makefile b/www/rubygem-jekyll-watch/Makefile
index fefb4e4e51d..f8a612abd4d 100644
--- a/www/rubygem-jekyll-watch/Makefile
+++ b/www/rubygem-jekyll-watch/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-listen>=3.0:devel/rubygem-listen
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jekyll/Makefile b/www/rubygem-jekyll/Makefile
index 2fb6e9efeb2..ec46ebd088a 100644
--- a/www/rubygem-jekyll/Makefile
+++ b/www/rubygem-jekyll/Makefile
@@ -25,8 +25,7 @@ CONFLICTS_INSTALL= rubygem-jekyll2-*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/jekyll
diff --git a/www/rubygem-jekyll2/Makefile b/www/rubygem-jekyll2/Makefile
index ce4fd8c91bf..2750653f0fa 100644
--- a/www/rubygem-jekyll2/Makefile
+++ b/www/rubygem-jekyll2/Makefile
@@ -35,8 +35,7 @@ PORTSCOUT= limit:^2\.
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/jekyll
diff --git a/www/rubygem-journey/Makefile b/www/rubygem-journey/Makefile
index cf3106947f4..62c657f7c17 100644
--- a/www/rubygem-journey/Makefile
+++ b/www/rubygem-journey/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-atwho-rails-rails4/Makefile b/www/rubygem-jquery-atwho-rails-rails4/Makefile
index 695112f31f3..c7e1509c355 100644
--- a/www/rubygem-jquery-atwho-rails-rails4/Makefile
+++ b/www/rubygem-jquery-atwho-rails-rails4/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-atwho-rails/Makefile b/www/rubygem-jquery-atwho-rails/Makefile
index a11a6fed0fb..349c5a04567 100644
--- a/www/rubygem-jquery-atwho-rails/Makefile
+++ b/www/rubygem-jquery-atwho-rails/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-rails/Makefile b/www/rubygem-jquery-rails/Makefile
index ed92cad8e9f..f0f583331e7 100644
--- a/www/rubygem-jquery-rails/Makefile
+++ b/www/rubygem-jquery-rails/Makefile
@@ -19,7 +19,6 @@ PORTSCOUT= limit:^3.*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-rails4/Makefile b/www/rubygem-jquery-rails4/Makefile
index 39b86352679..cc0ff4e1a0c 100644
--- a/www/rubygem-jquery-rails4/Makefile
+++ b/www/rubygem-jquery-rails4/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-rails-dom-testing>=1.0:textproc/rubygem-rails-dom-testing \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-scrollto-rails/Makefile b/www/rubygem-jquery-scrollto-rails/Makefile
index 7773b6a1383..67aa083ec2a 100644
--- a/www/rubygem-jquery-scrollto-rails/Makefile
+++ b/www/rubygem-jquery-scrollto-rails/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-railties4>=4.1.4:www/rubygem-railties4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-turbolinks/Makefile b/www/rubygem-jquery-turbolinks/Makefile
index f95b1b91ddb..279dd750513 100644
--- a/www/rubygem-jquery-turbolinks/Makefile
+++ b/www/rubygem-jquery-turbolinks/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-railties4>=4.1.6:www/rubygem-railties4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-ui-rails-rails4/Makefile b/www/rubygem-jquery-ui-rails-rails4/Makefile
index b5ff975ce90..2378f215606 100644
--- a/www/rubygem-jquery-ui-rails-rails4/Makefile
+++ b/www/rubygem-jquery-ui-rails-rails4/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-railties4>=4.1.4:www/rubygem-railties4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jquery-ui-rails/Makefile b/www/rubygem-jquery-ui-rails/Makefile
index 3c99f1c055c..d6f27218f8b 100644
--- a/www/rubygem-jquery-ui-rails/Makefile
+++ b/www/rubygem-jquery-ui-rails/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-railties>=3.2.16:www/rubygem-railties
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jruby-rack/Makefile b/www/rubygem-jruby-rack/Makefile
index eab732ae470..104fd428faf 100644
--- a/www/rubygem-jruby-rack/Makefile
+++ b/www/rubygem-jruby-rack/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= jruby:lang/jruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-jsobfu/Makefile b/www/rubygem-jsobfu/Makefile
index b2b610002f9..38a476b89e6 100644
--- a/www/rubygem-jsobfu/Makefile
+++ b/www/rubygem-jsobfu/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-rkelly-remix>=0.0.6:www/rubygem-rkelly-remix
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/jsobfu
.include <bsd.port.mk>
diff --git a/www/rubygem-jwt/Makefile b/www/rubygem-jwt/Makefile
index 9da6922647c..5e62d8055ca 100644
--- a/www/rubygem-jwt/Makefile
+++ b/www/rubygem-jwt/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-rails4/Makefile b/www/rubygem-kaminari-rails4/Makefile
index db6b5723286..5a0d17b02be 100644
--- a/www/rubygem-kaminari-rails4/Makefile
+++ b/www/rubygem-kaminari-rails4/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari/Makefile b/www/rubygem-kaminari/Makefile
index b10154b9800..999285ecc5b 100644
--- a/www/rubygem-kaminari/Makefile
+++ b/www/rubygem-kaminari/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-actionpack>=3.0.0:www/rubygem-actionpack \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-kensa/Makefile b/www/rubygem-kensa/Makefile
index fc447212d7d..c775019e166 100644
--- a/www/rubygem-kensa/Makefile
+++ b/www/rubygem-kensa/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/kensa
diff --git a/www/rubygem-layout_yullio_generator/Makefile b/www/rubygem-layout_yullio_generator/Makefile
index 4cba8ad195c..cc8369abf57 100644
--- a/www/rubygem-layout_yullio_generator/Makefile
+++ b/www/rubygem-layout_yullio_generator/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-hoe>=1.1.6:devel/rubygem-hoe
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-less/Makefile b/www/rubygem-less/Makefile
index 456331e9c01..9bd44443090 100644
--- a/www/rubygem-less/Makefile
+++ b/www/rubygem-less/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-treetop>=1.4.2:devel/rubygem-treetop \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/lessc
diff --git a/www/rubygem-lighthouse-api/Makefile b/www/rubygem-lighthouse-api/Makefile
index 76037baca04..552bac3644e 100644
--- a/www/rubygem-lighthouse-api/Makefile
+++ b/www/rubygem-lighthouse-api/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activeresource4>=3.0.0:www/rubygem-activeresource4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-maruku/Makefile b/www/rubygem-maruku/Makefile
index 2b5bf3fdada..c3f04a95174 100644
--- a/www/rubygem-maruku/Makefile
+++ b/www/rubygem-maruku/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/maruku bin/marutex
diff --git a/www/rubygem-mechanize/Makefile b/www/rubygem-mechanize/Makefile
index def6227a825..58e904d915d 100644
--- a/www/rubygem-mechanize/Makefile
+++ b/www/rubygem-mechanize/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= rubygem-domain_name>=0.5.1:net/rubygem-domain_name \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-mechanize26/Makefile b/www/rubygem-mechanize26/Makefile
index 1548aef55cb..4302bd77fca 100644
--- a/www/rubygem-mechanize26/Makefile
+++ b/www/rubygem-mechanize26/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS= rubygem-domain_name>=0.5.1:net/rubygem-domain_name \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.6
diff --git a/www/rubygem-merb-assets/Makefile b/www/rubygem-merb-assets/Makefile
index 6f2cd49e221..ca40dd5d529 100644
--- a/www/rubygem-merb-assets/Makefile
+++ b/www/rubygem-merb-assets/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-merb-core>=1.1.3:www/rubygem-merb-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-merb-core/Makefile b/www/rubygem-merb-core/Makefile
index 5068e102d58..04bdf399be0 100644
--- a/www/rubygem-merb-core/Makefile
+++ b/www/rubygem-merb-core/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= rubygem-bundler>=0:sysutils/rubygem-bundler \
rubygem-rake>=0:devel/rubygem-rake
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/bin/erubis \
spec10/public/webrat/test_app/gems/gems/erubis-2.6.2/contrib/erubis
diff --git a/www/rubygem-merb-haml/Makefile b/www/rubygem-merb-haml/Makefile
index 7a73fc3cc36..ee1c09f45ee 100644
--- a/www/rubygem-merb-haml/Makefile
+++ b/www/rubygem-merb-haml/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-haml>=2.0.3:www/rubygem-haml \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-merb-helpers/Makefile b/www/rubygem-merb-helpers/Makefile
index 9170ac52292..73e128dfc27 100644
--- a/www/rubygem-merb-helpers/Makefile
+++ b/www/rubygem-merb-helpers/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-merb-core>=1.1.3:www/rubygem-merb-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-merb-param-protection/Makefile b/www/rubygem-merb-param-protection/Makefile
index fe94e1893f8..4b2e6dea567 100644
--- a/www/rubygem-merb-param-protection/Makefile
+++ b/www/rubygem-merb-param-protection/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-merb-core>=1.1.3:www/rubygem-merb-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-mousetrap-rails/Makefile b/www/rubygem-mousetrap-rails/Makefile
index 2390b85b7f5..a5674d2fbbc 100644
--- a/www/rubygem-mousetrap-rails/Makefile
+++ b/www/rubygem-mousetrap-rails/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-multipart-post/Makefile b/www/rubygem-multipart-post/Makefile
index 51365c35b52..a46a2fdd60c 100644
--- a/www/rubygem-multipart-post/Makefile
+++ b/www/rubygem-multipart-post/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-nanoc/Makefile b/www/rubygem-nanoc/Makefile
index 4c02b689bf9..ea00199f9aa 100644
--- a/www/rubygem-nanoc/Makefile
+++ b/www/rubygem-nanoc/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS= rubygem-cri>=2.3:devel/rubygem-cri
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
USE_RAKE= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/nanoc
diff --git a/www/rubygem-nested_form/Makefile b/www/rubygem-nested_form/Makefile
index 7193a5e7e0b..f1cdbaefe69 100644
--- a/www/rubygem-nested_form/Makefile
+++ b/www/rubygem-nested_form/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-net-http-digest_auth/Makefile b/www/rubygem-net-http-digest_auth/Makefile
index 53b508476e9..8e2493ee710 100644
--- a/www/rubygem-net-http-digest_auth/Makefile
+++ b/www/rubygem-net-http-digest_auth/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-net-http-digest_auth11/Makefile b/www/rubygem-net-http-digest_auth11/Makefile
index bbb038708d7..84db27ca23f 100644
--- a/www/rubygem-net-http-digest_auth11/Makefile
+++ b/www/rubygem-net-http-digest_auth11/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^1\.1
diff --git a/www/rubygem-net-http-persistent/Makefile b/www/rubygem-net-http-persistent/Makefile
index bd73fce8f1b..10ff3f8660f 100644
--- a/www/rubygem-net-http-persistent/Makefile
+++ b/www/rubygem-net-http-persistent/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-net-http-persistent25/Makefile b/www/rubygem-net-http-persistent25/Makefile
index faad6efeaa2..761c5a611cb 100644
--- a/www/rubygem-net-http-persistent25/Makefile
+++ b/www/rubygem-net-http-persistent25/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.5
diff --git a/www/rubygem-net-http-pipeline/Makefile b/www/rubygem-net-http-pipeline/Makefile
index 344f2df886a..4ddbe246c52 100644
--- a/www/rubygem-net-http-pipeline/Makefile
+++ b/www/rubygem-net-http-pipeline/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-nicovideo/Makefile b/www/rubygem-nicovideo/Makefile
index cfc9304be1c..cda3a3e0a25 100644
--- a/www/rubygem-nicovideo/Makefile
+++ b/www/rubygem-nicovideo/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-hoe>=1.7.0:devel/rubygem-hoe \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-ntlm-http/Makefile b/www/rubygem-ntlm-http/Makefile
index e45dee1094e..86255f531da 100644
--- a/www/rubygem-ntlm-http/Makefile
+++ b/www/rubygem-ntlm-http/Makefile
@@ -15,7 +15,6 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-octopress/Makefile b/www/rubygem-octopress/Makefile
index c91101a2eb8..39d9818cb5d 100644
--- a/www/rubygem-octopress/Makefile
+++ b/www/rubygem-octopress/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/octopress
diff --git a/www/rubygem-pagerduty/Makefile b/www/rubygem-pagerduty/Makefile
index ebb9b4153a5..7839ed11604 100644
--- a/www/rubygem-pagerduty/Makefile
+++ b/www/rubygem-pagerduty/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= rubygem-json>=1.7.7:devel/rubygem-json
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= script/setup.sh
.include <bsd.port.mk>
diff --git a/www/rubygem-passenger/Makefile b/www/rubygem-passenger/Makefile
index a9dfb643154..dd18b86e685 100644
--- a/www/rubygem-passenger/Makefile
+++ b/www/rubygem-passenger/Makefile
@@ -10,8 +10,6 @@ PKGNAMEPREFIX= rubygem-
MAINTAINER= osa@FreeBSD.org
COMMENT= Modules for running Ruby on Rails and Rack applications
-USES+= cpe
-
CPE_VENDOR= phusion
CPE_PRODUCT= passenger
@@ -25,8 +23,7 @@ OPTIONS_DEFAULT= APACHE22
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= cpe gem:autoplist
NOPORTDOCS= yes
.include <bsd.port.options.mk>
diff --git a/www/rubygem-puma/Makefile b/www/rubygem-puma/Makefile
index be6e87240dc..c9f17ca56cb 100644
--- a/www/rubygem-puma/Makefile
+++ b/www/rubygem-puma/Makefile
@@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/puma bin/pumactl
diff --git a/www/rubygem-pusher-client/Makefile b/www/rubygem-pusher-client/Makefile
index 76bd9bdb14c..2a33f763e78 100644
--- a/www/rubygem-pusher-client/Makefile
+++ b/www/rubygem-pusher-client/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-json>=0:devel/rubygem-json \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rabbirack/Makefile b/www/rubygem-rabbirack/Makefile
index 03c8c649ae6..5e23206dc5f 100644
--- a/www/rubygem-rabbirack/Makefile
+++ b/www/rubygem-rabbirack/Makefile
@@ -18,10 +18,8 @@ RUN_DEPENDS= rubygem-haml>0:www/rubygem-haml \
rubygem-sinatra>0:www/rubygem-sinatra
NO_ARCH= yes
-USES= gettext
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist gettext
PLIST_FILES= bin/rabbirack
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-accept/Makefile b/www/rubygem-rack-accept/Makefile
index 7b7a9120f78..2576755ad52 100644
--- a/www/rubygem-rack-accept/Makefile
+++ b/www/rubygem-rack-accept/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=0.4:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-attack/Makefile b/www/rubygem-rack-attack/Makefile
index 9690f172bb8..86623c55a5b 100644
--- a/www/rubygem-rack-attack/Makefile
+++ b/www/rubygem-rack-attack/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-cache/Makefile b/www/rubygem-rack-cache/Makefile
index 648b0507927..e724630ee20 100644
--- a/www/rubygem-rack-cache/Makefile
+++ b/www/rubygem-rack-cache/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rack16>=0.4:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-contrib/Makefile b/www/rubygem-rack-contrib/Makefile
index f1ab14e3954..a4ee33cc149 100644
--- a/www/rubygem-rack-contrib/Makefile
+++ b/www/rubygem-rack-contrib/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-git-version-bump>=0.15:devel/rubygem-git-version-bump \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-cors/Makefile b/www/rubygem-rack-cors/Makefile
index 5dbd790e640..75ca184010d 100644
--- a/www/rubygem-rack-cors/Makefile
+++ b/www/rubygem-rack-cors/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-mount/Makefile b/www/rubygem-rack-mount/Makefile
index d65332aee05..d10a3021b69 100644
--- a/www/rubygem-rack-mount/Makefile
+++ b/www/rubygem-rack-mount/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=1.0.0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-openid/Makefile b/www/rubygem-rack-openid/Makefile
index 29f9e45df56..2b1c6091167 100644
--- a/www/rubygem-rack-openid/Makefile
+++ b/www/rubygem-rack-openid/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rack16>=1.1.0:www/rubygem-rack16 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-protection/Makefile b/www/rubygem-rack-protection/Makefile
index cc7a7f05944..c852243f756 100644
--- a/www/rubygem-rack-protection/Makefile
+++ b/www/rubygem-rack-protection/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rack16>=0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-ssl/Makefile b/www/rubygem-rack-ssl/Makefile
index 75547ebe150..292658cf614 100644
--- a/www/rubygem-rack-ssl/Makefile
+++ b/www/rubygem-rack-ssl/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rack16>=0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack-test/Makefile b/www/rubygem-rack-test/Makefile
index df03a28f2b7..011cd1f9884 100644
--- a/www/rubygem-rack-test/Makefile
+++ b/www/rubygem-rack-test/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=1.0:www/rubygem-rack16
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rack/Makefile b/www/rubygem-rack/Makefile
index 876fcbbba16..8ddc80d82e4 100644
--- a/www/rubygem-rack/Makefile
+++ b/www/rubygem-rack/Makefile
@@ -20,9 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/cgi/test.ru
SHEBANG_LANG= rackup
diff --git a/www/rubygem-rack15/Makefile b/www/rubygem-rack15/Makefile
index 9b10be973f6..ac170ddcaf3 100644
--- a/www/rubygem-rack15/Makefile
+++ b/www/rubygem-rack15/Makefile
@@ -21,9 +21,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/cgi/test.ru
SHEBANG_LANG= rackup
diff --git a/www/rubygem-rack16/Makefile b/www/rubygem-rack16/Makefile
index d0fc53a95b6..e6eede70e87 100644
--- a/www/rubygem-rack16/Makefile
+++ b/www/rubygem-rack16/Makefile
@@ -20,9 +20,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/cgi/test.ru
SHEBANG_LANG= rackup
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index 486a905a9c4..30a92ebf755 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -43,13 +43,10 @@ NOPORTDOCS= yes
NO_ARCH= yes
USE_RUBY= yes
USE_RUBY_RDOC= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= cpe gem:autoplist
PLIST_DIRS= ${GEM_LIB_DIR}
-USES= cpe
-
CPE_VENDOR= rubyonrails
CPE_PRODUCT= ruby_on_rails
diff --git a/www/rubygem-rails4/Makefile b/www/rubygem-rails4/Makefile
index 9e91bedc6cc..5d84dbbb467 100644
--- a/www/rubygem-rails4/Makefile
+++ b/www/rubygem-rails4/Makefile
@@ -44,9 +44,7 @@ RUN_DEPENDS= rubygem-actionmailer4>=${PORTVERSION}:mail/rubygem-actionmailer4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= cpe
+USES= cpe gem:autoplist
CPE_VENDOR= rubyonrails
CPE_PRODUCT= ruby_on_rails
diff --git a/www/rubygem-rails_autolink/Makefile b/www/rubygem-rails_autolink/Makefile
index 21894e4bb85..0babc08fb61 100644
--- a/www/rubygem-rails_autolink/Makefile
+++ b/www/rubygem-rails_autolink/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rails4>=${PORTVERSION}:www/rubygem-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-railties/Makefile b/www/rubygem-railties/Makefile
index ca27da4d4a7..ee10a03124e 100644
--- a/www/rubygem-railties/Makefile
+++ b/www/rubygem-railties/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL= rubygem-railties4-[0-9]* rubygem-railties41-[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rails
diff --git a/www/rubygem-railties4/Makefile b/www/rubygem-railties4/Makefile
index 5b9bd28b402..5ebf1d0acbf 100644
--- a/www/rubygem-railties4/Makefile
+++ b/www/rubygem-railties4/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL= rubygem-railties-[0-9]* rubygem-railties41-[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rails
diff --git a/www/rubygem-raindrops/Makefile b/www/rubygem-raindrops/Makefile
index 699c5fcf549..566d785604d 100644
--- a/www/rubygem-raindrops/Makefile
+++ b/www/rubygem-raindrops/Makefile
@@ -14,9 +14,7 @@ LICENSE_COMB= dual
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= examples/linux-listener-stats.rb
diff --git a/www/rubygem-ramaze/Makefile b/www/rubygem-ramaze/Makefile
index 58f48d46806..9cc9659a8b0 100644
--- a/www/rubygem-ramaze/Makefile
+++ b/www/rubygem-ramaze/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-innate>=2012.12:www/rubygem-innate \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ramaze
diff --git a/www/rubygem-raphael-rails/Makefile b/www/rubygem-raphael-rails/Makefile
index dcce2dc0d2a..eeb522e9348 100644
--- a/www/rubygem-raphael-rails/Makefile
+++ b/www/rubygem-raphael-rails/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-redcloth/Makefile b/www/rubygem-redcloth/Makefile
index 2560a97cc61..15a2f678b6e 100644
--- a/www/rubygem-redcloth/Makefile
+++ b/www/rubygem-redcloth/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
GEM_NAME= ${DISTNAME}
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/redcloth
diff --git a/www/rubygem-redis-rack/Makefile b/www/rubygem-redis-rack/Makefile
index a94b0afc995..06abbec16fc 100644
--- a/www/rubygem-redis-rack/Makefile
+++ b/www/rubygem-redis-rack/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rack16>=1.5:www/rubygem-rack16 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-redis-rails/Makefile b/www/rubygem-redis-rails/Makefile
index 5cfbd7d81eb..713130b57ad 100644
--- a/www/rubygem-redis-rails/Makefile
+++ b/www/rubygem-redis-rails/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-redis-actionpack>=4:databases/rubygem-redis-actionpack \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-redmine_acts_as_taggable_on/Makefile b/www/rubygem-redmine_acts_as_taggable_on/Makefile
index ae119153fc8..258910490dd 100644
--- a/www/rubygem-redmine_acts_as_taggable_on/Makefile
+++ b/www/rubygem-redmine_acts_as_taggable_on/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-acts-as-taggable-on>=2.3:www/rubygem-acts-as-taggable-on
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-responders-rails3/Makefile b/www/rubygem-responders-rails3/Makefile
index d642e244cb0..6efa4864772 100644
--- a/www/rubygem-responders-rails3/Makefile
+++ b/www/rubygem-responders-rails3/Makefile
@@ -19,7 +19,6 @@ PORTSCOUT= limit:^1\.[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-responders/Makefile b/www/rubygem-responders/Makefile
index 87b1b83999c..3ae666ef919 100644
--- a/www/rubygem-responders/Makefile
+++ b/www/rubygem-responders/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-railties4>=4.2.0:www/rubygem-railties4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rest-client/Makefile b/www/rubygem-rest-client/Makefile
index 0021c01b6a5..a3106ced40f 100644
--- a/www/rubygem-rest-client/Makefile
+++ b/www/rubygem-rest-client/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-http-cookie>=1.0.2:www/rubygem-http-cookie \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/restclient
.include <bsd.port.mk>
diff --git a/www/rubygem-rfacebook/Makefile b/www/rubygem-rfacebook/Makefile
index ca01939a9f6..7356dd501c4 100644
--- a/www/rubygem-rfacebook/Makefile
+++ b/www/rubygem-rfacebook/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-hpricot>=0.6.0:www/rubygem-hpricot \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rfeedfinder/Makefile b/www/rubygem-rfeedfinder/Makefile
index 4a871fa3318..1dbe3c02ec1 100644
--- a/www/rubygem-rfeedfinder/Makefile
+++ b/www/rubygem-rfeedfinder/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-hpricot>=0.6:www/rubygem-hpricot \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rinku/Makefile b/www/rubygem-rinku/Makefile
index 4db5195a63b..4114590ad2f 100644
--- a/www/rubygem-rinku/Makefile
+++ b/www/rubygem-rinku/Makefile
@@ -12,7 +12,6 @@ COMMENT= Fast and smart autolinking drop-in replacement for Rails auto_link
LICENSE= ISCL
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rkelly-remix/Makefile b/www/rubygem-rkelly-remix/Makefile
index b478486e7fb..a02ca199196 100644
--- a/www/rubygem-rkelly-remix/Makefile
+++ b/www/rubygem-rkelly-remix/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-robotex/Makefile b/www/rubygem-robotex/Makefile
index 90f5612e18e..bcf64582a55 100644
--- a/www/rubygem-robotex/Makefile
+++ b/www/rubygem-robotex/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-robots/Makefile b/www/rubygem-robots/Makefile
index 6f68675674f..de8dd30de8c 100644
--- a/www/rubygem-robots/Makefile
+++ b/www/rubygem-robots/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-extract:
${CHMOD} -R a+r ${WRKSRC}
diff --git a/www/rubygem-rqrcode-rails3/Makefile b/www/rubygem-rqrcode-rails3/Makefile
index 041d73b18ae..536d818371c 100644
--- a/www/rubygem-rqrcode-rails3/Makefile
+++ b/www/rubygem-rqrcode-rails3/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rqrcode>=0.4.2:www/rubygem-rqrcode
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rqrcode/Makefile b/www/rubygem-rqrcode/Makefile
index 9d2aafd7cd2..d7d774b6b29 100644
--- a/www/rubygem-rqrcode/Makefile
+++ b/www/rubygem-rqrcode/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-rtlit/Makefile b/www/rubygem-rtlit/Makefile
index 6da6dcf1226..56143876434 100644
--- a/www/rubygem-rtlit/Makefile
+++ b/www/rubygem-rtlit/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rtlit
diff --git a/www/rubygem-ruby-readability/Makefile b/www/rubygem-ruby-readability/Makefile
index a9f8bdc6bd2..4b10e58ccc1 100644
--- a/www/rubygem-ruby-readability/Makefile
+++ b/www/rubygem-ruby-readability/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-guess_html_encoding>=0.0.4:devel/rubygem-guess_html_encodin
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/readability
diff --git a/www/rubygem-savon/Makefile b/www/rubygem-savon/Makefile
index 647766bbecb..808f7954bc3 100644
--- a/www/rubygem-savon/Makefile
+++ b/www/rubygem-savon/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-sawyer/Makefile b/www/rubygem-sawyer/Makefile
index dd2a8d6937c..6f1d462953a 100644
--- a/www/rubygem-sawyer/Makefile
+++ b/www/rubygem-sawyer/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-addressable>=2.3.5:www/rubygem-addressable \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-scrapi/Makefile b/www/rubygem-scrapi/Makefile
index 95fb4ef1eb5..2a3046dad37 100644
--- a/www/rubygem-scrapi/Makefile
+++ b/www/rubygem-scrapi/Makefile
@@ -15,9 +15,8 @@ BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/tidy-1.1.2.gemspec:textproc/rubygem-tidy
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
USE_LDCONFIG= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= ${GEM_LIB_DIR}/lib/tidy/libtidy.so
.include <bsd.port.pre.mk>
diff --git a/www/rubygem-select2-rails/Makefile b/www/rubygem-select2-rails/Makefile
index 2093010f77f..1ef011eb58d 100644
--- a/www/rubygem-select2-rails/Makefile
+++ b/www/rubygem-select2-rails/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-thor>=0.14:devel/rubygem-thor
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index a4202f3d702..bf970efddac 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-childprocess>=0.5:devel/rubygem-childprocess \
rubygem-websocket>=1.0:www/rubygem-websocket
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-semantic-ui-sass/Makefile b/www/rubygem-semantic-ui-sass/Makefile
index 5cf98511c9f..7b4b313fe3c 100644
--- a/www/rubygem-semantic-ui-sass/Makefile
+++ b/www/rubygem-semantic-ui-sass/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-sass>=3.2:textproc/rubygem-sass
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-simple-rss/Makefile b/www/rubygem-simple-rss/Makefile
index ccedde424e9..2758e0260e2 100644
--- a/www/rubygem-simple-rss/Makefile
+++ b/www/rubygem-simple-rss/Makefile
@@ -12,7 +12,6 @@ COMMENT= Simple, flexible, extensible, and liberal RSS and Atom reader for Ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-sinatra-contrib/Makefile b/www/rubygem-sinatra-contrib/Makefile
index 1d3837a28b7..7aa28409f44 100644
--- a/www/rubygem-sinatra-contrib/Makefile
+++ b/www/rubygem-sinatra-contrib/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-backports>=2.0:devel/rubygem-backports \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-sinatra-r18n/Makefile b/www/rubygem-sinatra-r18n/Makefile
index 669ccfba9a2..bc2c8317a49 100644
--- a/www/rubygem-sinatra-r18n/Makefile
+++ b/www/rubygem-sinatra-r18n/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-r18n-core=${PORTVERSION}:devel/rubygem-r18n-core \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-sinatra-respond_to/Makefile b/www/rubygem-sinatra-respond_to/Makefile
index 821740cbce2..e98ae64d41c 100644
--- a/www/rubygem-sinatra-respond_to/Makefile
+++ b/www/rubygem-sinatra-respond_to/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-sinatra>=1.3:www/rubygem-sinatra
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-sinatra/Makefile b/www/rubygem-sinatra/Makefile
index 301591499a5..92de17e9cbc 100644
--- a/www/rubygem-sinatra/Makefile
+++ b/www/rubygem-sinatra/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rack16>=1.5:www/rubygem-rack16 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-task_list/Makefile b/www/rubygem-task_list/Makefile
index 850fb4d2217..a9f7cfedb16 100644
--- a/www/rubygem-task_list/Makefile
+++ b/www/rubygem-task_list/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-html-pipeline1>=0:textproc/rubygem-html-pipeline1
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-thin/Makefile b/www/rubygem-thin/Makefile
index f3d8fd49b4c..fe22039d5a6 100644
--- a/www/rubygem-thin/Makefile
+++ b/www/rubygem-thin/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-daemons>=1.0.9:devel/rubygem-daemons \
rubygem-rack16>=1.0:www/rubygem-rack16
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/thin
diff --git a/www/rubygem-tinyatom/Makefile b/www/rubygem-tinyatom/Makefile
index e239957e73c..5d71041add8 100644
--- a/www/rubygem-tinyatom/Makefile
+++ b/www/rubygem-tinyatom/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-builder32>=0:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-tinymce-rails/Makefile b/www/rubygem-tinymce-rails/Makefile
index 1d9be5082fd..b7894048fbf 100644
--- a/www/rubygem-tinymce-rails/Makefile
+++ b/www/rubygem-tinymce-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-railties>=3.1.1:www/rubygem-railties
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-totoridipjp/Makefile b/www/rubygem-totoridipjp/Makefile
index 9e88558a442..de871531b3d 100644
--- a/www/rubygem-totoridipjp/Makefile
+++ b/www/rubygem-totoridipjp/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-tumblr_client/Makefile b/www/rubygem-tumblr_client/Makefile
index 86298d5d129..496ce04e4c9 100644
--- a/www/rubygem-tumblr_client/Makefile
+++ b/www/rubygem-tumblr_client/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= rubygem-faraday>=0.9.0:www/rubygem-faraday \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/tumblr
diff --git a/www/rubygem-turbolinks/Makefile b/www/rubygem-turbolinks/Makefile
index 06d23aa5884..6bf4b287625 100644
--- a/www/rubygem-turbolinks/Makefile
+++ b/www/rubygem-turbolinks/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS?= rubygem-coffee-rails4>=4.0.1:devel/rubygem-coffee-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-typhoeus/Makefile b/www/rubygem-typhoeus/Makefile
index 0124e60acae..2bfda12ea19 100644
--- a/www/rubygem-typhoeus/Makefile
+++ b/www/rubygem-typhoeus/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-ethon>=0.8.0:www/rubygem-ethon
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-uglifier/Makefile b/www/rubygem-uglifier/Makefile
index 2969e169153..a9920b64f47 100644
--- a/www/rubygem-uglifier/Makefile
+++ b/www/rubygem-uglifier/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-execjs>=0.3.0:devel/rubygem-execjs
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-underscore-rails/Makefile b/www/rubygem-underscore-rails/Makefile
index 98124b829dd..809ee0775b9 100644
--- a/www/rubygem-underscore-rails/Makefile
+++ b/www/rubygem-underscore-rails/Makefile
@@ -12,7 +12,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-unicorn-worker-killer/Makefile b/www/rubygem-unicorn-worker-killer/Makefile
index 408fbaba6a1..f7df3d45e27 100644
--- a/www/rubygem-unicorn-worker-killer/Makefile
+++ b/www/rubygem-unicorn-worker-killer/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-get_process_mem>=0:devel/rubygem-get_process_mem \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-unicorn/Makefile b/www/rubygem-unicorn/Makefile
index 79490a254a5..13d30328857 100644
--- a/www/rubygem-unicorn/Makefile
+++ b/www/rubygem-unicorn/Makefile
@@ -18,9 +18,7 @@ RUN_DEPENDS= rubygem-kgio>=2.6:devel/rubygem-kgio \
rubygem-raindrops>=0.7:www/rubygem-raindrops
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/unicorn bin/unicorn_rails
diff --git a/www/rubygem-url-mount/Makefile b/www/rubygem-url-mount/Makefile
index db04ceddd35..e43602ff8cb 100644
--- a/www/rubygem-url-mount/Makefile
+++ b/www/rubygem-url-mount/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-rack>=0:www/rubygem-rack
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-url_escape/Makefile b/www/rubygem-url_escape/Makefile
index 4802469d6de..ba849d79a4a 100644
--- a/www/rubygem-url_escape/Makefile
+++ b/www/rubygem-url_escape/Makefile
@@ -12,7 +12,6 @@ COMMENT= Fast replacement for CGI.escape and Rack::Utils.escape
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-wasabi/Makefile b/www/rubygem-wasabi/Makefile
index b52bc6921c4..c8213ae2a54 100644
--- a/www/rubygem-wasabi/Makefile
+++ b/www/rubygem-wasabi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.6.1:textproc/rubygem-nokogiri
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-webkit-gtk/Makefile b/www/rubygem-webkit-gtk/Makefile
index f0394beb565..194a3978975 100644
--- a/www/rubygem-webkit-gtk/Makefile
+++ b/www/rubygem-webkit-gtk/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-webkit-gtk2/Makefile b/www/rubygem-webkit-gtk2/Makefile
index bc9e59f193b..3034ccbc498 100644
--- a/www/rubygem-webkit-gtk2/Makefile
+++ b/www/rubygem-webkit-gtk2/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-webmock/Makefile b/www/rubygem-webmock/Makefile
index beb2097d49a..c8a6657e62b 100644
--- a/www/rubygem-webmock/Makefile
+++ b/www/rubygem-webmock/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-addressable>=2.3.6:www/rubygem-addressable \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-webrobots/Makefile b/www/rubygem-webrobots/Makefile
index 38aa28db6d8..0dbda090ff0 100644
--- a/www/rubygem-webrobots/Makefile
+++ b/www/rubygem-webrobots/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-websocket/Makefile b/www/rubygem-websocket/Makefile
index c8d4bcadab0..0d108011ec9 100644
--- a/www/rubygem-websocket/Makefile
+++ b/www/rubygem-websocket/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-yapra/Makefile b/www/rubygem-yapra/Makefile
index 69f534978a4..da25021b377 100644
--- a/www/rubygem-yapra/Makefile
+++ b/www/rubygem-yapra/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-mechanize>=0:www/rubygem-mechanize
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/yapra