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

95 files changed, 95 insertions, 194 deletions

diff --git a/net/rubygem-amazon-ec2/Makefile b/net/rubygem-amazon-ec2/Makefile
index 10cc464c138e..e183af89378f 100644
--- a/net/rubygem-amazon-ec2/Makefile
+++ b/net/rubygem-amazon-ec2/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS=	rubygem-xml-simple>=1.0.12:textproc/rubygem-xml-simple
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/awshell bin/ec2-gem-example.rb bin/ec2-gem-profile.rb bin/ec2sh bin/setup.rb
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-amq-protocol/Makefile b/net/rubygem-amq-protocol/Makefile
index 1b473ad363c9..b165fae0d93b 100644
--- a/net/rubygem-amq-protocol/Makefile
+++ b/net/rubygem-amq-protocol/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/net/rubygem-amqp-utils/Makefile b/net/rubygem-amqp-utils/Makefile
index 128b789367c0..35d78f72277e 100644
--- a/net/rubygem-amqp-utils/Makefile
+++ b/net/rubygem-amqp-utils/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	rubygem-amqp>=0.7.1:net/rubygem-amqp \
 
 NO_ARCH=		yes
 USE_RUBY=		yes
-USE_RUBYGEMS=		yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES+=	bin/amqp-deleteq bin/amqp-dequeue bin/amqp-enqueue bin/amqp-peek bin/amqp-pop \
 		bin/amqp-purge bin/amqp-spy bin/amqp-statq bin/amqp-unbind \
diff --git a/net/rubygem-amqp/Makefile b/net/rubygem-amqp/Makefile
index 834a16661375..eb41b01dd545 100644
--- a/net/rubygem-amqp/Makefile
+++ b/net/rubygem-amqp/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-amq-protocol>=2.0.1:net/rubygem-amq-protocol \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-aws-s3/Makefile b/net/rubygem-aws-s3/Makefile
index 9e9d5f4a5525..8e487494450f 100644
--- a/net/rubygem-aws-s3/Makefile
+++ b/net/rubygem-aws-s3/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	rubygem-xml-simple>=0:textproc/rubygem-xml-simple \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/s3sh
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-aws-ses/Makefile b/net/rubygem-aws-ses/Makefile
index b395cdab6d85..c668c8ff5ff1 100644
--- a/net/rubygem-aws-ses/Makefile
+++ b/net/rubygem-aws-ses/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/net/rubygem-bunny/Makefile b/net/rubygem-bunny/Makefile
index 06453dfeae7a..fd21e6d70583 100644
--- a/net/rubygem-bunny/Makefile
+++ b/net/rubygem-bunny/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-amq-protocol>=2.0.1:net/rubygem-amq-protocol
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-connection_pool/Makefile b/net/rubygem-connection_pool/Makefile
index 4ea18a27b0c0..ff6161e978cc 100644
--- a/net/rubygem-connection_pool/Makefile
+++ b/net/rubygem-connection_pool/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/net/rubygem-dogapi/Makefile b/net/rubygem-dogapi/Makefile
index f6437b007ebf..92e93293bcdf 100644
--- a/net/rubygem-dogapi/Makefile
+++ b/net/rubygem-dogapi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-multi_json>=0:devel/rubygem-multi_json
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-domain_name/Makefile b/net/rubygem-domain_name/Makefile
index ccf280988fed..57926ba05c9a 100644
--- a/net/rubygem-domain_name/Makefile
+++ b/net/rubygem-domain_name/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-unf>=0.0.5:textproc/rubygem-unf
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-dropbox-sdk/Makefile b/net/rubygem-dropbox-sdk/Makefile
index cebb5e01c519..cec4ca55d5dc 100644
--- a/net/rubygem-dropbox-sdk/Makefile
+++ b/net/rubygem-dropbox-sdk/Makefile
@@ -15,7 +15,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/net/rubygem-epp-client-afnic/Makefile b/net/rubygem-epp-client-afnic/Makefile
index 7abfaad25c1f..b88161fdacd8 100644
--- a/net/rubygem-epp-client-afnic/Makefile
+++ b/net/rubygem-epp-client-afnic/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-base/Makefile b/net/rubygem-epp-client-base/Makefile
index 00f7f31e6c17..8a2f9a9a437b 100644
--- a/net/rubygem-epp-client-base/Makefile
+++ b/net/rubygem-epp-client-base/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-rgp/Makefile b/net/rubygem-epp-client-rgp/Makefile
index 6f82ac489262..38afcc1a2e8b 100644
--- a/net/rubygem-epp-client-rgp/Makefile
+++ b/net/rubygem-epp-client-rgp/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-secdns/Makefile b/net/rubygem-epp-client-secdns/Makefile
index 93b41510bfb4..1795ffa0118d 100644
--- a/net/rubygem-epp-client-secdns/Makefile
+++ b/net/rubygem-epp-client-secdns/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-nokogiri>=1.4:textproc/rubygem-nokogiri
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-epp-client-smallregistry/Makefile b/net/rubygem-epp-client-smallregistry/Makefile
index 3c86daec5141..a22c32293de8 100644
--- a/net/rubygem-epp-client-smallregistry/Makefile
+++ b/net/rubygem-epp-client-smallregistry/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-builder>=2.1.2:devel/rubygem-builder \
 		rubygem-epp-client-secdns=${PORTVERSION}:net/rubygem-epp-client-secdns \
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-aliyun/Makefile b/net/rubygem-fog-aliyun/Makefile
index 177d9ddfc955..ef0e11081a87 100644
--- a/net/rubygem-fog-aliyun/Makefile
+++ b/net/rubygem-fog-aliyun/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-atmos/Makefile b/net/rubygem-fog-atmos/Makefile
index d0fabee6b4be..e8d112d98af8 100644
--- a/net/rubygem-fog-atmos/Makefile
+++ b/net/rubygem-fog-atmos/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-aws/Makefile b/net/rubygem-fog-aws/Makefile
index 9bd1c35e42bb..fdfb59bcc549 100644
--- a/net/rubygem-fog-aws/Makefile
+++ b/net/rubygem-fog-aws/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-brightbox/Makefile b/net/rubygem-fog-brightbox/Makefile
index 8428e36df1a8..dbf8d790a6be 100644
--- a/net/rubygem-fog-brightbox/Makefile
+++ b/net/rubygem-fog-brightbox/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.22:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-cloudatcost/Makefile b/net/rubygem-fog-cloudatcost/Makefile
index 5ac25345c52d..7c5b1dd01ec4 100644
--- a/net/rubygem-fog-cloudatcost/Makefile
+++ b/net/rubygem-fog-cloudatcost/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.36:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-dynect/Makefile b/net/rubygem-fog-dynect/Makefile
index fa30e21a7c5e..ed672498b90f 100644
--- a/net/rubygem-fog-dynect/Makefile
+++ b/net/rubygem-fog-dynect/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-ecloud/Makefile b/net/rubygem-fog-ecloud/Makefile
index 321f668f2e25..4134a3b63ed2 100644
--- a/net/rubygem-fog-ecloud/Makefile
+++ b/net/rubygem-fog-ecloud/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile
index dae74a3b23b4..e3659bf96c79 100644
--- a/net/rubygem-fog-google/Makefile
+++ b/net/rubygem-fog-google/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-local/Makefile b/net/rubygem-fog-local/Makefile
index f897be202e93..c84a1916e3a6 100644
--- a/net/rubygem-fog-local/Makefile
+++ b/net/rubygem-fog-local/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-openstack/Makefile b/net/rubygem-fog-openstack/Makefile
index 384021daf822..b1bec4e95205 100644
--- a/net/rubygem-fog-openstack/Makefile
+++ b/net/rubygem-fog-openstack/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.37:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-powerdns/Makefile b/net/rubygem-fog-powerdns/Makefile
index 27e667a77954..d7d6ee9eb129 100644
--- a/net/rubygem-fog-powerdns/Makefile
+++ b/net/rubygem-fog-powerdns/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.27:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-profitbricks/Makefile b/net/rubygem-fog-profitbricks/Makefile
index 2b59447dabc9..83145b6e009f 100644
--- a/net/rubygem-fog-profitbricks/Makefile
+++ b/net/rubygem-fog-profitbricks/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-rackspace/Makefile b/net/rubygem-fog-rackspace/Makefile
index 6c58a72fe835..965b72929d33 100644
--- a/net/rubygem-fog-rackspace/Makefile
+++ b/net/rubygem-fog-rackspace/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.35:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-radosgw/Makefile b/net/rubygem-fog-radosgw/Makefile
index 60ab033c44f7..920c642f8853 100644
--- a/net/rubygem-fog-radosgw/Makefile
+++ b/net/rubygem-fog-radosgw/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=1.21.0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-riakcs/Makefile b/net/rubygem-fog-riakcs/Makefile
index a1e13914d4ac..b5521140167d 100644
--- a/net/rubygem-fog-riakcs/Makefile
+++ b/net/rubygem-fog-riakcs/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-sakuracloud/Makefile b/net/rubygem-fog-sakuracloud/Makefile
index 1199ad11d7c8..ee274ee6b5b2 100644
--- a/net/rubygem-fog-sakuracloud/Makefile
+++ b/net/rubygem-fog-sakuracloud/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-serverlove/Makefile b/net/rubygem-fog-serverlove/Makefile
index ab53cef2a2a6..03e662ed81e8 100644
--- a/net/rubygem-fog-serverlove/Makefile
+++ b/net/rubygem-fog-serverlove/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-softlayer/Makefile b/net/rubygem-fog-softlayer/Makefile
index bb18eb1533d0..f2e5d089eb07 100644
--- a/net/rubygem-fog-softlayer/Makefile
+++ b/net/rubygem-fog-softlayer/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-storm_on_demand/Makefile b/net/rubygem-fog-storm_on_demand/Makefile
index 4ee5228b96b1..4064a532620d 100644
--- a/net/rubygem-fog-storm_on_demand/Makefile
+++ b/net/rubygem-fog-storm_on_demand/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-terremark/Makefile b/net/rubygem-fog-terremark/Makefile
index 72a1a4af6143..4f46902bd6f0 100644
--- a/net/rubygem-fog-terremark/Makefile
+++ b/net/rubygem-fog-terremark/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-vmfusion/Makefile b/net/rubygem-fog-vmfusion/Makefile
index 51488c53a478..06f05456ed77 100644
--- a/net/rubygem-fog-vmfusion/Makefile
+++ b/net/rubygem-fog-vmfusion/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fission>=0:emulators/rubygem-fission \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-voxel/Makefile b/net/rubygem-fog-voxel/Makefile
index 928354b5d1ec..e267c3276cdf 100644
--- a/net/rubygem-fog-voxel/Makefile
+++ b/net/rubygem-fog-voxel/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-vsphere/Makefile b/net/rubygem-fog-vsphere/Makefile
index 9f0b9922e103..1f10f58ec2f6 100644
--- a/net/rubygem-fog-vsphere/Makefile
+++ b/net/rubygem-fog-vsphere/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-fog-xenserver/Makefile b/net/rubygem-fog-xenserver/Makefile
index 5cd02b931708..23d248ac1669 100644
--- a/net/rubygem-fog-xenserver/Makefile
+++ b/net/rubygem-fog-xenserver/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-fog-core>=0:devel/rubygem-fog-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-geoip/Makefile b/net/rubygem-geoip/Makefile
index 3ec0f4281ca7..f659fe802e2e 100644
--- a/net/rubygem-geoip/Makefile
+++ b/net/rubygem-geoip/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	geoiplookup:net/GeoIP
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/geoip
 
diff --git a/net/rubygem-gitlab_omniauth-ldap/Makefile b/net/rubygem-gitlab_omniauth-ldap/Makefile
index 0e6534055742..d8b6ba964195 100644
--- a/net/rubygem-gitlab_omniauth-ldap/Makefile
+++ b/net/rubygem-gitlab_omniauth-ldap/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-net-ldap>=0.9:net/rubygem-net-ldap \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-http_parser.rb/Makefile b/net/rubygem-http_parser.rb/Makefile
index d966a6070ef4..e578c2de58a8 100644
--- a/net/rubygem-http_parser.rb/Makefile
+++ b/net/rubygem-http_parser.rb/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Simple callback-based HTTP request/response parser
 LICENSE=	MIT
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-httpauth/Makefile b/net/rubygem-httpauth/Makefile
index 0cb40e286f3f..e8e889f0855d 100644
--- a/net/rubygem-httpauth/Makefile
+++ b/net/rubygem-httpauth/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/net/rubygem-ipaddress/Makefile b/net/rubygem-ipaddress/Makefile
index 563a26bfb75c..ebb3ca2631ee 100644
--- a/net/rubygem-ipaddress/Makefile
+++ b/net/rubygem-ipaddress/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/net/rubygem-iproto/Makefile b/net/rubygem-iproto/Makefile
index fe55f1c198ef..3ec3a4bbbe68 100644
--- a/net/rubygem-iproto/Makefile
+++ b/net/rubygem-iproto/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:devel/rubygem-bin_utils
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-lita-gems/Makefile b/net/rubygem-lita-gems/Makefile
index ac1520c7088d..7bf9af4e18e2 100644
--- a/net/rubygem-lita-gems/Makefile
+++ b/net/rubygem-lita-gems/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-gems>=0.8.0:devel/rubygem-gems \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-macaddr/Makefile b/net/rubygem-macaddr/Makefile
index 1976220956d4..3df33c237177 100644
--- a/net/rubygem-macaddr/Makefile
+++ b/net/rubygem-macaddr/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-systemu>=2.6.2:devel/rubygem-systemu
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-net-ldap/Makefile b/net/rubygem-net-ldap/Makefile
index 9e8ecbc933ae..1ba07a5d05f2 100644
--- a/net/rubygem-net-ldap/Makefile
+++ b/net/rubygem-net-ldap/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/License.rdoc
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-net-netrc/Makefile b/net/rubygem-net-netrc/Makefile
index c31f077e146c..f08cd3fd0315 100644
--- a/net/rubygem-net-netrc/Makefile
+++ b/net/rubygem-net-netrc/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS=	rubygem-platform>=0.3.0:devel/rubygem-platform
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-net-ping/Makefile b/net/rubygem-net-ping/Makefile
index e1b3befcb646..763dba65d572 100644
--- a/net/rubygem-net-ping/Makefile
+++ b/net/rubygem-net-ping/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Collection of classes that provide different ways to ping computers
 LICENSE=	APACHE20
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-netrc/Makefile b/net/rubygem-netrc/Makefile
index ec74f3239c98..3f645ebc762e 100644
--- a/net/rubygem-netrc/Makefile
+++ b/net/rubygem-netrc/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/net/rubygem-network_interface/Makefile b/net/rubygem-network_interface/Makefile
index 792d114d2074..a6ceaa6d3411 100644
--- a/net/rubygem-network_interface/Makefile
+++ b/net/rubygem-network_interface/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Get network interface information from Ruby
 LICENSE=	MIT
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-oauth/Makefile b/net/rubygem-oauth/Makefile
index 3efdfd7e58fc..89e674208eb4 100644
--- a/net/rubygem-oauth/Makefile
+++ b/net/rubygem-oauth/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/oauth
 
diff --git a/net/rubygem-oauth2/Makefile b/net/rubygem-oauth2/Makefile
index 41ebb101f856..c8bda5420686 100644
--- a/net/rubygem-oauth2/Makefile
+++ b/net/rubygem-oauth2/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-faraday>=0.8: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/net/rubygem-octokit/Makefile b/net/rubygem-octokit/Makefile
index a486dcda0e78..d3e07d7d43da 100644
--- a/net/rubygem-octokit/Makefile
+++ b/net/rubygem-octokit/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-sawyer>=0.7.0:www/rubygem-sawyer
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-octopress-deploy/Makefile b/net/rubygem-octopress-deploy/Makefile
index c20c4d9e9116..8b8f68a7366d 100644
--- a/net/rubygem-octopress-deploy/Makefile
+++ b/net/rubygem-octopress-deploy/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-colorator>=0:textproc/rubygem-colorator
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-auth0/Makefile b/net/rubygem-omniauth-auth0/Makefile
index 27de977e7e7c..4f5490a98967 100644
--- a/net/rubygem-omniauth-auth0/Makefile
+++ b/net/rubygem-omniauth-auth0/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-omniauth-oauth2>=1.1:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-azure-oauth2/Makefile b/net/rubygem-omniauth-azure-oauth2/Makefile
index 0bf474a887a4..b8f60ffde383 100644
--- a/net/rubygem-omniauth-azure-oauth2/Makefile
+++ b/net/rubygem-omniauth-azure-oauth2/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-jwt>=1.0:www/rubygem-jwt \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-facebook/Makefile b/net/rubygem-omniauth-facebook/Makefile
index a51f4960b50e..36513a007f93 100644
--- a/net/rubygem-omniauth-facebook/Makefile
+++ b/net/rubygem-omniauth-facebook/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-omniauth-oauth2>=1.2:net/rubygem-omniauth-oauth2
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-github-discourse/Makefile b/net/rubygem-omniauth-github-discourse/Makefile
index e7455979b2e9..4f235ad75f2d 100644
--- a/net/rubygem-omniauth-github-discourse/Makefile
+++ b/net/rubygem-omniauth-github-discourse/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-github/Makefile b/net/rubygem-omniauth-github/Makefile
index 9d1dd93ef877..16221d114e40 100644
--- a/net/rubygem-omniauth-github/Makefile
+++ b/net/rubygem-omniauth-github/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-google-oauth2/Makefile b/net/rubygem-omniauth-google-oauth2/Makefile
index 90e186c20881..c51832e3fe7e 100644
--- a/net/rubygem-omniauth-google-oauth2/Makefile
+++ b/net/rubygem-omniauth-google-oauth2/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-jwt>=1.5.2:www/rubygem-jwt \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-oauth/Makefile b/net/rubygem-omniauth-oauth/Makefile
index 9c2b7beb6683..d74a2321ae5f 100644
--- a/net/rubygem-omniauth-oauth/Makefile
+++ b/net/rubygem-omniauth-oauth/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-oauth>=0:net/rubygem-oauth \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-oauth2/Makefile b/net/rubygem-omniauth-oauth2/Makefile
index 2f72be58311b..d28e70af4853 100644
--- a/net/rubygem-omniauth-oauth2/Makefile
+++ b/net/rubygem-omniauth-oauth2/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-oauth2>=1.0:net/rubygem-oauth2 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-openid/Makefile b/net/rubygem-omniauth-openid/Makefile
index ce59f6b11b54..dbf9058df2f0 100644
--- a/net/rubygem-omniauth-openid/Makefile
+++ b/net/rubygem-omniauth-openid/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-omniauth>=1.0:security/rubygem-omniauth \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-omniauth-twitter/Makefile b/net/rubygem-omniauth-twitter/Makefile
index dc9a303889c5..f805980fa93d 100644
--- a/net/rubygem-omniauth-twitter/Makefile
+++ b/net/rubygem-omniauth-twitter/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-json>=1.3: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/net/rubygem-open-uri-cached/Makefile b/net/rubygem-open-uri-cached/Makefile
index 2d1279e12853..135db2a53997 100644
--- a/net/rubygem-open-uri-cached/Makefile
+++ b/net/rubygem-open-uri-cached/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/net/rubygem-opennebula/Makefile b/net/rubygem-opennebula/Makefile
index b5dcb3eebe58..52cc1c037f01 100644
--- a/net/rubygem-opennebula/Makefile
+++ b/net/rubygem-opennebula/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/net/rubygem-packetfu/Makefile b/net/rubygem-packetfu/Makefile
index 9403e920478c..51b4e9dff979 100644
--- a/net/rubygem-packetfu/Makefile
+++ b/net/rubygem-packetfu/Makefile
@@ -14,9 +14,7 @@ LICENSE=	BSD3CLAUSE
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 SHEBANG_FILES=	test/func_lldp.rb
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-pcaprub/Makefile b/net/rubygem-pcaprub/Makefile
index 0a42ed8eae59..f07a12a90782 100644
--- a/net/rubygem-pcaprub/Makefile
+++ b/net/rubygem-pcaprub/Makefile
@@ -11,7 +11,6 @@ COMMENT=	Libpcap bindings for ruby
 LICENSE=	LGPL21
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-rabbiter/Makefile b/net/rubygem-rabbiter/Makefile
index 88133c250546..151b264a7be5 100644
--- a/net/rubygem-rabbiter/Makefile
+++ b/net/rubygem-rabbiter/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-gio2>=1.1.4:devel/rubygem-gio2 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/rabbiter
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-rbvmomi/Makefile b/net/rubygem-rbvmomi/Makefile
index be3747122608..6d6b319f12bd 100644
--- a/net/rubygem-rbvmomi/Makefile
+++ b/net/rubygem-rbvmomi/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS=	rubygem-builder32>=0:devel/rubygem-builder32 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 SHEBANG_FILES=	examples/run.sh
 
 PLIST_FILES=	bin/rbvmomish
diff --git a/net/rubygem-right_aws/Makefile b/net/rubygem-right_aws/Makefile
index b768faa5458e..82e5774c8689 100644
--- a/net/rubygem-right_aws/Makefile
+++ b/net/rubygem-right_aws/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	rubygem-right_http_connection>=1.2.5:net/rubygem-right_http_connect
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 OPTIONS_DEFINE=	LIBXML
 LIBXML_DESC=	Use libxml instead of REXML
diff --git a/net/rubygem-right_flexiscale/Makefile b/net/rubygem-right_flexiscale/Makefile
index a46283e7e878..7d8def229ee6 100644
--- a/net/rubygem-right_flexiscale/Makefile
+++ b/net/rubygem-right_flexiscale/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-soap4r>=1.5.8:devel/rubygem-soap4r
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-right_gogrid/Makefile b/net/rubygem-right_gogrid/Makefile
index 7fcdbbe7bf55..e54ef6c2330f 100644
--- a/net/rubygem-right_gogrid/Makefile
+++ b/net/rubygem-right_gogrid/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:net/rubygem-right_http_connect
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-right_http_connection/Makefile b/net/rubygem-right_http_connection/Makefile
index c1bb8602b3fb..11a71ecc2883 100644
--- a/net/rubygem-right_http_connection/Makefile
+++ b/net/rubygem-right_http_connection/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/net/rubygem-right_slicehost/Makefile b/net/rubygem-right_slicehost/Makefile
index d37212b40d51..4f3157d5814b 100644
--- a/net/rubygem-right_slicehost/Makefile
+++ b/net/rubygem-right_slicehost/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-right_http_connection>=1.2.4:net/rubygem-right_http_connect
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-rsync/Makefile b/net/rubygem-rsync/Makefile
index 23234eb3a014..9a0d1162fa06 100644
--- a/net/rubygem-rsync/Makefile
+++ b/net/rubygem-rsync/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rsync:net/rsync
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-ruby-growl/Makefile b/net/rubygem-ruby-growl/Makefile
index 4127e9a6ae1f..2e9596af5e76 100644
--- a/net/rubygem-ruby-growl/Makefile
+++ b/net/rubygem-ruby-growl/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	rubygem-uuid>=2.3.5:devel/rubygem-uuid
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/growl
 
diff --git a/net/rubygem-ruby-openid/Makefile b/net/rubygem-ruby-openid/Makefile
index a82919e21168..951a7279016c 100644
--- a/net/rubygem-ruby-openid/Makefile
+++ b/net/rubygem-ruby-openid/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/net/rubygem-ruby-yadis/Makefile b/net/rubygem-ruby-yadis/Makefile
index f7e975126b33..88446e9201eb 100644
--- a/net/rubygem-ruby-yadis/Makefile
+++ b/net/rubygem-ruby-yadis/Makefile
@@ -14,7 +14,6 @@ LICENSE=	APACHE20
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-rubyntlm/Makefile b/net/rubygem-rubyntlm/Makefile
index 063d7192c4d9..a3b9df2ebeab 100644
--- a/net/rubygem-rubyntlm/Makefile
+++ b/net/rubygem-rubyntlm/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/net/rubygem-rubytter/Makefile b/net/rubygem-rubytter/Makefile
index 897fa486e89c..6af9edeec3f6 100644
--- a/net/rubygem-rubytter/Makefile
+++ b/net/rubygem-rubytter/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-json>=1.1.3: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/net/rubygem-rudy/Makefile b/net/rubygem-rudy/Makefile
index 2ad82e7dbad7..5d0f26902534 100644
--- a/net/rubygem-rudy/Makefile
+++ b/net/rubygem-rudy/Makefile
@@ -26,10 +26,8 @@ RUN_DEPENDS=	rubygem-amazon-ec2>=0.9.10:net/rubygem-amazon-ec2 \
 		rubygem-sysinfo>=0.7.3:devel/rubygem-sysinfo
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist shebangfix
 PLIST_FILES=	bin/rudy bin/rudy-ec2 bin/rudy-s3 bin/rudy-sdb
-USES=		shebangfix
 SHEBANG_FILES=	bin/* tryouts/exploration/machine.rb
 NO_ARCH=	yes
 
diff --git a/net/rubygem-rye/Makefile b/net/rubygem-rye/Makefile
index 6c093e43559b..5baf081944fd 100644
--- a/net/rubygem-rye/Makefile
+++ b/net/rubygem-rye/Makefile
@@ -22,9 +22,7 @@ RUN_DEPENDS=	rubygem-annoy>=0:devel/rubygem-annoy \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 SHEBANG_FILES=	try/*.rb tst/*.rb
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-simple_oauth/Makefile b/net/rubygem-simple_oauth/Makefile
index 04aca0e4549b..bf6cbebdb5b6 100644
--- a/net/rubygem-simple_oauth/Makefile
+++ b/net/rubygem-simple_oauth/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/net/rubygem-stompserver/Makefile b/net/rubygem-stompserver/Makefile
index 6cbc57017c10..d6f434be0026 100644
--- a/net/rubygem-stompserver/Makefile
+++ b/net/rubygem-stompserver/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	rubygem-daemons>=1.0.2:devel/rubygem-daemons \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/stompserver
 
diff --git a/net/rubygem-t/Makefile b/net/rubygem-t/Makefile
index 064a5a320d76..1f7b7d5720f7 100644
--- a/net/rubygem-t/Makefile
+++ b/net/rubygem-t/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	rubygem-geokit>=1.9:graphics/rubygem-geokit \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/t
 
diff --git a/net/rubygem-tweetstream/Makefile b/net/rubygem-tweetstream/Makefile
index 5f8ff042b85a..dfe8e68f6e38 100644
--- a/net/rubygem-tweetstream/Makefile
+++ b/net/rubygem-tweetstream/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-daemons>=1.1:devel/rubygem-daemons \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/net/rubygem-twitter-stream/Makefile b/net/rubygem-twitter-stream/Makefile
index ce0c0aca88f7..512c08713bdf 100644
--- a/net/rubygem-twitter-stream/Makefile
+++ b/net/rubygem-twitter-stream/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-eventmachine>=0.12.8: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/net/rubygem-twitter/Makefile b/net/rubygem-twitter/Makefile
index 051ea7e71781..72ce5d1d0f3d 100644
--- a/net/rubygem-twitter/Makefile
+++ b/net/rubygem-twitter/Makefile
@@ -25,7 +25,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/net/rubygem-twitter4r/Makefile b/net/rubygem-twitter4r/Makefile
index 569a31a708d9..e7905e424bdd 100644
--- a/net/rubygem-twitter4r/Makefile
+++ b/net/rubygem-twitter4r/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	rubygem-json>=1.1.1:devel/rubygem-json \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/t4r-oauth-access bin/t4rsh
 
diff --git a/net/rubygem-uri-redis/Makefile b/net/rubygem-uri-redis/Makefile
index 34fd9c53321b..675d29b57f1e 100644
--- a/net/rubygem-uri-redis/Makefile
+++ b/net/rubygem-uri-redis/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/net/rubygem-whois/Makefile b/net/rubygem-whois/Makefile
index 9dfbda4be736..e06716e7277a 100644
--- a/net/rubygem-whois/Makefile
+++ b/net/rubygem-whois/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	rubygem-activesupport4>=3:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/whoisrb