aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/gem.mk144
-rw-r--r--Mk/bsd.ruby.mk139
-rw-r--r--accessibility/rubygem-atk/Makefile3
-rw-r--r--archivers/rubygem-archive-tar-minitar/Makefile3
-rw-r--r--archivers/rubygem-archive-zip/Makefile3
-rw-r--r--archivers/rubygem-bzip2-ruby/Makefile3
-rw-r--r--archivers/rubygem-libarchive/Makefile4
-rw-r--r--archivers/rubygem-minitar/Makefile3
-rw-r--r--archivers/rubygem-ruby-xz/Makefile3
-rw-r--r--archivers/rubygem-rubyzip/Makefile3
-rw-r--r--archivers/rubygem-rubyzip2/Makefile3
-rw-r--r--audio/rubygem-librmpd/Makefile3
-rw-r--r--audio/rubygem-ruby-mp3info/Makefile3
-rw-r--r--audio/rubygem-ruby-ogginfo/Makefile3
-rw-r--r--audio/rubygem-ruby-shout/Makefile3
-rw-r--r--benchmarks/rubygem-benchmark-ips/Makefile3
-rw-r--r--benchmarks/rubygem-railsbench/Makefile3
-rw-r--r--comms/rubygem-callsign/Makefile3
-rw-r--r--comms/rubygem-ruby-termios/Makefile3
-rw-r--r--converters/rubygem-bsdconv/Makefile3
-rw-r--r--databases/rubygem-activemodel/Makefile3
-rw-r--r--databases/rubygem-activemodel4/Makefile3
-rw-r--r--databases/rubygem-activerecord-jdbc-adapter/Makefile3
-rw-r--r--databases/rubygem-activerecord-jdbcmysql-adapter/Makefile3
-rw-r--r--databases/rubygem-activerecord-mysql-adapter/Makefile3
-rw-r--r--databases/rubygem-activerecord-session_store/Makefile3
-rw-r--r--databases/rubygem-activerecord/Makefile3
-rw-r--r--databases/rubygem-activerecord4/Makefile3
-rw-r--r--databases/rubygem-after_commit_queue/Makefile3
-rw-r--r--databases/rubygem-amalgalite/Makefile3
-rw-r--r--databases/rubygem-arel-helpers/Makefile3
-rw-r--r--databases/rubygem-arel/Makefile3
-rw-r--r--databases/rubygem-arel3/Makefile3
-rw-r--r--databases/rubygem-arel5/Makefile3
-rw-r--r--databases/rubygem-arel6/Makefile3
-rw-r--r--databases/rubygem-awesome_nested_set/Makefile3
-rw-r--r--databases/rubygem-bdb1/Makefile4
-rw-r--r--databases/rubygem-bigrecord/Makefile3
-rw-r--r--databases/rubygem-couchrest/Makefile3
-rw-r--r--databases/rubygem-data_objects/Makefile3
-rw-r--r--databases/rubygem-datamapper/Makefile3
-rw-r--r--databases/rubygem-dbd-mysql/Makefile3
-rw-r--r--databases/rubygem-dbd-odbc/Makefile3
-rw-r--r--databases/rubygem-dbd-pg/Makefile3
-rw-r--r--databases/rubygem-dbd-sqlite3/Makefile3
-rw-r--r--databases/rubygem-dbi/Makefile3
-rw-r--r--databases/rubygem-dm-active_model/Makefile3
-rw-r--r--databases/rubygem-dm-aggregates/Makefile3
-rw-r--r--databases/rubygem-dm-chunked_query/Makefile3
-rw-r--r--databases/rubygem-dm-constraints/Makefile3
-rw-r--r--databases/rubygem-dm-core/Makefile3
-rw-r--r--databases/rubygem-dm-devise/Makefile3
-rw-r--r--databases/rubygem-dm-do-adapter/Makefile3
-rw-r--r--databases/rubygem-dm-migrations/Makefile3
-rw-r--r--databases/rubygem-dm-mysql-adapter/Makefile3
-rw-r--r--databases/rubygem-dm-observer/Makefile3
-rw-r--r--databases/rubygem-dm-pager/Makefile3
-rw-r--r--databases/rubygem-dm-paperclip/Makefile3
-rw-r--r--databases/rubygem-dm-postgres-adapter/Makefile3
-rw-r--r--databases/rubygem-dm-rails/Makefile3
-rw-r--r--databases/rubygem-dm-serializer/Makefile3
-rw-r--r--databases/rubygem-dm-timestamps/Makefile3
-rw-r--r--databases/rubygem-dm-transactions/Makefile3
-rw-r--r--databases/rubygem-dm-types/Makefile3
-rw-r--r--databases/rubygem-dm-validations/Makefile3
-rw-r--r--databases/rubygem-do_mysql/Makefile3
-rw-r--r--databases/rubygem-do_postgres/Makefile5
-rw-r--r--databases/rubygem-do_sqlite3/Makefile3
-rw-r--r--databases/rubygem-em-redis-unified/Makefile3
-rw-r--r--databases/rubygem-familia/Makefile3
-rw-r--r--databases/rubygem-globalid/Makefile3
-rw-r--r--databases/rubygem-her/Makefile3
-rw-r--r--databases/rubygem-hiredis/Makefile4
-rw-r--r--databases/rubygem-jdbc-mysql/Makefile3
-rw-r--r--databases/rubygem-leo_manager_client/Makefile3
-rw-r--r--databases/rubygem-memcache-client/Makefile3
-rw-r--r--databases/rubygem-memcache/Makefile3
-rw-r--r--databases/rubygem-mysql/Makefile3
-rw-r--r--databases/rubygem-mysql2/Makefile3
-rw-r--r--databases/rubygem-openid-redis-store/Makefile3
-rw-r--r--databases/rubygem-paranoia/Makefile3
-rw-r--r--databases/rubygem-pg/Makefile4
-rw-r--r--databases/rubygem-rbase/Makefile3
-rw-r--r--databases/rubygem-redis-actionpack/Makefile3
-rw-r--r--databases/rubygem-redis-namespace/Makefile3
-rw-r--r--databases/rubygem-redis/Makefile3
-rw-r--r--databases/rubygem-rubyrep/Makefile4
-rw-r--r--databases/rubygem-seed-fu/Makefile3
-rw-r--r--databases/rubygem-sqlite3-ruby/Makefile3
-rw-r--r--databases/rubygem-sqlite3/Makefile3
-rw-r--r--databases/rubygem-state_machines-activemodel/Makefile3
-rw-r--r--databases/rubygem-state_machines-activerecord/Makefile3
-rw-r--r--databases/rubygem-tarantool/Makefile3
-rw-r--r--deskutils/rubygem-shellplay/Makefile3
-rw-r--r--deskutils/rubygem-taskjuggler/Makefile3
-rw-r--r--devel/rubygem-CFPropertyList/Makefile3
-rw-r--r--devel/rubygem-abstract/Makefile3
-rw-r--r--devel/rubygem-actionpack-action_caching/Makefile3
-rw-r--r--devel/rubygem-actionview/Makefile3
-rw-r--r--devel/rubygem-active_scaffold/Makefile3
-rw-r--r--devel/rubygem-activejob/Makefile3
-rw-r--r--devel/rubygem-activemessaging/Makefile3
-rw-r--r--devel/rubygem-activerecord-deprecated_finders/Makefile3
-rw-r--r--devel/rubygem-activesupport/Makefile3
-rw-r--r--devel/rubygem-activesupport4/Makefile3
-rw-r--r--devel/rubygem-akismet/Makefile3
-rw-r--r--devel/rubygem-algebrick/Makefile3
-rw-r--r--devel/rubygem-algorithms/Makefile3
-rw-r--r--devel/rubygem-allison/Makefile3
-rw-r--r--devel/rubygem-analogger/Makefile4
-rw-r--r--devel/rubygem-annoy/Makefile3
-rw-r--r--devel/rubygem-ansi/Makefile3
-rw-r--r--devel/rubygem-apipie-bindings/Makefile3
-rw-r--r--devel/rubygem-apipie-params/Makefile3
-rw-r--r--devel/rubygem-app_config/Makefile3
-rw-r--r--devel/rubygem-arr-pm/Makefile3
-rw-r--r--devel/rubygem-arrayfields/Makefile3
-rw-r--r--devel/rubygem-ascii85/Makefile3
-rw-r--r--devel/rubygem-asetus/Makefile3
-rw-r--r--devel/rubygem-aspectr/Makefile3
-rw-r--r--devel/rubygem-ast/Makefile3
-rw-r--r--devel/rubygem-astrolabe/Makefile3
-rw-r--r--devel/rubygem-atomic/Makefile3
-rw-r--r--devel/rubygem-atoulme-antwrap/Makefile3
-rw-r--r--devel/rubygem-attic/Makefile3
-rw-r--r--devel/rubygem-attr_required/Makefile3
-rw-r--r--devel/rubygem-authlogic/Makefile3
-rw-r--r--devel/rubygem-awesome_print/Makefile3
-rw-r--r--devel/rubygem-aws-sdk-core/Makefile3
-rw-r--r--devel/rubygem-aws-sdk-resources/Makefile3
-rw-r--r--devel/rubygem-aws-sdk-v1/Makefile3
-rw-r--r--devel/rubygem-aws-sdk/Makefile3
-rw-r--r--devel/rubygem-axiom-types/Makefile3
-rw-r--r--devel/rubygem-backports/Makefile3
-rw-r--r--devel/rubygem-bacon/Makefile3
-rw-r--r--devel/rubygem-benelux/Makefile3
-rw-r--r--devel/rubygem-bin_utils/Makefile3
-rw-r--r--devel/rubygem-bindata/Makefile3
-rw-r--r--devel/rubygem-binding_of_caller/Makefile3
-rw-r--r--devel/rubygem-bio/Makefile4
-rw-r--r--devel/rubygem-blankslate/Makefile3
-rw-r--r--devel/rubygem-blobstore_client/Makefile3
-rw-r--r--devel/rubygem-blockenspiel/Makefile3
-rw-r--r--devel/rubygem-bones/Makefile3
-rw-r--r--devel/rubygem-bosh-template/Makefile3
-rw-r--r--devel/rubygem-bosh_common/Makefile3
-rw-r--r--devel/rubygem-bson/Makefile3
-rw-r--r--devel/rubygem-bson1/Makefile3
-rw-r--r--devel/rubygem-buftok/Makefile3
-rw-r--r--devel/rubygem-bugspots/Makefile3
-rw-r--r--devel/rubygem-builder/Makefile3
-rw-r--r--devel/rubygem-builder32/Makefile3
-rw-r--r--devel/rubygem-byebug/Makefile3
-rw-r--r--devel/rubygem-cabin/Makefile3
-rw-r--r--devel/rubygem-caesars/Makefile4
-rw-r--r--devel/rubygem-cairo-gobject/Makefile3
-rw-r--r--devel/rubygem-capybara/Makefile3
-rw-r--r--devel/rubygem-celluloid-essentials/Makefile3
-rw-r--r--devel/rubygem-celluloid-extras/Makefile3
-rw-r--r--devel/rubygem-celluloid-fsm/Makefile3
-rw-r--r--devel/rubygem-celluloid-io/Makefile3
-rw-r--r--devel/rubygem-celluloid-pool/Makefile3
-rw-r--r--devel/rubygem-celluloid-supervision/Makefile3
-rw-r--r--devel/rubygem-celluloid/Makefile3
-rw-r--r--devel/rubygem-cf-uaa-lib/Makefile3
-rw-r--r--devel/rubygem-childprocess/Makefile3
-rw-r--r--devel/rubygem-chronic/Makefile3
-rw-r--r--devel/rubygem-clamp/Makefile3
-rw-r--r--devel/rubygem-classifier-reborn/Makefile3
-rw-r--r--devel/rubygem-classifier/Makefile3
-rw-r--r--devel/rubygem-climate_control/Makefile3
-rw-r--r--devel/rubygem-clio/Makefile3
-rw-r--r--devel/rubygem-cliprompt/Makefile3
-rw-r--r--devel/rubygem-cloudfiles/Makefile3
-rw-r--r--devel/rubygem-cocaine/Makefile3
-rw-r--r--devel/rubygem-coercible/Makefile3
-rw-r--r--devel/rubygem-coffee-rails/Makefile3
-rw-r--r--devel/rubygem-coffee-rails4/Makefile3
-rw-r--r--devel/rubygem-coffee-script-source/Makefile3
-rw-r--r--devel/rubygem-coffee-script/Makefile3
-rw-r--r--devel/rubygem-colorize/Makefile3
-rw-r--r--devel/rubygem-columnize/Makefile3
-rw-r--r--devel/rubygem-commander/Makefile3
-rw-r--r--devel/rubygem-concurrent-ruby-edge/Makefile3
-rw-r--r--devel/rubygem-concurrent-ruby/Makefile3
-rw-r--r--devel/rubygem-configatron/Makefile3
-rw-r--r--devel/rubygem-configstruct/Makefile3
-rw-r--r--devel/rubygem-configuration/Makefile3
-rw-r--r--devel/rubygem-cool.io/Makefile3
-rw-r--r--devel/rubygem-corefines/Makefile3
-rw-r--r--devel/rubygem-crack/Makefile3
-rw-r--r--devel/rubygem-cri/Makefile3
-rw-r--r--devel/rubygem-cucumber-core/Makefile3
-rw-r--r--devel/rubygem-cucumber-wire/Makefile3
-rw-r--r--devel/rubygem-cucumber/Makefile3
-rw-r--r--devel/rubygem-curses/Makefile3
-rw-r--r--devel/rubygem-cyoi/Makefile3
-rw-r--r--devel/rubygem-daemon_controller/Makefile3
-rw-r--r--devel/rubygem-daemons/Makefile3
-rw-r--r--devel/rubygem-debug_inspector/Makefile3
-rw-r--r--devel/rubygem-debugger-linecache/Makefile3
-rw-r--r--devel/rubygem-debugger-xml/Makefile3
-rw-r--r--devel/rubygem-deep_merge/Makefile3
-rw-r--r--devel/rubygem-deep_test/Makefile3
-rw-r--r--devel/rubygem-deface/Makefile3
-rw-r--r--devel/rubygem-default_value_for/Makefile3
-rw-r--r--devel/rubygem-delayed_job/Makefile3
-rw-r--r--devel/rubygem-delayer-deferred/Makefile3
-rw-r--r--devel/rubygem-delayer/Makefile3
-rw-r--r--devel/rubygem-deprecated/Makefile3
-rw-r--r--devel/rubygem-deprecated2/Makefile3
-rw-r--r--devel/rubygem-descendants_tracker/Makefile3
-rw-r--r--devel/rubygem-devise-async/Makefile3
-rw-r--r--devel/rubygem-devise/Makefile3
-rw-r--r--devel/rubygem-directory_watcher/Makefile3
-rw-r--r--devel/rubygem-ditz/Makefile4
-rw-r--r--devel/rubygem-docile/Makefile3
-rw-r--r--devel/rubygem-drydock/Makefile4
-rw-r--r--devel/rubygem-dynflow/Makefile3
-rw-r--r--devel/rubygem-edavis10-object_daddy/Makefile3
-rw-r--r--devel/rubygem-elif/Makefile3
-rw-r--r--devel/rubygem-enumerize/Makefile3
-rw-r--r--devel/rubygem-equalizer/Makefile3
-rw-r--r--devel/rubygem-errand/Makefile3
-rw-r--r--devel/rubygem-event-bus/Makefile3
-rw-r--r--devel/rubygem-eventmachine/Makefile3
-rw-r--r--devel/rubygem-excon/Makefile3
-rw-r--r--devel/rubygem-execjs/Makefile3
-rw-r--r--devel/rubygem-extlib/Makefile3
-rw-r--r--devel/rubygem-facets/Makefile3
-rw-r--r--devel/rubygem-faraday_middleware-multi_json/Makefile3
-rw-r--r--devel/rubygem-fast-stemmer/Makefile3
-rw-r--r--devel/rubygem-fast_gettext/Makefile3
-rw-r--r--devel/rubygem-fast_stack/Makefile3
-rw-r--r--devel/rubygem-fast_xor/Makefile3
-rw-r--r--devel/rubygem-fastercsv/Makefile3
-rw-r--r--devel/rubygem-fastri/Makefile3
-rw-r--r--devel/rubygem-fastthread/Makefile3
-rw-r--r--devel/rubygem-fattr/Makefile3
-rw-r--r--devel/rubygem-ffi-compiler/Makefile3
-rw-r--r--devel/rubygem-ffi-yajl/Makefile3
-rw-r--r--devel/rubygem-ffi/Makefile3
-rw-r--r--devel/rubygem-file-tail/Makefile3
-rw-r--r--devel/rubygem-flexmock/Makefile3
-rw-r--r--devel/rubygem-fluent-logger/Makefile3
-rw-r--r--devel/rubygem-fog-core/Makefile3
-rw-r--r--devel/rubygem-fog-json/Makefile3
-rw-r--r--devel/rubygem-fog/Makefile3
-rw-r--r--devel/rubygem-font-awesome-rails-rails4/Makefile3
-rw-r--r--devel/rubygem-font-awesome-rails/Makefile3
-rw-r--r--devel/rubygem-foreigner/Makefile3
-rw-r--r--devel/rubygem-foreman/Makefile4
-rw-r--r--devel/rubygem-formatador/Makefile3
-rw-r--r--devel/rubygem-gdata/Makefile3
-rw-r--r--devel/rubygem-gem_plugin/Makefile3
-rw-r--r--devel/rubygem-gemcutter/Makefile3
-rw-r--r--devel/rubygem-gemnasium-gitlab-service/Makefile3
-rw-r--r--devel/rubygem-gems/Makefile3
-rw-r--r--devel/rubygem-generator_spec-rails4/Makefile3
-rw-r--r--devel/rubygem-generator_spec/Makefile3
-rw-r--r--devel/rubygem-georuby/Makefile3
-rw-r--r--devel/rubygem-get_process_mem/Makefile3
-rw-r--r--devel/rubygem-getopt/Makefile3
-rw-r--r--devel/rubygem-gettext/Makefile4
-rw-r--r--devel/rubygem-gh/Makefile3
-rw-r--r--devel/rubygem-gibbler/Makefile3
-rw-r--r--devel/rubygem-gio2/Makefile3
-rw-r--r--devel/rubygem-git-version-bump/Makefile3
-rw-r--r--devel/rubygem-git/Makefile3
-rw-r--r--devel/rubygem-github_api/Makefile3
-rw-r--r--devel/rubygem-gitlab-pygments.rb/Makefile3
-rw-r--r--devel/rubygem-gitlab_git/Makefile3
-rw-r--r--devel/rubygem-gitlab_meta/Makefile4
-rw-r--r--devel/rubygem-glib2/Makefile3
-rw-r--r--devel/rubygem-gobject-introspection/Makefile3
-rw-r--r--devel/rubygem-graf/Makefile3
-rw-r--r--devel/rubygem-grape-entity/Makefile3
-rw-r--r--devel/rubygem-grape-swagger/Makefile3
-rw-r--r--devel/rubygem-grape/Makefile3
-rw-r--r--devel/rubygem-grit/Makefile3
-rw-r--r--devel/rubygem-guess_html_encoding/Makefile3
-rw-r--r--devel/rubygem-gyoku/Makefile3
-rw-r--r--devel/rubygem-hashdiff/Makefile3
-rw-r--r--devel/rubygem-hashery/Makefile3
-rw-r--r--devel/rubygem-hashie/Makefile3
-rw-r--r--devel/rubygem-hashie2/Makefile3
-rw-r--r--devel/rubygem-highline/Makefile3
-rw-r--r--devel/rubygem-hike/Makefile3
-rw-r--r--devel/rubygem-hitimes/Makefile3
-rw-r--r--devel/rubygem-hoe/Makefile3
-rw-r--r--devel/rubygem-holidays/Makefile3
-rw-r--r--devel/rubygem-i18n/Makefile3
-rw-r--r--devel/rubygem-icalendar/Makefile3
-rw-r--r--devel/rubygem-ice_cube/Makefile3
-rw-r--r--devel/rubygem-ice_nine/Makefile3
-rw-r--r--devel/rubygem-inflecto/Makefile3
-rw-r--r--devel/rubygem-instance_storage/Makefile3
-rw-r--r--devel/rubygem-interact/Makefile3
-rw-r--r--devel/rubygem-iobuffer/Makefile3
-rw-r--r--devel/rubygem-jammit/Makefile3
-rw-r--r--devel/rubygem-jbuilder/Makefile3
-rw-r--r--devel/rubygem-jekyll-coffeescript/Makefile3
-rw-r--r--devel/rubygem-jeweler/Makefile3
-rw-r--r--devel/rubygem-jmespath/Makefile3
-rw-r--r--devel/rubygem-jquery-ui-themes/Makefile3
-rw-r--r--devel/rubygem-jruby-jars/Makefile3
-rw-r--r--devel/rubygem-json/Makefile3
-rw-r--r--devel/rubygem-json_pure/Makefile3
-rw-r--r--devel/rubygem-kafo/Makefile4
-rw-r--r--devel/rubygem-kafo_parsers/Makefile3
-rw-r--r--devel/rubygem-kafo_wizards/Makefile3
-rw-r--r--devel/rubygem-kgio/Makefile3
-rw-r--r--devel/rubygem-launchy/Makefile3
-rw-r--r--devel/rubygem-launchy22/Makefile3
-rw-r--r--devel/rubygem-librarian/Makefile3
-rw-r--r--devel/rubygem-librarianp/Makefile3
-rw-r--r--devel/rubygem-libyajl2/Makefile3
-rw-r--r--devel/rubygem-licensee/Makefile3
-rw-r--r--devel/rubygem-listen/Makefile3
-rw-r--r--devel/rubygem-little-plugger/Makefile3
-rw-r--r--devel/rubygem-locale/Makefile3
-rw-r--r--devel/rubygem-lockfile/Makefile3
-rw-r--r--devel/rubygem-logging/Makefile3
-rw-r--r--devel/rubygem-logster/Makefile3
-rw-r--r--devel/rubygem-loquacious/Makefile3
-rw-r--r--devel/rubygem-lru_redux/Makefile3
-rw-r--r--devel/rubygem-lumberjack/Makefile3
-rw-r--r--devel/rubygem-main/Makefile3
-rw-r--r--devel/rubygem-map/Makefile3
-rw-r--r--devel/rubygem-memoist/Makefile3
-rw-r--r--devel/rubygem-memoizable/Makefile3
-rw-r--r--devel/rubygem-memoize/Makefile3
-rw-r--r--devel/rubygem-mercenary/Makefile4
-rw-r--r--devel/rubygem-message_bus/Makefile3
-rw-r--r--devel/rubygem-metaclass/Makefile3
-rw-r--r--devel/rubygem-metaid/Makefile3
-rw-r--r--devel/rubygem-method_source/Makefile3
-rw-r--r--devel/rubygem-minitest/Makefile3
-rw-r--r--devel/rubygem-minitest4/Makefile3
-rw-r--r--devel/rubygem-mixlib-authentication/Makefile3
-rw-r--r--devel/rubygem-mixlib-cli/Makefile3
-rw-r--r--devel/rubygem-mixlib-config/Makefile3
-rw-r--r--devel/rubygem-mixlib-log/Makefile3
-rw-r--r--devel/rubygem-mixlib-shellout/Makefile3
-rw-r--r--devel/rubygem-mkrf/Makefile4
-rw-r--r--devel/rubygem-mocha/Makefile3
-rw-r--r--devel/rubygem-moneta/Makefile6
-rw-r--r--devel/rubygem-moneta06/Makefile3
-rw-r--r--devel/rubygem-mongo/Makefile3
-rw-r--r--devel/rubygem-msgpack/Makefile3
-rw-r--r--devel/rubygem-mspec/Makefile3
-rw-r--r--devel/rubygem-multi_json/Makefile3
-rw-r--r--devel/rubygem-multi_test/Makefile4
-rw-r--r--devel/rubygem-murmurhash3/Makefile3
-rw-r--r--devel/rubygem-mustache/Makefile3
-rw-r--r--devel/rubygem-mutter/Makefile3
-rw-r--r--devel/rubygem-naught/Makefile3
-rw-r--r--devel/rubygem-needle/Makefile3
-rw-r--r--devel/rubygem-nenv/Makefile3
-rw-r--r--devel/rubygem-nesty/Makefile3
-rw-r--r--devel/rubygem-netaddr/Makefile3
-rw-r--r--devel/rubygem-newrelic-grape/Makefile3
-rw-r--r--devel/rubygem-newrelic_rpm/Makefile4
-rw-r--r--devel/rubygem-nice-ffi/Makefile3
-rw-r--r--devel/rubygem-nio4r/Makefile3
-rw-r--r--devel/rubygem-nori/Makefile3
-rw-r--r--devel/rubygem-notiffany/Makefile3
-rw-r--r--devel/rubygem-notify/Makefile3
-rw-r--r--devel/rubygem-nprogress-rails/Makefile3
-rw-r--r--devel/rubygem-octopress-hooks/Makefile3
-rw-r--r--devel/rubygem-oj/Makefile3
-rw-r--r--devel/rubygem-omniauth_crowd/Makefile3
-rw-r--r--devel/rubygem-open3_backport/Makefile3
-rw-r--r--devel/rubygem-open4/Makefile3
-rw-r--r--devel/rubygem-orm_adapter/Makefile3
-rw-r--r--devel/rubygem-p4ruby/Makefile3
-rw-r--r--devel/rubygem-paint/Makefile3
-rw-r--r--devel/rubygem-paperclip/Makefile3
-rw-r--r--devel/rubygem-parser/Makefile3
-rw-r--r--devel/rubygem-piston/Makefile3
-rw-r--r--devel/rubygem-pkg-config/Makefile4
-rw-r--r--devel/rubygem-platform/Makefile3
-rw-r--r--devel/rubygem-plist/Makefile3
-rw-r--r--devel/rubygem-pluggaloid/Makefile3
-rw-r--r--devel/rubygem-polyamorous/Makefile3
-rw-r--r--devel/rubygem-polyglot/Makefile3
-rw-r--r--devel/rubygem-popen4/Makefile3
-rw-r--r--devel/rubygem-posix-spawn/Makefile3
-rw-r--r--devel/rubygem-power_assert/Makefile3
-rw-r--r--devel/rubygem-powerbar/Makefile3
-rw-r--r--devel/rubygem-powerpack/Makefile3
-rw-r--r--devel/rubygem-progressbar/Makefile3
-rw-r--r--devel/rubygem-protected_attributes/Makefile3
-rw-r--r--devel/rubygem-prototype-rails/Makefile3
-rw-r--r--devel/rubygem-pry-rails/Makefile3
-rw-r--r--devel/rubygem-pry-remote-em/Makefile3
-rw-r--r--devel/rubygem-pry/Makefile3
-rw-r--r--devel/rubygem-ptreloaded/Makefile3
-rw-r--r--devel/rubygem-pygments.rb/Makefile3
-rw-r--r--devel/rubygem-r18n-core/Makefile3
-rw-r--r--devel/rubygem-racc/Makefile3
-rw-r--r--devel/rubygem-rack-mini-profiler/Makefile3
-rw-r--r--devel/rubygem-rack-raw-upload/Makefile3
-rw-r--r--devel/rubygem-rails-deprecated_sanitizer/Makefile3
-rw-r--r--devel/rubygem-rails-observers/Makefile3
-rw-r--r--devel/rubygem-rainbow/Makefile3
-rw-r--r--devel/rubygem-rake-compiler/Makefile3
-rw-r--r--devel/rubygem-rake/Makefile3
-rw-r--r--devel/rubygem-ransack/Makefile3
-rw-r--r--devel/rubygem-rapt/Makefile3
-rw-r--r--devel/rubygem-rash/Makefile3
-rw-r--r--devel/rubygem-rb-fsevent/Makefile3
-rw-r--r--devel/rubygem-rb-inotify/Makefile3
-rw-r--r--devel/rubygem-rb-kqueue/Makefile3
-rw-r--r--devel/rubygem-rbtrace/Makefile3
-rw-r--r--devel/rubygem-rdoc/Makefile3
-rw-r--r--devel/rubygem-rdoc3/Makefile3
-rw-r--r--devel/rubygem-readwritesettings/Makefile3
-rw-r--r--devel/rubygem-recaptcha/Makefile3
-rw-r--r--devel/rubygem-redis-activesupport/Makefile3
-rw-r--r--devel/rubygem-redis-store/Makefile3
-rw-r--r--devel/rubygem-redmine_plugin_support/Makefile3
-rw-r--r--devel/rubygem-ref/Makefile3
-rw-r--r--devel/rubygem-request_store/Makefile3
-rw-r--r--devel/rubygem-require_all/Makefile3
-rw-r--r--devel/rubygem-retryable/Makefile3
-rw-r--r--devel/rubygem-rgl/Makefile3
-rw-r--r--devel/rubygem-rodzilla/Makefile3
-rw-r--r--devel/rubygem-rotp/Makefile3
-rw-r--r--devel/rubygem-rr/Makefile3
-rw-r--r--devel/rubygem-rrd-ffi/Makefile3
-rw-r--r--devel/rubygem-rscm/Makefile3
-rw-r--r--devel/rubygem-rspec-core/Makefile3
-rw-r--r--devel/rubygem-rspec-expectations/Makefile3
-rw-r--r--devel/rubygem-rspec-logsplit/Makefile3
-rw-r--r--devel/rubygem-rspec-mocks/Makefile3
-rw-r--r--devel/rubygem-rspec-rails/Makefile3
-rw-r--r--devel/rubygem-rspec-support/Makefile3
-rw-r--r--devel/rubygem-rspec/Makefile3
-rw-r--r--devel/rubygem-rubigen/Makefile3
-rw-r--r--devel/rubygem-rubocop/Makefile3
-rw-r--r--devel/rubygem-ruby-atmos-pure/Makefile3
-rw-r--r--devel/rubygem-ruby-bugzilla/Makefile3
-rw-r--r--devel/rubygem-ruby-filemagic/Makefile3
-rw-r--r--devel/rubygem-ruby-fogbugz/Makefile3
-rw-r--r--devel/rubygem-ruby-libvirt/Makefile5
-rw-r--r--devel/rubygem-ruby-ole/Makefile4
-rw-r--r--devel/rubygem-ruby-prof/Makefile3
-rw-r--r--devel/rubygem-ruby-progressbar/Makefile3
-rw-r--r--devel/rubygem-ruby-sdl-ffi/Makefile3
-rw-r--r--devel/rubygem-ruby2ruby/Makefile4
-rw-r--r--devel/rubygem-ruby_parser/Makefile6
-rw-r--r--devel/rubygem-rubygame/Makefile3
-rw-r--r--devel/rubygem-rubygems-mirror/Makefile3
-rw-r--r--devel/rubygem-rubygems-tasks/Makefile3
-rw-r--r--devel/rubygem-rubygems-test/Makefile3
-rw-r--r--devel/rubygem-rubyinline/Makefile4
-rw-r--r--devel/rubygem-rubyinlineaccel/Makefile3
-rw-r--r--devel/rubygem-rubytree/Makefile3
-rw-r--r--devel/rubygem-rufus-scheduler/Makefile3
-rw-r--r--devel/rubygem-rugged/Makefile4
-rw-r--r--devel/rubygem-runt/Makefile3
-rw-r--r--devel/rubygem-ruport/Makefile3
-rw-r--r--devel/rubygem-safe_yaml/Makefile4
-rw-r--r--devel/rubygem-sdoc/Makefile3
-rw-r--r--devel/rubygem-semantic_puppet/Makefile3
-rw-r--r--devel/rubygem-semi_semantic/Makefile3
-rw-r--r--devel/rubygem-sentry-raven/Makefile3
-rw-r--r--devel/rubygem-sequel/Makefile3
-rw-r--r--devel/rubygem-sequel3/Makefile3
-rw-r--r--devel/rubygem-settingslogic/Makefile3
-rw-r--r--devel/rubygem-sexp_processor/Makefile3
-rw-r--r--devel/rubygem-shoulda-context/Makefile3
-rw-r--r--devel/rubygem-shoulda-matchers/Makefile4
-rw-r--r--devel/rubygem-shoulda/Makefile3
-rw-r--r--devel/rubygem-sidekiq-cron/Makefile3
-rw-r--r--devel/rubygem-sidekiq/Makefile3
-rw-r--r--devel/rubygem-sidetiq/Makefile3
-rw-r--r--devel/rubygem-sigdump/Makefile3
-rw-r--r--devel/rubygem-simple_form/Makefile3
-rw-r--r--devel/rubygem-simplecov/Makefile3
-rw-r--r--devel/rubygem-slack-notifier/Makefile3
-rw-r--r--devel/rubygem-slim/Makefile3
-rw-r--r--devel/rubygem-slop/Makefile3
-rw-r--r--devel/rubygem-slop3/Makefile3
-rw-r--r--devel/rubygem-soap4r/Makefile3
-rw-r--r--devel/rubygem-spring/Makefile3
-rw-r--r--devel/rubygem-sprockets-helpers/Makefile3
-rw-r--r--devel/rubygem-sprockets-rails/Makefile3
-rw-r--r--devel/rubygem-sprockets-sass/Makefile3
-rw-r--r--devel/rubygem-sprockets/Makefile3
-rw-r--r--devel/rubygem-sprockets211/Makefile3
-rw-r--r--devel/rubygem-sprockets22/Makefile3
-rw-r--r--devel/rubygem-sprockets3/Makefile3
-rw-r--r--devel/rubygem-spruz/Makefile3
-rw-r--r--devel/rubygem-state_machine/Makefile3
-rw-r--r--devel/rubygem-state_machines/Makefile3
-rw-r--r--devel/rubygem-statsd/Makefile3
-rw-r--r--devel/rubygem-stella/Makefile4
-rw-r--r--devel/rubygem-stemmer/Makefile3
-rw-r--r--devel/rubygem-stomp/Makefile3
-rw-r--r--devel/rubygem-storable/Makefile3
-rw-r--r--devel/rubygem-stream/Makefile3
-rw-r--r--devel/rubygem-streetaddress/Makefile3
-rw-r--r--devel/rubygem-stringex/Makefile3
-rw-r--r--devel/rubygem-structured_warnings/Makefile3
-rw-r--r--devel/rubygem-subexec/Makefile3
-rw-r--r--devel/rubygem-sugar-high/Makefile3
-rw-r--r--devel/rubygem-sumbur/Makefile3
-rw-r--r--devel/rubygem-sundawg_country_codes/Makefile3
-rw-r--r--devel/rubygem-svn2git/Makefile3
-rw-r--r--devel/rubygem-sysinfo/Makefile4
-rw-r--r--devel/rubygem-systemu/Makefile3
-rw-r--r--devel/rubygem-table_print/Makefile3
-rw-r--r--devel/rubygem-tdiff/Makefile3
-rw-r--r--devel/rubygem-templater/Makefile3
-rw-r--r--devel/rubygem-temple/Makefile3
-rw-r--r--devel/rubygem-term-ansicolor/Makefile3
-rw-r--r--devel/rubygem-test-unit/Makefile3
-rw-r--r--devel/rubygem-thor/Makefile3
-rw-r--r--devel/rubygem-thread_safe/Makefile3
-rw-r--r--devel/rubygem-thread_safe1/Makefile3
-rw-r--r--devel/rubygem-thrift/Makefile3
-rw-r--r--devel/rubygem-tilt/Makefile3
-rw-r--r--devel/rubygem-tilt1/Makefile3
-rw-r--r--devel/rubygem-timers/Makefile3
-rw-r--r--devel/rubygem-tins/Makefile3
-rw-r--r--devel/rubygem-titlecase/Makefile3
-rw-r--r--devel/rubygem-toml/Makefile3
-rw-r--r--devel/rubygem-transaction-simple/Makefile3
-rw-r--r--devel/rubygem-travis/Makefile3
-rw-r--r--devel/rubygem-treetop/Makefile3
-rw-r--r--devel/rubygem-trollop/Makefile3
-rw-r--r--devel/rubygem-trollop1/Makefile3
-rw-r--r--devel/rubygem-turn/Makefile3
-rw-r--r--devel/rubygem-typed-array/Makefile3
-rw-r--r--devel/rubygem-tzinfo/Makefile3
-rw-r--r--devel/rubygem-tzinfo03/Makefile3
-rw-r--r--devel/rubygem-unicode-display_width/Makefile3
-rw-r--r--devel/rubygem-unicode/Makefile3
-rw-r--r--devel/rubygem-uuid/Makefile3
-rw-r--r--devel/rubygem-uuidtools/Makefile3
-rw-r--r--devel/rubygem-validatable/Makefile3
-rw-r--r--devel/rubygem-versionomy/Makefile3
-rw-r--r--devel/rubygem-virtus/Makefile3
-rw-r--r--devel/rubygem-warbler/Makefile3
-rw-r--r--devel/rubygem-warden/Makefile3
-rw-r--r--devel/rubygem-wdm/Makefile3
-rw-r--r--devel/rubygem-web-console/Makefile3
-rw-r--r--devel/rubygem-webby/Makefile3
-rw-r--r--devel/rubygem-wmi-lite/Makefile3
-rw-r--r--devel/rubygem-xpath/Makefile3
-rw-r--r--devel/rubygem-yajl-ruby/Makefile3
-rw-r--r--devel/rubygem-yui-compressor/Makefile3
-rw-r--r--devel/rubygem-zentest/Makefile3
-rw-r--r--dns/rubygem-dnsruby/Makefile3
-rw-r--r--dns/rubygem-net-dns/Makefile3
-rw-r--r--dns/rubygem-public_suffix/Makefile3
-rw-r--r--dns/rubygem-public_suffix_service/Makefile3
-rw-r--r--emulators/rubygem-fission/Makefile3
-rw-r--r--finance/rubygem-money/Makefile3
-rw-r--r--ftp/rubygem-curb/Makefile3
-rw-r--r--games/lolcat/Makefile3
-rw-r--r--games/rubygem-fortune_gem/Makefile3
-rw-r--r--graphics/rubygem-cairo/Makefile4
-rw-r--r--graphics/rubygem-captcha/Makefile3
-rw-r--r--graphics/rubygem-chunky_png/Makefile3
-rw-r--r--graphics/rubygem-clutter-gtk/Makefile3
-rw-r--r--graphics/rubygem-clutter/Makefile3
-rw-r--r--graphics/rubygem-dragonfly/Makefile4
-rw-r--r--graphics/rubygem-emoji/Makefile3
-rw-r--r--graphics/rubygem-exifr/Makefile3
-rw-r--r--graphics/rubygem-ezprint/Makefile3
-rw-r--r--graphics/rubygem-fastimage/Makefile3
-rw-r--r--graphics/rubygem-flamegraph/Makefile3
-rw-r--r--graphics/rubygem-gd2/Makefile3
-rw-r--r--graphics/rubygem-gdk_pixbuf2/Makefile3
-rw-r--r--graphics/rubygem-gemojione/Makefile3
-rw-r--r--graphics/rubygem-geokit/Makefile3
-rw-r--r--graphics/rubygem-gitlab_emoji/Makefile3
-rw-r--r--graphics/rubygem-goocanvas/Makefile3
-rw-r--r--graphics/rubygem-gruff/Makefile4
-rw-r--r--graphics/rubygem-image_science/Makefile3
-rw-r--r--graphics/rubygem-imagesize/Makefile3
-rw-r--r--graphics/rubygem-mini_magick/Makefile3
-rw-r--r--graphics/rubygem-objectdetect/Makefile4
-rw-r--r--graphics/rubygem-opengl/Makefile3
-rw-r--r--graphics/rubygem-pdfkit/Makefile3
-rw-r--r--graphics/rubygem-png/Makefile3
-rw-r--r--graphics/rubygem-railroad/Makefile3
-rw-r--r--graphics/rubygem-rmagick/Makefile4
-rw-r--r--graphics/rubygem-rsvg2/Makefile3
-rw-r--r--graphics/rubygem-ruby-graphviz/Makefile3
-rw-r--r--graphics/rubygem-scruffy/Makefile3
-rw-r--r--irc/rubygem-cinch/Makefile3
-rw-r--r--irc/rubygem-cogbot/Makefile3
-rw-r--r--irc/rubygem-lita-irc/Makefile3
-rw-r--r--irc/rubygem-net-irc/Makefile3
-rw-r--r--japanese/rubygem-jpmobile-ipaddresses/Makefile3
-rw-r--r--japanese/rubygem-jpmobile-terminfo/Makefile3
-rw-r--r--japanese/rubygem-jpmobile/Makefile3
-rw-r--r--japanese/rubygem-jpmobile4/Makefile3
-rw-r--r--japanese/rubygem-mail-iso-2022-jp/Makefile3
-rw-r--r--japanese/rubygem-myrurema/Makefile3
-rw-r--r--java/rubygem-rjb/Makefile3
-rw-r--r--mail/rubygem-actionmailer/Makefile3
-rw-r--r--mail/rubygem-actionmailer4/Makefile3
-rw-r--r--mail/rubygem-email_reply_parser-discourse/Makefile3
-rw-r--r--mail/rubygem-email_reply_parser/Makefile3
-rw-r--r--mail/rubygem-exception_notification/Makefile3
-rw-r--r--mail/rubygem-larch/Makefile3
-rw-r--r--mail/rubygem-mail/Makefile3
-rw-r--r--mail/rubygem-mail25/Makefile3
-rw-r--r--mail/rubygem-mail_room/Makefile3
-rw-r--r--mail/rubygem-mailboxer/Makefile3
-rw-r--r--mail/rubygem-mailfactory/Makefile3
-rw-r--r--mail/rubygem-pony/Makefile3
-rw-r--r--mail/rubygem-premailer-rails/Makefile3
-rw-r--r--mail/rubygem-premailer/Makefile3
-rw-r--r--mail/rubygem-rmail/Makefile3
-rw-r--r--mail/rubygem-roadie-rails/Makefile3
-rw-r--r--mail/rubygem-roadie/Makefile3
-rw-r--r--mail/rubygem-ruby-qmail/Makefile3
-rw-r--r--mail/rubygem-tmail/Makefile3
-rw-r--r--mail/rubygem-vmail/Makefile3
-rw-r--r--math/rubygem-expression_parser/Makefile3
-rw-r--r--math/rubygem-fftw3/Makefile3
-rw-r--r--math/rubygem-narray/Makefile3
-rw-r--r--math/rubygem-narray_miss/Makefile3
-rw-r--r--math/rubygem-numru-misc/Makefile3
-rw-r--r--math/rubygem-numru-units/Makefile3
-rw-r--r--math/rubygem-rb-gsl/Makefile3
-rw-r--r--misc/rubygem-dotenv/Makefile3
-rw-r--r--misc/rubygem-iesd/Makefile3
-rw-r--r--misc/rubygem-mime-types-data/Makefile3
-rw-r--r--misc/rubygem-mime-types/Makefile3
-rw-r--r--misc/rubygem-mime-types1/Makefile3
-rw-r--r--misc/rubygem-mimemagic/Makefile3
-rw-r--r--misc/rubygem-rabbit/Makefile4
-rw-r--r--misc/rubygem-vpim/Makefile3
-rw-r--r--multimedia/rubygem-clutter-gstreamer/Makefile3
-rw-r--r--multimedia/rubygem-flvtool2/Makefile3
-rw-r--r--multimedia/rubygem-gstreamer/Makefile3
-rw-r--r--net-im/rubygem-earthquake/Makefile3
-rw-r--r--net-im/rubygem-hipchat/Makefile3
-rw-r--r--net-im/rubygem-lita/Makefile3
-rw-r--r--net-im/rubygem-termtter/Makefile3
-rw-r--r--net-im/rubygem-tinder/Makefile3
-rw-r--r--net-mgmt/rubygem-blimpy/Makefile3
-rw-r--r--net-mgmt/rubygem-snmp/Makefile3
-rw-r--r--net-mgmt/rubygem-visage-app/Makefile3
-rw-r--r--net/rubygem-amazon-ec2/Makefile3
-rw-r--r--net/rubygem-amq-protocol/Makefile3
-rw-r--r--net/rubygem-amqp-utils/Makefile3
-rw-r--r--net/rubygem-amqp/Makefile3
-rw-r--r--net/rubygem-aws-s3/Makefile3
-rw-r--r--net/rubygem-aws-ses/Makefile3
-rw-r--r--net/rubygem-bunny/Makefile3
-rw-r--r--net/rubygem-connection_pool/Makefile3
-rw-r--r--net/rubygem-dogapi/Makefile3
-rw-r--r--net/rubygem-domain_name/Makefile3
-rw-r--r--net/rubygem-dropbox-sdk/Makefile3
-rw-r--r--net/rubygem-epp-client-afnic/Makefile3
-rw-r--r--net/rubygem-epp-client-base/Makefile3
-rw-r--r--net/rubygem-epp-client-rgp/Makefile3
-rw-r--r--net/rubygem-epp-client-secdns/Makefile3
-rw-r--r--net/rubygem-epp-client-smallregistry/Makefile3
-rw-r--r--net/rubygem-fog-aliyun/Makefile3
-rw-r--r--net/rubygem-fog-atmos/Makefile3
-rw-r--r--net/rubygem-fog-aws/Makefile3
-rw-r--r--net/rubygem-fog-brightbox/Makefile3
-rw-r--r--net/rubygem-fog-cloudatcost/Makefile3
-rw-r--r--net/rubygem-fog-dynect/Makefile3
-rw-r--r--net/rubygem-fog-ecloud/Makefile3
-rw-r--r--net/rubygem-fog-google/Makefile3
-rw-r--r--net/rubygem-fog-local/Makefile3
-rw-r--r--net/rubygem-fog-openstack/Makefile3
-rw-r--r--net/rubygem-fog-powerdns/Makefile3
-rw-r--r--net/rubygem-fog-profitbricks/Makefile3
-rw-r--r--net/rubygem-fog-rackspace/Makefile3
-rw-r--r--net/rubygem-fog-radosgw/Makefile3
-rw-r--r--net/rubygem-fog-riakcs/Makefile3
-rw-r--r--net/rubygem-fog-sakuracloud/Makefile3
-rw-r--r--net/rubygem-fog-serverlove/Makefile3
-rw-r--r--net/rubygem-fog-softlayer/Makefile3
-rw-r--r--net/rubygem-fog-storm_on_demand/Makefile3
-rw-r--r--net/rubygem-fog-terremark/Makefile3
-rw-r--r--net/rubygem-fog-vmfusion/Makefile3
-rw-r--r--net/rubygem-fog-voxel/Makefile3
-rw-r--r--net/rubygem-fog-vsphere/Makefile3
-rw-r--r--net/rubygem-fog-xenserver/Makefile3
-rw-r--r--net/rubygem-geoip/Makefile3
-rw-r--r--net/rubygem-gitlab_omniauth-ldap/Makefile3
-rw-r--r--net/rubygem-http_parser.rb/Makefile3
-rw-r--r--net/rubygem-httpauth/Makefile3
-rw-r--r--net/rubygem-ipaddress/Makefile3
-rw-r--r--net/rubygem-iproto/Makefile3
-rw-r--r--net/rubygem-lita-gems/Makefile3
-rw-r--r--net/rubygem-macaddr/Makefile3
-rw-r--r--net/rubygem-net-ldap/Makefile3
-rw-r--r--net/rubygem-net-netrc/Makefile3
-rw-r--r--net/rubygem-net-ping/Makefile3
-rw-r--r--net/rubygem-netrc/Makefile3
-rw-r--r--net/rubygem-network_interface/Makefile3
-rw-r--r--net/rubygem-oauth/Makefile3
-rw-r--r--net/rubygem-oauth2/Makefile3
-rw-r--r--net/rubygem-octokit/Makefile3
-rw-r--r--net/rubygem-octopress-deploy/Makefile3
-rw-r--r--net/rubygem-omniauth-auth0/Makefile3
-rw-r--r--net/rubygem-omniauth-azure-oauth2/Makefile3
-rw-r--r--net/rubygem-omniauth-facebook/Makefile3
-rw-r--r--net/rubygem-omniauth-github-discourse/Makefile3
-rw-r--r--net/rubygem-omniauth-github/Makefile3
-rw-r--r--net/rubygem-omniauth-google-oauth2/Makefile3
-rw-r--r--net/rubygem-omniauth-oauth/Makefile3
-rw-r--r--net/rubygem-omniauth-oauth2/Makefile3
-rw-r--r--net/rubygem-omniauth-openid/Makefile3
-rw-r--r--net/rubygem-omniauth-twitter/Makefile3
-rw-r--r--net/rubygem-open-uri-cached/Makefile3
-rw-r--r--net/rubygem-opennebula/Makefile3
-rw-r--r--net/rubygem-packetfu/Makefile4
-rw-r--r--net/rubygem-pcaprub/Makefile3
-rw-r--r--net/rubygem-rabbiter/Makefile3
-rw-r--r--net/rubygem-rbvmomi/Makefile4
-rw-r--r--net/rubygem-right_aws/Makefile3
-rw-r--r--net/rubygem-right_flexiscale/Makefile3
-rw-r--r--net/rubygem-right_gogrid/Makefile3
-rw-r--r--net/rubygem-right_http_connection/Makefile3
-rw-r--r--net/rubygem-right_slicehost/Makefile3
-rw-r--r--net/rubygem-rsync/Makefile3
-rw-r--r--net/rubygem-ruby-growl/Makefile3
-rw-r--r--net/rubygem-ruby-openid/Makefile3
-rw-r--r--net/rubygem-ruby-yadis/Makefile3
-rw-r--r--net/rubygem-rubyntlm/Makefile3
-rw-r--r--net/rubygem-rubytter/Makefile3
-rw-r--r--net/rubygem-rudy/Makefile4
-rw-r--r--net/rubygem-rye/Makefile4
-rw-r--r--net/rubygem-simple_oauth/Makefile3
-rw-r--r--net/rubygem-stompserver/Makefile3
-rw-r--r--net/rubygem-t/Makefile3
-rw-r--r--net/rubygem-tweetstream/Makefile3
-rw-r--r--net/rubygem-twitter-stream/Makefile3
-rw-r--r--net/rubygem-twitter/Makefile3
-rw-r--r--net/rubygem-twitter4r/Makefile3
-rw-r--r--net/rubygem-uri-redis/Makefile3
-rw-r--r--net/rubygem-whois/Makefile3
-rw-r--r--print/rubygem-afm/Makefile3
-rw-r--r--print/rubygem-color-tools/Makefile3
-rw-r--r--print/rubygem-color/Makefile3
-rw-r--r--print/rubygem-pdf-core/Makefile3
-rw-r--r--print/rubygem-pdf-reader/Makefile3
-rw-r--r--print/rubygem-pdf-writer/Makefile3
-rw-r--r--print/rubygem-prawn-core/Makefile3
-rw-r--r--print/rubygem-prawn-flexible-table/Makefile3
-rw-r--r--print/rubygem-prawn-format/Makefile3
-rw-r--r--print/rubygem-prawn-graph/Makefile3
-rw-r--r--print/rubygem-prawn-js/Makefile3
-rw-r--r--print/rubygem-prawn-layout/Makefile3
-rw-r--r--print/rubygem-prawn-security/Makefile3
-rw-r--r--print/rubygem-prawn-svg/Makefile3
-rw-r--r--print/rubygem-prawn/Makefile3
-rw-r--r--print/rubygem-rbpdf-font/Makefile3
-rw-r--r--print/rubygem-rbpdf/Makefile3
-rw-r--r--print/rubygem-ttfunk/Makefile3
-rw-r--r--russian/rubygem-russian/Makefile3
-rw-r--r--science/rubygem-ai4r/Makefile3
-rw-r--r--science/rubygem-cdo/Makefile3
-rw-r--r--science/rubygem-ruby-dcl/Makefile3
-rw-r--r--science/rubygem-ruby-netcdf/Makefile3
-rw-r--r--security/ruby-hmac/Makefile3
-rw-r--r--security/rubygem-attr_encrypted/Makefile3
-rw-r--r--security/rubygem-bcrypt-ruby/Makefile3
-rw-r--r--security/rubygem-bcrypt/Makefile3
-rw-r--r--security/rubygem-devise-two-factor/Makefile3
-rw-r--r--security/rubygem-doorkeeper/Makefile3
-rw-r--r--security/rubygem-encryptor/Makefile3
-rw-r--r--security/rubygem-ezcrypto/Makefile3
-rw-r--r--security/rubygem-gpgr/Makefile3
-rw-r--r--security/rubygem-gssapi/Makefile3
-rw-r--r--security/rubygem-jugyo-twitter_oauth/Makefile3
-rw-r--r--security/rubygem-metasploit-concern/Makefile3
-rw-r--r--security/rubygem-metasploit-credential/Makefile3
-rw-r--r--security/rubygem-metasploit-model/Makefile3
-rw-r--r--security/rubygem-metasploit-payloads/Makefile3
-rw-r--r--security/rubygem-metasploit_data_models/Makefile3
-rw-r--r--security/rubygem-net-scp/Makefile3
-rw-r--r--security/rubygem-net-sftp/Makefile3
-rw-r--r--security/rubygem-net-ssh-gateway/Makefile3
-rw-r--r--security/rubygem-net-ssh-multi/Makefile3
-rw-r--r--security/rubygem-net-ssh/Makefile4
-rw-r--r--security/rubygem-nmap-parser/Makefile3
-rw-r--r--security/rubygem-omniauth-bitbucket/Makefile3
-rw-r--r--security/rubygem-omniauth-cas3/Makefile3
-rw-r--r--security/rubygem-omniauth-gitlab/Makefile3
-rw-r--r--security/rubygem-omniauth-multipassword/Makefile3
-rw-r--r--security/rubygem-omniauth-saml/Makefile3
-rw-r--r--security/rubygem-omniauth-shibboleth/Makefile3
-rw-r--r--security/rubygem-omniauth/Makefile3
-rw-r--r--security/rubygem-origami/Makefile4
-rw-r--r--security/rubygem-pyu-ruby-sasl/Makefile3
-rw-r--r--security/rubygem-rack-oauth2/Makefile3
-rw-r--r--security/rubygem-razorback-scriptNugget/Makefile4
-rw-r--r--security/rubygem-recog/Makefile3
-rw-r--r--security/rubygem-roauth/Makefile3
-rw-r--r--security/rubygem-ruby-hmac/Makefile3
-rw-r--r--security/rubygem-ruby-rc4/Makefile3
-rw-r--r--security/rubygem-ruby-saml/Makefile3
-rw-r--r--security/rubygem-scrypt/Makefile3
-rw-r--r--security/rubygem-six/Makefile3
-rw-r--r--security/rubygem-sshkey/Makefile3
-rw-r--r--security/rubygem-sshkit/Makefile3
-rw-r--r--security/rubygem-twitter_oauth/Makefile3
-rw-r--r--sysutils/puppet-lint/Makefile3
-rw-r--r--sysutils/rhc/Makefile3
-rw-r--r--sysutils/rubygem-SyslogLogger/Makefile3
-rw-r--r--sysutils/rubygem-backup/Makefile3
-rw-r--r--sysutils/rubygem-bosh-gen/Makefile4
-rw-r--r--sysutils/rubygem-bosh_cli/Makefile3
-rw-r--r--sysutils/rubygem-bundler/Makefile3
-rw-r--r--sysutils/rubygem-bundler_ext/Makefile3
-rw-r--r--sysutils/rubygem-capistrano-ext/Makefile3
-rw-r--r--sysutils/rubygem-capistrano/Makefile3
-rw-r--r--sysutils/rubygem-chef-api/Makefile3
-rw-r--r--sysutils/rubygem-chef-zero/Makefile3
-rw-r--r--sysutils/rubygem-chef/Makefile3
-rw-r--r--sysutils/rubygem-facter/Makefile3
-rw-r--r--sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile3
-rw-r--r--sysutils/rubygem-fluent-plugin-config-expander/Makefile3
-rw-r--r--sysutils/rubygem-fluent-plugin-file-alternative/Makefile3
-rw-r--r--sysutils/rubygem-fluent-plugin-tail-asis/Makefile3
-rw-r--r--sysutils/rubygem-fluentd/Makefile3
-rw-r--r--sysutils/rubygem-fluentd010/Makefile3
-rw-r--r--sysutils/rubygem-fssm/Makefile3
-rw-r--r--sysutils/rubygem-god/Makefile3
-rw-r--r--sysutils/rubygem-guard-compat/Makefile3
-rw-r--r--sysutils/rubygem-guard-livereload/Makefile3
-rw-r--r--sysutils/rubygem-guard-minitest/Makefile3
-rw-r--r--sysutils/rubygem-guard-rspec/Makefile3
-rw-r--r--sysutils/rubygem-guard/Makefile3
-rw-r--r--sysutils/rubygem-hammer_cli/Makefile3
-rw-r--r--sysutils/rubygem-hammer_cli_foreman/Makefile3
-rw-r--r--sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile3
-rw-r--r--sysutils/rubygem-hammer_cli_foreman_salt/Makefile3
-rw-r--r--sysutils/rubygem-hammer_cli_foreman_ssh/Makefile3
-rw-r--r--sysutils/rubygem-hiera-file/Makefile3
-rw-r--r--sysutils/rubygem-hiera/Makefile3
-rw-r--r--sysutils/rubygem-hiera1/Makefile3
-rw-r--r--sysutils/rubygem-hieracles/Makefile3
-rw-r--r--sysutils/rubygem-librarian-puppet/Makefile3
-rw-r--r--sysutils/rubygem-log4r/Makefile3
-rw-r--r--sysutils/rubygem-logify/Makefile3
-rw-r--r--sysutils/rubygem-mogilefs-client/Makefile3
-rw-r--r--sysutils/rubygem-mothra/Makefile3
-rw-r--r--sysutils/rubygem-murder/Makefile4
-rw-r--r--sysutils/rubygem-ohai/Makefile3
-rw-r--r--sysutils/rubygem-parallel/Makefile3
-rw-r--r--sysutils/rubygem-puppet_forge/Makefile3
-rw-r--r--sysutils/rubygem-puppet_forge1/Makefile3
-rw-r--r--sysutils/rubygem-r10k/Makefile4
-rw-r--r--sysutils/rubygem-rubyipmi/Makefile3
-rw-r--r--sysutils/rubygem-shellany/Makefile3
-rw-r--r--sysutils/rubygem-smart_proxy_chef/Makefile3
-rw-r--r--sysutils/rubygem-smart_proxy_dynflow/Makefile3
-rw-r--r--sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile3
-rw-r--r--sysutils/rubygem-smart_proxy_salt/Makefile4
-rw-r--r--sysutils/rubygem-sys-admin/Makefile3
-rw-r--r--sysutils/rubygem-sys-cpu/Makefile3
-rw-r--r--sysutils/rubygem-sys-filesystem/Makefile3
-rw-r--r--sysutils/rubygem-sys-host/Makefile3
-rw-r--r--sysutils/rubygem-sys-proctable/Makefile3
-rw-r--r--sysutils/rubygem-sys-uname/Makefile3
-rw-r--r--sysutils/rubygem-sys-uptime/Makefile3
-rw-r--r--sysutils/rubygem-teamocil/Makefile3
-rw-r--r--sysutils/rubygem-winrm-fs/Makefile3
-rw-r--r--sysutils/rubygem-winrm/Makefile3
-rw-r--r--sysutils/rubygem-yell/Makefile3
-rw-r--r--textproc/rubygem-actionpack-xml_parser/Makefile3
-rw-r--r--textproc/rubygem-albino/Makefile4
-rw-r--r--textproc/rubygem-amatch/Makefile3
-rw-r--r--textproc/rubygem-asciidoctor/Makefile3
-rw-r--r--textproc/rubygem-autoprefixer-rails/Makefile3
-rw-r--r--textproc/rubygem-babosa/Makefile3
-rw-r--r--textproc/rubygem-charlock_holmes/Makefile3
-rw-r--r--textproc/rubygem-coderay/Makefile3
-rw-r--r--textproc/rubygem-colorator/Makefile3
-rw-r--r--textproc/rubygem-colored/Makefile3
-rw-r--r--textproc/rubygem-compass-core/Makefile3
-rw-r--r--textproc/rubygem-compass-import-once/Makefile3
-rw-r--r--textproc/rubygem-compass-rails/Makefile3
-rw-r--r--textproc/rubygem-compass/Makefile3
-rw-r--r--textproc/rubygem-creole/Makefile3
-rw-r--r--textproc/rubygem-css_parser/Makefile3
-rw-r--r--textproc/rubygem-cssmin/Makefile3
-rw-r--r--textproc/rubygem-diff-lcs/Makefile4
-rw-r--r--textproc/rubygem-diffy/Makefile3
-rw-r--r--textproc/rubygem-elasticsearch-api/Makefile3
-rw-r--r--textproc/rubygem-elasticsearch-transport/Makefile3
-rw-r--r--textproc/rubygem-elasticsearch/Makefile3
-rw-r--r--textproc/rubygem-emot/Makefile3
-rw-r--r--textproc/rubygem-escape_utils-rails4/Makefile3
-rw-r--r--textproc/rubygem-escape_utils/Makefile3
-rw-r--r--textproc/rubygem-ezamar/Makefile3
-rw-r--r--textproc/rubygem-fast_xs/Makefile3
-rw-r--r--textproc/rubygem-fast_xs073/Makefile3
-rw-r--r--textproc/rubygem-ferret/Makefile3
-rw-r--r--textproc/rubygem-fog-xml/Makefile3
-rw-r--r--textproc/rubygem-gemoji/Makefile3
-rw-r--r--textproc/rubygem-gherkin/Makefile3
-rw-r--r--textproc/rubygem-gherkin3/Makefile3
-rw-r--r--textproc/rubygem-github-linguist/Makefile3
-rw-r--r--textproc/rubygem-github-markdown/Makefile3
-rw-r--r--textproc/rubygem-github-markup/Makefile4
-rw-r--r--textproc/rubygem-gitlab-grit/Makefile3
-rw-r--r--textproc/rubygem-gitlab-linguist/Makefile3
-rw-r--r--textproc/rubygem-heredoc_unindent/Makefile3
-rw-r--r--textproc/rubygem-hikidoc/Makefile3
-rw-r--r--textproc/rubygem-html-pipeline-gitlab/Makefile3
-rw-r--r--textproc/rubygem-html-pipeline/Makefile3
-rw-r--r--textproc/rubygem-html-pipeline1/Makefile3
-rw-r--r--textproc/rubygem-htmlentities/Makefile3
-rw-r--r--textproc/rubygem-ini/Makefile3
-rw-r--r--textproc/rubygem-itextomml/Makefile3
-rw-r--r--textproc/rubygem-jekyll-assets/Makefile3
-rw-r--r--textproc/rubygem-jekyll-feed/Makefile3
-rw-r--r--textproc/rubygem-jekyll-gist/Makefile3
-rw-r--r--textproc/rubygem-jekyll-mentions/Makefile3
-rw-r--r--textproc/rubygem-jekyll-paginate/Makefile4
-rw-r--r--textproc/rubygem-jekyll-redirect-from/Makefile3
-rw-r--r--textproc/rubygem-jekyll-sass-converter/Makefile3
-rw-r--r--textproc/rubygem-jekyll-sitemap/Makefile3
-rw-r--r--textproc/rubygem-jemoji/Makefile3
-rw-r--r--textproc/rubygem-jsmin/Makefile3
-rw-r--r--textproc/rubygem-kramdown/Makefile4
-rw-r--r--textproc/rubygem-kwalify/Makefile3
-rw-r--r--textproc/rubygem-libxml-ruby/Makefile3
-rw-r--r--textproc/rubygem-linguistics/Makefile4
-rw-r--r--textproc/rubygem-liquid/Makefile3
-rw-r--r--textproc/rubygem-liquid2/Makefile3
-rw-r--r--textproc/rubygem-loggability/Makefile3
-rw-r--r--textproc/rubygem-loofah/Makefile3
-rw-r--r--textproc/rubygem-ltsv/Makefile3
-rw-r--r--textproc/rubygem-markaby/Makefile3
-rw-r--r--textproc/rubygem-multi_xml/Makefile3
-rw-r--r--textproc/rubygem-nokogiri-diff/Makefile3
-rw-r--r--textproc/rubygem-nokogiri/Makefile4
-rw-r--r--textproc/rubygem-nokogiri14/Makefile4
-rw-r--r--textproc/rubygem-nokogumbo/Makefile4
-rw-r--r--textproc/rubygem-octopress-escape-code/Makefile3
-rw-r--r--textproc/rubygem-opml/Makefile3
-rw-r--r--textproc/rubygem-org-ruby/Makefile3
-rw-r--r--textproc/rubygem-parslet/Makefile3
-rw-r--r--textproc/rubygem-phone/Makefile3
-rw-r--r--textproc/rubygem-rails-dom-testing/Makefile3
-rw-r--r--textproc/rubygem-rails-html-sanitizer/Makefile3
-rw-r--r--textproc/rubygem-rak/Makefile3
-rw-r--r--textproc/rubygem-rchardet/Makefile3
-rw-r--r--textproc/rubygem-rdiscount/Makefile3
-rw-r--r--textproc/rubygem-rdtool/Makefile6
-rw-r--r--textproc/rubygem-redcarpet/Makefile3
-rw-r--r--textproc/rubygem-reverse_markdown/Makefile3
-rw-r--r--textproc/rubygem-ri_cal/Makefile3
-rw-r--r--textproc/rubygem-rich/Makefile3
-rw-r--r--textproc/rubygem-rmmseg-cpp/Makefile4
-rw-r--r--textproc/rubygem-rouge/Makefile3
-rw-r--r--textproc/rubygem-rttool/Makefile3
-rw-r--r--textproc/rubygem-ruby-augeas/Makefile4
-rw-r--r--textproc/rubygem-ruby-xslt/Makefile3
-rw-r--r--textproc/rubygem-rubypants/Makefile3
-rw-r--r--textproc/rubygem-rugments/Makefile3
-rw-r--r--textproc/rubygem-sanitize/Makefile3
-rw-r--r--textproc/rubygem-sass-rails/Makefile3
-rw-r--r--textproc/rubygem-sass-rails4/Makefile3
-rw-r--r--textproc/rubygem-sass-rails5/Makefile3
-rw-r--r--textproc/rubygem-sass/Makefile3
-rw-r--r--textproc/rubygem-sass32/Makefile3
-rw-r--r--textproc/rubygem-sax-machine/Makefile3
-rw-r--r--textproc/rubygem-scss_lint/Makefile3
-rw-r--r--textproc/rubygem-shell2html/Makefile3
-rw-r--r--textproc/rubygem-simplecov-html/Makefile3
-rw-r--r--textproc/rubygem-spreadsheet/Makefile3
-rw-r--r--textproc/rubygem-stamp/Makefile3
-rw-r--r--textproc/rubygem-string-scrub/Makefile3
-rw-r--r--textproc/rubygem-syntax/Makefile3
-rw-r--r--textproc/rubygem-termcolor/Makefile3
-rw-r--r--textproc/rubygem-terminal-table/Makefile3
-rw-r--r--textproc/rubygem-text/Makefile3
-rw-r--r--textproc/rubygem-tidy/Makefile3
-rw-r--r--textproc/rubygem-twitter-text/Makefile3
-rw-r--r--textproc/rubygem-unf/Makefile3
-rw-r--r--textproc/rubygem-unf_ext/Makefile3
-rw-r--r--textproc/rubygem-version_sorter/Makefile3
-rw-r--r--textproc/rubygem-wikicloth/Makefile3
-rw-r--r--textproc/rubygem-xml-simple/Makefile3
-rw-r--r--textproc/rubygem-ya2yaml/Makefile3
-rw-r--r--textproc/rubygem-yard-chef/Makefile3
-rw-r--r--textproc/rubygem-yard/Makefile3
-rw-r--r--textproc/rubygem-zmq/Makefile3
-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
-rw-r--r--x11-toolkits/rubygem-gdk3/Makefile3
-rw-r--r--x11-toolkits/rubygem-gtk2/Makefile3
-rw-r--r--x11-toolkits/rubygem-gtk3/Makefile3
-rw-r--r--x11-toolkits/rubygem-gtksourceview2/Makefile3
-rw-r--r--x11-toolkits/rubygem-gtksourceview3/Makefile3
-rw-r--r--x11-toolkits/rubygem-pango/Makefile3
-rw-r--r--x11-toolkits/rubygem-poppler/Makefile3
-rw-r--r--x11-toolkits/rubygem-vte/Makefile3
-rw-r--r--x11-toolkits/rubygem-vte3/Makefile3
1196 files changed, 1342 insertions, 2608 deletions
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
new file mode 100644
index 000000000000..4953b9df6dc3
--- /dev/null
+++ b/Mk/Uses/gem.mk
@@ -0,0 +1,144 @@
+# $FreeBSD$
+#
+# Support rubygem packages
+#
+# Feature: gem
+# Usage: USES=gem[:autoplist]
+# Valid args: autoplist Automatically generate packing list
+#
+# MAINTAINER: portmgr@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_GEM_MK)
+
+_INCLUDE_USES_GEM_MK= yes
+
+BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
+RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
+
+PKGNAMEPREFIX?= rubygem-
+EXTRACT_SUFX= .gem
+EXTRACT_ONLY=
+DIST_SUBDIR= rubygem
+
+EXTRACT_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
+GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER}
+GEMS_DIR= ${GEMS_BASE_DIR}/gems
+DOC_DIR= ${GEMS_BASE_DIR}/doc
+CACHE_DIR= ${GEMS_BASE_DIR}/cache
+SPEC_DIR= ${GEMS_BASE_DIR}/specifications
+EXT_DIR= ${GEMS_BASE_DIR}/extensions
+GEM_NAME?= ${PORTNAME}-${PORTVERSION}
+GEM_LIB_DIR?= ${GEMS_DIR}/${GEM_NAME}
+GEM_DOC_DIR?= ${DOC_DIR}/${GEM_NAME}
+GEM_SPEC?= ${SPEC_DIR}/${GEM_NAME}.gemspec
+GEM_CACHE?= ${CACHE_DIR}/${GEM_NAME}.gem
+GEMSPEC= ${PORTNAME}.gemspec
+GEM_ENV+= RB_USER_INSTALL=yes
+
+.if defined(LANG) && !empty(LANG)
+GEM_ENV+= LANG=${LANG}
+.else
+GEM_ENV+= LANG=en_US.UTF-8
+.endif
+
+.if defined(LC_ALL) && !empty(LC_ALL)
+GEM_ENV+= LC_ALL=${LC_ALL}
+.else
+GEM_ENV+= LC_ALL=en_US.UTF-8
+.endif
+
+.if defined(LC_CTYPE) && !empty(LC_CTYPE)
+GEM_ENV+= LC_CTYPE=${LC_CTYPE}
+.else
+GEM_ENV+= LC_CTYPE=UTF-8
+.endif
+
+PLIST_SUB+= PORTVERSION="${PORTVERSION}" \
+ REV="${RUBY_GEM}" \
+ GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \
+ GEMS_DIR="${GEMS_DIR}" \
+ DOC_DIR="${DOC_DIR}" \
+ CACHE_DIR="${CACHE_DIR}" \
+ SPEC_DIR="${SPEC_DIR}" \
+ EXT_DIR="${EXT_DIR}" \
+ PORT="${PORTNAME}-${PORTVERSION}" \
+ GEM_NAME="${GEM_NAME}" \
+ GEM_LIB_DIR="${GEM_LIB_DIR}" \
+ GEM_DOC_DIR="${GEM_DOC_DIR}" \
+ GEM_SPEC="${GEM_SPEC}" \
+ GEM_CACHE="${GEM_CACHE}" \
+ EXTRACT_SUFX="${EXTRACT_SUFX}"
+
+RUBYGEMBIN= ${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
+
+. if defined(DISTFILES)
+GEMFILES= ${DISTFILES:C/:[^:]+$//}
+. else
+GEMFILES= ${DISTNAME}${EXTRACT_SUFX}
+. endif
+
+RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
+
+.if ${PORT_OPTIONS:MDOCS}
+RUBYGEM_ARGS+= --rdoc --ri
+.else
+RUBYGEM_ARGS+= --no-rdoc --no-ri
+.endif
+
+.if !target(do-extract)
+do-extract:
+ @${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
+ @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
+ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
+ ${ECHO_MSG} "===> Extraction failed unexpectedly."; \
+ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+.endif
+
+.if !target(do-build)
+do-build:
+ @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \
+ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+.endif
+
+.if !target(do-install)
+do-install:
+ (cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
+ ${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
+ ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
+ ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
+ ${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
+ ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
+ ${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
+.if defined(NOPORTDOCS)
+ -@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
+.endif
+.endif
+
+.if ${gem_ARGS} == "autoplist"
+.if !target(post-install-script)
+post-install-script:
+ @${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
+ @${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
+ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+.endif
+ @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
+ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
+ @if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
+ ${FIND} -ds ${STAGEDIR}${PREFIX}/${EXT_DIR} -type f -print | ${SED} -E -e \
+ 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
+ fi
+.endif
+.else
+IGNORE= Incorrect 'USES+=gem:${gem_ARGS}' expecting 'USES+=gem[:autoplist]'
+.endif
+
+.endif
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index e3b868ff9ac0..e8cd9c4981fa 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -56,10 +56,7 @@ Ruby_Include_MAINTAINER= ruby@FreeBSD.org
# documents from. If this is defined and not empty,
# USE_RUBY_RDTOOL is implied and RUBY_RD_HTML_FILES is
# defined.
-# USE_RUBYGEMS - Says that the port uses rubygems packaging system.
-# RUBYGEM_AUTOPLIST - Generate packing list for rubygems based port
-# automatically.
-#
+# USE_RUBYGEMS - Do not use this -- instead USES=gem
#
# [variables that each port should not (re)define]
#
@@ -263,24 +260,6 @@ _RUBY_VENDORDIR?= ${_RUBY_SYSLIBDIR}/ruby/vendor_ruby
.if !defined(_INVALID_RUBY_VER)
-.if defined(LANG) && !empty(LANG)
-GEM_ENV+= LANG=${LANG}
-.else
-GEM_ENV+= LANG=en_US.UTF-8
-.endif
-
-.if defined(LC_ALL) && !empty(LC_ALL)
-GEM_ENV+= LC_ALL=${LC_ALL}
-.else
-GEM_ENV+= LC_ALL=en_US.UTF-8
-.endif
-
-.if defined(LC_CTYPE) && !empty(LC_CTYPE)
-GEM_ENV+= LC_CTYPE=${LC_CTYPE}
-.else
-GEM_ENV+= LC_CTYPE=UTF-8
-.endif
-
RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//}
RUBY_DISTVERSION?= ${RUBY_VERSION}
@@ -392,122 +371,6 @@ RUBY_FLAGS+= -d
.endif
#
-# RubyGems support
-#
-.if defined(USE_RUBYGEMS)
-
-BUILD_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
-RUN_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
-
-PKGNAMEPREFIX?= rubygem-
-EXTRACT_SUFX= .gem
-EXTRACT_ONLY=
-DIST_SUBDIR= rubygem
-
-EXTRACT_DEPENDS+= ${RUBYGEMBIN}:devel/ruby-gems
-GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER}
-GEMS_DIR= ${GEMS_BASE_DIR}/gems
-DOC_DIR= ${GEMS_BASE_DIR}/doc
-CACHE_DIR= ${GEMS_BASE_DIR}/cache
-SPEC_DIR= ${GEMS_BASE_DIR}/specifications
-EXT_DIR= ${GEMS_BASE_DIR}/extensions
-GEM_NAME?= ${PORTNAME}-${PORTVERSION}
-GEM_LIB_DIR?= ${GEMS_DIR}/${GEM_NAME}
-GEM_DOC_DIR?= ${DOC_DIR}/${GEM_NAME}
-GEM_SPEC?= ${SPEC_DIR}/${GEM_NAME}.gemspec
-GEM_CACHE?= ${CACHE_DIR}/${GEM_NAME}.gem
-
-PLIST_SUB+= PORTVERSION="${PORTVERSION}" \
- REV="${RUBY_GEM}" \
- GEMS_BASE_DIR="lib/ruby/gems/${RUBY_VER}" \
- GEMS_DIR="${GEMS_DIR}" \
- DOC_DIR="${DOC_DIR}" \
- CACHE_DIR="${CACHE_DIR}" \
- SPEC_DIR="${SPEC_DIR}" \
- EXT_DIR="${EXT_DIR}" \
- PORT="${PORTNAME}-${PORTVERSION}" \
- GEM_NAME="${GEM_NAME}" \
- GEM_LIB_DIR="${GEM_LIB_DIR}" \
- GEM_DOC_DIR="${GEM_DOC_DIR}" \
- GEM_SPEC="${GEM_SPEC}" \
- GEM_CACHE="${GEM_CACHE}" \
- EXTRACT_SUFX="${EXTRACT_SUFX}"
-
-RUBYGEMBIN= ${LOCALBASE}/bin/gem${RUBY_VER:S/.//}
-
-. if defined(DISTFILES)
-GEMFILES= ${DISTFILES:C/:[^:]+$//}
-. else
-GEMFILES= ${DISTNAME}${EXTRACT_SUFX}
-. endif
-
-GEMSPEC= ${PORTNAME}.gemspec
-
-RUBYGEM_ARGS=-l --no-update-sources --install-dir ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} --ignore-dependencies --bindir=${STAGEDIR}${PREFIX}/bin
-GEM_ENV+= RB_USER_INSTALL=yes
-.if defined(NOPORTDOCS)
-RUBYGEM_ARGS+= --no-rdoc --no-ri
-.else
-RUBYGEM_ARGS+= --rdoc --ri
-.endif
-
-.if !target(do-extract)
-do-extract:
- @${SETENV} ${GEM_ENV} ${RUBYGEMBIN} unpack --target=${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES}
- @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} spec --ruby ${DISTDIR}/${DIST_SUBDIR}/${GEMFILES} > ${GEMSPEC} ; then \
- if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
- ${ECHO_MSG} "===> Extraction failed unexpectedly."; \
- (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
- fi; \
- ${FALSE}; \
- fi)
-.endif
-
-.if !target(do-build)
-do-build:
- @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} build --force ${GEMSPEC} ; then \
- if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
- ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
- (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \
- fi; \
- ${FALSE}; \
- fi)
-.endif
-
-.if !target(do-install)
-do-install:
- (cd ${BUILD_WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBYGEMBIN} install ${RUBYGEM_ARGS} ${GEMFILES} -- --build-args ${CONFIGURE_ARGS})
- ${RM} -r ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info/
- ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f -name '*.so' -exec ${STRIP_CMD} {} +
- ${FIND} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} -type f \( -name mkmf.log -or -name gem_make.out \) -delete
- ${RM} -rf ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
- ${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
- ${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
-.if defined(NOPORTDOCS)
- -@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
-.endif
-.endif
-
-. if defined(RUBYGEM_AUTOPLIST)
-. if !target(post-install-script)
-post-install-script:
- @${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
- @${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
- 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
-.endif
- @${FIND} -ds ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR} -type f -print | ${SED} -E -e \
- 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
- @if [ -d ${STAGEDIR}${PREFIX}/${EXT_DIR} ]; then \
- ${FIND} -ds ${STAGEDIR}${PREFIX}/${EXT_DIR} -type f -print | ${SED} -E -e \
- 's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST} ; \
- fi
-. endif
-. endif
-
-.endif # USE_RUBYGEMS
-
-#
# extconf.rb support
#
.if defined(USE_RUBY_EXTCONF)
diff --git a/accessibility/rubygem-atk/Makefile b/accessibility/rubygem-atk/Makefile
index 1260ee8a135f..64123b8c6a1b 100644
--- a/accessibility/rubygem-atk/Makefile
+++ b/accessibility/rubygem-atk/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
USE_GNOME= atk
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/archivers/rubygem-archive-tar-minitar/Makefile b/archivers/rubygem-archive-tar-minitar/Makefile
index 7a19c813474e..8005646dc448 100644
--- a/archivers/rubygem-archive-tar-minitar/Makefile
+++ b/archivers/rubygem-archive-tar-minitar/Makefile
@@ -14,8 +14,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/minitar
diff --git a/archivers/rubygem-archive-zip/Makefile b/archivers/rubygem-archive-zip/Makefile
index b80675bb09f5..5d9ffa8f637d 100644
--- a/archivers/rubygem-archive-zip/Makefile
+++ b/archivers/rubygem-archive-zip/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-io-like>=0.3.0:devel/rubygem-io-like
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/archivers/rubygem-bzip2-ruby/Makefile b/archivers/rubygem-bzip2-ruby/Makefile
index 829aeaea9ee8..de4a6c5fcd21 100644
--- a/archivers/rubygem-bzip2-ruby/Makefile
+++ b/archivers/rubygem-bzip2-ruby/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/archivers/rubygem-libarchive/Makefile b/archivers/rubygem-libarchive/Makefile
index 2fa674148bd3..c603d3bc2740 100644
--- a/archivers/rubygem-libarchive/Makefile
+++ b/archivers/rubygem-libarchive/Makefile
@@ -12,10 +12,8 @@ COMMENT= Ruby bindings for libarchive
LICENSE= BSD3CLAUSE
-USES= dos2unix libarchive
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= dos2unix gem:autoplist libarchive
DOS2UNIX_FILES= ext/depend
diff --git a/archivers/rubygem-minitar/Makefile b/archivers/rubygem-minitar/Makefile
index 70330cf9d075..5a6c07b09d29 100644
--- a/archivers/rubygem-minitar/Makefile
+++ b/archivers/rubygem-minitar/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/minitar
diff --git a/archivers/rubygem-ruby-xz/Makefile b/archivers/rubygem-ruby-xz/Makefile
index 60b18009fc84..ab1750545118 100644
--- a/archivers/rubygem-ruby-xz/Makefile
+++ b/archivers/rubygem-ruby-xz/Makefile
@@ -9,7 +9,6 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby bindings for the liblzma library
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/archivers/rubygem-rubyzip/Makefile b/archivers/rubygem-rubyzip/Makefile
index 3b0f1b214bbc..65ebebc4caf0 100644
--- a/archivers/rubygem-rubyzip/Makefile
+++ b/archivers/rubygem-rubyzip/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/archivers/rubygem-rubyzip2/Makefile b/archivers/rubygem-rubyzip2/Makefile
index 6540e819a8f6..5661dfbd35e8 100644
--- a/archivers/rubygem-rubyzip2/Makefile
+++ b/archivers/rubygem-rubyzip2/Makefile
@@ -12,7 +12,6 @@ COMMENT= Ruby compatible Zip library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/audio/rubygem-librmpd/Makefile b/audio/rubygem-librmpd/Makefile
index 2c3627904305..2fd2023790e6 100644
--- a/audio/rubygem-librmpd/Makefile
+++ b/audio/rubygem-librmpd/Makefile
@@ -12,7 +12,6 @@ COMMENT= Is a simple yet powerful Music Player Daemon library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/audio/rubygem-ruby-mp3info/Makefile b/audio/rubygem-ruby-mp3info/Makefile
index 8602ae62c87e..52a4d41e1cf0 100644
--- a/audio/rubygem-ruby-mp3info/Makefile
+++ b/audio/rubygem-ruby-mp3info/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/audio/rubygem-ruby-ogginfo/Makefile b/audio/rubygem-ruby-ogginfo/Makefile
index a6cb11c2c774..2118a700a03e 100644
--- a/audio/rubygem-ruby-ogginfo/Makefile
+++ b/audio/rubygem-ruby-ogginfo/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/audio/rubygem-ruby-shout/Makefile b/audio/rubygem-ruby-shout/Makefile
index db4d11c8eda5..cbe85aa94c50 100644
--- a/audio/rubygem-ruby-shout/Makefile
+++ b/audio/rubygem-ruby-shout/Makefile
@@ -16,7 +16,6 @@ LIB_DEPENDS= libshout.so:audio/libshout
CONFIGURE_ARGS= --with-opt-include="${LOCALBASE}/include"
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/benchmarks/rubygem-benchmark-ips/Makefile b/benchmarks/rubygem-benchmark-ips/Makefile
index 3b10db39aa4c..c9ac26706b1d 100644
--- a/benchmarks/rubygem-benchmark-ips/Makefile
+++ b/benchmarks/rubygem-benchmark-ips/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/benchmarks/rubygem-railsbench/Makefile b/benchmarks/rubygem-railsbench/Makefile
index 6ce1ea3c5aaa..2e0a278fe8a0 100644
--- a/benchmarks/rubygem-railsbench/Makefile
+++ b/benchmarks/rubygem-railsbench/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/railsbench
diff --git a/comms/rubygem-callsign/Makefile b/comms/rubygem-callsign/Makefile
index 43055b2b257e..f2f0fac27676 100644
--- a/comms/rubygem-callsign/Makefile
+++ b/comms/rubygem-callsign/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-hashie>=0:devel/rubygem-hashie \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/comms/rubygem-ruby-termios/Makefile b/comms/rubygem-ruby-termios/Makefile
index 65bd5955cf9a..ce70864f7e05 100644
--- a/comms/rubygem-ruby-termios/Makefile
+++ b/comms/rubygem-ruby-termios/Makefile
@@ -12,7 +12,6 @@ LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/converters/rubygem-bsdconv/Makefile b/converters/rubygem-bsdconv/Makefile
index bd9eb0f18995..c66eb0fe4c8b 100644
--- a/converters/rubygem-bsdconv/Makefile
+++ b/converters/rubygem-bsdconv/Makefile
@@ -19,7 +19,6 @@ CONFIGURE_ARGS+=--with-bsdconv-dir=${LOCALBASE}
GEM_NAME= ${DISTNAME}
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-activemodel/Makefile b/databases/rubygem-activemodel/Makefile
index 5983eabfc089..1eaf20268182 100644
--- a/databases/rubygem-activemodel/Makefile
+++ b/databases/rubygem-activemodel/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-activemodel4/Makefile b/databases/rubygem-activemodel4/Makefile
index a04fc3894261..16290bd1bac4 100644
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-jdbc-adapter/Makefile b/databases/rubygem-activerecord-jdbc-adapter/Makefile
index 2c57c35a4f05..173160463c95 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@@ -17,7 +17,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/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index ae0af6409ff5..f882a987752f 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -18,7 +18,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/databases/rubygem-activerecord-mysql-adapter/Makefile b/databases/rubygem-activerecord-mysql-adapter/Makefile
index 48ad9c374fd9..88a8eddb22ec 100644
--- a/databases/rubygem-activerecord-mysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-mysql-adapter/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord>=3.2.9:databases/rubygem-activerecord \
rubygem-mysql>=2.9.0:databases/rubygem-mysql
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-session_store/Makefile b/databases/rubygem-activerecord-session_store/Makefile
index 685f19206ec3..dc949e1cca94 100644
--- a/databases/rubygem-activerecord-session_store/Makefile
+++ b/databases/rubygem-activerecord-session_store/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/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 4f8a76bfba7a..bbddc4bb3d52 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
OPTIONS_DEFINE= MYSQL PGSQL SQLITE3
MYSQL_DESC= Use native MySQL bindings
diff --git a/databases/rubygem-activerecord4/Makefile b/databases/rubygem-activerecord4/Makefile
index c526c51d8387..25d389190e87 100644
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@@ -19,7 +19,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/databases/rubygem-after_commit_queue/Makefile b/databases/rubygem-after_commit_queue/Makefile
index c57cf12a033c..dbb9dac1e516 100644
--- a/databases/rubygem-after_commit_queue/Makefile
+++ b/databases/rubygem-after_commit_queue/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS?= rubygem-activerecord4>=3.0: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/databases/rubygem-amalgalite/Makefile b/databases/rubygem-amalgalite/Makefile
index 13ed667c22bd..43e752f69519 100644
--- a/databases/rubygem-amalgalite/Makefile
+++ b/databases/rubygem-amalgalite/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-arrayfields>=4.9:devel/rubygem-arrayfields
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/amalgalite-pack
diff --git a/databases/rubygem-arel-helpers/Makefile b/databases/rubygem-arel-helpers/Makefile
index e30f03a807cb..110f509f4a11 100644
--- a/databases/rubygem-arel-helpers/Makefile
+++ b/databases/rubygem-arel-helpers/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-activerecord>=3.1.0:databases/rubygem-activerecord
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-arel/Makefile b/databases/rubygem-arel/Makefile
index b8d352b308ba..6cd24f4ef678 100644
--- a/databases/rubygem-arel/Makefile
+++ b/databases/rubygem-arel/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/databases/rubygem-arel3/Makefile b/databases/rubygem-arel3/Makefile
index 0750824273b0..880868fa95ba 100644
--- a/databases/rubygem-arel3/Makefile
+++ b/databases/rubygem-arel3/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= ignore
diff --git a/databases/rubygem-arel5/Makefile b/databases/rubygem-arel5/Makefile
index 10c5225dc1af..b7b7e245b12b 100644
--- a/databases/rubygem-arel5/Makefile
+++ b/databases/rubygem-arel5/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/databases/rubygem-arel6/Makefile b/databases/rubygem-arel6/Makefile
index c57358672213..5b7d130f3ded 100644
--- a/databases/rubygem-arel6/Makefile
+++ b/databases/rubygem-arel6/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/databases/rubygem-awesome_nested_set/Makefile b/databases/rubygem-awesome_nested_set/Makefile
index 1611a209eb51..c392236859aa 100644
--- a/databases/rubygem-awesome_nested_set/Makefile
+++ b/databases/rubygem-awesome_nested_set/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=4.0.0: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/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile
index 5dd8f7b448c9..0e3ef3a9d60a 100644
--- a/databases/rubygem-bdb1/Makefile
+++ b/databases/rubygem-bdb1/Makefile
@@ -11,10 +11,8 @@ COMMENT= Ruby interface to Berkeley DB revision 1.8x with full feature support
LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
-USES= execinfo
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= execinfo gem:autoplist
.include <bsd.port.pre.mk>
diff --git a/databases/rubygem-bigrecord/Makefile b/databases/rubygem-bigrecord/Makefile
index 26a27386032d..bf71d8315f58 100644
--- a/databases/rubygem-bigrecord/Makefile
+++ b/databases/rubygem-bigrecord/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-activerecord4>=0: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/databases/rubygem-couchrest/Makefile b/databases/rubygem-couchrest/Makefile
index d8be088942c4..55b071ef47d1 100644
--- a/databases/rubygem-couchrest/Makefile
+++ b/databases/rubygem-couchrest/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-mime-types>=1.15: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/databases/rubygem-data_objects/Makefile b/databases/rubygem-data_objects/Makefile
index d5e6447acb2a..464eefac97d3 100644
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-addressable>=2.1: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/databases/rubygem-datamapper/Makefile b/databases/rubygem-datamapper/Makefile
index 6ff4bf14491e..d3dfc45e8389 100644
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS= rubygem-dm-aggregates>=${PORTVERSION}:databases/rubygem-dm-aggregat
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-mysql/Makefile b/databases/rubygem-dbd-mysql/Makefile
index 784f51c61ac4..43e4b500d607 100644
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-dbi>=0:databases/rubygem-dbi \
rubygem-mysql>=0:databases/rubygem-mysql
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-odbc/Makefile b/databases/rubygem-dbd-odbc/Makefile
index e4c104f7036f..f1e5c9d3dca3 100644
--- a/databases/rubygem-dbd-odbc/Makefile
+++ b/databases/rubygem-dbd-odbc/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dbi>=0:databases/rubygem-dbi \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-pg/Makefile b/databases/rubygem-dbd-pg/Makefile
index 59cf09ca7a7e..5ec07e537198 100644
--- a/databases/rubygem-dbd-pg/Makefile
+++ b/databases/rubygem-dbd-pg/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dbi>=0.4.0:databases/rubygem-dbi \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-sqlite3/Makefile b/databases/rubygem-dbd-sqlite3/Makefile
index cfc4b81d2a43..2e0e1f93b72c 100644
--- a/databases/rubygem-dbd-sqlite3/Makefile
+++ b/databases/rubygem-dbd-sqlite3/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-dbi>=0.4.0:databases/rubygem-dbi \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dbi/Makefile b/databases/rubygem-dbi/Makefile
index bd4673246bef..c21f5c6e44ed 100644
--- a/databases/rubygem-dbi/Makefile
+++ b/databases/rubygem-dbi/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-deprecated2>=2.0.1:devel/rubygem-deprecated2 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/dbi bin/test_broken_dbi
diff --git a/databases/rubygem-dm-active_model/Makefile b/databases/rubygem-dm-active_model/Makefile
index d1dafc9a7528..ff885b6e8cd3 100644
--- a/databases/rubygem-dm-active_model/Makefile
+++ b/databases/rubygem-dm-active_model/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activemodel>=3.0: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/databases/rubygem-dm-aggregates/Makefile b/databases/rubygem-dm-aggregates/Makefile
index 4c07401d06ce..d6078fc5c462 100644
--- a/databases/rubygem-dm-aggregates/Makefile
+++ b/databases/rubygem-dm-aggregates/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-chunked_query/Makefile b/databases/rubygem-dm-chunked_query/Makefile
index 3cde1e522af1..542fe829c526 100644
--- a/databases/rubygem-dm-chunked_query/Makefile
+++ b/databases/rubygem-dm-chunked_query/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-dm-aggregates>=1.0:databases/rubygem-dm-aggregates \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-constraints/Makefile b/databases/rubygem-dm-constraints/Makefile
index 7cc7b319f82f..b07669aded7b 100644
--- a/databases/rubygem-dm-constraints/Makefile
+++ b/databases/rubygem-dm-constraints/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-core/Makefile b/databases/rubygem-dm-core/Makefile
index f224a83aff81..cff8562517e4 100644
--- a/databases/rubygem-dm-core/Makefile
+++ b/databases/rubygem-dm-core/Makefile
@@ -17,7 +17,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/databases/rubygem-dm-devise/Makefile b/databases/rubygem-dm-devise/Makefile
index d66415d174a8..b630d746e743 100644
--- a/databases/rubygem-dm-devise/Makefile
+++ b/databases/rubygem-dm-devise/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-devise>=1.3:devel/rubygem-devise \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-do-adapter/Makefile b/databases/rubygem-dm-do-adapter/Makefile
index fea7a53b0797..1927847f923c 100644
--- a/databases/rubygem-dm-do-adapter/Makefile
+++ b/databases/rubygem-dm-do-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-data_objects>=0.10.6:databases/rubygem-data_objects \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-migrations/Makefile b/databases/rubygem-dm-migrations/Makefile
index 3e70733c57ab..1d643610f9a5 100644
--- a/databases/rubygem-dm-migrations/Makefile
+++ b/databases/rubygem-dm-migrations/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-mysql-adapter/Makefile b/databases/rubygem-dm-mysql-adapter/Makefile
index 45bd9401de9f..6c737a25a078 100644
--- a/databases/rubygem-dm-mysql-adapter/Makefile
+++ b/databases/rubygem-dm-mysql-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-observer/Makefile b/databases/rubygem-dm-observer/Makefile
index d6abc8209136..c1b43e2e7ff4 100644
--- a/databases/rubygem-dm-observer/Makefile
+++ b/databases/rubygem-dm-observer/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-pager/Makefile b/databases/rubygem-dm-pager/Makefile
index d096ad847135..1e513d944a3c 100644
--- a/databases/rubygem-dm-pager/Makefile
+++ b/databases/rubygem-dm-pager/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-dm-aggregates>=0.10.1:databases/rubygem-dm-aggregates \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-paperclip/Makefile b/databases/rubygem-dm-paperclip/Makefile
index dd6a56742c67..ad88f350b56b 100644
--- a/databases/rubygem-dm-paperclip/Makefile
+++ b/databases/rubygem-dm-paperclip/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-postgres-adapter/Makefile b/databases/rubygem-dm-postgres-adapter/Makefile
index 86b9e8fbee1b..6bd26cda2515 100644
--- a/databases/rubygem-dm-postgres-adapter/Makefile
+++ b/databases/rubygem-dm-postgres-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-rails/Makefile b/databases/rubygem-dm-rails/Makefile
index a64b44895505..fa660d102410 100644
--- a/databases/rubygem-dm-rails/Makefile
+++ b/databases/rubygem-dm-rails/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-actionpack>=3.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/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile
index 660a6f8c0899..a385afedbeb0 100644
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-timestamps/Makefile b/databases/rubygem-dm-timestamps/Makefile
index c9ddf1aa418d..fc7f2eb99347 100644
--- a/databases/rubygem-dm-timestamps/Makefile
+++ b/databases/rubygem-dm-timestamps/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-transactions/Makefile b/databases/rubygem-dm-transactions/Makefile
index c7ddc805da48..e3dc0109dc2d 100644
--- a/databases/rubygem-dm-transactions/Makefile
+++ b/databases/rubygem-dm-transactions/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-types/Makefile b/databases/rubygem-dm-types/Makefile
index 4003110feffe..3c298042d244 100644
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= rubygem-bcrypt-ruby>=3.0:security/rubygem-bcrypt-ruby \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-dm-validations/Makefile b/databases/rubygem-dm-validations/Makefile
index 552114af1ca2..737264923cc6 100644
--- a/databases/rubygem-dm-validations/Makefile
+++ b/databases/rubygem-dm-validations/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-do_mysql/Makefile b/databases/rubygem-do_mysql/Makefile
index b1e1033bba41..11876a27c963 100644
--- a/databases/rubygem-do_mysql/Makefile
+++ b/databases/rubygem-do_mysql/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS= rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
USE_MYSQL= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile
index 8cc4ed07b428..943eb404d8ee 100644
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@@ -11,10 +11,7 @@ COMMENT= Ruby DataObjects driver for PostgreSQL
RUN_DEPENDS= rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
-USES+= pgsql
-
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pgsql
.include <bsd.port.mk>
diff --git a/databases/rubygem-do_sqlite3/Makefile b/databases/rubygem-do_sqlite3/Makefile
index 8b3840b25cd5..6bd1202e3d53 100644
--- a/databases/rubygem-do_sqlite3/Makefile
+++ b/databases/rubygem-do_sqlite3/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3
RUN_DEPENDS= rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
CONFIGURE_ARGS= --with-sqlite3-dir=${LOCALBASE}
diff --git a/databases/rubygem-em-redis-unified/Makefile b/databases/rubygem-em-redis-unified/Makefile
index 4828d7a481c0..3dcda8c73d35 100644
--- a/databases/rubygem-em-redis-unified/Makefile
+++ b/databases/rubygem-em-redis-unified/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
NO_ARCH= yes
.include <bsd.port.mk>
diff --git a/databases/rubygem-familia/Makefile b/databases/rubygem-familia/Makefile
index 21c979615703..fefe400e225d 100644
--- a/databases/rubygem-familia/Makefile
+++ b/databases/rubygem-familia/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-gibbler>=0.8.6:devel/rubygem-gibbler \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile
index 4897445d18b9..13a7c770ac09 100644
--- a/databases/rubygem-globalid/Makefile
+++ b/databases/rubygem-globalid/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport4>=4.1.0:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-her/Makefile b/databases/rubygem-her/Makefile
index c425c1c5db9f..0145ddb32784 100644
--- a/databases/rubygem-her/Makefile
+++ b/databases/rubygem-her/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activemodel4>=3.0.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/databases/rubygem-hiredis/Makefile b/databases/rubygem-hiredis/Makefile
index 0577d480f139..3fdec6114daa 100644
--- a/databases/rubygem-hiredis/Makefile
+++ b/databases/rubygem-hiredis/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= redis>=0:databases/redis
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= gmake
+USES= gem:autoplist gmake
.include <bsd.port.mk>
diff --git a/databases/rubygem-jdbc-mysql/Makefile b/databases/rubygem-jdbc-mysql/Makefile
index 52c9411ce04d..747fa8b60d76 100644
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/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/databases/rubygem-leo_manager_client/Makefile b/databases/rubygem-leo_manager_client/Makefile
index fbf5c9d02810..dc11425fa5e8 100644
--- a/databases/rubygem-leo_manager_client/Makefile
+++ b/databases/rubygem-leo_manager_client/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/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index 4beca358d57c..1e037f037469 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/memcached_top
diff --git a/databases/rubygem-memcache/Makefile b/databases/rubygem-memcache/Makefile
index 2a88d0d002f4..9527eb0d4967 100644
--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libmemcached.so:databases/libmemcached
CONFIGURE_ARGS= --with-opt-dir=${LOCALBASE}
GEM_ENV= EXTERNAL_LIB="yes"
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
index f1c2f86fa3eb..c33ac5d9c242 100644
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@@ -14,7 +14,6 @@ LICENSE_COMB= dual
USE_MYSQL= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
index 86d04ba7db44..6ef90983706c 100644
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
USE_MYSQL= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-openid-redis-store/Makefile b/databases/rubygem-openid-redis-store/Makefile
index d5edc4339fcf..904e9db69d4a 100644
--- a/databases/rubygem-openid-redis-store/Makefile
+++ b/databases/rubygem-openid-redis-store/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-redis>=0:databases/rubygem-redis \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-paranoia/Makefile b/databases/rubygem-paranoia/Makefile
index 58daa1a1d1d0..590866e8f6de 100644
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS?= rubygem-activerecord4>=0: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/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile
index 93d69e54280c..7a65f33c1706 100644
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@@ -15,9 +15,7 @@ LICENSE_COMB= dual
CONFIGURE_ARGS= --with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
PG_CONFIG= ${LOCALBASE}/bin/pg_config
-USES= pgsql
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pgsql
.include <bsd.port.mk>
diff --git a/databases/rubygem-rbase/Makefile b/databases/rubygem-rbase/Makefile
index 269c89aaea06..e547370fb607 100644
--- a/databases/rubygem-rbase/Makefile
+++ b/databases/rubygem-rbase/Makefile
@@ -12,7 +12,6 @@ COMMENT= Library to create/read/write to XBase databases (*.DBF files)
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-actionpack/Makefile b/databases/rubygem-redis-actionpack/Makefile
index 8be6e87c5078..785a133c3c54 100644
--- a/databases/rubygem-redis-actionpack/Makefile
+++ b/databases/rubygem-redis-actionpack/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-actionpack4>=4: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/databases/rubygem-redis-namespace/Makefile b/databases/rubygem-redis-namespace/Makefile
index 5356f1e69f4b..5239bccd8d3d 100644
--- a/databases/rubygem-redis-namespace/Makefile
+++ b/databases/rubygem-redis-namespace/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-redis>=3.0.4:databases/rubygem-redis
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-redis/Makefile b/databases/rubygem-redis/Makefile
index 100984c49bff..c14dd2666b03 100644
--- a/databases/rubygem-redis/Makefile
+++ b/databases/rubygem-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/databases/rubygem-rubyrep/Makefile b/databases/rubygem-rubyrep/Makefile
index 16fa801dd99e..e62602b5a451 100644
--- a/databases/rubygem-rubyrep/Makefile
+++ b/databases/rubygem-rubyrep/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= flog>=0:sysutils/flog \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/rubyrep rubyrep
USE_RC_SUBR= rubyrep
diff --git a/databases/rubygem-seed-fu/Makefile b/databases/rubygem-seed-fu/Makefile
index 04227d924239..e88e40b1d7ff 100644
--- a/databases/rubygem-seed-fu/Makefile
+++ b/databases/rubygem-seed-fu/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=3.1: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/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 6b550ccfd1d7..88ac029fea6d 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3
CONFIGURE_ARGS= --with-sqlite3-dir=${LOCALBASE}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sqlite3_ruby
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index 17f4dada1ecb..0b495c99ecf0 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS= libsqlite3.so:databases/sqlite3
CONFIGURE_ARGS= --with-sqlite3-dir=${LOCALBASE}
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/databases/rubygem-state_machines-activemodel/Makefile b/databases/rubygem-state_machines-activemodel/Makefile
index cce9bbf58281..8586236b27de 100644
--- a/databases/rubygem-state_machines-activemodel/Makefile
+++ b/databases/rubygem-state_machines-activemodel/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activemodel4>=4.1: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/databases/rubygem-state_machines-activerecord/Makefile b/databases/rubygem-state_machines-activerecord/Makefile
index 71f78d554f03..9258a2a62b81 100644
--- a/databases/rubygem-state_machines-activerecord/Makefile
+++ b/databases/rubygem-state_machines-activerecord/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1: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/databases/rubygem-tarantool/Makefile b/databases/rubygem-tarantool/Makefile
index b5ab68590415..17a472e55bc7 100644
--- a/databases/rubygem-tarantool/Makefile
+++ b/databases/rubygem-tarantool/Makefile
@@ -17,7 +17,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/deskutils/rubygem-shellplay/Makefile b/deskutils/rubygem-shellplay/Makefile
index c57b46d0b777..358e08fdc0c7 100644
--- a/deskutils/rubygem-shellplay/Makefile
+++ b/deskutils/rubygem-shellplay/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-paint>=1.0.0:devel/rubygem-paint \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/shellcat bin/shellexport bin/shellplay bin/shellrecord
.include <bsd.port.mk>
diff --git a/deskutils/rubygem-taskjuggler/Makefile b/deskutils/rubygem-taskjuggler/Makefile
index cfc0c1c7a984..83d656b26534 100644
--- a/deskutils/rubygem-taskjuggler/Makefile
+++ b/deskutils/rubygem-taskjuggler/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-mail>=2.4.3:mail/rubygem-mail \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/tj3 \
bin/tj3client \
diff --git a/devel/rubygem-CFPropertyList/Makefile b/devel/rubygem-CFPropertyList/Makefile
index a0efab9c63e6..69bcf35acd27 100644
--- a/devel/rubygem-CFPropertyList/Makefile
+++ b/devel/rubygem-CFPropertyList/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/devel/rubygem-abstract/Makefile b/devel/rubygem-abstract/Makefile
index ae45a21787e8..b6b35132bfdd 100644
--- a/devel/rubygem-abstract/Makefile
+++ b/devel/rubygem-abstract/Makefile
@@ -15,7 +15,6 @@ LICENSE= RUBY
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-actionpack-action_caching/Makefile b/devel/rubygem-actionpack-action_caching/Makefile
index eb938adcbc02..4807d3be71bc 100644
--- a/devel/rubygem-actionpack-action_caching/Makefile
+++ b/devel/rubygem-actionpack-action_caching/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-actionpack4>=4.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/devel/rubygem-actionview/Makefile b/devel/rubygem-actionview/Makefile
index d0d0858d4640..9da50b072ba2 100644
--- a/devel/rubygem-actionview/Makefile
+++ b/devel/rubygem-actionview/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-active_scaffold/Makefile b/devel/rubygem-active_scaffold/Makefile
index 41a2ebafc868..bd8b8f67ad2d 100644
--- a/devel/rubygem-active_scaffold/Makefile
+++ b/devel/rubygem-active_scaffold/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rails4>=3.2.22.2: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/devel/rubygem-activejob/Makefile b/devel/rubygem-activejob/Makefile
index 6aa0671f4870..892074550ed1 100644
--- a/devel/rubygem-activejob/Makefile
+++ b/devel/rubygem-activejob/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-activemessaging/Makefile b/devel/rubygem-activemessaging/Makefile
index 7f4ec240605f..d2672cb2ce0b 100644
--- a/devel/rubygem-activemessaging/Makefile
+++ b/devel/rubygem-activemessaging/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-activesupport4>=2.3.11:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-activerecord-deprecated_finders/Makefile b/devel/rubygem-activerecord-deprecated_finders/Makefile
index a2af2db1f867..e8e2884170e3 100644
--- a/devel/rubygem-activerecord-deprecated_finders/Makefile
+++ b/devel/rubygem-activerecord-deprecated_finders/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/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index d358fb445dc4..d632a5a1e3c5 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-i18n>=0.6.4:devel/rubygem-i18n \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-activesupport4/Makefile b/devel/rubygem-activesupport4/Makefile
index 77d683810eac..e9b99d94068e 100644
--- a/devel/rubygem-activesupport4/Makefile
+++ b/devel/rubygem-activesupport4/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-i18n>=0.6.9:devel/rubygem-i18n \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-akismet/Makefile b/devel/rubygem-akismet/Makefile
index 4fe2c18816dd..48a089d73fd6 100644
--- a/devel/rubygem-akismet/Makefile
+++ b/devel/rubygem-akismet/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/devel/rubygem-algebrick/Makefile b/devel/rubygem-algebrick/Makefile
index 29a79a7f0a9a..02740d4ff266 100644
--- a/devel/rubygem-algebrick/Makefile
+++ b/devel/rubygem-algebrick/Makefile
@@ -13,7 +13,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/devel/rubygem-algorithms/Makefile b/devel/rubygem-algorithms/Makefile
index 3a9914a56aec..0a1dd6ece345 100644
--- a/devel/rubygem-algorithms/Makefile
+++ b/devel/rubygem-algorithms/Makefile
@@ -12,7 +12,6 @@ COMMENT= Ruby algorithms and data structures
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-allison/Makefile b/devel/rubygem-allison/Makefile
index 20a7a66fbef8..1d37ce358b5e 100644
--- a/devel/rubygem-allison/Makefile
+++ b/devel/rubygem-allison/Makefile
@@ -12,8 +12,7 @@ COMMENT= Modern, pretty RDoc template
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/allison
diff --git a/devel/rubygem-analogger/Makefile b/devel/rubygem-analogger/Makefile
index 85cec439f724..c277085965ca 100644
--- a/devel/rubygem-analogger/Makefile
+++ b/devel/rubygem-analogger/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-eventmachine>=0.0.0:devel/rubygem-eventmachine
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/analogger
ruby_OLD_CMD= ruby
diff --git a/devel/rubygem-annoy/Makefile b/devel/rubygem-annoy/Makefile
index 88492e0ef491..8bc6697d7a7f 100644
--- a/devel/rubygem-annoy/Makefile
+++ b/devel/rubygem-annoy/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-highline>=1.5.0:devel/rubygem-highline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ansi/Makefile b/devel/rubygem-ansi/Makefile
index 8d1c22fa33cc..c3457683b36f 100644
--- a/devel/rubygem-ansi/Makefile
+++ b/devel/rubygem-ansi/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD2CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-apipie-bindings/Makefile b/devel/rubygem-apipie-bindings/Makefile
index 8acedba00b9d..3bd597bc7ebc 100644
--- a/devel/rubygem-apipie-bindings/Makefile
+++ b/devel/rubygem-apipie-bindings/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-json>=1.2.1: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/devel/rubygem-apipie-params/Makefile b/devel/rubygem-apipie-params/Makefile
index cd936f75bc57..ebfbb81df0b1 100644
--- a/devel/rubygem-apipie-params/Makefile
+++ b/devel/rubygem-apipie-params/Makefile
@@ -15,7 +15,6 @@ NO_ARCH= yes
USE_RAKE= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-app_config/Makefile b/devel/rubygem-app_config/Makefile
index ab6fdc1fdd43..9f542f0bc2cb 100644
--- a/devel/rubygem-app_config/Makefile
+++ b/devel/rubygem-app_config/Makefile
@@ -20,7 +20,6 @@ SQLITE3_RUN_DEPENDS= rubygem-sqlite3>=0:databases/rubygem-sqlite3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-arr-pm/Makefile b/devel/rubygem-arr-pm/Makefile
index dcafafa145b2..d391ca3636ef 100644
--- a/devel/rubygem-arr-pm/Makefile
+++ b/devel/rubygem-arr-pm/Makefile
@@ -10,7 +10,6 @@ COMMENT= Read and write rpm packages
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-arrayfields/Makefile b/devel/rubygem-arrayfields/Makefile
index cc3536fbccfd..a3507f165daa 100644
--- a/devel/rubygem-arrayfields/Makefile
+++ b/devel/rubygem-arrayfields/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/devel/rubygem-ascii85/Makefile b/devel/rubygem-ascii85/Makefile
index 6bd11818de7c..5244cb795e34 100644
--- a/devel/rubygem-ascii85/Makefile
+++ b/devel/rubygem-ascii85/Makefile
@@ -16,8 +16,7 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ascii85
diff --git a/devel/rubygem-asetus/Makefile b/devel/rubygem-asetus/Makefile
index 3aa4f091bc84..830c4531c674 100644
--- a/devel/rubygem-asetus/Makefile
+++ b/devel/rubygem-asetus/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/devel/rubygem-aspectr/Makefile b/devel/rubygem-aspectr/Makefile
index c5cfa8026b6d..ce4e445e4d77 100644
--- a/devel/rubygem-aspectr/Makefile
+++ b/devel/rubygem-aspectr/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/devel/rubygem-ast/Makefile b/devel/rubygem-ast/Makefile
index f55176157e11..1ea813abe5cf 100644
--- a/devel/rubygem-ast/Makefile
+++ b/devel/rubygem-ast/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-astrolabe/Makefile b/devel/rubygem-astrolabe/Makefile
index d4c5ffc75576..0c0a90909b06 100644
--- a/devel/rubygem-astrolabe/Makefile
+++ b/devel/rubygem-astrolabe/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-parser>=2.2:devel/rubygem-parser
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-atomic/Makefile b/devel/rubygem-atomic/Makefile
index becdc23b36e8..01c05cbed192 100644
--- a/devel/rubygem-atomic/Makefile
+++ b/devel/rubygem-atomic/Makefile
@@ -12,7 +12,6 @@ COMMENT= Atomic reference implementation
LICENSE= APACHE20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-atoulme-antwrap/Makefile b/devel/rubygem-atoulme-antwrap/Makefile
index c10642bc47f7..dbf231baace6 100644
--- a/devel/rubygem-atoulme-antwrap/Makefile
+++ b/devel/rubygem-atoulme-antwrap/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= ant:devel/apache-ant \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-attic/Makefile b/devel/rubygem-attic/Makefile
index 7d60fe172db4..f374d3242fa9 100644
--- a/devel/rubygem-attic/Makefile
+++ b/devel/rubygem-attic/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/devel/rubygem-attr_required/Makefile b/devel/rubygem-attr_required/Makefile
index 34ce307e0f78..5649429233c9 100644
--- a/devel/rubygem-attr_required/Makefile
+++ b/devel/rubygem-attr_required/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/devel/rubygem-authlogic/Makefile b/devel/rubygem-authlogic/Makefile
index dbdb86893481..ea9f67cfbff5 100644
--- a/devel/rubygem-authlogic/Makefile
+++ b/devel/rubygem-authlogic/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-activerecord4>=3.2: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/devel/rubygem-awesome_print/Makefile b/devel/rubygem-awesome_print/Makefile
index 1740335e8ff3..cd96f4564727 100644
--- a/devel/rubygem-awesome_print/Makefile
+++ b/devel/rubygem-awesome_print/Makefile
@@ -15,7 +15,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/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile
index 4942f7c3a4fb..60ad22707e03 100644
--- a/devel/rubygem-aws-sdk-core/Makefile
+++ b/devel/rubygem-aws-sdk-core/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS= rubygem-jmespath>=1.0:devel/rubygem-jmespath
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/aws.rb
diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile
index fd3fee7ab2ad..d391c8720134 100644
--- a/devel/rubygem-aws-sdk-resources/Makefile
+++ b/devel/rubygem-aws-sdk-resources/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-aws-sdk-core>=${PORTVERSION}:devel/rubygem-aws-sdk-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-aws-sdk-v1/Makefile b/devel/rubygem-aws-sdk-v1/Makefile
index 93eb59faa51e..228185ad2149 100644
--- a/devel/rubygem-aws-sdk-v1/Makefile
+++ b/devel/rubygem-aws-sdk-v1/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/aws-rb
diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile
index a08cc86f96ed..efd6887cd979 100644
--- a/devel/rubygem-aws-sdk/Makefile
+++ b/devel/rubygem-aws-sdk/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-aws-sdk-resources>=${PORTVERSION}:devel/rubygem-aws-sdk-res
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-axiom-types/Makefile b/devel/rubygem-axiom-types/Makefile
index f94687668a02..337cacc2f8fa 100644
--- a/devel/rubygem-axiom-types/Makefile
+++ b/devel/rubygem-axiom-types/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-descendants_tracker>=0.0.4:devel/rubygem-descendants_tracke
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-backports/Makefile b/devel/rubygem-backports/Makefile
index 6240ae2396a9..21c865e6eef3 100644
--- a/devel/rubygem-backports/Makefile
+++ b/devel/rubygem-backports/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/devel/rubygem-bacon/Makefile b/devel/rubygem-bacon/Makefile
index 468e6cd8fc0c..b0532798b09c 100644
--- a/devel/rubygem-bacon/Makefile
+++ b/devel/rubygem-bacon/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/bacon
diff --git a/devel/rubygem-benelux/Makefile b/devel/rubygem-benelux/Makefile
index 999292f41b56..86b0c670d8b4 100644
--- a/devel/rubygem-benelux/Makefile
+++ b/devel/rubygem-benelux/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-attic>=0.5.3:devel/rubygem-attic \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bin_utils/Makefile b/devel/rubygem-bin_utils/Makefile
index b66eee9b0591..6aae099088a0 100644
--- a/devel/rubygem-bin_utils/Makefile
+++ b/devel/rubygem-bin_utils/Makefile
@@ -10,7 +10,6 @@ MAINTAINER= vg@FreeBSD.org
COMMENT= Extracting binary integers from binary string and packing back
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bindata/Makefile b/devel/rubygem-bindata/Makefile
index a13260221d20..293533a16ca1 100644
--- a/devel/rubygem-bindata/Makefile
+++ b/devel/rubygem-bindata/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-binding_of_caller/Makefile b/devel/rubygem-binding_of_caller/Makefile
index 770a79239cc7..caee3bb50a6b 100644
--- a/devel/rubygem-binding_of_caller/Makefile
+++ b/devel/rubygem-binding_of_caller/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-debug_inspector>=0.0.1:devel/rubygem-debug_inspector
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bio/Makefile b/devel/rubygem-bio/Makefile
index 8f777c8287de..b3780a8b7c00 100644
--- a/devel/rubygem-bio/Makefile
+++ b/devel/rubygem-bio/Makefile
@@ -16,9 +16,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= sample/biofetch.rb
ruby_OLD_CMD= /usr/proj/bioruby/bin/ruby
diff --git a/devel/rubygem-blankslate/Makefile b/devel/rubygem-blankslate/Makefile
index 6dca5ab6efc3..d45a80a6f534 100644
--- a/devel/rubygem-blankslate/Makefile
+++ b/devel/rubygem-blankslate/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/devel/rubygem-blobstore_client/Makefile b/devel/rubygem-blobstore_client/Makefile
index ca1d6bc40476..2e4223023afb 100644
--- a/devel/rubygem-blobstore_client/Makefile
+++ b/devel/rubygem-blobstore_client/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-aws-sdk-resources>=2.2.0:devel/rubygem-aws-sdk-resources \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/blobstore_client_console
diff --git a/devel/rubygem-blockenspiel/Makefile b/devel/rubygem-blockenspiel/Makefile
index a237a796f640..ec7313ac8087 100644
--- a/devel/rubygem-blockenspiel/Makefile
+++ b/devel/rubygem-blockenspiel/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bones/Makefile b/devel/rubygem-bones/Makefile
index 77f1fc35d70c..636d362cb2dc 100644
--- a/devel/rubygem-bones/Makefile
+++ b/devel/rubygem-bones/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-little-plugger>=1.1:devel/rubygem-little-plugger \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/bones
diff --git a/devel/rubygem-bosh-template/Makefile b/devel/rubygem-bosh-template/Makefile
index 4e43c172b3b7..78cc2b46738b 100644
--- a/devel/rubygem-bosh-template/Makefile
+++ b/devel/rubygem-bosh-template/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS= rubygem-semi_semantic>=1.1.0:devel/rubygem-semi_semantic
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/bosh-template
diff --git a/devel/rubygem-bosh_common/Makefile b/devel/rubygem-bosh_common/Makefile
index bacac934b1d9..aaaaac12cf88 100644
--- a/devel/rubygem-bosh_common/Makefile
+++ b/devel/rubygem-bosh_common/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-logging>=1.8.2:devel/rubygem-logging \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bson/Makefile b/devel/rubygem-bson/Makefile
index 215848d5b30b..7014b20bf2ff 100644
--- a/devel/rubygem-bson/Makefile
+++ b/devel/rubygem-bson/Makefile
@@ -13,7 +13,6 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-bson1/Makefile b/devel/rubygem-bson1/Makefile
index 2e9e83a7ac7e..ca82506aef48 100644
--- a/devel/rubygem-bson1/Makefile
+++ b/devel/rubygem-bson1/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^1\.
diff --git a/devel/rubygem-buftok/Makefile b/devel/rubygem-buftok/Makefile
index bb7c5fe59975..1f5ee965af01 100644
--- a/devel/rubygem-buftok/Makefile
+++ b/devel/rubygem-buftok/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/devel/rubygem-bugspots/Makefile b/devel/rubygem-bugspots/Makefile
index 085d2cf269cf..de45fe5286dd 100644
--- a/devel/rubygem-bugspots/Makefile
+++ b/devel/rubygem-bugspots/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rainbow>=0:devel/rubygem-rainbow \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/bugspots bin/git-bugspots
diff --git a/devel/rubygem-builder/Makefile b/devel/rubygem-builder/Makefile
index dc561d49c02b..f77986df960a 100644
--- a/devel/rubygem-builder/Makefile
+++ b/devel/rubygem-builder/Makefile
@@ -16,7 +16,6 @@ PORTSCOUT= limit:^3.0
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-builder32/Makefile b/devel/rubygem-builder32/Makefile
index 2c4f42750b7f..289d216c86cb 100644
--- a/devel/rubygem-builder32/Makefile
+++ b/devel/rubygem-builder32/Makefile
@@ -15,7 +15,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/devel/rubygem-byebug/Makefile b/devel/rubygem-byebug/Makefile
index ea3d7cf9a705..b8050c1c4363 100644
--- a/devel/rubygem-byebug/Makefile
+++ b/devel/rubygem-byebug/Makefile
@@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/byebug
diff --git a/devel/rubygem-cabin/Makefile b/devel/rubygem-cabin/Makefile
index 275255d40024..40a157f30546 100644
--- a/devel/rubygem-cabin/Makefile
+++ b/devel/rubygem-cabin/Makefile
@@ -10,8 +10,7 @@ COMMENT= Structured+contextual logging experiments in Ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rubygems-cabin-test
.include <bsd.port.mk>
diff --git a/devel/rubygem-caesars/Makefile b/devel/rubygem-caesars/Makefile
index e9d938e2ee0e..e5562a6a257c 100644
--- a/devel/rubygem-caesars/Makefile
+++ b/devel/rubygem-caesars/Makefile
@@ -13,9 +13,7 @@ COMMENT= Rapid DSL prototyping in Ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/example
.include <bsd.port.mk>
diff --git a/devel/rubygem-cairo-gobject/Makefile b/devel/rubygem-cairo-gobject/Makefile
index f1b0c2ca9a68..c64a8ac1f5ab 100644
--- a/devel/rubygem-cairo-gobject/Makefile
+++ b/devel/rubygem-cairo-gobject/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-cairo>=0:graphics/rubygem-cairo \
rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-capybara/Makefile b/devel/rubygem-capybara/Makefile
index b6a5a088d018..f2f3184322bb 100644
--- a/devel/rubygem-capybara/Makefile
+++ b/devel/rubygem-capybara/Makefile
@@ -21,7 +21,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/devel/rubygem-celluloid-essentials/Makefile b/devel/rubygem-celluloid-essentials/Makefile
index 8f603bcd12f9..d8be7f72cd50 100644
--- a/devel/rubygem-celluloid-essentials/Makefile
+++ b/devel/rubygem-celluloid-essentials/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-timers>=4.1.1:devel/rubygem-timers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid-extras/Makefile b/devel/rubygem-celluloid-extras/Makefile
index 608bd3d4ecf0..b5ed05dadfd4 100644
--- a/devel/rubygem-celluloid-extras/Makefile
+++ b/devel/rubygem-celluloid-extras/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-timers>=4.1.1:devel/rubygem-timers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid-fsm/Makefile b/devel/rubygem-celluloid-fsm/Makefile
index f20040ab7ec0..53c0207aa29c 100644
--- a/devel/rubygem-celluloid-fsm/Makefile
+++ b/devel/rubygem-celluloid-fsm/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-timers>=4.1.1:devel/rubygem-timers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid-io/Makefile b/devel/rubygem-celluloid-io/Makefile
index 4a3be64966ac..1c5dce6803ad 100644
--- a/devel/rubygem-celluloid-io/Makefile
+++ b/devel/rubygem-celluloid-io/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-celluloid>=0.17.2:devel/rubygem-celluloid \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid-pool/Makefile b/devel/rubygem-celluloid-pool/Makefile
index 44e61f99bdee..de54e82713ef 100644
--- a/devel/rubygem-celluloid-pool/Makefile
+++ b/devel/rubygem-celluloid-pool/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-timers>=4.1.1:devel/rubygem-timers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid-supervision/Makefile b/devel/rubygem-celluloid-supervision/Makefile
index d36d8e68076b..4c3844f4bc6f 100644
--- a/devel/rubygem-celluloid-supervision/Makefile
+++ b/devel/rubygem-celluloid-supervision/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-timers>=4.1.1:devel/rubygem-timers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-celluloid/Makefile b/devel/rubygem-celluloid/Makefile
index 9a3faa134685..8b88a9534ba4 100644
--- a/devel/rubygem-celluloid/Makefile
+++ b/devel/rubygem-celluloid/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-celluloid-essentials>=0:devel/rubygem-celluloid-essentials
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cf-uaa-lib/Makefile b/devel/rubygem-cf-uaa-lib/Makefile
index 8d7185d28259..f2427e0e7451 100644
--- a/devel/rubygem-cf-uaa-lib/Makefile
+++ b/devel/rubygem-cf-uaa-lib/Makefile
@@ -15,7 +15,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/devel/rubygem-childprocess/Makefile b/devel/rubygem-childprocess/Makefile
index fd53538bf9ec..1885df0c0f1d 100644
--- a/devel/rubygem-childprocess/Makefile
+++ b/devel/rubygem-childprocess/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-ffi>=1.0.11: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/devel/rubygem-chronic/Makefile b/devel/rubygem-chronic/Makefile
index bf306b57b1fd..01c98d7e7b25 100644
--- a/devel/rubygem-chronic/Makefile
+++ b/devel/rubygem-chronic/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/devel/rubygem-clamp/Makefile b/devel/rubygem-clamp/Makefile
index f6f2ee8c9203..37b0d82f0add 100644
--- a/devel/rubygem-clamp/Makefile
+++ b/devel/rubygem-clamp/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/devel/rubygem-classifier-reborn/Makefile b/devel/rubygem-classifier-reborn/Makefile
index cba9c597dd30..f2bd534ccbfb 100644
--- a/devel/rubygem-classifier-reborn/Makefile
+++ b/devel/rubygem-classifier-reborn/Makefile
@@ -18,7 +18,6 @@ PLIST_FILES= bin/bayes.rb bin/summarize.rb
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-classifier/Makefile b/devel/rubygem-classifier/Makefile
index cc855e8851f5..31c6bb4400b7 100644
--- a/devel/rubygem-classifier/Makefile
+++ b/devel/rubygem-classifier/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-fast-stemmer>=1.0.0:devel/rubygem-fast-stemmer
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-climate_control/Makefile b/devel/rubygem-climate_control/Makefile
index 5ac1681b8101..a0a597391d2f 100644
--- a/devel/rubygem-climate_control/Makefile
+++ b/devel/rubygem-climate_control/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activesupport4>=3.0:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-clio/Makefile b/devel/rubygem-clio/Makefile
index 5ceb6cb5362a..c36125d90c4f 100644
--- a/devel/rubygem-clio/Makefile
+++ b/devel/rubygem-clio/Makefile
@@ -14,7 +14,6 @@ LICENSE= GPLv3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cliprompt/Makefile b/devel/rubygem-cliprompt/Makefile
index c28b8cf307ba..8ab3ecb5f9b7 100644
--- a/devel/rubygem-cliprompt/Makefile
+++ b/devel/rubygem-cliprompt/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-paint>=1.0.0:devel/rubygem-paint
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cloudfiles/Makefile b/devel/rubygem-cloudfiles/Makefile
index cf6ecd2f09a9..52e0869655c2 100644
--- a/devel/rubygem-cloudfiles/Makefile
+++ b/devel/rubygem-cloudfiles/Makefile
@@ -16,7 +16,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/devel/rubygem-cocaine/Makefile b/devel/rubygem-cocaine/Makefile
index 02ea322e8bd1..71f7b42ea4d2 100644
--- a/devel/rubygem-cocaine/Makefile
+++ b/devel/rubygem-cocaine/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-climate_control>=0.0.3:devel/rubygem-climate_control
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-coercible/Makefile b/devel/rubygem-coercible/Makefile
index a56a7667f345..8fb5cc14c9f0 100644
--- a/devel/rubygem-coercible/Makefile
+++ b/devel/rubygem-coercible/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-descendants_tracker>=0.0.1:devel/rubygem-descendants_tracke
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-coffee-rails/Makefile b/devel/rubygem-coffee-rails/Makefile
index 5e39f9090d36..96679fd5e333 100644
--- a/devel/rubygem-coffee-rails/Makefile
+++ b/devel/rubygem-coffee-rails/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^3\.
diff --git a/devel/rubygem-coffee-rails4/Makefile b/devel/rubygem-coffee-rails4/Makefile
index cb7f81ed17c9..624a9cfd48b8 100644
--- a/devel/rubygem-coffee-rails4/Makefile
+++ b/devel/rubygem-coffee-rails4/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS?= rubygem-coffee-script>=2.2.0:devel/rubygem-coffee-script \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-coffee-script-source/Makefile b/devel/rubygem-coffee-script-source/Makefile
index 88504d685a8e..979e78dff1d9 100644
--- a/devel/rubygem-coffee-script-source/Makefile
+++ b/devel/rubygem-coffee-script-source/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/devel/rubygem-coffee-script/Makefile b/devel/rubygem-coffee-script/Makefile
index faf311eaaf86..838b75ae3988 100644
--- a/devel/rubygem-coffee-script/Makefile
+++ b/devel/rubygem-coffee-script/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-coffee-script-source>=0:devel/rubygem-coffee-script-source
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-colorize/Makefile b/devel/rubygem-colorize/Makefile
index 29275c0f7dae..5410d095c5c4 100644
--- a/devel/rubygem-colorize/Makefile
+++ b/devel/rubygem-colorize/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/devel/rubygem-columnize/Makefile b/devel/rubygem-columnize/Makefile
index 5066fc8ab580..5e8cc3c7f9e0 100644
--- a/devel/rubygem-columnize/Makefile
+++ b/devel/rubygem-columnize/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/devel/rubygem-commander/Makefile b/devel/rubygem-commander/Makefile
index aeaf14c43bba..cc66019c1313 100644
--- a/devel/rubygem-commander/Makefile
+++ b/devel/rubygem-commander/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-highline>=1.7.2:devel/rubygem-highline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/commander
diff --git a/devel/rubygem-concurrent-ruby-edge/Makefile b/devel/rubygem-concurrent-ruby-edge/Makefile
index 62dae10241ab..09ac019ff680 100644
--- a/devel/rubygem-concurrent-ruby-edge/Makefile
+++ b/devel/rubygem-concurrent-ruby-edge/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.1:devel/rubygem-concurrent-ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-concurrent-ruby/Makefile b/devel/rubygem-concurrent-ruby/Makefile
index 18e4ddb19c16..c30c72f86e3f 100644
--- a/devel/rubygem-concurrent-ruby/Makefile
+++ b/devel/rubygem-concurrent-ruby/Makefile
@@ -13,7 +13,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/devel/rubygem-configatron/Makefile b/devel/rubygem-configatron/Makefile
index 44dfbd495e2b..d19e762dc8e9 100644
--- a/devel/rubygem-configatron/Makefile
+++ b/devel/rubygem-configatron/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/devel/rubygem-configstruct/Makefile b/devel/rubygem-configstruct/Makefile
index 748b763f1a45..6e34dd99af1b 100644
--- a/devel/rubygem-configstruct/Makefile
+++ b/devel/rubygem-configstruct/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/devel/rubygem-configuration/Makefile b/devel/rubygem-configuration/Makefile
index bdae0e78156d..07e0d9084457 100644
--- a/devel/rubygem-configuration/Makefile
+++ b/devel/rubygem-configuration/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/devel/rubygem-cool.io/Makefile b/devel/rubygem-cool.io/Makefile
index 2c507eae5a2d..39a56f19f0c7 100644
--- a/devel/rubygem-cool.io/Makefile
+++ b/devel/rubygem-cool.io/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= \
rubygem-iobuffer>=1.0.0:devel/rubygem-iobuffer
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-corefines/Makefile b/devel/rubygem-corefines/Makefile
index 1cf70fb44348..306c03f131a0 100644
--- a/devel/rubygem-corefines/Makefile
+++ b/devel/rubygem-corefines/Makefile
@@ -9,7 +9,6 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Refinements for extending Rubys built-in classes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-crack/Makefile b/devel/rubygem-crack/Makefile
index 277e03c387eb..9c0ce692ca9f 100644
--- a/devel/rubygem-crack/Makefile
+++ b/devel/rubygem-crack/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-safe_yaml>=1.0.0:devel/rubygem-safe_yaml
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cri/Makefile b/devel/rubygem-cri/Makefile
index 0323a9de257b..ade531ddf13b 100644
--- a/devel/rubygem-cri/Makefile
+++ b/devel/rubygem-cri/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-colored>=1.2:textproc/rubygem-colored
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile
index 0c59b930b38a..10e0b2fef561 100644
--- a/devel/rubygem-cucumber-core/Makefile
+++ b/devel/rubygem-cucumber-core/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gherkin>=3.2.0:textproc/rubygem-gherkin
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cucumber-wire/Makefile b/devel/rubygem-cucumber-wire/Makefile
index 9617dafa6253..3b124dbe6824 100644
--- a/devel/rubygem-cucumber-wire/Makefile
+++ b/devel/rubygem-cucumber-wire/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/devel/rubygem-cucumber/Makefile b/devel/rubygem-cucumber/Makefile
index f1467f6e5054..7a5bff2fcd37 100644
--- a/devel/rubygem-cucumber/Makefile
+++ b/devel/rubygem-cucumber/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/cucumber
diff --git a/devel/rubygem-curses/Makefile b/devel/rubygem-curses/Makefile
index b058087433d2..a43aeacd75dd 100644
--- a/devel/rubygem-curses/Makefile
+++ b/devel/rubygem-curses/Makefile
@@ -12,7 +12,6 @@ LICENSE= RUBY BSD2CLAUSE
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-cyoi/Makefile b/devel/rubygem-cyoi/Makefile
index 6160488b0dcb..bfde32b6f6ed 100644
--- a/devel/rubygem-cyoi/Makefile
+++ b/devel/rubygem-cyoi/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-fog>=0:devel/rubygem-fog \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/cyoi
diff --git a/devel/rubygem-daemon_controller/Makefile b/devel/rubygem-daemon_controller/Makefile
index fa6f95ae866d..fd7ff6615d1b 100644
--- a/devel/rubygem-daemon_controller/Makefile
+++ b/devel/rubygem-daemon_controller/Makefile
@@ -13,7 +13,6 @@ COMMENT= Library for implementing daemon management capabilities
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-daemons/Makefile b/devel/rubygem-daemons/Makefile
index 1b5997048292..df4b2159dfdb 100644
--- a/devel/rubygem-daemons/Makefile
+++ b/devel/rubygem-daemons/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/devel/rubygem-debug_inspector/Makefile b/devel/rubygem-debug_inspector/Makefile
index 6f08f011b40c..59706612eee8 100644
--- a/devel/rubygem-debug_inspector/Makefile
+++ b/devel/rubygem-debug_inspector/Makefile
@@ -11,7 +11,6 @@ COMMENT= Ruby wrapper for the MRI 2.0 debug_inspector API
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-debugger-linecache/Makefile b/devel/rubygem-debugger-linecache/Makefile
index b321e72b90a2..7662baab9847 100644
--- a/devel/rubygem-debugger-linecache/Makefile
+++ b/devel/rubygem-debugger-linecache/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/devel/rubygem-debugger-xml/Makefile b/devel/rubygem-debugger-xml/Makefile
index d7a65e305fa7..46dd803e8a55 100644
--- a/devel/rubygem-debugger-xml/Makefile
+++ b/devel/rubygem-debugger-xml/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-builder32>=2.0.0:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rdebug-ide bin/rdebug-vim
diff --git a/devel/rubygem-deep_merge/Makefile b/devel/rubygem-deep_merge/Makefile
index 72545127340f..afe9bfb727f3 100644
--- a/devel/rubygem-deep_merge/Makefile
+++ b/devel/rubygem-deep_merge/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/devel/rubygem-deep_test/Makefile b/devel/rubygem-deep_test/Makefile
index 9507fe208c92..100fffec3798 100644
--- a/devel/rubygem-deep_test/Makefile
+++ b/devel/rubygem-deep_test/Makefile
@@ -14,8 +14,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/deep_test
diff --git a/devel/rubygem-deface/Makefile b/devel/rubygem-deface/Makefile
index 786bec9148c7..662a10c73a41 100644
--- a/devel/rubygem-deface/Makefile
+++ b/devel/rubygem-deface/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-colorize>=0.5.8:devel/rubygem-colorize \
rubygem-rails4>=3.1:www/rubygem-rails4
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-default_value_for/Makefile b/devel/rubygem-default_value_for/Makefile
index 4b1b8342120f..96f40ebd94ff 100644
--- a/devel/rubygem-default_value_for/Makefile
+++ b/devel/rubygem-default_value_for/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1.4: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/devel/rubygem-delayed_job/Makefile b/devel/rubygem-delayed_job/Makefile
index 22dd0e4952ad..6fec96f2a5e4 100644
--- a/devel/rubygem-delayed_job/Makefile
+++ b/devel/rubygem-delayed_job/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport4>=3.0:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-delayer-deferred/Makefile b/devel/rubygem-delayer-deferred/Makefile
index aa7219f3114f..ce1aaf7da5b1 100644
--- a/devel/rubygem-delayer-deferred/Makefile
+++ b/devel/rubygem-delayer-deferred/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-delayer>=0:devel/rubygem-delayer
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-delayer/Makefile b/devel/rubygem-delayer/Makefile
index 8155c69b2d04..48a35f73ec66 100644
--- a/devel/rubygem-delayer/Makefile
+++ b/devel/rubygem-delayer/Makefile
@@ -12,7 +12,6 @@ COMMENT= Delay any task, similar to a priority-queue
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-deprecated/Makefile b/devel/rubygem-deprecated/Makefile
index d10154c5eb50..873d5519ea90 100644
--- a/devel/rubygem-deprecated/Makefile
+++ b/devel/rubygem-deprecated/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/devel/rubygem-deprecated2/Makefile b/devel/rubygem-deprecated2/Makefile
index d6e4c103c406..9306712ec69e 100644
--- a/devel/rubygem-deprecated2/Makefile
+++ b/devel/rubygem-deprecated2/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.[0-9]*
diff --git a/devel/rubygem-descendants_tracker/Makefile b/devel/rubygem-descendants_tracker/Makefile
index 9b875e0fb6a8..5f1646bf2040 100644
--- a/devel/rubygem-descendants_tracker/Makefile
+++ b/devel/rubygem-descendants_tracker/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-devise-async/Makefile b/devel/rubygem-devise-async/Makefile
index 1d0a643cad64..8f96c4290e76 100644
--- a/devel/rubygem-devise-async/Makefile
+++ b/devel/rubygem-devise-async/Makefile
@@ -18,7 +18,6 @@ SLAVEDIRS= devel/rubygem-devise-async-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-devise/Makefile b/devel/rubygem-devise/Makefile
index 0cc0aa0062ba..ae7657ed91c9 100644
--- a/devel/rubygem-devise/Makefile
+++ b/devel/rubygem-devise/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-bcrypt>=3.0:security/rubygem-bcrypt \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
BROKEN_RUBY23= yes
diff --git a/devel/rubygem-directory_watcher/Makefile b/devel/rubygem-directory_watcher/Makefile
index c12d62c97da3..c72dd223c01a 100644
--- a/devel/rubygem-directory_watcher/Makefile
+++ b/devel/rubygem-directory_watcher/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/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 866a6be5e4e9..f15895e13f8f 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -18,9 +18,7 @@ NO_ARCH= yes
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/ditz
ruby_OLD_CMD= /usr/bin/ruby1.8
diff --git a/devel/rubygem-docile/Makefile b/devel/rubygem-docile/Makefile
index 26101a07fe46..00fc4504a993 100644
--- a/devel/rubygem-docile/Makefile
+++ b/devel/rubygem-docile/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/devel/rubygem-drydock/Makefile b/devel/rubygem-drydock/Makefile
index ad33d747a572..e932ee8b8098 100644
--- a/devel/rubygem-drydock/Makefile
+++ b/devel/rubygem-drydock/Makefile
@@ -15,9 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/example
.include <bsd.port.mk>
diff --git a/devel/rubygem-dynflow/Makefile b/devel/rubygem-dynflow/Makefile
index cb7da8bff6e5..691da18acc00 100644
--- a/devel/rubygem-dynflow/Makefile
+++ b/devel/rubygem-dynflow/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-algebrick>=0.7.0:devel/rubygem-algebrick \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-edavis10-object_daddy/Makefile b/devel/rubygem-edavis10-object_daddy/Makefile
index b724cddc5aa1..068091c6f09d 100644
--- a/devel/rubygem-edavis10-object_daddy/Makefile
+++ b/devel/rubygem-edavis10-object_daddy/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/devel/rubygem-elif/Makefile b/devel/rubygem-elif/Makefile
index 4757d81a1755..9c55939b7d20 100644
--- a/devel/rubygem-elif/Makefile
+++ b/devel/rubygem-elif/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/devel/rubygem-enumerize/Makefile b/devel/rubygem-enumerize/Makefile
index 08c88e16878a..46c8bfbf5553 100644
--- a/devel/rubygem-enumerize/Makefile
+++ b/devel/rubygem-enumerize/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-activesupport4>=3.2:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-equalizer/Makefile b/devel/rubygem-equalizer/Makefile
index ad63cc46dd57..336a9930fd2c 100644
--- a/devel/rubygem-equalizer/Makefile
+++ b/devel/rubygem-equalizer/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/devel/rubygem-errand/Makefile b/devel/rubygem-errand/Makefile
index 72d8e9da12ae..daecf664ddcf 100644
--- a/devel/rubygem-errand/Makefile
+++ b/devel/rubygem-errand/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rrdtool:databases/rrdtool \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-event-bus/Makefile b/devel/rubygem-event-bus/Makefile
index 5bb727edf6a5..1aa955f2863c 100644
--- a/devel/rubygem-event-bus/Makefile
+++ b/devel/rubygem-event-bus/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/devel/rubygem-eventmachine/Makefile b/devel/rubygem-eventmachine/Makefile
index d32511b02af0..937cfd29b062 100644
--- a/devel/rubygem-eventmachine/Makefile
+++ b/devel/rubygem-eventmachine/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE_RUBY= ${WRKSRC}/GNU
LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-excon/Makefile b/devel/rubygem-excon/Makefile
index d52930227790..5f8164588929 100644
--- a/devel/rubygem-excon/Makefile
+++ b/devel/rubygem-excon/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-execjs/Makefile b/devel/rubygem-execjs/Makefile
index 210ce1d306dc..b892d8264c83 100644
--- a/devel/rubygem-execjs/Makefile
+++ b/devel/rubygem-execjs/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= node:www/node
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-patch:
@${REINPLACE_CMD} -e 's#%%LOCALBASE%%#${LOCALBASE}#' \
diff --git a/devel/rubygem-extlib/Makefile b/devel/rubygem-extlib/Makefile
index fd621eb0d6f8..edc790b2dbfa 100644
--- a/devel/rubygem-extlib/Makefile
+++ b/devel/rubygem-extlib/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/devel/rubygem-facets/Makefile b/devel/rubygem-facets/Makefile
index 349c171d67a6..3b1860de4c1e 100644
--- a/devel/rubygem-facets/Makefile
+++ b/devel/rubygem-facets/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/devel/rubygem-faraday_middleware-multi_json/Makefile b/devel/rubygem-faraday_middleware-multi_json/Makefile
index fcc0d73c14a4..9a4c40166533 100644
--- a/devel/rubygem-faraday_middleware-multi_json/Makefile
+++ b/devel/rubygem-faraday_middleware-multi_json/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-faraday_middleware>0:www/rubygem-faraday_middleware \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-fast-stemmer/Makefile b/devel/rubygem-fast-stemmer/Makefile
index cae1a7c34ecf..c7d2944920db 100644
--- a/devel/rubygem-fast-stemmer/Makefile
+++ b/devel/rubygem-fast-stemmer/Makefile
@@ -11,7 +11,6 @@ COMMENT= Fast Porter stemmer based on a C version of algorithm
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-fast_gettext/Makefile b/devel/rubygem-fast_gettext/Makefile
index f588eeb70b3f..3b6f15127563 100644
--- a/devel/rubygem-fast_gettext/Makefile
+++ b/devel/rubygem-fast_gettext/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/devel/rubygem-fast_stack/Makefile b/devel/rubygem-fast_stack/Makefile
index ad70eb92ac18..48b8e424e5ec 100644
--- a/devel/rubygem-fast_stack/Makefile
+++ b/devel/rubygem-fast_stack/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-fast_xor/Makefile b/devel/rubygem-fast_xor/Makefile
index a2a1cc0bba1e..f990f5d9033f 100644
--- a/devel/rubygem-fast_xor/Makefile
+++ b/devel/rubygem-fast_xor/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rake>=0:devel/rubygem-rake \
rubygem-rake-compiler>=0:devel/rubygem-rake-compiler
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-fastercsv/Makefile b/devel/rubygem-fastercsv/Makefile
index f40a7f9c9d85..da72f7674dca 100644
--- a/devel/rubygem-fastercsv/Makefile
+++ b/devel/rubygem-fastercsv/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/devel/rubygem-fastri/Makefile b/devel/rubygem-fastri/Makefile
index ce762472bbf1..d32f510325d5 100644
--- a/devel/rubygem-fastri/Makefile
+++ b/devel/rubygem-fastri/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/fastri-server bin/fri bin/qri bin/ri-emacs
diff --git a/devel/rubygem-fastthread/Makefile b/devel/rubygem-fastthread/Makefile
index f156a33fd88e..3f65a2e2b949 100644
--- a/devel/rubygem-fastthread/Makefile
+++ b/devel/rubygem-fastthread/Makefile
@@ -12,7 +12,6 @@ COMMENT= Optimized replacement for thread.rb primitives
LICENSE= LGPL21
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-fattr/Makefile b/devel/rubygem-fattr/Makefile
index ed4ddee5c7d2..fa70f8cfd606 100644
--- a/devel/rubygem-fattr/Makefile
+++ b/devel/rubygem-fattr/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/devel/rubygem-ffi-compiler/Makefile b/devel/rubygem-ffi-compiler/Makefile
index 6202752c49d8..9ef44403bb4f 100644
--- a/devel/rubygem-ffi-compiler/Makefile
+++ b/devel/rubygem-ffi-compiler/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-ffi>=1.0.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/devel/rubygem-ffi-yajl/Makefile b/devel/rubygem-ffi-yajl/Makefile
index 708d636a2831..96a9b55c143a 100644
--- a/devel/rubygem-ffi-yajl/Makefile
+++ b/devel/rubygem-ffi-yajl/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= yajl>=2.0.0:devel/yajl \
rubygem-libyajl2>=1.0.0:devel/rubygem-libyajl2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ffi-yajl-bench
diff --git a/devel/rubygem-ffi/Makefile b/devel/rubygem-ffi/Makefile
index 4f5328b8df94..c99afe8889a9 100644
--- a/devel/rubygem-ffi/Makefile
+++ b/devel/rubygem-ffi/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libffi.so:devel/libffi
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-file-tail/Makefile b/devel/rubygem-file-tail/Makefile
index 15badaac957e..0363b7e04f80 100644
--- a/devel/rubygem-file-tail/Makefile
+++ b/devel/rubygem-file-tail/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-tins>=1.0:devel/rubygem-tins
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-flexmock/Makefile b/devel/rubygem-flexmock/Makefile
index 845b65f99cbc..97f11633a116 100644
--- a/devel/rubygem-flexmock/Makefile
+++ b/devel/rubygem-flexmock/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/devel/rubygem-fluent-logger/Makefile b/devel/rubygem-fluent-logger/Makefile
index a876fb3af902..9f0286cb9ea3 100644
--- a/devel/rubygem-fluent-logger/Makefile
+++ b/devel/rubygem-fluent-logger/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-msgpack>=0.5.4:devel/rubygem-msgpack
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/fluent-post
diff --git a/devel/rubygem-fog-core/Makefile b/devel/rubygem-fog-core/Makefile
index 7ea5b2f4431a..fe030b95637e 100644
--- a/devel/rubygem-fog-core/Makefile
+++ b/devel/rubygem-fog-core/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/devel/rubygem-fog-json/Makefile b/devel/rubygem-fog-json/Makefile
index e366738eb7f3..051a48da1cc8 100644
--- a/devel/rubygem-fog-json/Makefile
+++ b/devel/rubygem-fog-json/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-fog-core>=1.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/devel/rubygem-fog/Makefile b/devel/rubygem-fog/Makefile
index 110d3733fb35..eab529b2fabc 100644
--- a/devel/rubygem-fog/Makefile
+++ b/devel/rubygem-fog/Makefile
@@ -43,8 +43,7 @@ RUN_DEPENDS= rubygem-fog-aliyun>=0.1.0:net/rubygem-fog-aliyun \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/fog
diff --git a/devel/rubygem-font-awesome-rails-rails4/Makefile b/devel/rubygem-font-awesome-rails-rails4/Makefile
index d8b81e77728d..f23d5c41e5c1 100644
--- a/devel/rubygem-font-awesome-rails-rails4/Makefile
+++ b/devel/rubygem-font-awesome-rails-rails4/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-railties4>=3.2: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/devel/rubygem-font-awesome-rails/Makefile b/devel/rubygem-font-awesome-rails/Makefile
index e3b09e0ea3c8..1a91e05b176b 100644
--- a/devel/rubygem-font-awesome-rails/Makefile
+++ b/devel/rubygem-font-awesome-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-railties>=3.2: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/devel/rubygem-foreigner/Makefile b/devel/rubygem-foreigner/Makefile
index bff96b352867..0dcbd5319066 100644
--- a/devel/rubygem-foreigner/Makefile
+++ b/devel/rubygem-foreigner/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=3.0.0: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/devel/rubygem-foreman/Makefile b/devel/rubygem-foreman/Makefile
index 9edc21e47d6f..65bae89c27e1 100644
--- a/devel/rubygem-foreman/Makefile
+++ b/devel/rubygem-foreman/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= rubygem-thor>=0.19.1:devel/rubygem-thor
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= spec/resources/bin/env
PLIST_FILES= bin/foreman
diff --git a/devel/rubygem-formatador/Makefile b/devel/rubygem-formatador/Makefile
index 8fc19fe994ef..b1eb0ef55ab1 100644
--- a/devel/rubygem-formatador/Makefile
+++ b/devel/rubygem-formatador/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gdata/Makefile b/devel/rubygem-gdata/Makefile
index ded1155b2ef8..1dc6c834bda3 100644
--- a/devel/rubygem-gdata/Makefile
+++ b/devel/rubygem-gdata/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/devel/rubygem-gem_plugin/Makefile b/devel/rubygem-gem_plugin/Makefile
index 4bec238cf07e..adf86490f326 100644
--- a/devel/rubygem-gem_plugin/Makefile
+++ b/devel/rubygem-gem_plugin/Makefile
@@ -17,8 +17,7 @@ LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/gpgen
diff --git a/devel/rubygem-gemcutter/Makefile b/devel/rubygem-gemcutter/Makefile
index 3da8e4d41a7f..3094c53d149c 100644
--- a/devel/rubygem-gemcutter/Makefile
+++ b/devel/rubygem-gemcutter/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gemnasium-gitlab-service/Makefile b/devel/rubygem-gemnasium-gitlab-service/Makefile
index fea1f55a9f05..e9e61b5e0c89 100644
--- a/devel/rubygem-gemnasium-gitlab-service/Makefile
+++ b/devel/rubygem-gemnasium-gitlab-service/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rugged>=0.21:devel/rubygem-rugged
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gems/Makefile b/devel/rubygem-gems/Makefile
index 149ba816eb0c..6a3cd01fdb82 100644
--- a/devel/rubygem-gems/Makefile
+++ b/devel/rubygem-gems/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/devel/rubygem-generator_spec-rails4/Makefile b/devel/rubygem-generator_spec-rails4/Makefile
index 535063d6dc44..402da20e7839 100644
--- a/devel/rubygem-generator_spec-rails4/Makefile
+++ b/devel/rubygem-generator_spec-rails4/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1.4: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/devel/rubygem-generator_spec/Makefile b/devel/rubygem-generator_spec/Makefile
index 2e3e7b440540..99145be91587 100644
--- a/devel/rubygem-generator_spec/Makefile
+++ b/devel/rubygem-generator_spec/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord>=3.0.0:databases/rubygem-activerecord \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-georuby/Makefile b/devel/rubygem-georuby/Makefile
index c58a32962a18..b977cc57cf48 100644
--- a/devel/rubygem-georuby/Makefile
+++ b/devel/rubygem-georuby/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/devel/rubygem-get_process_mem/Makefile b/devel/rubygem-get_process_mem/Makefile
index 7fec372aeee9..8a8c04b60675 100644
--- a/devel/rubygem-get_process_mem/Makefile
+++ b/devel/rubygem-get_process_mem/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/devel/rubygem-getopt/Makefile b/devel/rubygem-getopt/Makefile
index 09c64ef944ff..e72bcea98b9d 100644
--- a/devel/rubygem-getopt/Makefile
+++ b/devel/rubygem-getopt/Makefile
@@ -13,7 +13,6 @@ NO_ARCH= yes
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gettext/Makefile b/devel/rubygem-gettext/Makefile
index 9cd0dab4478e..e136e970b624 100644
--- a/devel/rubygem-gettext/Makefile
+++ b/devel/rubygem-gettext/Makefile
@@ -15,12 +15,10 @@ LICENSE_COMB= dual
RUN_DEPENDS= rubygem-locale>=2.0.5:devel/rubygem-locale \
rubygem-text>=1.3.0:textproc/rubygem-text
-USES= shebangfix
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist shebangfix
SHEBANG_FILES= samples/*.rb samples/cgi/*.rb
PLIST_FILES= bin/rmsgcat bin/rmsgfmt bin/rmsginit bin/rmsgmerge bin/rxgettext
diff --git a/devel/rubygem-gh/Makefile b/devel/rubygem-gh/Makefile
index e123673949b9..0507291206e2 100644
--- a/devel/rubygem-gh/Makefile
+++ b/devel/rubygem-gh/Makefile
@@ -21,7 +21,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/devel/rubygem-gibbler/Makefile b/devel/rubygem-gibbler/Makefile
index b207a55f2d90..35937f9a71fe 100644
--- a/devel/rubygem-gibbler/Makefile
+++ b/devel/rubygem-gibbler/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/devel/rubygem-gio2/Makefile b/devel/rubygem-gio2/Makefile
index 357d224cf165..6b7d01455d43 100644
--- a/devel/rubygem-gio2/Makefile
+++ b/devel/rubygem-gio2/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-git-version-bump/Makefile b/devel/rubygem-git-version-bump/Makefile
index 6c7165043df4..aafee7bd7417 100644
--- a/devel/rubygem-git-version-bump/Makefile
+++ b/devel/rubygem-git-version-bump/Makefile
@@ -13,8 +13,7 @@ LICENSE= GPLv3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/git-version-bump
diff --git a/devel/rubygem-git/Makefile b/devel/rubygem-git/Makefile
index ac50a84138cb..d0955b9a7663 100644
--- a/devel/rubygem-git/Makefile
+++ b/devel/rubygem-git/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= git>=1.6:devel/git
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-github_api/Makefile b/devel/rubygem-github_api/Makefile
index 4a449475492f..e9e6319d3f2b 100644
--- a/devel/rubygem-github_api/Makefile
+++ b/devel/rubygem-github_api/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-addressable>=2.4.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/devel/rubygem-gitlab-pygments.rb/Makefile b/devel/rubygem-gitlab-pygments.rb/Makefile
index db5623da1efc..6adadfbf5fe9 100644
--- a/devel/rubygem-gitlab-pygments.rb/Makefile
+++ b/devel/rubygem-gitlab-pygments.rb/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gitlab_git/Makefile b/devel/rubygem-gitlab_git/Makefile
index a039b89adaf2..0b112a8d997f 100644
--- a/devel/rubygem-gitlab_git/Makefile
+++ b/devel/rubygem-gitlab_git/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gitlab_meta/Makefile b/devel/rubygem-gitlab_meta/Makefile
index a0b826c5d40e..83796c483861 100644
--- a/devel/rubygem-gitlab_meta/Makefile
+++ b/devel/rubygem-gitlab_meta/Makefile
@@ -13,9 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= cpe
+USES= cpe gem:autoplist
CPE_PRODUCT= gitlab
CPE_VENDOR= gitlab
diff --git a/devel/rubygem-glib2/Makefile b/devel/rubygem-glib2/Makefile
index 9609cd941afc..83e2376014d4 100644
--- a/devel/rubygem-glib2/Makefile
+++ b/devel/rubygem-glib2/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-pkg-config>=0:devel/rubygem-pkg-config
USE_GNOME= glib20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-gobject-introspection/Makefile b/devel/rubygem-gobject-introspection/Makefile
index 84f6dddfe863..3f21134058b2 100644
--- a/devel/rubygem-gobject-introspection/Makefile
+++ b/devel/rubygem-gobject-introspection/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
USE_GNOME= introspection
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-graf/Makefile b/devel/rubygem-graf/Makefile
index e7d04a845070..31825991e217 100644
--- a/devel/rubygem-graf/Makefile
+++ b/devel/rubygem-graf/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/graf
.include <bsd.port.mk>
diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile
index 35c120332d94..a8d39a01af68 100644
--- a/devel/rubygem-grape-entity/Makefile
+++ b/devel/rubygem-grape-entity/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-grape-swagger/Makefile b/devel/rubygem-grape-swagger/Makefile
index c1a33d0b5daa..844b8473fae6 100644
--- a/devel/rubygem-grape-swagger/Makefile
+++ b/devel/rubygem-grape-swagger/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-awesome_print>=0:devel/rubygem-awesome_print \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-grape/Makefile b/devel/rubygem-grape/Makefile
index 4fbb6b40ebe1..494e3d13e449 100644
--- a/devel/rubygem-grape/Makefile
+++ b/devel/rubygem-grape/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-grit/Makefile b/devel/rubygem-grit/Makefile
index 355230abfa5d..a52be648e61c 100644
--- a/devel/rubygem-grit/Makefile
+++ b/devel/rubygem-grit/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-diff-lcs>=1.1:textproc/rubygem-diff-lcs \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-guess_html_encoding/Makefile b/devel/rubygem-guess_html_encoding/Makefile
index 2d678b91032a..b8369f19e508 100644
--- a/devel/rubygem-guess_html_encoding/Makefile
+++ b/devel/rubygem-guess_html_encoding/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/devel/rubygem-gyoku/Makefile b/devel/rubygem-gyoku/Makefile
index 6b96441a30f2..319b4d7587eb 100644
--- a/devel/rubygem-gyoku/Makefile
+++ b/devel/rubygem-gyoku/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-builder32>=2.1.2: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/devel/rubygem-hashdiff/Makefile b/devel/rubygem-hashdiff/Makefile
index 13645ecfb0d4..304cf22f0505 100644
--- a/devel/rubygem-hashdiff/Makefile
+++ b/devel/rubygem-hashdiff/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/devel/rubygem-hashery/Makefile b/devel/rubygem-hashery/Makefile
index cdf9f5acb561..29829cd6f775 100644
--- a/devel/rubygem-hashery/Makefile
+++ b/devel/rubygem-hashery/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD2CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-hashie/Makefile b/devel/rubygem-hashie/Makefile
index 2d26d9e00976..38d68db19a22 100644
--- a/devel/rubygem-hashie/Makefile
+++ b/devel/rubygem-hashie/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/devel/rubygem-hashie2/Makefile b/devel/rubygem-hashie2/Makefile
index 412c99c08cd3..e4268b97f77c 100644
--- a/devel/rubygem-hashie2/Makefile
+++ b/devel/rubygem-hashie2/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\.
diff --git a/devel/rubygem-highline/Makefile b/devel/rubygem-highline/Makefile
index 38985bfcf3d0..a31de207055e 100644
--- a/devel/rubygem-highline/Makefile
+++ b/devel/rubygem-highline/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/devel/rubygem-hike/Makefile b/devel/rubygem-hike/Makefile
index 61a1af5435ac..c1f6af10c9d7 100644
--- a/devel/rubygem-hike/Makefile
+++ b/devel/rubygem-hike/Makefile
@@ -15,7 +15,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/devel/rubygem-hitimes/Makefile b/devel/rubygem-hitimes/Makefile
index adca78d5fca5..d9a2738f0ad2 100644
--- a/devel/rubygem-hitimes/Makefile
+++ b/devel/rubygem-hitimes/Makefile
@@ -12,7 +12,6 @@ COMMENT= High resolution timer library for Ruby
LICENSE= ISCL
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-hoe/Makefile b/devel/rubygem-hoe/Makefile
index 244c6e86ad14..8a43cfa78237 100644
--- a/devel/rubygem-hoe/Makefile
+++ b/devel/rubygem-hoe/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-rake>=0.8:devel/rubygem-rake
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sow
diff --git a/devel/rubygem-holidays/Makefile b/devel/rubygem-holidays/Makefile
index 656134c65715..5fe82cff8146 100644
--- a/devel/rubygem-holidays/Makefile
+++ b/devel/rubygem-holidays/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/devel/rubygem-i18n/Makefile b/devel/rubygem-i18n/Makefile
index 4f156be85b59..7ae9329722e2 100644
--- a/devel/rubygem-i18n/Makefile
+++ b/devel/rubygem-i18n/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/devel/rubygem-icalendar/Makefile b/devel/rubygem-icalendar/Makefile
index 030f464454ce..332154559e71 100644
--- a/devel/rubygem-icalendar/Makefile
+++ b/devel/rubygem-icalendar/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/devel/rubygem-ice_cube/Makefile b/devel/rubygem-ice_cube/Makefile
index 5855acfbe9ce..ad78bab94166 100644
--- a/devel/rubygem-ice_cube/Makefile
+++ b/devel/rubygem-ice_cube/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/devel/rubygem-ice_nine/Makefile b/devel/rubygem-ice_nine/Makefile
index 0b0f939ea6bf..a4e643cb27b7 100644
--- a/devel/rubygem-ice_nine/Makefile
+++ b/devel/rubygem-ice_nine/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/devel/rubygem-inflecto/Makefile b/devel/rubygem-inflecto/Makefile
index 1036bf015ba5..1ac0ccc4822c 100644
--- a/devel/rubygem-inflecto/Makefile
+++ b/devel/rubygem-inflecto/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/devel/rubygem-instance_storage/Makefile b/devel/rubygem-instance_storage/Makefile
index b0de0c79ae92..f1870d806e0f 100644
--- a/devel/rubygem-instance_storage/Makefile
+++ b/devel/rubygem-instance_storage/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/devel/rubygem-interact/Makefile b/devel/rubygem-interact/Makefile
index 25cc91924311..e98290d85b50 100644
--- a/devel/rubygem-interact/Makefile
+++ b/devel/rubygem-interact/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-iobuffer/Makefile b/devel/rubygem-iobuffer/Makefile
index 1329e007913b..e59a44f52f97 100644
--- a/devel/rubygem-iobuffer/Makefile
+++ b/devel/rubygem-iobuffer/Makefile
@@ -9,7 +9,6 @@ MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Gems for iobuffer
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-jammit/Makefile b/devel/rubygem-jammit/Makefile
index 76f752a0083b..30024d216a43 100644
--- a/devel/rubygem-jammit/Makefile
+++ b/devel/rubygem-jammit/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-cssmin>=1.0:textproc/rubygem-cssmin \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/jammit
diff --git a/devel/rubygem-jbuilder/Makefile b/devel/rubygem-jbuilder/Makefile
index 8d6c391c75d6..77713ea8ad9f 100644
--- a/devel/rubygem-jbuilder/Makefile
+++ b/devel/rubygem-jbuilder/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS?= rubygem-activesupport4>=3.0.0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-jekyll-coffeescript/Makefile b/devel/rubygem-jekyll-coffeescript/Makefile
index 4ef501f50d2d..5e6d3d53cbfe 100644
--- a/devel/rubygem-jekyll-coffeescript/Makefile
+++ b/devel/rubygem-jekyll-coffeescript/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-coffee-script>=2.2:devel/rubygem-coffee-script
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-jeweler/Makefile b/devel/rubygem-jeweler/Makefile
index b1e5c5b00a30..d001fef10ec6 100644
--- a/devel/rubygem-jeweler/Makefile
+++ b/devel/rubygem-jeweler/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= rubygem-builder32>=0:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/jeweler
diff --git a/devel/rubygem-jmespath/Makefile b/devel/rubygem-jmespath/Makefile
index 424337cb67fc..8cf24af73c4e 100644
--- a/devel/rubygem-jmespath/Makefile
+++ b/devel/rubygem-jmespath/Makefile
@@ -12,7 +12,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/devel/rubygem-jquery-ui-themes/Makefile b/devel/rubygem-jquery-ui-themes/Makefile
index 384dc50b0c2b..48cb58418a51 100644
--- a/devel/rubygem-jquery-ui-themes/Makefile
+++ b/devel/rubygem-jquery-ui-themes/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-httparty>=0: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/devel/rubygem-jruby-jars/Makefile b/devel/rubygem-jruby-jars/Makefile
index 39e6f0764733..cded0e5c642f 100644
--- a/devel/rubygem-jruby-jars/Makefile
+++ b/devel/rubygem-jruby-jars/Makefile
@@ -16,7 +16,6 @@ USE_JAVA= yes
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-json/Makefile b/devel/rubygem-json/Makefile
index 2545a5dfde70..81723752db6f 100644
--- a/devel/rubygem-json/Makefile
+++ b/devel/rubygem-json/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/GPL
LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-json_pure/Makefile b/devel/rubygem-json_pure/Makefile
index 403888590f3c..5ceb85da62b2 100644
--- a/devel/rubygem-json_pure/Makefile
+++ b/devel/rubygem-json_pure/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv2 RUBY
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-kafo/Makefile b/devel/rubygem-kafo/Makefile
index 1ee8ceaa4212..a5ed1485cc05 100644
--- a/devel/rubygem-kafo/Makefile
+++ b/devel/rubygem-kafo/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= gsed:textproc/gsed \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= cpe
+USES= cpe gem:autoplist
CPE_VENDOR= theforeman
diff --git a/devel/rubygem-kafo_parsers/Makefile b/devel/rubygem-kafo_parsers/Makefile
index b268d7b48017..55c7f4320cc2 100644
--- a/devel/rubygem-kafo_parsers/Makefile
+++ b/devel/rubygem-kafo_parsers/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/devel/rubygem-kafo_wizards/Makefile b/devel/rubygem-kafo_wizards/Makefile
index 981badf75713..b7f69899c64e 100644
--- a/devel/rubygem-kafo_wizards/Makefile
+++ b/devel/rubygem-kafo_wizards/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-highline>=0:devel/rubygem-highline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-kgio/Makefile b/devel/rubygem-kgio/Makefile
index b9f3670c5f10..298a5cb4135b 100644
--- a/devel/rubygem-kgio/Makefile
+++ b/devel/rubygem-kgio/Makefile
@@ -13,7 +13,6 @@ LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-launchy/Makefile b/devel/rubygem-launchy/Makefile
index 53a65df6a9a3..107209f022a1 100644
--- a/devel/rubygem-launchy/Makefile
+++ b/devel/rubygem-launchy/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/launchy
diff --git a/devel/rubygem-launchy22/Makefile b/devel/rubygem-launchy22/Makefile
index d30c2a05a813..20b0fb7159f3 100644
--- a/devel/rubygem-launchy22/Makefile
+++ b/devel/rubygem-launchy22/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.2
diff --git a/devel/rubygem-librarian/Makefile b/devel/rubygem-librarian/Makefile
index 57fc34bc82f9..bfeac02fd6d6 100644
--- a/devel/rubygem-librarian/Makefile
+++ b/devel/rubygem-librarian/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}highline>=0:devel/rubygem-highline \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-librarianp/Makefile b/devel/rubygem-librarianp/Makefile
index 52c3c23c4c6d..75c65b9da39b 100644
--- a/devel/rubygem-librarianp/Makefile
+++ b/devel/rubygem-librarianp/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-thor>=0.15: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/devel/rubygem-libyajl2/Makefile b/devel/rubygem-libyajl2/Makefile
index 075e84854777..8f08f9c3a766 100644
--- a/devel/rubygem-libyajl2/Makefile
+++ b/devel/rubygem-libyajl2/Makefile
@@ -11,7 +11,6 @@ COMMENT= Vendored copy of libyajl2
LICENSE= APACHE20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-licensee/Makefile b/devel/rubygem-licensee/Makefile
index 0a415ea6d91f..de3519fca7ed 100644
--- a/devel/rubygem-licensee/Makefile
+++ b/devel/rubygem-licensee/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rugged>=0.23:devel/rubygem-rugged
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/licensee
diff --git a/devel/rubygem-listen/Makefile b/devel/rubygem-listen/Makefile
index 77f1a76349dc..7b6cacf5ceaf 100644
--- a/devel/rubygem-listen/Makefile
+++ b/devel/rubygem-listen/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-rb-fsevent>=0.9.3:devel/rubygem-rb-fsevent \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/listen
diff --git a/devel/rubygem-little-plugger/Makefile b/devel/rubygem-little-plugger/Makefile
index 05a38a4d8c3d..f1a1d47fad1b 100644
--- a/devel/rubygem-little-plugger/Makefile
+++ b/devel/rubygem-little-plugger/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/devel/rubygem-locale/Makefile b/devel/rubygem-locale/Makefile
index 194515117654..50f070ff2382 100644
--- a/devel/rubygem-locale/Makefile
+++ b/devel/rubygem-locale/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/devel/rubygem-lockfile/Makefile b/devel/rubygem-lockfile/Makefile
index 0f7092ba8b4e..a351ab12f145 100644
--- a/devel/rubygem-lockfile/Makefile
+++ b/devel/rubygem-lockfile/Makefile
@@ -13,8 +13,7 @@ LICENSE= RUBY
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rlock
diff --git a/devel/rubygem-logging/Makefile b/devel/rubygem-logging/Makefile
index f059f0deb610..3e284e6c9b6a 100644
--- a/devel/rubygem-logging/Makefile
+++ b/devel/rubygem-logging/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-little-plugger>=1.1.3:devel/rubygem-little-plugger \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-logster/Makefile b/devel/rubygem-logster/Makefile
index c6c39fe95746..7e494da5c694 100644
--- a/devel/rubygem-logster/Makefile
+++ b/devel/rubygem-logster/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/devel/rubygem-loquacious/Makefile b/devel/rubygem-loquacious/Makefile
index 3925a5ab049a..ca308189bde6 100644
--- a/devel/rubygem-loquacious/Makefile
+++ b/devel/rubygem-loquacious/Makefile
@@ -15,7 +15,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/devel/rubygem-lru_redux/Makefile b/devel/rubygem-lru_redux/Makefile
index 04cc12b25abe..c4f4d22904b0 100644
--- a/devel/rubygem-lru_redux/Makefile
+++ b/devel/rubygem-lru_redux/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/devel/rubygem-lumberjack/Makefile b/devel/rubygem-lumberjack/Makefile
index 25625f853a38..155eba9446e2 100644
--- a/devel/rubygem-lumberjack/Makefile
+++ b/devel/rubygem-lumberjack/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT_LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-main/Makefile b/devel/rubygem-main/Makefile
index 3bede5bd6fbd..d38cd66a9a87 100644
--- a/devel/rubygem-main/Makefile
+++ b/devel/rubygem-main/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-arrayfields>=4.7.4:devel/rubygem-arrayfields \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-map/Makefile b/devel/rubygem-map/Makefile
index 4e054c8e8f4a..266417ba4943 100644
--- a/devel/rubygem-map/Makefile
+++ b/devel/rubygem-map/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/devel/rubygem-memoist/Makefile b/devel/rubygem-memoist/Makefile
index f9934f657520..32d7b963523f 100644
--- a/devel/rubygem-memoist/Makefile
+++ b/devel/rubygem-memoist/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCHI= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-memoizable/Makefile b/devel/rubygem-memoizable/Makefile
index 555c74f2aaa1..4228dab233ee 100644
--- a/devel/rubygem-memoizable/Makefile
+++ b/devel/rubygem-memoizable/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-thread_safe>=0.3.1:devel/rubygem-thread_safe
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-memoize/Makefile b/devel/rubygem-memoize/Makefile
index 0b68add6e20f..ae18518f0e01 100644
--- a/devel/rubygem-memoize/Makefile
+++ b/devel/rubygem-memoize/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-test-unit>=2.0.2:devel/rubygem-test-unit
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mercenary/Makefile b/devel/rubygem-mercenary/Makefile
index cb689bde6492..a5c7616e327e 100644
--- a/devel/rubygem-mercenary/Makefile
+++ b/devel/rubygem-mercenary/Makefile
@@ -13,9 +13,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= script/console script/examples
.include <bsd.port.mk>
diff --git a/devel/rubygem-message_bus/Makefile b/devel/rubygem-message_bus/Makefile
index 5d083009ba3b..bde3aa8c9371 100644
--- a/devel/rubygem-message_bus/Makefile
+++ b/devel/rubygem-message_bus/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rack16>=1.1.3: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/devel/rubygem-metaclass/Makefile b/devel/rubygem-metaclass/Makefile
index 7d8d0218943f..fa0be7436339 100644
--- a/devel/rubygem-metaclass/Makefile
+++ b/devel/rubygem-metaclass/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/devel/rubygem-metaid/Makefile b/devel/rubygem-metaid/Makefile
index 57df3ad8d5a7..94676b9b9221 100644
--- a/devel/rubygem-metaid/Makefile
+++ b/devel/rubygem-metaid/Makefile
@@ -11,7 +11,6 @@ COMMENT= Ruby metaprogramming helpers
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-method_source/Makefile b/devel/rubygem-method_source/Makefile
index 693c141fd0f1..d265b2d25964 100644
--- a/devel/rubygem-method_source/Makefile
+++ b/devel/rubygem-method_source/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/devel/rubygem-minitest/Makefile b/devel/rubygem-minitest/Makefile
index 200b4597a797..c344fb576713 100644
--- a/devel/rubygem-minitest/Makefile
+++ b/devel/rubygem-minitest/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/devel/rubygem-minitest4/Makefile b/devel/rubygem-minitest4/Makefile
index e35897a00fd8..0ad2a50fffcf 100644
--- a/devel/rubygem-minitest4/Makefile
+++ b/devel/rubygem-minitest4/Makefile
@@ -15,7 +15,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/devel/rubygem-mixlib-authentication/Makefile b/devel/rubygem-mixlib-authentication/Makefile
index e1360a7b64d3..e5c73537b4ec 100644
--- a/devel/rubygem-mixlib-authentication/Makefile
+++ b/devel/rubygem-mixlib-authentication/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-mixlib-log>=0:devel/rubygem-mixlib-log
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mixlib-cli/Makefile b/devel/rubygem-mixlib-cli/Makefile
index 934a252025b5..33e170808581 100644
--- a/devel/rubygem-mixlib-cli/Makefile
+++ b/devel/rubygem-mixlib-cli/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/devel/rubygem-mixlib-config/Makefile b/devel/rubygem-mixlib-config/Makefile
index 94062649232a..e1dc6d97c4ae 100644
--- a/devel/rubygem-mixlib-config/Makefile
+++ b/devel/rubygem-mixlib-config/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/devel/rubygem-mixlib-log/Makefile b/devel/rubygem-mixlib-log/Makefile
index 7bdfced9fbb3..22bb06e42720 100644
--- a/devel/rubygem-mixlib-log/Makefile
+++ b/devel/rubygem-mixlib-log/Makefile
@@ -12,7 +12,6 @@ COMMENT= Provides a simple mixin for log functionality
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mixlib-shellout/Makefile b/devel/rubygem-mixlib-shellout/Makefile
index f1cc6730b145..8fbe7e865db2 100644
--- a/devel/rubygem-mixlib-shellout/Makefile
+++ b/devel/rubygem-mixlib-shellout/Makefile
@@ -13,7 +13,6 @@ COMMENT= Shell interface that also collects stdout and stderr
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mkrf/Makefile b/devel/rubygem-mkrf/Makefile
index 1bb5a8873311..e44e68726660 100644
--- a/devel/rubygem-mkrf/Makefile
+++ b/devel/rubygem-mkrf/Makefile
@@ -11,10 +11,8 @@ COMMENT= Replacement to mkmf generates Rakefiles to build C Extensions
LICENSE= MIT
-USES= python
USE_RUBY= yes
-USE_RUBYGEMS= yes
USE_RAKE= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist python
.include <bsd.port.mk>
diff --git a/devel/rubygem-mocha/Makefile b/devel/rubygem-mocha/Makefile
index 376bed14112a..c434a233e506 100644
--- a/devel/rubygem-mocha/Makefile
+++ b/devel/rubygem-mocha/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-metaclass>=0:devel/rubygem-metaclass
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-moneta/Makefile b/devel/rubygem-moneta/Makefile
index 7ba092f81eac..0de1f2a022a3 100644
--- a/devel/rubygem-moneta/Makefile
+++ b/devel/rubygem-moneta/Makefile
@@ -12,14 +12,12 @@ COMMENT= Unified interface to key/value stores
NO_ARCH= yes
-USES= shebangfix
+USE_RUBY= yes
+USES= gem:autoplist shebangfix
SHEBANG_FILES= script/install-kyotocabinet \
script/kill-travis \
script/start-services \
script/upload-bundle \
script/wait-services
-USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
.include <bsd.port.mk>
diff --git a/devel/rubygem-moneta06/Makefile b/devel/rubygem-moneta06/Makefile
index 8e1c51c6d15e..88ae2ad7007d 100644
--- a/devel/rubygem-moneta06/Makefile
+++ b/devel/rubygem-moneta06/Makefile
@@ -13,7 +13,6 @@ COMMENT= Unified interface to key/value stores
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mongo/Makefile b/devel/rubygem-mongo/Makefile
index 80e8125df69e..6657c2b1c1ed 100644
--- a/devel/rubygem-mongo/Makefile
+++ b/devel/rubygem-mongo/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-bson1>=${PORTVERSION}:devel/rubygem-bson1
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/mongo_console
diff --git a/devel/rubygem-msgpack/Makefile b/devel/rubygem-msgpack/Makefile
index 65653ab2b1f1..292c57f693b4 100644
--- a/devel/rubygem-msgpack/Makefile
+++ b/devel/rubygem-msgpack/Makefile
@@ -11,8 +11,7 @@ COMMENT= Gems for MessagePack
LICENSE= APACHE20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
STRIPDIR= ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
post-install:
diff --git a/devel/rubygem-mspec/Makefile b/devel/rubygem-mspec/Makefile
index 0c304b2340a8..c3fedcb2e32d 100644
--- a/devel/rubygem-mspec/Makefile
+++ b/devel/rubygem-mspec/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/mkspec bin/mspec bin/mspec-ci bin/mspec-run bin/mspec-tag
diff --git a/devel/rubygem-multi_json/Makefile b/devel/rubygem-multi_json/Makefile
index bf6e6b838a7a..09394c47ab88 100644
--- a/devel/rubygem-multi_json/Makefile
+++ b/devel/rubygem-multi_json/Makefile
@@ -20,8 +20,7 @@ YAJL_RUBY_DESC= Yajl JSON stream-based parser library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
JSON_RUN_DEPENDS= rubygem-json>=0:devel/rubygem-json
JSON_PURE_RUN_DEPENDS= rubygem-json_pure>=0:devel/rubygem-json_pure
diff --git a/devel/rubygem-multi_test/Makefile b/devel/rubygem-multi_test/Makefile
index 06865c427e28..815bfddbab3f 100644
--- a/devel/rubygem-multi_test/Makefile
+++ b/devel/rubygem-multi_test/Makefile
@@ -14,9 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/all test/run
.include <bsd.port.mk>
diff --git a/devel/rubygem-murmurhash3/Makefile b/devel/rubygem-murmurhash3/Makefile
index b2ab2f062f9d..465a12006781 100644
--- a/devel/rubygem-murmurhash3/Makefile
+++ b/devel/rubygem-murmurhash3/Makefile
@@ -10,7 +10,6 @@ MAINTAINER= vg@FreeBSD.org
COMMENT= Implementation of murmur3 hashing function
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-mustache/Makefile b/devel/rubygem-mustache/Makefile
index 55dd2d7b8215..03c12978f294 100644
--- a/devel/rubygem-mustache/Makefile
+++ b/devel/rubygem-mustache/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/mustache
diff --git a/devel/rubygem-mutter/Makefile b/devel/rubygem-mutter/Makefile
index 173c962dda7f..190eb00fe9a6 100644
--- a/devel/rubygem-mutter/Makefile
+++ b/devel/rubygem-mutter/Makefile
@@ -13,7 +13,6 @@ COMMENT= This Ruby gem is a tiny command-line interface library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-naught/Makefile b/devel/rubygem-naught/Makefile
index c9ac2b4c4c06..0fa7ec0c1fbd 100644
--- a/devel/rubygem-naught/Makefile
+++ b/devel/rubygem-naught/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/devel/rubygem-needle/Makefile b/devel/rubygem-needle/Makefile
index fb16d407fa66..0afee2a34c1a 100644
--- a/devel/rubygem-needle/Makefile
+++ b/devel/rubygem-needle/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/devel/rubygem-nenv/Makefile b/devel/rubygem-nenv/Makefile
index c902b0c04de3..97781281110e 100644
--- a/devel/rubygem-nenv/Makefile
+++ b/devel/rubygem-nenv/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/devel/rubygem-nesty/Makefile b/devel/rubygem-nesty/Makefile
index 8f36013dcb8b..5759c71825d1 100644
--- a/devel/rubygem-nesty/Makefile
+++ b/devel/rubygem-nesty/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/devel/rubygem-netaddr/Makefile b/devel/rubygem-netaddr/Makefile
index 2e26e93e68fb..a42f8548ed68 100644
--- a/devel/rubygem-netaddr/Makefile
+++ b/devel/rubygem-netaddr/Makefile
@@ -12,7 +12,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/devel/rubygem-newrelic-grape/Makefile b/devel/rubygem-newrelic-grape/Makefile
index a4bfe0091488..23d3635019cc 100644
--- a/devel/rubygem-newrelic-grape/Makefile
+++ b/devel/rubygem-newrelic-grape/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS?= rubygem-grape>=0:devel/rubygem-grape \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-newrelic_rpm/Makefile b/devel/rubygem-newrelic_rpm/Makefile
index 95de6ab7c7a2..49ddfbce6d94 100644
--- a/devel/rubygem-newrelic_rpm/Makefile
+++ b/devel/rubygem-newrelic_rpm/Makefile
@@ -17,9 +17,7 @@ LICENSE_PERMS_NEWRELIC= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-acc
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/script/*.sh
PLIST_FILES= bin/mongrel_rpm bin/newrelic bin/newrelic_cmd bin/nrdebug
diff --git a/devel/rubygem-nice-ffi/Makefile b/devel/rubygem-nice-ffi/Makefile
index e27f9ff51893..e547840eb16a 100644
--- a/devel/rubygem-nice-ffi/Makefile
+++ b/devel/rubygem-nice-ffi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-ffi>=0.5.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/devel/rubygem-nio4r/Makefile b/devel/rubygem-nio4r/Makefile
index eb1e94d388b1..0fe36d1b5ec7 100644
--- a/devel/rubygem-nio4r/Makefile
+++ b/devel/rubygem-nio4r/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-nori/Makefile b/devel/rubygem-nori/Makefile
index 54e972b8cd1c..7dd1e7c8b7f1 100644
--- a/devel/rubygem-nori/Makefile
+++ b/devel/rubygem-nori/Makefile
@@ -15,7 +15,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/devel/rubygem-notiffany/Makefile b/devel/rubygem-notiffany/Makefile
index 30622363cefe..7ffb47a0aa8c 100644
--- a/devel/rubygem-notiffany/Makefile
+++ b/devel/rubygem-notiffany/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-nenv>=0.1:devel/rubygem-nenv \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-notify/Makefile b/devel/rubygem-notify/Makefile
index 7b8eacae8b5d..0512fafef229 100644
--- a/devel/rubygem-notify/Makefile
+++ b/devel/rubygem-notify/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/notify
diff --git a/devel/rubygem-nprogress-rails/Makefile b/devel/rubygem-nprogress-rails/Makefile
index f64d5e4cb80b..0a17a608b92c 100644
--- a/devel/rubygem-nprogress-rails/Makefile
+++ b/devel/rubygem-nprogress-rails/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/devel/rubygem-octopress-hooks/Makefile b/devel/rubygem-octopress-hooks/Makefile
index 40a4a28b11c2..8a9e1406f947 100644
--- a/devel/rubygem-octopress-hooks/Makefile
+++ b/devel/rubygem-octopress-hooks/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-oj/Makefile b/devel/rubygem-oj/Makefile
index 02cd811fa693..d081aa8c30eb 100644
--- a/devel/rubygem-oj/Makefile
+++ b/devel/rubygem-oj/Makefile
@@ -12,7 +12,6 @@ COMMENT= Fast JSON parser and serializer
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-omniauth_crowd/Makefile b/devel/rubygem-omniauth_crowd/Makefile
index 66863635bb3d..8676b0a2f34b 100644
--- a/devel/rubygem-omniauth_crowd/Makefile
+++ b/devel/rubygem-omniauth_crowd/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS?= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-open3_backport/Makefile b/devel/rubygem-open3_backport/Makefile
index 5f079ddf1569..90ea00164f01 100644
--- a/devel/rubygem-open3_backport/Makefile
+++ b/devel/rubygem-open3_backport/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}open4>=1.3:devel/rubygem-open4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-open4/Makefile b/devel/rubygem-open4/Makefile
index 37330dfd8ad2..cf83480359b3 100644
--- a/devel/rubygem-open4/Makefile
+++ b/devel/rubygem-open4/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/devel/rubygem-orm_adapter/Makefile b/devel/rubygem-orm_adapter/Makefile
index 49af7e0c73ab..20924e780e71 100644
--- a/devel/rubygem-orm_adapter/Makefile
+++ b/devel/rubygem-orm_adapter/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/devel/rubygem-p4ruby/Makefile b/devel/rubygem-p4ruby/Makefile
index 26b6a033e29b..fbe33a9d9f8e 100644
--- a/devel/rubygem-p4ruby/Makefile
+++ b/devel/rubygem-p4ruby/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/perforce/libclient.a:devel/p4api
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
CONFIGURE_ARGS= --with-p4api-dir=${LOCALBASE} --with-p4api-lib=${LOCALBASE}/lib/perforce
diff --git a/devel/rubygem-paint/Makefile b/devel/rubygem-paint/Makefile
index 70b8831ee83c..bbcbb103e5f0 100644
--- a/devel/rubygem-paint/Makefile
+++ b/devel/rubygem-paint/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-paperclip/Makefile b/devel/rubygem-paperclip/Makefile
index 2392c03b364a..3e34724eaef1 100644
--- a/devel/rubygem-paperclip/Makefile
+++ b/devel/rubygem-paperclip/Makefile
@@ -20,7 +20,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/devel/rubygem-parser/Makefile b/devel/rubygem-parser/Makefile
index e25638a250a2..4a4b37152e0f 100644
--- a/devel/rubygem-parser/Makefile
+++ b/devel/rubygem-parser/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-ast>=2.2:devel/rubygem-ast
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ruby-parse bin/ruby-rewrite
diff --git a/devel/rubygem-piston/Makefile b/devel/rubygem-piston/Makefile
index a439740f4d9e..ed2fb4fc95aa 100644
--- a/devel/rubygem-piston/Makefile
+++ b/devel/rubygem-piston/Makefile
@@ -12,8 +12,7 @@ COMMENT= Utility to manage local copies of Subversion repositories
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/piston
.include <bsd.port.mk>
diff --git a/devel/rubygem-pkg-config/Makefile b/devel/rubygem-pkg-config/Makefile
index 5f839e610a4a..12049878deb8 100644
--- a/devel/rubygem-pkg-config/Makefile
+++ b/devel/rubygem-pkg-config/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LGPL-2.1
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= pkgconfig
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/devel/rubygem-platform/Makefile b/devel/rubygem-platform/Makefile
index b87e43aae3c0..844f0e5768f3 100644
--- a/devel/rubygem-platform/Makefile
+++ b/devel/rubygem-platform/Makefile
@@ -15,7 +15,6 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-plist/Makefile b/devel/rubygem-plist/Makefile
index 92ab209bb634..0af3014dff7a 100644
--- a/devel/rubygem-plist/Makefile
+++ b/devel/rubygem-plist/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/devel/rubygem-pluggaloid/Makefile b/devel/rubygem-pluggaloid/Makefile
index 5b15f8cac87e..e5796e1ebed3 100644
--- a/devel/rubygem-pluggaloid/Makefile
+++ b/devel/rubygem-pluggaloid/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-delayer>=0:devel/rubygem-delayer \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-polyamorous/Makefile b/devel/rubygem-polyamorous/Makefile
index 7b873bef9d59..165f46a0d9e6 100644
--- a/devel/rubygem-polyamorous/Makefile
+++ b/devel/rubygem-polyamorous/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activerecord4>=3.0: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/devel/rubygem-polyglot/Makefile b/devel/rubygem-polyglot/Makefile
index 081647a900fd..c899e28e3784 100644
--- a/devel/rubygem-polyglot/Makefile
+++ b/devel/rubygem-polyglot/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/devel/rubygem-popen4/Makefile b/devel/rubygem-popen4/Makefile
index 70a6bced7e58..d876666b2b07 100644
--- a/devel/rubygem-popen4/Makefile
+++ b/devel/rubygem-popen4/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-open4>=0.4.0:devel/rubygem-open4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
GEM_NAME= POpen4-${PORTVERSION}
.include <bsd.port.mk>
diff --git a/devel/rubygem-posix-spawn/Makefile b/devel/rubygem-posix-spawn/Makefile
index 8ab9b524dd84..c4d7501fdac0 100644
--- a/devel/rubygem-posix-spawn/Makefile
+++ b/devel/rubygem-posix-spawn/Makefile
@@ -12,8 +12,7 @@ COMMENT= Ruby wrapper for posix_spawnp(2) for faster process spawning
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/posix-spawn-benchmark
diff --git a/devel/rubygem-power_assert/Makefile b/devel/rubygem-power_assert/Makefile
index 658583e5f672..e674c3d0ab8a 100644
--- a/devel/rubygem-power_assert/Makefile
+++ b/devel/rubygem-power_assert/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE_RUBY= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-powerbar/Makefile b/devel/rubygem-powerbar/Makefile
index f5bdeb50b5b8..b9a940ced12f 100644
--- a/devel/rubygem-powerbar/Makefile
+++ b/devel/rubygem-powerbar/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-hashie>=1.1.0:devel/rubygem-hashie
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/powerbar-demo
diff --git a/devel/rubygem-powerpack/Makefile b/devel/rubygem-powerpack/Makefile
index 44f0ac439c0c..42b0c0cbadfa 100644
--- a/devel/rubygem-powerpack/Makefile
+++ b/devel/rubygem-powerpack/Makefile
@@ -13,7 +13,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/devel/rubygem-progressbar/Makefile b/devel/rubygem-progressbar/Makefile
index 779f8cd13c82..f63a8e574ac3 100644
--- a/devel/rubygem-progressbar/Makefile
+++ b/devel/rubygem-progressbar/Makefile
@@ -13,7 +13,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/devel/rubygem-protected_attributes/Makefile b/devel/rubygem-protected_attributes/Makefile
index 4d1f00965d0e..cd68f5b4dc9e 100644
--- a/devel/rubygem-protected_attributes/Makefile
+++ b/devel/rubygem-protected_attributes/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activemodel4>=4.0.1: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/devel/rubygem-prototype-rails/Makefile b/devel/rubygem-prototype-rails/Makefile
index f972b0a83ac0..ceb76bc69390 100644
--- a/devel/rubygem-prototype-rails/Makefile
+++ b/devel/rubygem-prototype-rails/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-rails>=3.2.0:www/rubygem-rails
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-pry-rails/Makefile b/devel/rubygem-pry-rails/Makefile
index 5a7e2891afa3..11913959b0b8 100644
--- a/devel/rubygem-pry-rails/Makefile
+++ b/devel/rubygem-pry-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-pry>=0.9.10:devel/rubygem-pry
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-pry-remote-em/Makefile b/devel/rubygem-pry-remote-em/Makefile
index 4fdf557c79f8..bab64f288108 100644
--- a/devel/rubygem-pry-remote-em/Makefile
+++ b/devel/rubygem-pry-remote-em/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-eventmachine>=0:devel/rubygem-eventmachine \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/pry-remote-em
diff --git a/devel/rubygem-pry/Makefile b/devel/rubygem-pry/Makefile
index aea16b9e73cb..43e9d8a91e06 100644
--- a/devel/rubygem-pry/Makefile
+++ b/devel/rubygem-pry/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-coderay>=1.1.0:textproc/rubygem-coderay \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/pry
diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile
index b19a5cdd7ef6..9148f86a951d 100644
--- a/devel/rubygem-ptreloaded/Makefile
+++ b/devel/rubygem-ptreloaded/Makefile
@@ -19,7 +19,6 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-pygments.rb/Makefile b/devel/rubygem-pygments.rb/Makefile
index daba1b41e770..833a9c6c0a71 100644
--- a/devel/rubygem-pygments.rb/Makefile
+++ b/devel/rubygem-pygments.rb/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-r18n-core/Makefile b/devel/rubygem-r18n-core/Makefile
index e87e33ac39ea..88e64164d2b1 100644
--- a/devel/rubygem-r18n-core/Makefile
+++ b/devel/rubygem-r18n-core/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/devel/rubygem-racc/Makefile b/devel/rubygem-racc/Makefile
index b69f32d9fee3..4e45b7f4c850 100644
--- a/devel/rubygem-racc/Makefile
+++ b/devel/rubygem-racc/Makefile
@@ -12,8 +12,7 @@ COMMENT= LALR(1) parser generator for Ruby
LICENSE= LGPL21
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/racc bin/racc2y bin/y2racc
.include <bsd.port.mk>
diff --git a/devel/rubygem-rack-mini-profiler/Makefile b/devel/rubygem-rack-mini-profiler/Makefile
index f12c72f93b0f..5abf7e557452 100644
--- a/devel/rubygem-rack-mini-profiler/Makefile
+++ b/devel/rubygem-rack-mini-profiler/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rack16>=1.2.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/devel/rubygem-rack-raw-upload/Makefile b/devel/rubygem-rack-raw-upload/Makefile
index 5ef98bd96c4f..330fa5153d1e 100644
--- a/devel/rubygem-rack-raw-upload/Makefile
+++ b/devel/rubygem-rack-raw-upload/Makefile
@@ -15,7 +15,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/devel/rubygem-rails-deprecated_sanitizer/Makefile b/devel/rubygem-rails-deprecated_sanitizer/Makefile
index b4f74b6cbaac..0267b34c0ffe 100644
--- a/devel/rubygem-rails-deprecated_sanitizer/Makefile
+++ b/devel/rubygem-rails-deprecated_sanitizer/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-activesupport4>=4.2.1:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rails-observers/Makefile b/devel/rubygem-rails-observers/Makefile
index 9eb29d8fc92f..128371ec8639 100644
--- a/devel/rubygem-rails-observers/Makefile
+++ b/devel/rubygem-rails-observers/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activemodel4>=4.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/devel/rubygem-rainbow/Makefile b/devel/rubygem-rainbow/Makefile
index cb5024e4b566..b2c3f9ea6f45 100644
--- a/devel/rubygem-rainbow/Makefile
+++ b/devel/rubygem-rainbow/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/devel/rubygem-rake-compiler/Makefile b/devel/rubygem-rake-compiler/Makefile
index bf438d5a7e6f..658ec6cc1b94 100644
--- a/devel/rubygem-rake-compiler/Makefile
+++ b/devel/rubygem-rake-compiler/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-rake>=0:devel/rubygem-rake
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rake-compiler
diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile
index 1f06c5c1dc56..36281c5f1fd6 100644
--- a/devel/rubygem-rake/Makefile
+++ b/devel/rubygem-rake/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rake
diff --git a/devel/rubygem-ransack/Makefile b/devel/rubygem-ransack/Makefile
index bebb2aa44fbe..2a18398ebfa7 100644
--- a/devel/rubygem-ransack/Makefile
+++ b/devel/rubygem-ransack/Makefile
@@ -20,7 +20,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/devel/rubygem-rapt/Makefile b/devel/rubygem-rapt/Makefile
index 5d9a8db4dd5b..46d936e35288 100644
--- a/devel/rubygem-rapt/Makefile
+++ b/devel/rubygem-rapt/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/rapt
diff --git a/devel/rubygem-rash/Makefile b/devel/rubygem-rash/Makefile
index 02ff096ef19f..7b5d26ec31ed 100644
--- a/devel/rubygem-rash/Makefile
+++ b/devel/rubygem-rash/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-hashie>=2.0.0:devel/rubygem-hashie
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rb-fsevent/Makefile b/devel/rubygem-rb-fsevent/Makefile
index 0342be6d050a..1122257a16a8 100644
--- a/devel/rubygem-rb-fsevent/Makefile
+++ b/devel/rubygem-rb-fsevent/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rb-inotify/Makefile b/devel/rubygem-rb-inotify/Makefile
index f47f838c0bf3..8d2e0a56cdf8 100644
--- a/devel/rubygem-rb-inotify/Makefile
+++ b/devel/rubygem-rb-inotify/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-ffi>=0.5.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/devel/rubygem-rb-kqueue/Makefile b/devel/rubygem-rb-kqueue/Makefile
index bd2ecacb2f4f..b3e531849612 100644
--- a/devel/rubygem-rb-kqueue/Makefile
+++ b/devel/rubygem-rb-kqueue/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=0.5.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/devel/rubygem-rbtrace/Makefile b/devel/rubygem-rbtrace/Makefile
index 1415d96fe652..e14e810c7921 100644
--- a/devel/rubygem-rbtrace/Makefile
+++ b/devel/rubygem-rbtrace/Makefile
@@ -18,8 +18,7 @@ xRUN_DEPENDS= rubygem-ffi>=1.0.6:devel/rubygem-ffi \
rubygem-trollop>=1.16.2:devel/rubygem-trollop
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rbtrace
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index 3239a3e41421..ede196ac7c94 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri
diff --git a/devel/rubygem-rdoc3/Makefile b/devel/rubygem-rdoc3/Makefile
index 3e8b30becd79..3f0b1c84a0b3 100644
--- a/devel/rubygem-rdoc3/Makefile
+++ b/devel/rubygem-rdoc3/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-json>=1.4:devel/rubygem-json
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${RM} ${STAGEDIR}${PREFIX}/bin/rdoc ${STAGEDIR}${PREFIX}/bin/ri
diff --git a/devel/rubygem-readwritesettings/Makefile b/devel/rubygem-readwritesettings/Makefile
index 5820090139d3..fd88e28a3057 100644
--- a/devel/rubygem-readwritesettings/Makefile
+++ b/devel/rubygem-readwritesettings/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/devel/rubygem-recaptcha/Makefile b/devel/rubygem-recaptcha/Makefile
index fb78cf2d3990..bfb8dc840102 100644
--- a/devel/rubygem-recaptcha/Makefile
+++ b/devel/rubygem-recaptcha/Makefile
@@ -16,7 +16,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/devel/rubygem-redis-activesupport/Makefile b/devel/rubygem-redis-activesupport/Makefile
index 1ab1ce106dd7..8e073dd9cc98 100644
--- a/devel/rubygem-redis-activesupport/Makefile
+++ b/devel/rubygem-redis-activesupport/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport4>=3:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-redis-store/Makefile b/devel/rubygem-redis-store/Makefile
index 5253497fe57f..852d5e13dbf4 100644
--- a/devel/rubygem-redis-store/Makefile
+++ b/devel/rubygem-redis-store/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-redmine_plugin_support/Makefile b/devel/rubygem-redmine_plugin_support/Makefile
index 1fa37f7328c8..cd9ff950c017 100644
--- a/devel/rubygem-redmine_plugin_support/Makefile
+++ b/devel/rubygem-redmine_plugin_support/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/devel/rubygem-ref/Makefile b/devel/rubygem-ref/Makefile
index 84b704e4f7cc..0fd76e588546 100644
--- a/devel/rubygem-ref/Makefile
+++ b/devel/rubygem-ref/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/devel/rubygem-request_store/Makefile b/devel/rubygem-request_store/Makefile
index a56a4a7e695b..5a1ecb8cccb9 100644
--- a/devel/rubygem-request_store/Makefile
+++ b/devel/rubygem-request_store/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/devel/rubygem-require_all/Makefile b/devel/rubygem-require_all/Makefile
index 51d26482a3ad..12ac7e4cb82b 100644
--- a/devel/rubygem-require_all/Makefile
+++ b/devel/rubygem-require_all/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/devel/rubygem-retryable/Makefile b/devel/rubygem-retryable/Makefile
index 9ffedc88fbb3..159a5d89fede 100644
--- a/devel/rubygem-retryable/Makefile
+++ b/devel/rubygem-retryable/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rgl/Makefile b/devel/rubygem-rgl/Makefile
index b2c009e68809..fb0035ca56c6 100644
--- a/devel/rubygem-rgl/Makefile
+++ b/devel/rubygem-rgl/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-algorithms>=0.6.1:devel/rubygem-algorithms \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rodzilla/Makefile b/devel/rubygem-rodzilla/Makefile
index de2adddaf9aa..cf99439e38cb 100644
--- a/devel/rubygem-rodzilla/Makefile
+++ b/devel/rubygem-rodzilla/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-httparty>=0.12.0: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/devel/rubygem-rotp/Makefile b/devel/rubygem-rotp/Makefile
index cdb5596b6909..a290ab862586 100644
--- a/devel/rubygem-rotp/Makefile
+++ b/devel/rubygem-rotp/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/rotp
diff --git a/devel/rubygem-rr/Makefile b/devel/rubygem-rr/Makefile
index 5256c0c5f213..7d4c19de92e4 100644
--- a/devel/rubygem-rr/Makefile
+++ b/devel/rubygem-rr/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/devel/rubygem-rrd-ffi/Makefile b/devel/rubygem-rrd-ffi/Makefile
index bf4de60091aa..8d899bd993c9 100644
--- a/devel/rubygem-rrd-ffi/Makefile
+++ b/devel/rubygem-rrd-ffi/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rrdtool:databases/rrdtool \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rscm/Makefile b/devel/rubygem-rscm/Makefile
index 5518202076e5..2dc3265d3207 100644
--- a/devel/rubygem-rscm/Makefile
+++ b/devel/rubygem-rscm/Makefile
@@ -12,7 +12,6 @@ COMMENT= Ruby SCM, an SCM-independent API for accessing SCMs
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rspec-core/Makefile b/devel/rubygem-rspec-core/Makefile
index 3f46ed038d47..9406f57f0d78 100644
--- a/devel/rubygem-rspec-core/Makefile
+++ b/devel/rubygem-rspec-core/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rspec-support>=${PORTVERSION:R}:devel/rubygem-rspec-support
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rspec
diff --git a/devel/rubygem-rspec-expectations/Makefile b/devel/rubygem-rspec-expectations/Makefile
index c39423dbc5bb..f1672023bf56 100644
--- a/devel/rubygem-rspec-expectations/Makefile
+++ b/devel/rubygem-rspec-expectations/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rspec-logsplit/Makefile b/devel/rubygem-rspec-logsplit/Makefile
index a421e2d6352f..cd7c6cdbb2cf 100644
--- a/devel/rubygem-rspec-logsplit/Makefile
+++ b/devel/rubygem-rspec-logsplit/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/devel/rubygem-rspec-mocks/Makefile b/devel/rubygem-rspec-mocks/Makefile
index 64c780187dde..94a6bcb7a143 100644
--- a/devel/rubygem-rspec-mocks/Makefile
+++ b/devel/rubygem-rspec-mocks/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-diff-lcs>=1.2.0:textproc/rubygem-diff-lcs \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rspec-rails/Makefile b/devel/rubygem-rspec-rails/Makefile
index 347eea9ae73c..f290cdc1aff5 100644
--- a/devel/rubygem-rspec-rails/Makefile
+++ b/devel/rubygem-rspec-rails/Makefile
@@ -22,7 +22,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/devel/rubygem-rspec-support/Makefile b/devel/rubygem-rspec-support/Makefile
index 94bd88aa9c0c..aac241d0be12 100644
--- a/devel/rubygem-rspec-support/Makefile
+++ b/devel/rubygem-rspec-support/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rspec/Makefile b/devel/rubygem-rspec/Makefile
index 8b59377b1c68..020d0fc1594e 100644
--- a/devel/rubygem-rspec/Makefile
+++ b/devel/rubygem-rspec/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-rspec-core>=${PORTVERSION:R}:devel/rubygem-rspec-core \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rubigen/Makefile b/devel/rubygem-rubigen/Makefile
index 653c7ecb9d9c..ff6e465e5641 100644
--- a/devel/rubygem-rubigen/Makefile
+++ b/devel/rubygem-rubigen/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-activesupport>=2.3.5:devel/rubygem-activesupport
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/install_rubigen_scripts \
bin/ruby_app \
diff --git a/devel/rubygem-rubocop/Makefile b/devel/rubygem-rubocop/Makefile
index be849112ce5d..353857879f47 100644
--- a/devel/rubygem-rubocop/Makefile
+++ b/devel/rubygem-rubocop/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-parser>=2.3.0.7:devel/rubygem-parser \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rubocop
diff --git a/devel/rubygem-ruby-atmos-pure/Makefile b/devel/rubygem-ruby-atmos-pure/Makefile
index 7e81a3c166c7..b4dac4651284 100644
--- a/devel/rubygem-ruby-atmos-pure/Makefile
+++ b/devel/rubygem-ruby-atmos-pure/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS= rubygem-log4r>=1.1.9:sysutils/rubygem-log4r \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-bugzilla/Makefile b/devel/rubygem-ruby-bugzilla/Makefile
index ec401d3b6e7b..89f5a1058755 100644
--- a/devel/rubygem-ruby-bugzilla/Makefile
+++ b/devel/rubygem-ruby-bugzilla/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-gruff>=0:graphics/rubygem-gruff \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/bzconsole
diff --git a/devel/rubygem-ruby-filemagic/Makefile b/devel/rubygem-ruby-filemagic/Makefile
index 2e0843007cce..a7e0ca593b50 100644
--- a/devel/rubygem-ruby-filemagic/Makefile
+++ b/devel/rubygem-ruby-filemagic/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD2CLAUSE RUBY
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-fogbugz/Makefile b/devel/rubygem-ruby-fogbugz/Makefile
index a576d7ea2af9..ce9217cb4eec 100644
--- a/devel/rubygem-ruby-fogbugz/Makefile
+++ b/devel/rubygem-ruby-fogbugz/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-crack>=0.4:devel/rubygem-crack
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-libvirt/Makefile b/devel/rubygem-ruby-libvirt/Makefile
index 448970ebb4f4..f94826421b30 100644
--- a/devel/rubygem-ruby-libvirt/Makefile
+++ b/devel/rubygem-ruby-libvirt/Makefile
@@ -13,10 +13,7 @@ LICENSE= LGPL21
LIB_DEPENDS= libvirt.so:devel/libvirt
-USES= pkgconfig
-
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-ole/Makefile b/devel/rubygem-ruby-ole/Makefile
index 27b5185baebd..70cb9e5e723f 100644
--- a/devel/rubygem-ruby-ole/Makefile
+++ b/devel/rubygem-ruby-ole/Makefile
@@ -16,9 +16,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= bin/oletool \
test/*.rb
diff --git a/devel/rubygem-ruby-prof/Makefile b/devel/rubygem-ruby-prof/Makefile
index da50d20585ad..00c25b809280 100644
--- a/devel/rubygem-ruby-prof/Makefile
+++ b/devel/rubygem-ruby-prof/Makefile
@@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ruby-prof bin/ruby-prof-check-trace
diff --git a/devel/rubygem-ruby-progressbar/Makefile b/devel/rubygem-ruby-progressbar/Makefile
index ff620acb87de..296671e56365 100644
--- a/devel/rubygem-ruby-progressbar/Makefile
+++ b/devel/rubygem-ruby-progressbar/Makefile
@@ -15,7 +15,6 @@ CONFLICTS_INSTALL= ${RUBY_PKGNAMEPREFIX}progressbar-*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby-sdl-ffi/Makefile b/devel/rubygem-ruby-sdl-ffi/Makefile
index 1b8b40ffc911..208a22f2b055 100644
--- a/devel/rubygem-ruby-sdl-ffi/Makefile
+++ b/devel/rubygem-ruby-sdl-ffi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-nice-ffi>=0.2:devel/rubygem-nice-ffi
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-ruby2ruby/Makefile b/devel/rubygem-ruby2ruby/Makefile
index 112c7d569cfc..7b99989563a6 100644
--- a/devel/rubygem-ruby2ruby/Makefile
+++ b/devel/rubygem-ruby2ruby/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= rubygem-ruby_parser>=3.1:devel/rubygem-ruby_parser \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/r2r_show
diff --git a/devel/rubygem-ruby_parser/Makefile b/devel/rubygem-ruby_parser/Makefile
index 27f711a9f38a..3790ab4cffb3 100644
--- a/devel/rubygem-ruby_parser/Makefile
+++ b/devel/rubygem-ruby_parser/Makefile
@@ -13,13 +13,11 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-sexp_processor>=4.1:devel/rubygem-sexp_processor
-USES= shebangfix
-USE_RUBY= yes
-USE_RUBYGEMS= yes
NO_ARCH= yes
+USE_RUBY= yes
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/ruby_parse*
-RUBYGEM_AUTOPLIST= yes
PLIST_FILES= bin/ruby_parse \
bin/ruby_parse_extract_error
diff --git a/devel/rubygem-rubygame/Makefile b/devel/rubygem-rubygame/Makefile
index e108533d1ce0..2bbd06798abf 100644
--- a/devel/rubygem-rubygame/Makefile
+++ b/devel/rubygem-rubygame/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-ruby-sdl-ffi>=0.1.0:devel/rubygem-ruby-sdl-ffi
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
USE_SDL= gfx image mixer ttf
.include <bsd.port.mk>
diff --git a/devel/rubygem-rubygems-mirror/Makefile b/devel/rubygem-rubygems-mirror/Makefile
index 7e612971cb6e..2e25bfaa6ead 100644
--- a/devel/rubygem-rubygems-mirror/Makefile
+++ b/devel/rubygem-rubygems-mirror/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-net-http-persistent>=2.9:www/rubygem-net-http-persistent
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rubygems-tasks/Makefile b/devel/rubygem-rubygems-tasks/Makefile
index 94900b0a84ae..15d26f0dd618 100644
--- a/devel/rubygem-rubygems-tasks/Makefile
+++ b/devel/rubygem-rubygems-tasks/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/devel/rubygem-rubygems-test/Makefile b/devel/rubygem-rubygems-test/Makefile
index 0a9c24860706..680d63b2de75 100644
--- a/devel/rubygem-rubygems-test/Makefile
+++ b/devel/rubygem-rubygems-test/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-rake>=0.8.7:devel/rubygem-rake
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rubyinline/Makefile b/devel/rubygem-rubyinline/Makefile
index 6bcb1a58e7db..4251c104091e 100644
--- a/devel/rubygem-rubyinline/Makefile
+++ b/devel/rubygem-rubyinline/Makefile
@@ -20,9 +20,7 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= tutorial/example1.rb \
tutorial/example2.rb
diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile
index 49d9a148e6b0..7c9c5827ba52 100644
--- a/devel/rubygem-rubyinlineaccel/Makefile
+++ b/devel/rubygem-rubyinlineaccel/Makefile
@@ -20,7 +20,6 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rubytree/Makefile b/devel/rubygem-rubytree/Makefile
index f0caa6c87864..bdb2497f4200 100644
--- a/devel/rubygem-rubytree/Makefile
+++ b/devel/rubygem-rubytree/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-json>=1.8:devel/rubygem-json \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
USE_RUBY_RDOC= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-rufus-scheduler/Makefile b/devel/rubygem-rufus-scheduler/Makefile
index bfb5153b9710..d2c0e296e274 100644
--- a/devel/rubygem-rufus-scheduler/Makefile
+++ b/devel/rubygem-rufus-scheduler/Makefile
@@ -13,7 +13,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/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile
index a27fee6af7a3..6ac1f8c5414f 100644
--- a/devel/rubygem-rugged/Makefile
+++ b/devel/rubygem-rugged/Makefile
@@ -18,8 +18,6 @@ LIB_DEPENDS= libgit2.so:devel/libgit2
CONFIGURE_ARGS= --use-system-libraries
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= pkgconfig
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/devel/rubygem-runt/Makefile b/devel/rubygem-runt/Makefile
index f5589827ad0e..167b6e80f0f3 100644
--- a/devel/rubygem-runt/Makefile
+++ b/devel/rubygem-runt/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/devel/rubygem-ruport/Makefile b/devel/rubygem-ruport/Makefile
index ed879c7759bb..cb4e0b4bac1e 100644
--- a/devel/rubygem-ruport/Makefile
+++ b/devel/rubygem-ruport/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-fastercsv>=0:devel/rubygem-fastercsv \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-safe_yaml/Makefile b/devel/rubygem-safe_yaml/Makefile
index d767924c9e53..1803609d1dbe 100644
--- a/devel/rubygem-safe_yaml/Makefile
+++ b/devel/rubygem-safe_yaml/Makefile
@@ -16,9 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bundle_install_all_ruby_versions.sh \
run_specs_all_ruby_versions.sh
PLIST_FILES= bin/safe_yaml
diff --git a/devel/rubygem-sdoc/Makefile b/devel/rubygem-sdoc/Makefile
index 88d49b967d16..797bba558a21 100644
--- a/devel/rubygem-sdoc/Makefile
+++ b/devel/rubygem-sdoc/Makefile
@@ -16,8 +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= gem:autoplist
PLIST_FILES= bin/sdoc bin/sdoc-merge
diff --git a/devel/rubygem-semantic_puppet/Makefile b/devel/rubygem-semantic_puppet/Makefile
index 199f4d30bbc9..1b7b3dfac92e 100644
--- a/devel/rubygem-semantic_puppet/Makefile
+++ b/devel/rubygem-semantic_puppet/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/devel/rubygem-semi_semantic/Makefile b/devel/rubygem-semi_semantic/Makefile
index d0f066b7ce77..61ace4bf8f26 100644
--- a/devel/rubygem-semi_semantic/Makefile
+++ b/devel/rubygem-semi_semantic/Makefile
@@ -12,7 +12,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/devel/rubygem-sentry-raven/Makefile b/devel/rubygem-sentry-raven/Makefile
index 15c40b367d9c..286e6bac067e 100644
--- a/devel/rubygem-sentry-raven/Makefile
+++ b/devel/rubygem-sentry-raven/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-faraday>=0.7.6: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/devel/rubygem-sequel/Makefile b/devel/rubygem-sequel/Makefile
index 4f482f95b227..3b8856d4c078 100644
--- a/devel/rubygem-sequel/Makefile
+++ b/devel/rubygem-sequel/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sequel
diff --git a/devel/rubygem-sequel3/Makefile b/devel/rubygem-sequel3/Makefile
index e765a99f1301..bd73b43a13ef 100644
--- a/devel/rubygem-sequel3/Makefile
+++ b/devel/rubygem-sequel3/Makefile
@@ -18,8 +18,7 @@ PORTSCOUT= limit:^3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sequel
diff --git a/devel/rubygem-settingslogic/Makefile b/devel/rubygem-settingslogic/Makefile
index 0192521a9746..f8bc42c2b424 100644
--- a/devel/rubygem-settingslogic/Makefile
+++ b/devel/rubygem-settingslogic/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/devel/rubygem-sexp_processor/Makefile b/devel/rubygem-sexp_processor/Makefile
index 0328d001f702..77b8532624e8 100644
--- a/devel/rubygem-sexp_processor/Makefile
+++ b/devel/rubygem-sexp_processor/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/devel/rubygem-shoulda-context/Makefile b/devel/rubygem-shoulda-context/Makefile
index b96de59f8d1d..5d816dd0ef41 100644
--- a/devel/rubygem-shoulda-context/Makefile
+++ b/devel/rubygem-shoulda-context/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/convert_to_should_syntax
diff --git a/devel/rubygem-shoulda-matchers/Makefile b/devel/rubygem-shoulda-matchers/Makefile
index 4c609ab69849..fcbb961589ab 100644
--- a/devel/rubygem-shoulda-matchers/Makefile
+++ b/devel/rubygem-shoulda-matchers/Makefile
@@ -16,9 +16,7 @@ RUN_DEPENDS= rubygem-activesupport4>=4.0.0:devel/rubygem-activesupport4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= script/*
diff --git a/devel/rubygem-shoulda/Makefile b/devel/rubygem-shoulda/Makefile
index c52abbbb1e3d..2ea7a2f04839 100644
--- a/devel/rubygem-shoulda/Makefile
+++ b/devel/rubygem-shoulda/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-shoulda-context>=1.0.1:devel/rubygem-shoulda-context \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sidekiq-cron/Makefile b/devel/rubygem-sidekiq-cron/Makefile
index b725d68d1701..04d31ccf4c68 100644
--- a/devel/rubygem-sidekiq-cron/Makefile
+++ b/devel/rubygem-sidekiq-cron/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sidekiq/Makefile b/devel/rubygem-sidekiq/Makefile
index 7ca5df7e59f7..4524b0058a6a 100644
--- a/devel/rubygem-sidekiq/Makefile
+++ b/devel/rubygem-sidekiq/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0.0:devel/rubygem-concurrent-ruby \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sidekiq bin/sidekiqctl
diff --git a/devel/rubygem-sidetiq/Makefile b/devel/rubygem-sidetiq/Makefile
index 50830bdaa1fb..3e268b7d9110 100644
--- a/devel/rubygem-sidetiq/Makefile
+++ b/devel/rubygem-sidetiq/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-celluloid>=0.17.3:devel/rubygem-celluloid \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sigdump/Makefile b/devel/rubygem-sigdump/Makefile
index bb31cb6094ab..5a81c6fecc15 100644
--- a/devel/rubygem-sigdump/Makefile
+++ b/devel/rubygem-sigdump/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/devel/rubygem-simple_form/Makefile b/devel/rubygem-simple_form/Makefile
index 611371339c5c..1d3e54418dca 100644
--- a/devel/rubygem-simple_form/Makefile
+++ b/devel/rubygem-simple_form/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activemodel4>=4: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/devel/rubygem-simplecov/Makefile b/devel/rubygem-simplecov/Makefile
index 34416dfee21d..b7377afcfa7b 100644
--- a/devel/rubygem-simplecov/Makefile
+++ b/devel/rubygem-simplecov/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-docile>=1.1.0:devel/rubygem-docile \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-slack-notifier/Makefile b/devel/rubygem-slack-notifier/Makefile
index 0b42522fd77c..ecdd92219b2b 100644
--- a/devel/rubygem-slack-notifier/Makefile
+++ b/devel/rubygem-slack-notifier/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/devel/rubygem-slim/Makefile b/devel/rubygem-slim/Makefile
index df284e361582..11cc9179b738 100644
--- a/devel/rubygem-slim/Makefile
+++ b/devel/rubygem-slim/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-temple>=0.7.3:devel/rubygem-temple \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/slimrb
diff --git a/devel/rubygem-slop/Makefile b/devel/rubygem-slop/Makefile
index c4cf602cc797..db4ed56aa999 100644
--- a/devel/rubygem-slop/Makefile
+++ b/devel/rubygem-slop/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/devel/rubygem-slop3/Makefile b/devel/rubygem-slop3/Makefile
index 81ede0fc0723..34782dd32fdd 100644
--- a/devel/rubygem-slop3/Makefile
+++ b/devel/rubygem-slop3/Makefile
@@ -15,7 +15,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/devel/rubygem-soap4r/Makefile b/devel/rubygem-soap4r/Makefile
index ccaa1b6fc102..9909b9d08b5d 100644
--- a/devel/rubygem-soap4r/Makefile
+++ b/devel/rubygem-soap4r/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-httpclient>=2.1.1:www/rubygem-httpclient
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/wsdl2ruby.rb bin/xsd2ruby.rb
diff --git a/devel/rubygem-spring/Makefile b/devel/rubygem-spring/Makefile
index ac02be2e336d..8c78b716ec4c 100644
--- a/devel/rubygem-spring/Makefile
+++ b/devel/rubygem-spring/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/spring
diff --git a/devel/rubygem-sprockets-helpers/Makefile b/devel/rubygem-sprockets-helpers/Makefile
index cd3d3d85dd43..f9ddd9a9483d 100644
--- a/devel/rubygem-sprockets-helpers/Makefile
+++ b/devel/rubygem-sprockets-helpers/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-sprockets3>=2.2:devel/rubygem-sprockets3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sprockets-rails/Makefile b/devel/rubygem-sprockets-rails/Makefile
index 63134fc28f06..fa7f06f11bdf 100644
--- a/devel/rubygem-sprockets-rails/Makefile
+++ b/devel/rubygem-sprockets-rails/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS?= rubygem-actionpack4>=4.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/devel/rubygem-sprockets-sass/Makefile b/devel/rubygem-sprockets-sass/Makefile
index b356303c1c8d..c3821ae0d06d 100644
--- a/devel/rubygem-sprockets-sass/Makefile
+++ b/devel/rubygem-sprockets-sass/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-sprockets>=2.0:devel/rubygem-sprockets \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sprockets/Makefile b/devel/rubygem-sprockets/Makefile
index 803eeea3d165..17b37229ae3e 100644
--- a/devel/rubygem-sprockets/Makefile
+++ b/devel/rubygem-sprockets/Makefile
@@ -20,8 +20,7 @@ CONFLICTS_INSTALL= rubygem-sprockets211-[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sprockets
diff --git a/devel/rubygem-sprockets211/Makefile b/devel/rubygem-sprockets211/Makefile
index 54ed7999237e..b107d38c7478 100644
--- a/devel/rubygem-sprockets211/Makefile
+++ b/devel/rubygem-sprockets211/Makefile
@@ -22,8 +22,7 @@ CONFLICTS_INSTALL= rubygem-sprockets-[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sprockets
diff --git a/devel/rubygem-sprockets22/Makefile b/devel/rubygem-sprockets22/Makefile
index 696043e66914..6050f5f0e8cb 100644
--- a/devel/rubygem-sprockets22/Makefile
+++ b/devel/rubygem-sprockets22/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-hike>=1.2:devel/rubygem-hike \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.2
diff --git a/devel/rubygem-sprockets3/Makefile b/devel/rubygem-sprockets3/Makefile
index f95862016b9b..28d3ec9acb49 100644
--- a/devel/rubygem-sprockets3/Makefile
+++ b/devel/rubygem-sprockets3/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-concurrent-ruby>=1.0:devel/rubygem-concurrent-ruby \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
@${RM} ${STAGEDIR}${PREFIX}/bin/sprockets
diff --git a/devel/rubygem-spruz/Makefile b/devel/rubygem-spruz/Makefile
index 3ac63d87754f..a959aa4736a1 100644
--- a/devel/rubygem-spruz/Makefile
+++ b/devel/rubygem-spruz/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/enum
diff --git a/devel/rubygem-state_machine/Makefile b/devel/rubygem-state_machine/Makefile
index a76bc2d134fa..90a4d8904577 100644
--- a/devel/rubygem-state_machine/Makefile
+++ b/devel/rubygem-state_machine/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/devel/rubygem-state_machines/Makefile b/devel/rubygem-state_machines/Makefile
index c9d752d8cd5a..72a97a2578bf 100644
--- a/devel/rubygem-state_machines/Makefile
+++ b/devel/rubygem-state_machines/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/devel/rubygem-statsd/Makefile b/devel/rubygem-statsd/Makefile
index dbe4bde244c0..d7308a51da24 100644
--- a/devel/rubygem-statsd/Makefile
+++ b/devel/rubygem-statsd/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-erubis>=2.6.6:www/rubygem-erubis \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/statsd
diff --git a/devel/rubygem-stella/Makefile b/devel/rubygem-stella/Makefile
index e85990a2d5cc..706295c49513 100644
--- a/devel/rubygem-stella/Makefile
+++ b/devel/rubygem-stella/Makefile
@@ -26,9 +26,7 @@ RUN_DEPENDS= rubygem-benelux>=0.6.1:devel/rubygem-benelux \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/stella
diff --git a/devel/rubygem-stemmer/Makefile b/devel/rubygem-stemmer/Makefile
index 02780376a7aa..2b7334de6c1a 100644
--- a/devel/rubygem-stemmer/Makefile
+++ b/devel/rubygem-stemmer/Makefile
@@ -12,7 +12,6 @@ COMMENT= Implementation of the Porter word stemming algorithm
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-stomp/Makefile b/devel/rubygem-stomp/Makefile
index eef84a788cca..b5fa70f8a255 100644
--- a/devel/rubygem-stomp/Makefile
+++ b/devel/rubygem-stomp/Makefile
@@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/catstomp bin/stompcat
diff --git a/devel/rubygem-storable/Makefile b/devel/rubygem-storable/Makefile
index 1b360a3df321..9c6ca92cca85 100644
--- a/devel/rubygem-storable/Makefile
+++ b/devel/rubygem-storable/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/devel/rubygem-stream/Makefile b/devel/rubygem-stream/Makefile
index 87cdd47b99df..fe155d657455 100644
--- a/devel/rubygem-stream/Makefile
+++ b/devel/rubygem-stream/Makefile
@@ -16,7 +16,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/devel/rubygem-streetaddress/Makefile b/devel/rubygem-streetaddress/Makefile
index 68811815b055..09484d850747 100644
--- a/devel/rubygem-streetaddress/Makefile
+++ b/devel/rubygem-streetaddress/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/devel/rubygem-stringex/Makefile b/devel/rubygem-stringex/Makefile
index ed206ba5238c..478286c8966d 100644
--- a/devel/rubygem-stringex/Makefile
+++ b/devel/rubygem-stringex/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-structured_warnings/Makefile b/devel/rubygem-structured_warnings/Makefile
index 7b4b2212592d..a8951601fb18 100644
--- a/devel/rubygem-structured_warnings/Makefile
+++ b/devel/rubygem-structured_warnings/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/devel/rubygem-subexec/Makefile b/devel/rubygem-subexec/Makefile
index c263c8334bc3..1e42b72fd587 100644
--- a/devel/rubygem-subexec/Makefile
+++ b/devel/rubygem-subexec/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/devel/rubygem-sugar-high/Makefile b/devel/rubygem-sugar-high/Makefile
index fd6b91924eec..9ee073e2c5c2 100644
--- a/devel/rubygem-sugar-high/Makefile
+++ b/devel/rubygem-sugar-high/Makefile
@@ -15,7 +15,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/devel/rubygem-sumbur/Makefile b/devel/rubygem-sumbur/Makefile
index 7920ed17a6ab..f30fe4c039cd 100644
--- a/devel/rubygem-sumbur/Makefile
+++ b/devel/rubygem-sumbur/Makefile
@@ -10,7 +10,6 @@ MAINTAINER= vg@FreeBSD.org
COMMENT= Consistent spreading for server balancing
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-sundawg_country_codes/Makefile b/devel/rubygem-sundawg_country_codes/Makefile
index 23981fff3b10..ea49d3482bd4 100644
--- a/devel/rubygem-sundawg_country_codes/Makefile
+++ b/devel/rubygem-sundawg_country_codes/Makefile
@@ -12,7 +12,6 @@ COMMENT= Manage ISO 3166 country names and codes
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-svn2git/Makefile b/devel/rubygem-svn2git/Makefile
index 30eeb41c8a13..f82a0fd93836 100644
--- a/devel/rubygem-svn2git/Makefile
+++ b/devel/rubygem-svn2git/Makefile
@@ -17,8 +17,7 @@ CONFLICTS_INSTALL= svn2git-[0-9]*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/svn2git
.include <bsd.port.mk>
diff --git a/devel/rubygem-sysinfo/Makefile b/devel/rubygem-sysinfo/Makefile
index bf2d92c1e274..31cce340df2f 100644
--- a/devel/rubygem-sysinfo/Makefile
+++ b/devel/rubygem-sysinfo/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-drydock>=0:devel/rubygem-drydock \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/sysinfo
PLIST_FILES= bin/sysinfo
diff --git a/devel/rubygem-systemu/Makefile b/devel/rubygem-systemu/Makefile
index 84496cbf291c..93820e78e9ed 100644
--- a/devel/rubygem-systemu/Makefile
+++ b/devel/rubygem-systemu/Makefile
@@ -12,7 +12,6 @@ COMMENT= Portable replacement for popen4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-table_print/Makefile b/devel/rubygem-table_print/Makefile
index 61f0479ba2cf..da2e0f6f5e0c 100644
--- a/devel/rubygem-table_print/Makefile
+++ b/devel/rubygem-table_print/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/devel/rubygem-tdiff/Makefile b/devel/rubygem-tdiff/Makefile
index d3591aebdd39..3b7fddb7b9da 100644
--- a/devel/rubygem-tdiff/Makefile
+++ b/devel/rubygem-tdiff/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/devel/rubygem-templater/Makefile b/devel/rubygem-templater/Makefile
index 63d765b98a83..f48158cc2388 100644
--- a/devel/rubygem-templater/Makefile
+++ b/devel/rubygem-templater/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-diff-lcs>=1.1.2:textproc/rubygem-diff-lcs \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-temple/Makefile b/devel/rubygem-temple/Makefile
index b67cd7b3bd6b..a8c9f5d4ed13 100644
--- a/devel/rubygem-temple/Makefile
+++ b/devel/rubygem-temple/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/devel/rubygem-term-ansicolor/Makefile b/devel/rubygem-term-ansicolor/Makefile
index b385adda294c..5a5d755be966 100644
--- a/devel/rubygem-term-ansicolor/Makefile
+++ b/devel/rubygem-term-ansicolor/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-tins>=1.0:devel/rubygem-tins
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/colortab bin/term_display bin/term_cdiff bin/term_decolor bin/term_mandel
diff --git a/devel/rubygem-test-unit/Makefile b/devel/rubygem-test-unit/Makefile
index 5e940380be03..265f2dcfb7ea 100644
--- a/devel/rubygem-test-unit/Makefile
+++ b/devel/rubygem-test-unit/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-power_assert>=0:devel/rubygem-power_assert
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-thor/Makefile b/devel/rubygem-thor/Makefile
index 209f078e8cdd..db831b0bd4dc 100644
--- a/devel/rubygem-thor/Makefile
+++ b/devel/rubygem-thor/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/thor
diff --git a/devel/rubygem-thread_safe/Makefile b/devel/rubygem-thread_safe/Makefile
index 4fce6b14ba66..f696f19819b3 100644
--- a/devel/rubygem-thread_safe/Makefile
+++ b/devel/rubygem-thread_safe/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/devel/rubygem-thread_safe1/Makefile b/devel/rubygem-thread_safe1/Makefile
index 2ba2544c8a2c..7033a53d02b4 100644
--- a/devel/rubygem-thread_safe1/Makefile
+++ b/devel/rubygem-thread_safe1/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-atomic>=0:devel/rubygem-atomic
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^0\.1
diff --git a/devel/rubygem-thrift/Makefile b/devel/rubygem-thrift/Makefile
index a791e75d341d..2908b0e7fef5 100644
--- a/devel/rubygem-thrift/Makefile
+++ b/devel/rubygem-thrift/Makefile
@@ -13,8 +13,7 @@ COMMENT= Ruby interface to thrift
LICENSE= APACHE20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
# Workaround for stage-qa:
post-install:
diff --git a/devel/rubygem-tilt/Makefile b/devel/rubygem-tilt/Makefile
index 9f9fdb78b9a6..edb9070fe4cb 100644
--- a/devel/rubygem-tilt/Makefile
+++ b/devel/rubygem-tilt/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/tilt
diff --git a/devel/rubygem-tilt1/Makefile b/devel/rubygem-tilt1/Makefile
index 6a1bc408f2fb..e70be4912138 100644
--- a/devel/rubygem-tilt1/Makefile
+++ b/devel/rubygem-tilt1/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\.
diff --git a/devel/rubygem-timers/Makefile b/devel/rubygem-timers/Makefile
index 6a1b8b6fd917..d0ce654f4653 100644
--- a/devel/rubygem-timers/Makefile
+++ b/devel/rubygem-timers/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-hitimes>=0:devel/rubygem-hitimes
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-tins/Makefile b/devel/rubygem-tins/Makefile
index 9fc16bb4bd1c..4da1a9563635 100644
--- a/devel/rubygem-tins/Makefile
+++ b/devel/rubygem-tins/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-titlecase/Makefile b/devel/rubygem-titlecase/Makefile
index 244b082cbcf1..d1367444b5ca 100644
--- a/devel/rubygem-titlecase/Makefile
+++ b/devel/rubygem-titlecase/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/devel/rubygem-toml/Makefile b/devel/rubygem-toml/Makefile
index 8aae19638a4b..1206db8a33e9 100644
--- a/devel/rubygem-toml/Makefile
+++ b/devel/rubygem-toml/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-parslet>=1.5.0:textproc/rubygem-parslet
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-transaction-simple/Makefile b/devel/rubygem-transaction-simple/Makefile
index d46496c2f2d0..510bb7560b2b 100644
--- a/devel/rubygem-transaction-simple/Makefile
+++ b/devel/rubygem-transaction-simple/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/devel/rubygem-travis/Makefile b/devel/rubygem-travis/Makefile
index caedcff74b9c..0142ad1e4eb7 100644
--- a/devel/rubygem-travis/Makefile
+++ b/devel/rubygem-travis/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= rubygem-backports>=0:devel/rubygem-backports \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/travis
diff --git a/devel/rubygem-treetop/Makefile b/devel/rubygem-treetop/Makefile
index 53ed6981b471..b3bb4e382d47 100644
--- a/devel/rubygem-treetop/Makefile
+++ b/devel/rubygem-treetop/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-polyglot>=0.3:devel/rubygem-polyglot
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/tt
diff --git a/devel/rubygem-trollop/Makefile b/devel/rubygem-trollop/Makefile
index 670846567453..0b070126b3b3 100644
--- a/devel/rubygem-trollop/Makefile
+++ b/devel/rubygem-trollop/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/devel/rubygem-trollop1/Makefile b/devel/rubygem-trollop1/Makefile
index 92893dd9e839..53127e6965e0 100644
--- a/devel/rubygem-trollop1/Makefile
+++ b/devel/rubygem-trollop1/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/devel/rubygem-turn/Makefile b/devel/rubygem-turn/Makefile
index 644aa1d98bd9..692448b5e2be 100644
--- a/devel/rubygem-turn/Makefile
+++ b/devel/rubygem-turn/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-ansi>=0:devel/rubygem-ansi \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/turn
diff --git a/devel/rubygem-typed-array/Makefile b/devel/rubygem-typed-array/Makefile
index 676220c50488..b581eec2e251 100644
--- a/devel/rubygem-typed-array/Makefile
+++ b/devel/rubygem-typed-array/Makefile
@@ -12,7 +12,6 @@ COMMENT= Provides methods for creating type-enforced Arrays
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index f1196a14e293..e12332a26cfa 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-thread_safe1>=0.1:devel/rubygem-thread_safe1
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-tzinfo03/Makefile b/devel/rubygem-tzinfo03/Makefile
index c3544678daa0..8748b7a2ba30 100644
--- a/devel/rubygem-tzinfo03/Makefile
+++ b/devel/rubygem-tzinfo03/Makefile
@@ -15,7 +15,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/devel/rubygem-unicode-display_width/Makefile b/devel/rubygem-unicode-display_width/Makefile
index fef1e704bc67..7dfeea386b60 100644
--- a/devel/rubygem-unicode-display_width/Makefile
+++ b/devel/rubygem-unicode-display_width/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-unicode/Makefile b/devel/rubygem-unicode/Makefile
index 0cc24bc20324..d5e7037ebfb0 100644
--- a/devel/rubygem-unicode/Makefile
+++ b/devel/rubygem-unicode/Makefile
@@ -10,7 +10,6 @@ MAINTAINER= alexey@renatasystems.org
COMMENT= Unicode string manipulation library for Ruby
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-uuid/Makefile b/devel/rubygem-uuid/Makefile
index feb89540f0fe..5c04a3f99a67 100644
--- a/devel/rubygem-uuid/Makefile
+++ b/devel/rubygem-uuid/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-macaddr>=1.0:net/rubygem-macaddr
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/uuid
diff --git a/devel/rubygem-uuidtools/Makefile b/devel/rubygem-uuidtools/Makefile
index 3802ce3da12e..d895afae8167 100644
--- a/devel/rubygem-uuidtools/Makefile
+++ b/devel/rubygem-uuidtools/Makefile
@@ -13,7 +13,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/devel/rubygem-validatable/Makefile b/devel/rubygem-validatable/Makefile
index d9111e7e34b2..3a8e0e33c319 100644
--- a/devel/rubygem-validatable/Makefile
+++ b/devel/rubygem-validatable/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/devel/rubygem-versionomy/Makefile b/devel/rubygem-versionomy/Makefile
index 2726c9ddeb9d..d60e96afed24 100644
--- a/devel/rubygem-versionomy/Makefile
+++ b/devel/rubygem-versionomy/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-blockenspiel>=0.5:devel/rubygem-blockenspiel
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-virtus/Makefile b/devel/rubygem-virtus/Makefile
index 84f62fde1fbb..8a1380f2d9f5 100644
--- a/devel/rubygem-virtus/Makefile
+++ b/devel/rubygem-virtus/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-axiom-types>=0.1:devel/rubygem-axiom-types \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-warbler/Makefile b/devel/rubygem-warbler/Makefile
index ef332c5a7995..3dcf0180b620 100644
--- a/devel/rubygem-warbler/Makefile
+++ b/devel/rubygem-warbler/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= jruby:lang/jruby \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/warble
diff --git a/devel/rubygem-warden/Makefile b/devel/rubygem-warden/Makefile
index 6b4adf93679e..435d0fa49a54 100644
--- a/devel/rubygem-warden/Makefile
+++ b/devel/rubygem-warden/Makefile
@@ -16,7 +16,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/devel/rubygem-wdm/Makefile b/devel/rubygem-wdm/Makefile
index e99fb8409450..02abbe147ed3 100644
--- a/devel/rubygem-wdm/Makefile
+++ b/devel/rubygem-wdm/Makefile
@@ -12,7 +12,6 @@ COMMENT= Library for monitoring directories for changes
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-web-console/Makefile b/devel/rubygem-web-console/Makefile
index b43881293518..a8191574482a 100644
--- a/devel/rubygem-web-console/Makefile
+++ b/devel/rubygem-web-console/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activemodel4>=4.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/devel/rubygem-webby/Makefile b/devel/rubygem-webby/Makefile
index 83a68df36679..bc369e72e4a2 100644
--- a/devel/rubygem-webby/Makefile
+++ b/devel/rubygem-webby/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS= rubygem-bones>=2.5.0:devel/rubygem-bones \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
USE_RAKE= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/webby bin/webby-gen
.include <bsd.port.mk>
diff --git a/devel/rubygem-wmi-lite/Makefile b/devel/rubygem-wmi-lite/Makefile
index b8e921080352..9bc442e2f5c2 100644
--- a/devel/rubygem-wmi-lite/Makefile
+++ b/devel/rubygem-wmi-lite/Makefile
@@ -15,7 +15,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/devel/rubygem-xpath/Makefile b/devel/rubygem-xpath/Makefile
index d27f1ba84516..fd4b1984eab3 100644
--- a/devel/rubygem-xpath/Makefile
+++ b/devel/rubygem-xpath/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.3: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/devel/rubygem-yajl-ruby/Makefile b/devel/rubygem-yajl-ruby/Makefile
index 9cd6ad8e34d6..f36dc62fcca1 100644
--- a/devel/rubygem-yajl-ruby/Makefile
+++ b/devel/rubygem-yajl-ruby/Makefile
@@ -12,7 +12,6 @@ COMMENT= Streaming JSON parsing and encoding library for Ruby
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/devel/rubygem-yui-compressor/Makefile b/devel/rubygem-yui-compressor/Makefile
index 59534c8c3e34..8bc91d20b3aa 100644
--- a/devel/rubygem-yui-compressor/Makefile
+++ b/devel/rubygem-yui-compressor/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/devel/rubygem-zentest/Makefile b/devel/rubygem-zentest/Makefile
index 83b99ab19fd5..80c097773b2b 100644
--- a/devel/rubygem-zentest/Makefile
+++ b/devel/rubygem-zentest/Makefile
@@ -17,8 +17,7 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/autotest \
bin/multigem \
diff --git a/dns/rubygem-dnsruby/Makefile b/dns/rubygem-dnsruby/Makefile
index d4d0d7130f26..b9995ce119b8 100644
--- a/dns/rubygem-dnsruby/Makefile
+++ b/dns/rubygem-dnsruby/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/dns/rubygem-net-dns/Makefile b/dns/rubygem-net-dns/Makefile
index b433a9d01eb8..32ccf9df7b34 100644
--- a/dns/rubygem-net-dns/Makefile
+++ b/dns/rubygem-net-dns/Makefile
@@ -16,7 +16,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/dns/rubygem-public_suffix/Makefile b/dns/rubygem-public_suffix/Makefile
index 0969ae0395f4..94961f205fd7 100644
--- a/dns/rubygem-public_suffix/Makefile
+++ b/dns/rubygem-public_suffix/Makefile
@@ -17,8 +17,7 @@ PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-patch:
@${CP} ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat ${WRKSRC}/data/definitions.txt
diff --git a/dns/rubygem-public_suffix_service/Makefile b/dns/rubygem-public_suffix_service/Makefile
index c73651e307a1..6bec00bdd03f 100644
--- a/dns/rubygem-public_suffix_service/Makefile
+++ b/dns/rubygem-public_suffix_service/Makefile
@@ -17,8 +17,7 @@ PATCH_DEPENDS= public_suffix_list>=0:dns/public_suffix_list
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-patch:
@${CP} ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat ${WRKSRC}/lib/public_suffix/definitions.txt
diff --git a/emulators/rubygem-fission/Makefile b/emulators/rubygem-fission/Makefile
index f651cdb3e69e..08134884a64e 100644
--- a/emulators/rubygem-fission/Makefile
+++ b/emulators/rubygem-fission/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-CFPropertyList>=2.2:devel/rubygem-CFPropertyList
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/fission
diff --git a/finance/rubygem-money/Makefile b/finance/rubygem-money/Makefile
index 81b30faeaf1f..aae91bfda99a 100644
--- a/finance/rubygem-money/Makefile
+++ b/finance/rubygem-money/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-i18n>=0.6.4:devel/rubygem-i18n
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/ftp/rubygem-curb/Makefile b/ftp/rubygem-curb/Makefile
index f4c69d8678be..9d7b811c4b4b 100644
--- a/ftp/rubygem-curb/Makefile
+++ b/ftp/rubygem-curb/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcurl.so:ftp/curl
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/games/lolcat/Makefile b/games/lolcat/Makefile
index a32ce281e8ff..49bb568f8614 100644
--- a/games/lolcat/Makefile
+++ b/games/lolcat/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-trollop1>=1.9:devel/rubygem-trollop1 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/lolcat
diff --git a/games/rubygem-fortune_gem/Makefile b/games/rubygem-fortune_gem/Makefile
index 66fc01720bc8..30cfcdc1f4a6 100644
--- a/games/rubygem-fortune_gem/Makefile
+++ b/games/rubygem-fortune_gem/Makefile
@@ -12,8 +12,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/fortune_gem
.include <bsd.port.mk>
diff --git a/graphics/rubygem-cairo/Makefile b/graphics/rubygem-cairo/Makefile
index a5f12b4aabb2..32d3e6035c39 100644
--- a/graphics/rubygem-cairo/Makefile
+++ b/graphics/rubygem-cairo/Makefile
@@ -14,10 +14,8 @@ LICENSE_COMB= dual
RUN_DEPENDS= rubygem-pkg-config>=1.1.5:devel/rubygem-pkg-config
-USES= pkgconfig
USE_GNOME= cairo
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/graphics/rubygem-captcha/Makefile b/graphics/rubygem-captcha/Makefile
index 742bf042b79a..eaf3719162d2 100644
--- a/graphics/rubygem-captcha/Makefile
+++ b/graphics/rubygem-captcha/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rmagick>=2.9.2:graphics/rubygem-rmagick
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-chunky_png/Makefile b/graphics/rubygem-chunky_png/Makefile
index 3b48ac3d1772..eca788838fff 100644
--- a/graphics/rubygem-chunky_png/Makefile
+++ b/graphics/rubygem-chunky_png/Makefile
@@ -15,7 +15,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/graphics/rubygem-clutter-gtk/Makefile b/graphics/rubygem-clutter-gtk/Makefile
index b4f3ba80f158..953a03d52e9a 100644
--- a/graphics/rubygem-clutter-gtk/Makefile
+++ b/graphics/rubygem-clutter-gtk/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-clutter>=${PORTVERSION}:graphics/rubygem-clutter \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-clutter/Makefile b/graphics/rubygem-clutter/Makefile
index 17636da88944..129e82b5cfe7 100644
--- a/graphics/rubygem-clutter/Makefile
+++ b/graphics/rubygem-clutter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-dragonfly/Makefile b/graphics/rubygem-dragonfly/Makefile
index 0696a1bf4003..f3b03e60c180 100644
--- a/graphics/rubygem-dragonfly/Makefile
+++ b/graphics/rubygem-dragonfly/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS= rubygem-addressable>=2.3:www/rubygem-addressable \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= dev/test_rails
ruby_OLD_CMD= "env ruby"
diff --git a/graphics/rubygem-emoji/Makefile b/graphics/rubygem-emoji/Makefile
index c85f53963719..97a00d2b4f87 100644
--- a/graphics/rubygem-emoji/Makefile
+++ b/graphics/rubygem-emoji/Makefile
@@ -16,7 +16,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/graphics/rubygem-exifr/Makefile b/graphics/rubygem-exifr/Makefile
index a684971700ae..bcd1c987c41e 100644
--- a/graphics/rubygem-exifr/Makefile
+++ b/graphics/rubygem-exifr/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/exifr
diff --git a/graphics/rubygem-ezprint/Makefile b/graphics/rubygem-ezprint/Makefile
index 0f693a89cc2a..69635a31b88a 100644
--- a/graphics/rubygem-ezprint/Makefile
+++ b/graphics/rubygem-ezprint/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-pdfkit>=0.5.0:graphics/rubygem-pdfkit
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-fastimage/Makefile b/graphics/rubygem-fastimage/Makefile
index 9e509ec92d63..fd63ddbf8de5 100644
--- a/graphics/rubygem-fastimage/Makefile
+++ b/graphics/rubygem-fastimage/Makefile
@@ -16,7 +16,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/graphics/rubygem-flamegraph/Makefile b/graphics/rubygem-flamegraph/Makefile
index 2ae79969323b..4c6cb1217435 100644
--- a/graphics/rubygem-flamegraph/Makefile
+++ b/graphics/rubygem-flamegraph/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-fast_stack>=0:devel/rubygem-fast_stack
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-gd2/Makefile b/graphics/rubygem-gd2/Makefile
index 779ba3df16eb..73c9a6ea8002 100644
--- a/graphics/rubygem-gd2/Makefile
+++ b/graphics/rubygem-gd2/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= libgd.so:graphics/gd
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-patch:
@${REINPLACE_CMD} 's|libgd.so.2|libgd.so.5|' ${WRKSRC}/lib/gd2.rb
diff --git a/graphics/rubygem-gdk_pixbuf2/Makefile b/graphics/rubygem-gdk_pixbuf2/Makefile
index 58a6a057ccb6..09c88919419e 100644
--- a/graphics/rubygem-gdk_pixbuf2/Makefile
+++ b/graphics/rubygem-gdk_pixbuf2/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2
USE_GNOME= gdkpixbuf2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-gemojione/Makefile b/graphics/rubygem-gemojione/Makefile
index 5de26e1fd97b..2f8877c437ae 100644
--- a/graphics/rubygem-gemojione/Makefile
+++ b/graphics/rubygem-gemojione/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/graphics/rubygem-geokit/Makefile b/graphics/rubygem-geokit/Makefile
index ae9981d3836d..b30901b2061e 100644
--- a/graphics/rubygem-geokit/Makefile
+++ b/graphics/rubygem-geokit/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/graphics/rubygem-gitlab_emoji/Makefile b/graphics/rubygem-gitlab_emoji/Makefile
index 0fdbc5d44b73..80bbf58ae6c5 100644
--- a/graphics/rubygem-gitlab_emoji/Makefile
+++ b/graphics/rubygem-gitlab_emoji/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gemojione>=2.2.1:graphics/rubygem-gemojione
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-goocanvas/Makefile b/graphics/rubygem-goocanvas/Makefile
index c679d238eb09..91a5784a3e84 100644
--- a/graphics/rubygem-goocanvas/Makefile
+++ b/graphics/rubygem-goocanvas/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject
rubygem-gtk3>=${PORTVERSION}:x11-toolkits/rubygem-gtk3
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-gruff/Makefile b/graphics/rubygem-gruff/Makefile
index 32c27b25e533..54dc0b37d458 100644
--- a/graphics/rubygem-gruff/Makefile
+++ b/graphics/rubygem-gruff/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-rmagick>=2.13.4:graphics/rubygem-rmagick
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= test/image_compare.rb
ruby_OLD_CMD= ruby
diff --git a/graphics/rubygem-image_science/Makefile b/graphics/rubygem-image_science/Makefile
index a1b217dd24aa..8c1ce6ec1b96 100644
--- a/graphics/rubygem-image_science/Makefile
+++ b/graphics/rubygem-image_science/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-rubyinline>=3.9:devel/rubygem-rubyinline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/image_science_thumb
diff --git a/graphics/rubygem-imagesize/Makefile b/graphics/rubygem-imagesize/Makefile
index 5da5eba61974..c3a92c5e2628 100644
--- a/graphics/rubygem-imagesize/Makefile
+++ b/graphics/rubygem-imagesize/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/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile
index 82ecb8749dff..2e4569602df1 100644
--- a/graphics/rubygem-mini_magick/Makefile
+++ b/graphics/rubygem-mini_magick/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFAULT=X11
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
X11_RUN_DEPENDS= convert:graphics/ImageMagick
X11_RUN_DEPENDS_OFF= convert:graphics/ImageMagick-nox11
diff --git a/graphics/rubygem-objectdetect/Makefile b/graphics/rubygem-objectdetect/Makefile
index f507cbc398cc..bf9dab658197 100644
--- a/graphics/rubygem-objectdetect/Makefile
+++ b/graphics/rubygem-objectdetect/Makefile
@@ -14,10 +14,8 @@ LICENSE= MIT
LIB_DEPENDS= libopencv_legacy.so:graphics/opencv
-USES= pkgconfig
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pkgconfig
post-patch:
${REINPLACE_CMD} -E 's|(objectdetect)|\1/version|' ${WRKSRC}/test/test_helper.rb
diff --git a/graphics/rubygem-opengl/Makefile b/graphics/rubygem-opengl/Makefile
index 3b052478a50c..4a67c28bdf83 100644
--- a/graphics/rubygem-opengl/Makefile
+++ b/graphics/rubygem-opengl/Makefile
@@ -15,7 +15,6 @@ LICENSE= MIT
USE_GL= glut
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-pdfkit/Makefile b/graphics/rubygem-pdfkit/Makefile
index 2ad4861ac191..0824f458a405 100644
--- a/graphics/rubygem-pdfkit/Makefile
+++ b/graphics/rubygem-pdfkit/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= wkhtmltopdf:converters/wkhtmltopdf
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-png/Makefile b/graphics/rubygem-png/Makefile
index c48bb53ba8b7..91bc476b6ecf 100644
--- a/graphics/rubygem-png/Makefile
+++ b/graphics/rubygem-png/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-rubyinline>=3.9:devel/rubygem-rubyinline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-railroad/Makefile b/graphics/rubygem-railroad/Makefile
index 5ccac65a197c..572822bd66c6 100644
--- a/graphics/rubygem-railroad/Makefile
+++ b/graphics/rubygem-railroad/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/railroad
diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile
index 7ae970c11dde..6b1013de6a9c 100644
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@@ -14,9 +14,7 @@ OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= pkgconfig
+USES= gem:autoplist pkgconfig
X11_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
X11_LIB_DEPENDS_OFF= libMagickWand-6.so:graphics/ImageMagick-nox11
diff --git a/graphics/rubygem-rsvg2/Makefile b/graphics/rubygem-rsvg2/Makefile
index f36ff54ad08b..a93c6118f3dc 100644
--- a/graphics/rubygem-rsvg2/Makefile
+++ b/graphics/rubygem-rsvg2/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-cairo>=1.12.8:graphics/rubygem-cairo \
USE_GNOME= librsvg2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/graphics/rubygem-ruby-graphviz/Makefile b/graphics/rubygem-ruby-graphviz/Makefile
index a836719c150e..e89785afa0a8 100644
--- a/graphics/rubygem-ruby-graphviz/Makefile
+++ b/graphics/rubygem-ruby-graphviz/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/gxl2dot:graphics/graphviz
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/dot2ruby bin/gem2gv bin/git2gv bin/ruby2gv bin/xml2gv
diff --git a/graphics/rubygem-scruffy/Makefile b/graphics/rubygem-scruffy/Makefile
index f4233dcd966a..6749a6030e90 100644
--- a/graphics/rubygem-scruffy/Makefile
+++ b/graphics/rubygem-scruffy/Makefile
@@ -15,8 +15,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-patch:
@${REINPLACE_CMD} -e 's|#{options|0 0 #{options|' ${WRKSRC}/lib/scruffy/renderers/base.rb
diff --git a/irc/rubygem-cinch/Makefile b/irc/rubygem-cinch/Makefile
index 74f184566cf2..6a7fb90c344f 100644
--- a/irc/rubygem-cinch/Makefile
+++ b/irc/rubygem-cinch/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/irc/rubygem-cogbot/Makefile b/irc/rubygem-cogbot/Makefile
index 01fb86a4add9..705ec7007378 100644
--- a/irc/rubygem-cogbot/Makefile
+++ b/irc/rubygem-cogbot/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS= rubygem-cinch>=2.3.1:irc/rubygem-cinch \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/cogbot
diff --git a/irc/rubygem-lita-irc/Makefile b/irc/rubygem-lita-irc/Makefile
index 13fefe6caf75..3ac5a740eb03 100644
--- a/irc/rubygem-lita-irc/Makefile
+++ b/irc/rubygem-lita-irc/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-cinch>=2.0:irc/rubygem-cinch \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/irc/rubygem-net-irc/Makefile b/irc/rubygem-net-irc/Makefile
index 5eaa262013db..081581ebea26 100644
--- a/irc/rubygem-net-irc/Makefile
+++ b/irc/rubygem-net-irc/Makefile
@@ -12,7 +12,6 @@ COMMENT= Ruby library for implementing IRC server and client
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/japanese/rubygem-jpmobile-ipaddresses/Makefile b/japanese/rubygem-jpmobile-ipaddresses/Makefile
index 28ed39ef4d99..c9d9974ebed2 100644
--- a/japanese/rubygem-jpmobile-ipaddresses/Makefile
+++ b/japanese/rubygem-jpmobile-ipaddresses/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.pre.mk>
diff --git a/japanese/rubygem-jpmobile-terminfo/Makefile b/japanese/rubygem-jpmobile-terminfo/Makefile
index 03091eb21719..19e1813c4f5f 100644
--- a/japanese/rubygem-jpmobile-terminfo/Makefile
+++ b/japanese/rubygem-jpmobile-terminfo/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.pre.mk>
diff --git a/japanese/rubygem-jpmobile/Makefile b/japanese/rubygem-jpmobile/Makefile
index 5643bf42eebd..3c7a8395b854 100644
--- a/japanese/rubygem-jpmobile/Makefile
+++ b/japanese/rubygem-jpmobile/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-rails>=3.2.8:www/rubygem-rails
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
BROKEN_RUBY23= yes
diff --git a/japanese/rubygem-jpmobile4/Makefile b/japanese/rubygem-jpmobile4/Makefile
index f756a5d23ba3..5ae86d6f5068 100644
--- a/japanese/rubygem-jpmobile4/Makefile
+++ b/japanese/rubygem-jpmobile4/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-rails4>0:www/rubygem-rails4
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
OPTIONS_DEFINE= GEOKIT IPADDRESSES TERMINFO
GEOKIT_DESC= Run with geokit
diff --git a/japanese/rubygem-mail-iso-2022-jp/Makefile b/japanese/rubygem-mail-iso-2022-jp/Makefile
index 45687c748151..82de8d90c8e7 100644
--- a/japanese/rubygem-mail-iso-2022-jp/Makefile
+++ b/japanese/rubygem-mail-iso-2022-jp/Makefile
@@ -14,8 +14,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.pre.mk>
diff --git a/japanese/rubygem-myrurema/Makefile b/japanese/rubygem-myrurema/Makefile
index 8d18a0edd482..9af29e1c453b 100644
--- a/japanese/rubygem-myrurema/Makefile
+++ b/japanese/rubygem-myrurema/Makefile
@@ -13,8 +13,7 @@ RUN_DEPENDS= rubygem-launchy>=2.3:devel/rubygem-launchy
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rurema
diff --git a/java/rubygem-rjb/Makefile b/java/rubygem-rjb/Makefile
index 237f283114a2..6493ed5f8895 100644
--- a/java/rubygem-rjb/Makefile
+++ b/java/rubygem-rjb/Makefile
@@ -13,8 +13,7 @@ LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
+USES= gem:autoplist
USE_JAVA= yes
GEM_ENV= JAVA_HOME=${JAVA_HOME}
diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index 457ad7d319ac..21e6f8cbeb2a 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-actionpack>=${PORTVERSION}: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/mail/rubygem-actionmailer4/Makefile b/mail/rubygem-actionmailer4/Makefile
index d10c4a51ebc3..e782cc1c309a 100644
--- a/mail/rubygem-actionmailer4/Makefile
+++ b/mail/rubygem-actionmailer4/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS= rubygem-actionpack4>=${PORTVERSION}: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/mail/rubygem-email_reply_parser-discourse/Makefile b/mail/rubygem-email_reply_parser-discourse/Makefile
index db01e61a3560..7f1b7e7a2736 100644
--- a/mail/rubygem-email_reply_parser-discourse/Makefile
+++ b/mail/rubygem-email_reply_parser-discourse/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/mail/rubygem-email_reply_parser/Makefile b/mail/rubygem-email_reply_parser/Makefile
index 66e41376bc0f..3239194bae58 100644
--- a/mail/rubygem-email_reply_parser/Makefile
+++ b/mail/rubygem-email_reply_parser/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/mail/rubygem-exception_notification/Makefile b/mail/rubygem-exception_notification/Makefile
index 00c87b791d2f..19907a814098 100644
--- a/mail/rubygem-exception_notification/Makefile
+++ b/mail/rubygem-exception_notification/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-actionmailer4>=4.0:mail/rubygem-actionmailer4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-larch/Makefile b/mail/rubygem-larch/Makefile
index d931231614e3..de659085cb62 100644
--- a/mail/rubygem-larch/Makefile
+++ b/mail/rubygem-larch/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-highline>=1.5:devel/rubygem-highline \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/larch
diff --git a/mail/rubygem-mail/Makefile b/mail/rubygem-mail/Makefile
index 967cb901a499..91435411ebeb 100644
--- a/mail/rubygem-mail/Makefile
+++ b/mail/rubygem-mail/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-mime-types>=1.16: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/mail/rubygem-mail25/Makefile b/mail/rubygem-mail25/Makefile
index 7a869f6e3cac..97904478761d 100644
--- a/mail/rubygem-mail25/Makefile
+++ b/mail/rubygem-mail25/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-mime-types1>=1.16:misc/rubygem-mime-types1 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^2\.5
diff --git a/mail/rubygem-mail_room/Makefile b/mail/rubygem-mail_room/Makefile
index 3e1e3ed52f92..a016149b18ea 100644
--- a/mail/rubygem-mail_room/Makefile
+++ b/mail/rubygem-mail_room/Makefile
@@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/mail_room
diff --git a/mail/rubygem-mailboxer/Makefile b/mail/rubygem-mailboxer/Makefile
index 2925b5e00c9b..24930755daca 100644
--- a/mail/rubygem-mailboxer/Makefile
+++ b/mail/rubygem-mailboxer/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-carrierwave>=0.5.8:www/rubygem-carrierwave \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-mailfactory/Makefile b/mail/rubygem-mailfactory/Makefile
index 6a8344166547..c6584d9d3f08 100644
--- a/mail/rubygem-mailfactory/Makefile
+++ b/mail/rubygem-mailfactory/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-mime-types>=1.13.1: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/mail/rubygem-pony/Makefile b/mail/rubygem-pony/Makefile
index c65a54bad5ca..97e293dd4808 100644
--- a/mail/rubygem-pony/Makefile
+++ b/mail/rubygem-pony/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-mail>=2.0:mail/rubygem-mail
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-premailer-rails/Makefile b/mail/rubygem-premailer-rails/Makefile
index 65a031ec2e94..497171e881c6 100644
--- a/mail/rubygem-premailer-rails/Makefile
+++ b/mail/rubygem-premailer-rails/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-actionmailer4>=3:mail/rubygem-actionmailer4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-premailer/Makefile b/mail/rubygem-premailer/Makefile
index 72d71009d04b..beda454a4041 100644
--- a/mail/rubygem-premailer/Makefile
+++ b/mail/rubygem-premailer/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-css_parser>=1.3.6:textproc/rubygem-css_parser \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/premailer
diff --git a/mail/rubygem-rmail/Makefile b/mail/rubygem-rmail/Makefile
index 13ab19e1c411..a371ad4b0abe 100644
--- a/mail/rubygem-rmail/Makefile
+++ b/mail/rubygem-rmail/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-roadie-rails/Makefile b/mail/rubygem-roadie-rails/Makefile
index 59dea7b8cf61..4a9836133d87 100644
--- a/mail/rubygem-roadie-rails/Makefile
+++ b/mail/rubygem-roadie-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-railties4>=3.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/mail/rubygem-roadie/Makefile b/mail/rubygem-roadie/Makefile
index c2b78ab6f56c..25f7abe79d9b 100644
--- a/mail/rubygem-roadie/Makefile
+++ b/mail/rubygem-roadie/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-css_parser>=1.3.4:textproc/rubygem-css_parser \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-ruby-qmail/Makefile b/mail/rubygem-ruby-qmail/Makefile
index 4cc7a5bfc646..0925af52f8a4 100644
--- a/mail/rubygem-ruby-qmail/Makefile
+++ b/mail/rubygem-ruby-qmail/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-rspec>=1.2.9:devel/rubygem-rspec
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index 0059f0e9f042..22a4dfe9a416 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -10,7 +10,6 @@ MAINTAINER= knu@FreeBSD.org
COMMENT= RFC2822/MIME compliant mail manipulating library for Ruby
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/mail/rubygem-vmail/Makefile b/mail/rubygem-vmail/Makefile
index d561c105c7ea..6793238241a5 100644
--- a/mail/rubygem-vmail/Makefile
+++ b/mail/rubygem-vmail/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS= rubygem-highline>=1.6.1:devel/rubygem-highline \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/vmail bin/vmail_client bin/vmailsend
diff --git a/math/rubygem-expression_parser/Makefile b/math/rubygem-expression_parser/Makefile
index 22c5169986a1..cc87924ad271 100644
--- a/math/rubygem-expression_parser/Makefile
+++ b/math/rubygem-expression_parser/Makefile
@@ -11,7 +11,6 @@ COMMENT= Mathematical expression parser for Ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/math/rubygem-fftw3/Makefile b/math/rubygem-fftw3/Makefile
index c947eb8575b0..bb18a8c8670c 100644
--- a/math/rubygem-fftw3/Makefile
+++ b/math/rubygem-fftw3/Makefile
@@ -14,7 +14,6 @@ LIB_DEPENDS= libfftw3.so:math/fftw3
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/math/rubygem-narray/Makefile b/math/rubygem-narray/Makefile
index 972031ba6c12..32c1b3138953 100644
--- a/math/rubygem-narray/Makefile
+++ b/math/rubygem-narray/Makefile
@@ -11,8 +11,7 @@ COMMENT= Numerical N-dimensional array library for Ruby
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include "${.CURDIR}/Makefile.version"
diff --git a/math/rubygem-narray_miss/Makefile b/math/rubygem-narray_miss/Makefile
index 2c42a0de96f8..cb92ca336a04 100644
--- a/math/rubygem-narray_miss/Makefile
+++ b/math/rubygem-narray_miss/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS= rubygem-narray>0:math/rubygem-narray
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/math/rubygem-numru-misc/Makefile b/math/rubygem-numru-misc/Makefile
index 408bef80c44b..3c62c3266cfa 100644
--- a/math/rubygem-numru-misc/Makefile
+++ b/math/rubygem-numru-misc/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-narray>0:math/rubygem-narray \
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/math/rubygem-numru-units/Makefile b/math/rubygem-numru-units/Makefile
index 4b41a864c6da..c0bc5f6bec07 100644
--- a/math/rubygem-numru-units/Makefile
+++ b/math/rubygem-numru-units/Makefile
@@ -13,7 +13,6 @@ NO_ARCH= yes
USE_RUBY= yes
USE_RAKE= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/math/rubygem-rb-gsl/Makefile b/math/rubygem-rb-gsl/Makefile
index 1d57b54f12bf..b7e17923c977 100644
--- a/math/rubygem-rb-gsl/Makefile
+++ b/math/rubygem-rb-gsl/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS= libgsl.so:math/gsl
RUN_DEPENDS= rubygem-narray>=0.5.9:math/rubygem-narray
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/misc/rubygem-dotenv/Makefile b/misc/rubygem-dotenv/Makefile
index cbeb6c0299ac..b3096775399f 100644
--- a/misc/rubygem-dotenv/Makefile
+++ b/misc/rubygem-dotenv/Makefile
@@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/dotenv
diff --git a/misc/rubygem-iesd/Makefile b/misc/rubygem-iesd/Makefile
index 8f45500ebd9b..1c61cb7b2791 100644
--- a/misc/rubygem-iesd/Makefile
+++ b/misc/rubygem-iesd/Makefile
@@ -13,8 +13,7 @@ LICENSE= BSD2CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/iesd
diff --git a/misc/rubygem-mime-types-data/Makefile b/misc/rubygem-mime-types-data/Makefile
index 7bb6b2e4f152..0367da9f7d59 100644
--- a/misc/rubygem-mime-types-data/Makefile
+++ b/misc/rubygem-mime-types-data/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/Licence.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/misc/rubygem-mime-types/Makefile b/misc/rubygem-mime-types/Makefile
index 2392fb969f80..06ef86ba63a8 100644
--- a/misc/rubygem-mime-types/Makefile
+++ b/misc/rubygem-mime-types/Makefile
@@ -17,7 +17,6 @@ LICENSE_FILE_MIT= ${WRKSRC}/Licence.rdoc
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/misc/rubygem-mime-types1/Makefile b/misc/rubygem-mime-types1/Makefile
index a5ea97415de1..d777676f092d 100644
--- a/misc/rubygem-mime-types1/Makefile
+++ b/misc/rubygem-mime-types1/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^1\.
diff --git a/misc/rubygem-mimemagic/Makefile b/misc/rubygem-mimemagic/Makefile
index 278cf394e12e..9547e8b32847 100644
--- a/misc/rubygem-mimemagic/Makefile
+++ b/misc/rubygem-mimemagic/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/misc/rubygem-rabbit/Makefile b/misc/rubygem-rabbit/Makefile
index e7e012c9173f..ece265bb73fe 100644
--- a/misc/rubygem-rabbit/Makefile
+++ b/misc/rubygem-rabbit/Makefile
@@ -26,10 +26,8 @@ RUN_DEPENDS= rubygem-coderay>=1.0.0:textproc/rubygem-coderay \
rubygem-rttool>0:textproc/rubygem-rttool
NO_ARCH= yes
-USES= gettext
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist gettext
PLIST_FILES= bin/rabbit bin/rabbirc bin/rabbit-command bin/rabbit-slide \
bin/rabbit-theme
diff --git a/misc/rubygem-vpim/Makefile b/misc/rubygem-vpim/Makefile
index 62edd2fc583a..7cf066dd9a43 100644
--- a/misc/rubygem-vpim/Makefile
+++ b/misc/rubygem-vpim/Makefile
@@ -15,8 +15,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/reminder bin/rrule
diff --git a/multimedia/rubygem-clutter-gstreamer/Makefile b/multimedia/rubygem-clutter-gstreamer/Makefile
index 61fab024ec66..90fdefc9c5c5 100644
--- a/multimedia/rubygem-clutter-gstreamer/Makefile
+++ b/multimedia/rubygem-clutter-gstreamer/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-clutter>=${PORTSVERSION}:graphics/rubygem-clutter \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/multimedia/rubygem-flvtool2/Makefile b/multimedia/rubygem-flvtool2/Makefile
index 0e34ffa3bbdd..db67b4a7ca09 100644
--- a/multimedia/rubygem-flvtool2/Makefile
+++ b/multimedia/rubygem-flvtool2/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/flvtool2
diff --git a/multimedia/rubygem-gstreamer/Makefile b/multimedia/rubygem-gstreamer/Makefile
index 479be8868aa8..77a03eb50824 100644
--- a/multimedia/rubygem-gstreamer/Makefile
+++ b/multimedia/rubygem-gstreamer/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-glib2>=${PORTVERSION}:devel/rubygem-glib2 \
rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject-introspection
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/net-im/rubygem-earthquake/Makefile b/net-im/rubygem-earthquake/Makefile
index 9ec6b2320354..c0f4eb8c60f5 100644
--- a/net-im/rubygem-earthquake/Makefile
+++ b/net-im/rubygem-earthquake/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= rubygem-activesupport>=0:devel/rubygem-activesupport \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/earthquake
diff --git a/net-im/rubygem-hipchat/Makefile b/net-im/rubygem-hipchat/Makefile
index a15c6c2eb60b..e303b1d72712 100644
--- a/net-im/rubygem-hipchat/Makefile
+++ b/net-im/rubygem-hipchat/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-httparty>=0: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/net-im/rubygem-lita/Makefile b/net-im/rubygem-lita/Makefile
index 0e88e3196ae6..3460f46553ec 100644
--- a/net-im/rubygem-lita/Makefile
+++ b/net-im/rubygem-lita/Makefile
@@ -26,8 +26,7 @@ RUN_DEPENDS= redis>=0:databases/redis \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/lita
diff --git a/net-im/rubygem-termtter/Makefile b/net-im/rubygem-termtter/Makefile
index 522d78e0e423..fca390acb362 100644
--- a/net-im/rubygem-termtter/Makefile
+++ b/net-im/rubygem-termtter/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= rubygem-activerecord4>=4.1.0:databases/rubygem-activerecord4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/termtter bin/termtter_frame
diff --git a/net-im/rubygem-tinder/Makefile b/net-im/rubygem-tinder/Makefile
index 602dda04743b..68071e10de64 100644
--- a/net-im/rubygem-tinder/Makefile
+++ b/net-im/rubygem-tinder/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-eventmachine>=1.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/net-mgmt/rubygem-blimpy/Makefile b/net-mgmt/rubygem-blimpy/Makefile
index fc23b617da53..8ab04dbfacce 100644
--- a/net-mgmt/rubygem-blimpy/Makefile
+++ b/net-mgmt/rubygem-blimpy/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-fog>=0:devel/rubygem-fog \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/blimpy
diff --git a/net-mgmt/rubygem-snmp/Makefile b/net-mgmt/rubygem-snmp/Makefile
index ae529a18f08d..3ea5d4f83728 100644
--- a/net-mgmt/rubygem-snmp/Makefile
+++ b/net-mgmt/rubygem-snmp/Makefile
@@ -11,7 +11,6 @@ COMMENT= SNMP library for Ruby
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/net-mgmt/rubygem-visage-app/Makefile b/net-mgmt/rubygem-visage-app/Makefile
index 470421ae6162..08c27878f8db 100644
--- a/net-mgmt/rubygem-visage-app/Makefile
+++ b/net-mgmt/rubygem-visage-app/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-errand>=0.7.3:devel/rubygem-errand \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/visage-app
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
diff --git a/print/rubygem-afm/Makefile b/print/rubygem-afm/Makefile
index 2b3f9ca7e5b2..25b933f58144 100644
--- a/print/rubygem-afm/Makefile
+++ b/print/rubygem-afm/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/print/rubygem-color-tools/Makefile b/print/rubygem-color-tools/Makefile
index 32b16c82ee41..e7127de7ab92 100644
--- a/print/rubygem-color-tools/Makefile
+++ b/print/rubygem-color-tools/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/print/rubygem-color/Makefile b/print/rubygem-color/Makefile
index ce54f73994ad..07b0e582aaf3 100644
--- a/print/rubygem-color/Makefile
+++ b/print/rubygem-color/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/print/rubygem-pdf-core/Makefile b/print/rubygem-pdf-core/Makefile
index 14edabe6b9b7..213f988dcffb 100644
--- a/print/rubygem-pdf-core/Makefile
+++ b/print/rubygem-pdf-core/Makefile
@@ -17,7 +17,6 @@ LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-pdf-reader/Makefile b/print/rubygem-pdf-reader/Makefile
index e0af5759e2b4..480d39b91d8e 100644
--- a/print/rubygem-pdf-reader/Makefile
+++ b/print/rubygem-pdf-reader/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-afm>=0.2.1:print/rubygem-afm \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES+= bin/pdf_callbacks bin/pdf_list_callbacks bin/pdf_object bin/pdf_text
diff --git a/print/rubygem-pdf-writer/Makefile b/print/rubygem-pdf-writer/Makefile
index e61d23cc3fb6..5fd8318ea590 100644
--- a/print/rubygem-pdf-writer/Makefile
+++ b/print/rubygem-pdf-writer/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-color>=1.4.0:print/rubygem-color \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/techbook
diff --git a/print/rubygem-prawn-core/Makefile b/print/rubygem-prawn-core/Makefile
index c559e41d0677..ba0afde830f5 100644
--- a/print/rubygem-prawn-core/Makefile
+++ b/print/rubygem-prawn-core/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/print/rubygem-prawn-flexible-table/Makefile b/print/rubygem-prawn-flexible-table/Makefile
index a56e36d3f8db..c4e4d20a36d0 100644
--- a/print/rubygem-prawn-flexible-table/Makefile
+++ b/print/rubygem-prawn-flexible-table/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/print/rubygem-prawn-format/Makefile b/print/rubygem-prawn-format/Makefile
index 09d14ffdbbd2..198ee3c7e0d8 100644
--- a/print/rubygem-prawn-format/Makefile
+++ b/print/rubygem-prawn-format/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-prawn-core>=0:print/rubygem-prawn-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-prawn-graph/Makefile b/print/rubygem-prawn-graph/Makefile
index b9bd54496294..aa3e12e3d81e 100644
--- a/print/rubygem-prawn-graph/Makefile
+++ b/print/rubygem-prawn-graph/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-prawn>=0:print/rubygem-prawn
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-prawn-js/Makefile b/print/rubygem-prawn-js/Makefile
index ef75fb70b47f..53e7ba41d25a 100644
--- a/print/rubygem-prawn-js/Makefile
+++ b/print/rubygem-prawn-js/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-prawn-core>=0.6.1:print/rubygem-prawn-core
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-prawn-layout/Makefile b/print/rubygem-prawn-layout/Makefile
index 1e14877a692b..d7521b91c85c 100644
--- a/print/rubygem-prawn-layout/Makefile
+++ b/print/rubygem-prawn-layout/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/print/rubygem-prawn-security/Makefile b/print/rubygem-prawn-security/Makefile
index 326dfe8f97bb..f79508769903 100644
--- a/print/rubygem-prawn-security/Makefile
+++ b/print/rubygem-prawn-security/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/print/rubygem-prawn-svg/Makefile b/print/rubygem-prawn-svg/Makefile
index f9194e94f4cc..987e67ea3ca5 100644
--- a/print/rubygem-prawn-svg/Makefile
+++ b/print/rubygem-prawn-svg/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-css_parser>=1.3:textproc/rubygem-css_parser \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-prawn/Makefile b/print/rubygem-prawn/Makefile
index 3b09c9c57634..65e028cd77b8 100644
--- a/print/rubygem-prawn/Makefile
+++ b/print/rubygem-prawn/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-pdf-core>=0.6.1:print/rubygem-pdf-core \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-rbpdf-font/Makefile b/print/rubygem-rbpdf-font/Makefile
index 23f22e51ce73..f5aa184a6e43 100644
--- a/print/rubygem-rbpdf-font/Makefile
+++ b/print/rubygem-rbpdf-font/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-rbpdf/Makefile b/print/rubygem-rbpdf/Makefile
index 7cd7248c6303..17613e1db0a5 100644
--- a/print/rubygem-rbpdf/Makefile
+++ b/print/rubygem-rbpdf/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-htmlentities>=4.3.1:textproc/rubygem-htmlentities \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/print/rubygem-ttfunk/Makefile b/print/rubygem-ttfunk/Makefile
index 5dcd222a4a79..8c1d4e82b360 100644
--- a/print/rubygem-ttfunk/Makefile
+++ b/print/rubygem-ttfunk/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/russian/rubygem-russian/Makefile b/russian/rubygem-russian/Makefile
index 78cfaba1dd56..cf56bac6648b 100644
--- a/russian/rubygem-russian/Makefile
+++ b/russian/rubygem-russian/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-i18n>=0.5.0:devel/rubygem-i18n
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/science/rubygem-ai4r/Makefile b/science/rubygem-ai4r/Makefile
index de5215960c72..9700aba65414 100644
--- a/science/rubygem-ai4r/Makefile
+++ b/science/rubygem-ai4r/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/science/rubygem-cdo/Makefile b/science/rubygem-cdo/Makefile
index 8fb17a2cf481..bab770276031 100644
--- a/science/rubygem-cdo/Makefile
+++ b/science/rubygem-cdo/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= cdo:science/cdo
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/science/rubygem-ruby-dcl/Makefile b/science/rubygem-ruby-dcl/Makefile
index 598a00724298..3f9df97bc85e 100644
--- a/science/rubygem-ruby-dcl/Makefile
+++ b/science/rubygem-ruby-dcl/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-narray>=0.5.5:math/rubygem-narray \
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/science/rubygem-ruby-netcdf/Makefile b/science/rubygem-ruby-netcdf/Makefile
index 1490b72633d7..932895639962 100644
--- a/science/rubygem-ruby-netcdf/Makefile
+++ b/science/rubygem-ruby-netcdf/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-narray>=0:math/rubygem-narray \
rubygem-narray_miss>=0:math/rubygem-narray_miss
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/ruby-hmac/Makefile b/security/ruby-hmac/Makefile
index 3d0dc7b02529..f25a766bf216 100644
--- a/security/ruby-hmac/Makefile
+++ b/security/ruby-hmac/Makefile
@@ -12,8 +12,7 @@ MAINTAINER= ruby@FreeBSD.org
COMMENT= Ruby library which implements the HMAC algorithm
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
GEM_NAME= ${DISTNAME}
.include <bsd.port.mk>
diff --git a/security/rubygem-attr_encrypted/Makefile b/security/rubygem-attr_encrypted/Makefile
index 3fe44ae09c90..f95120c61122 100644
--- a/security/rubygem-attr_encrypted/Makefile
+++ b/security/rubygem-attr_encrypted/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-encryptor>=1.3.0:security/rubygem-encryptor
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-bcrypt-ruby/Makefile b/security/rubygem-bcrypt-ruby/Makefile
index e21a6ee1f5ff..8c205f17b474 100644
--- a/security/rubygem-bcrypt-ruby/Makefile
+++ b/security/rubygem-bcrypt-ruby/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-bcrypt>=3.1.3:security/rubygem-bcrypt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-bcrypt/Makefile b/security/rubygem-bcrypt/Makefile
index 8bc1125100db..158e141ead21 100644
--- a/security/rubygem-bcrypt/Makefile
+++ b/security/rubygem-bcrypt/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-devise-two-factor/Makefile b/security/rubygem-devise-two-factor/Makefile
index 89c72ad83d5f..a2fb31357732 100644
--- a/security/rubygem-devise-two-factor/Makefile
+++ b/security/rubygem-devise-two-factor/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-activesupport4>=0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-doorkeeper/Makefile b/security/rubygem-doorkeeper/Makefile
index 8b2da8ee4c7c..5cee9876b582 100644
--- a/security/rubygem-doorkeeper/Makefile
+++ b/security/rubygem-doorkeeper/Makefile
@@ -24,7 +24,6 @@ RAILTIES4_RUN_DEPENDS= rubygem-railties4>=4.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/security/rubygem-encryptor/Makefile b/security/rubygem-encryptor/Makefile
index 58e1532c52b2..09c1b9f3ae86 100644
--- a/security/rubygem-encryptor/Makefile
+++ b/security/rubygem-encryptor/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-ezcrypto/Makefile b/security/rubygem-ezcrypto/Makefile
index b70ad0987d33..3186dbb6fff2 100644
--- a/security/rubygem-ezcrypto/Makefile
+++ b/security/rubygem-ezcrypto/Makefile
@@ -12,7 +12,6 @@ COMMENT= Wrapper for the poorly documented OpenSSL ruby library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-gpgr/Makefile b/security/rubygem-gpgr/Makefile
index f61fb7fc1e47..f9d346960441 100644
--- a/security/rubygem-gpgr/Makefile
+++ b/security/rubygem-gpgr/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= gpg:security/gnupg
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-gssapi/Makefile b/security/rubygem-gssapi/Makefile
index 62d56d38c472..0817e4d2259f 100644
--- a/security/rubygem-gssapi/Makefile
+++ b/security/rubygem-gssapi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-ffi>=1.9.3: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/security/rubygem-jugyo-twitter_oauth/Makefile b/security/rubygem-jugyo-twitter_oauth/Makefile
index 1b9fc7203cf9..11bc325e4f36 100644
--- a/security/rubygem-jugyo-twitter_oauth/Makefile
+++ b/security/rubygem-jugyo-twitter_oauth/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-json>=1.1.9:devel/rubygem-json \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
GEM_NAME= ${PORTNAME}-${DISTVERSION}
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-metasploit-concern/Makefile b/security/rubygem-metasploit-concern/Makefile
index 8022ee037c66..3d851df30d0c 100644
--- a/security/rubygem-metasploit-concern/Makefile
+++ b/security/rubygem-metasploit-concern/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-activesupport>=3.0.0:devel/rubygem-activesupport \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= ignore:1
diff --git a/security/rubygem-metasploit-credential/Makefile b/security/rubygem-metasploit-credential/Makefile
index e6d92b2c41a1..91153d7a0f64 100644
--- a/security/rubygem-metasploit-credential/Makefile
+++ b/security/rubygem-metasploit-credential/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= rubygem-metasploit-concern>=0.4.0:security/rubygem-metasploit-conce
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= ignore:1
diff --git a/security/rubygem-metasploit-model/Makefile b/security/rubygem-metasploit-model/Makefile
index 68c2aafa178c..a0bc974ccb07 100644
--- a/security/rubygem-metasploit-model/Makefile
+++ b/security/rubygem-metasploit-model/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-activesupport>=0:devel/rubygem-activesupport \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= ignore:1
diff --git a/security/rubygem-metasploit-payloads/Makefile b/security/rubygem-metasploit-payloads/Makefile
index a7da3d3aa9d3..5d19242fbf07 100644
--- a/security/rubygem-metasploit-payloads/Makefile
+++ b/security/rubygem-metasploit-payloads/Makefile
@@ -12,8 +12,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= ignore:1
diff --git a/security/rubygem-metasploit_data_models/Makefile b/security/rubygem-metasploit_data_models/Makefile
index a160231614ac..e4c75f91a544 100644
--- a/security/rubygem-metasploit_data_models/Makefile
+++ b/security/rubygem-metasploit_data_models/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= rubygem-activerecord>=3.2.13:databases/rubygem-activerecord \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/mdm_console
PORTSCOUT= ignore:1
diff --git a/security/rubygem-net-scp/Makefile b/security/rubygem-net-scp/Makefile
index 702413d34ad5..f13ae2097121 100644
--- a/security/rubygem-net-scp/Makefile
+++ b/security/rubygem-net-scp/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index f726097ac03f..9ed347efd453 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-net-ssh-gateway/Makefile b/security/rubygem-net-ssh-gateway/Makefile
index d4718cb25769..76008ec52752 100644
--- a/security/rubygem-net-ssh-gateway/Makefile
+++ b/security/rubygem-net-ssh-gateway/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-net-ssh-multi/Makefile b/security/rubygem-net-ssh-multi/Makefile
index 8206dd38d324..4464ddb3d978 100644
--- a/security/rubygem-net-ssh-multi/Makefile
+++ b/security/rubygem-net-ssh-multi/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-net-ssh>=2.6.5:security/rubygem-net-ssh \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index ab0239d259dd..e2f5f22d972b 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -19,9 +19,7 @@ PROMPT_PASSPHRASES_DESC= Prompt for passphrases on keys
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= support/ssh_tunnel_bug.rb
PROMPT_PASSPHRASES_RUN_DEPENDS= rubygem-ruby-termios>=0:comms/rubygem-ruby-termios
diff --git a/security/rubygem-nmap-parser/Makefile b/security/rubygem-nmap-parser/Makefile
index 157c22ff391d..13220e740b85 100644
--- a/security/rubygem-nmap-parser/Makefile
+++ b/security/rubygem-nmap-parser/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= nmap:security/nmap
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-omniauth-bitbucket/Makefile b/security/rubygem-omniauth-bitbucket/Makefile
index 6575a2b3501f..36b1e98d99bb 100644
--- a/security/rubygem-omniauth-bitbucket/Makefile
+++ b/security/rubygem-omniauth-bitbucket/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-multi_json>=1.7: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/security/rubygem-omniauth-cas3/Makefile b/security/rubygem-omniauth-cas3/Makefile
index 9d3db1bce7e2..a94a5f290789 100644
--- a/security/rubygem-omniauth-cas3/Makefile
+++ b/security/rubygem-omniauth-cas3/Makefile
@@ -18,7 +18,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/security/rubygem-omniauth-gitlab/Makefile b/security/rubygem-omniauth-gitlab/Makefile
index 51882c45998c..75352d7ef56c 100644
--- a/security/rubygem-omniauth-gitlab/Makefile
+++ b/security/rubygem-omniauth-gitlab/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/security/rubygem-omniauth-multipassword/Makefile b/security/rubygem-omniauth-multipassword/Makefile
index 60f73fb96687..b7679570313e 100644
--- a/security/rubygem-omniauth-multipassword/Makefile
+++ b/security/rubygem-omniauth-multipassword/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/security/rubygem-omniauth-saml/Makefile b/security/rubygem-omniauth-saml/Makefile
index 3d80dcb39dd9..0bcb0557745a 100644
--- a/security/rubygem-omniauth-saml/Makefile
+++ b/security/rubygem-omniauth-saml/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-omniauth>=1.3: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/security/rubygem-omniauth-shibboleth/Makefile b/security/rubygem-omniauth-shibboleth/Makefile
index 1945fa59e21c..08c3706d405b 100644
--- a/security/rubygem-omniauth-shibboleth/Makefile
+++ b/security/rubygem-omniauth-shibboleth/Makefile
@@ -14,7 +14,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/security/rubygem-omniauth/Makefile b/security/rubygem-omniauth/Makefile
index 67020a53b1af..3403a7dd2d47 100644
--- a/security/rubygem-omniauth/Makefile
+++ b/security/rubygem-omniauth/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-hashie>=1.2:devel/rubygem-hashie \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-origami/Makefile b/security/rubygem-origami/Makefile
index 1fc6819eb21b..db4bea19f263 100644
--- a/security/rubygem-origami/Makefile
+++ b/security/rubygem-origami/Makefile
@@ -14,9 +14,7 @@ LICENSE= LGPL3
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST=yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= samples/actions/launch/calc.rb \
samples/actions/launch/winparams.rb \
samples/actions/named/named.rb \
diff --git a/security/rubygem-pyu-ruby-sasl/Makefile b/security/rubygem-pyu-ruby-sasl/Makefile
index 3bb5dbfa3300..0b1debd9dc09 100644
--- a/security/rubygem-pyu-ruby-sasl/Makefile
+++ b/security/rubygem-pyu-ruby-sasl/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/security/rubygem-rack-oauth2/Makefile b/security/rubygem-rack-oauth2/Makefile
index 5061be5b17db..31918436fb13 100644
--- a/security/rubygem-rack-oauth2/Makefile
+++ b/security/rubygem-rack-oauth2/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-activesupport4>=2.3:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-razorback-scriptNugget/Makefile b/security/rubygem-razorback-scriptNugget/Makefile
index 77d4c1c13505..ad07b894ced0 100644
--- a/security/rubygem-razorback-scriptNugget/Makefile
+++ b/security/rubygem-razorback-scriptNugget/Makefile
@@ -15,9 +15,7 @@ GEM_NAME= ${DISTNAME}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= lib/razorback.rb
.include <bsd.port.mk>
diff --git a/security/rubygem-recog/Makefile b/security/rubygem-recog/Makefile
index 4132a5abe703..dd4035a31f00 100644
--- a/security/rubygem-recog/Makefile
+++ b/security/rubygem-recog/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-nokogiri>=0:textproc/rubygem-nokogiri
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/recog_export \
bin/recog_match \
bin/recog_verify
diff --git a/security/rubygem-roauth/Makefile b/security/rubygem-roauth/Makefile
index 0602c96d0399..6cac630bd511 100644
--- a/security/rubygem-roauth/Makefile
+++ b/security/rubygem-roauth/Makefile
@@ -12,7 +12,6 @@ COMMENT= Simple Ruby OAuth library
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-ruby-hmac/Makefile b/security/rubygem-ruby-hmac/Makefile
index 4552a972ea05..59953d907da8 100644
--- a/security/rubygem-ruby-hmac/Makefile
+++ b/security/rubygem-ruby-hmac/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/security/rubygem-ruby-rc4/Makefile b/security/rubygem-ruby-rc4/Makefile
index 1c6ea2f962cd..eda605d244e1 100644
--- a/security/rubygem-ruby-rc4/Makefile
+++ b/security/rubygem-ruby-rc4/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/security/rubygem-ruby-saml/Makefile b/security/rubygem-ruby-saml/Makefile
index 220b6009fbf5..cfbaa918a4de 100644
--- a/security/rubygem-ruby-saml/Makefile
+++ b/security/rubygem-ruby-saml/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.5.10: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/security/rubygem-scrypt/Makefile b/security/rubygem-scrypt/Makefile
index 288ec0baecf1..361a343a16a6 100644
--- a/security/rubygem-scrypt/Makefile
+++ b/security/rubygem-scrypt/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-ffi-compiler>=0.0.2:devel/rubygem-ffi-compiler \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
ONLY_FOR_ARCHS= amd64 i386 ia64
ONLY_FOR_ARCHS_REASON= invokes SSE compiler flags
diff --git a/security/rubygem-six/Makefile b/security/rubygem-six/Makefile
index 95261f788e1e..6bde55430494 100644
--- a/security/rubygem-six/Makefile
+++ b/security/rubygem-six/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/security/rubygem-sshkey/Makefile b/security/rubygem-sshkey/Makefile
index b882e7ddf3fa..6d3bce08f479 100644
--- a/security/rubygem-sshkey/Makefile
+++ b/security/rubygem-sshkey/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/security/rubygem-sshkit/Makefile b/security/rubygem-sshkit/Makefile
index 2b40ce68d18f..a9d1ff9a5c58 100644
--- a/security/rubygem-sshkit/Makefile
+++ b/security/rubygem-sshkit/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-net-scp>=1.1.2:security/rubygem-net-scp \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/security/rubygem-twitter_oauth/Makefile b/security/rubygem-twitter_oauth/Makefile
index a35290689d48..0daa69c921bb 100644
--- a/security/rubygem-twitter_oauth/Makefile
+++ b/security/rubygem-twitter_oauth/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-json>=1.8.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/sysutils/puppet-lint/Makefile b/sysutils/puppet-lint/Makefile
index be818a3b4c15..e99382c052cb 100644
--- a/sysutils/puppet-lint/Makefile
+++ b/sysutils/puppet-lint/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/puppet-lint
NO_ARCH= yes
diff --git a/sysutils/rhc/Makefile b/sysutils/rhc/Makefile
index 880c42260a3e..0e4fc8b48ce8 100644
--- a/sysutils/rhc/Makefile
+++ b/sysutils/rhc/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/minitar:archivers/rubygem-archive-tar-minitar \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rhc
diff --git a/sysutils/rubygem-SyslogLogger/Makefile b/sysutils/rubygem-SyslogLogger/Makefile
index 662e6ac52d4b..183cc30ebd33 100644
--- a/sysutils/rubygem-SyslogLogger/Makefile
+++ b/sysutils/rubygem-SyslogLogger/Makefile
@@ -12,7 +12,6 @@ COMMENT= Logger replacement that logs to syslog
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-backup/Makefile b/sysutils/rubygem-backup/Makefile
index ef1437002df8..88776429d604 100644
--- a/sysutils/rubygem-backup/Makefile
+++ b/sysutils/rubygem-backup/Makefile
@@ -76,8 +76,7 @@ RUN_DEPENDS= rubygem-CFPropertyList>=2.3.1:devel/rubygem-CFPropertyList \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/backup
diff --git a/sysutils/rubygem-bosh-gen/Makefile b/sysutils/rubygem-bosh-gen/Makefile
index e699558f1995..76cf0cc10928 100644
--- a/sysutils/rubygem-bosh-gen/Makefile
+++ b/sysutils/rubygem-bosh-gen/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS= rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt \
spec/fixtures/releases/s3test-boshrelease/templates/make_manifest
diff --git a/sysutils/rubygem-bosh_cli/Makefile b/sysutils/rubygem-bosh_cli/Makefile
index 1a1246707887..dcc6e41c39ad 100644
--- a/sysutils/rubygem-bosh_cli/Makefile
+++ b/sysutils/rubygem-bosh_cli/Makefile
@@ -29,8 +29,7 @@ RUN_DEPENDS= rubygem-blobstore_client>=${PORTVERSION}:devel/rubygem-blobstore_cl
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/bosh
diff --git a/sysutils/rubygem-bundler/Makefile b/sysutils/rubygem-bundler/Makefile
index 651a9d817f23..e997a2eea38d 100644
--- a/sysutils/rubygem-bundler/Makefile
+++ b/sysutils/rubygem-bundler/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/bundle bin/bundler
diff --git a/sysutils/rubygem-bundler_ext/Makefile b/sysutils/rubygem-bundler_ext/Makefile
index 338a1bc0f1f2..2113e0d61b90 100644
--- a/sysutils/rubygem-bundler_ext/Makefile
+++ b/sysutils/rubygem-bundler_ext/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-bundler>=0:sysutils/rubygem-bundler
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-capistrano-ext/Makefile b/sysutils/rubygem-capistrano-ext/Makefile
index 2865f7ed7006..79d3f3872fb9 100644
--- a/sysutils/rubygem-capistrano-ext/Makefile
+++ b/sysutils/rubygem-capistrano-ext/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-capistrano>=1.0.0:sysutils/rubygem-capistrano
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index c9dec6956230..f440d6cdafd5 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-i18n>=0:devel/rubygem-i18n \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/cap bin/capify
diff --git a/sysutils/rubygem-chef-api/Makefile b/sysutils/rubygem-chef-api/Makefile
index dcdad574c37b..f8703c559c68 100644
--- a/sysutils/rubygem-chef-api/Makefile
+++ b/sysutils/rubygem-chef-api/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-logify>=0.1:sysutils/rubygem-logify
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef-zero/Makefile b/sysutils/rubygem-chef-zero/Makefile
index 571b090eace5..e0ad0f57d700 100644
--- a/sysutils/rubygem-chef-zero/Makefile
+++ b/sysutils/rubygem-chef-zero/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS= rubygem-hashie2>=2.0.0:devel/rubygem-hashie2 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/chef-zero
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 89ee76ce53e1..c77b612098ec 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -33,8 +33,7 @@ RUN_DEPENDS= rubygem-chef-zero>=2.1.0:sysutils/rubygem-chef-zero \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
SUB_LIST= RUBY=${RUBY}
USE_RC_SUBR= chef_client
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index 311d194fe627..2d397063ca3e 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -14,8 +14,7 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/facter
diff --git a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
index d7d69b91290e..296d1b3ffdb4 100644
--- a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
+++ b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= \
rubygem-ltsv>0:textproc/rubygem-ltsv
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-config-expander/Makefile b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
index 1c4d13a4fe01..fa76263c827b 100644
--- a/sysutils/rubygem-fluent-plugin-config-expander/Makefile
+++ b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
@@ -12,7 +12,6 @@ RUN_DEPENDS= \
rubygem-fluentd>0:sysutils/rubygem-fluentd
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
index 756b35ddc2d4..b3c99ace7b35 100644
--- a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
+++ b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS= \
rubygem-fluent-mixin-plaintextformatter>0:sysutils/rubygem-fluent-mixin-plaintextformatter
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
index a5e97c41b994..1bc5cd07cd59 100644
--- a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
+++ b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
@@ -12,7 +12,6 @@ RUN_DEPENDS= \
rubygem-fluentd>0:sysutils/rubygem-fluentd
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 4e159834f294..6cfc92995941 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS= \
rubygem-tzinfo>=1.0.0:devel/rubygem-tzinfo
USE_RUBY= yes
-USE_RUBYGEMS= yes
PLIST_FILES= bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
"@sample etc/fluentd/fluent.conf.sample"
PLIST_DIRS= etc/fluentd/plugin
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
USE_RC_SUBR= fluentd
USERS= fluentd
GROUPS= fluentd
diff --git a/sysutils/rubygem-fluentd010/Makefile b/sysutils/rubygem-fluentd010/Makefile
index 165badcc1e73..84b39679449a 100644
--- a/sysutils/rubygem-fluentd010/Makefile
+++ b/sysutils/rubygem-fluentd010/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS= \
rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby
USE_RUBY= yes
-USE_RUBYGEMS= yes
PLIST_FILES= bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
"@sample etc/fluentd/fluent.conf.sample"
PLIST_DIRS= etc/fluentd/plugin
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
USE_RC_SUBR= fluentd
USERS= fluentd
GROUPS= fluentd
diff --git a/sysutils/rubygem-fssm/Makefile b/sysutils/rubygem-fssm/Makefile
index 656f41878ea0..bcf5c4cf12b3 100644
--- a/sysutils/rubygem-fssm/Makefile
+++ b/sysutils/rubygem-fssm/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/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile
index abaab20d905d..048c1b20ea43 100644
--- a/sysutils/rubygem-god/Makefile
+++ b/sysutils/rubygem-god/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/god
diff --git a/sysutils/rubygem-guard-compat/Makefile b/sysutils/rubygem-guard-compat/Makefile
index 0ff67ad84e0c..108afe9dcd74 100644
--- a/sysutils/rubygem-guard-compat/Makefile
+++ b/sysutils/rubygem-guard-compat/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/sysutils/rubygem-guard-livereload/Makefile b/sysutils/rubygem-guard-livereload/Makefile
index c5abd3cf80b8..ebfe5b1b79ad 100644
--- a/sysutils/rubygem-guard-livereload/Makefile
+++ b/sysutils/rubygem-guard-livereload/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-em-websocket>=0.5:www/rubygem-em-websocket \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard-minitest/Makefile b/sysutils/rubygem-guard-minitest/Makefile
index e40714ed5e4e..4b24c4ba1275 100644
--- a/sysutils/rubygem-guard-minitest/Makefile
+++ b/sysutils/rubygem-guard-minitest/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-guard-compat>=1.2:sysutils/rubygem-guard-compat \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard-rspec/Makefile b/sysutils/rubygem-guard-rspec/Makefile
index 6e5b078dbbc1..44d78db054ff 100644
--- a/sysutils/rubygem-guard-rspec/Makefile
+++ b/sysutils/rubygem-guard-rspec/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-guard>=2.1:sysutils/rubygem-guard \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard/Makefile b/sysutils/rubygem-guard/Makefile
index 15dfadbf8632..649113355346 100644
--- a/sysutils/rubygem-guard/Makefile
+++ b/sysutils/rubygem-guard/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= rubygem-formatador>=0.2.4:devel/rubygem-formatador \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/guard \
bin/_guard-core
diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index e3115eccb7e2..adab3d78b49f 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS= rubygem-apipie-bindings>=0.0.14:devel/rubygem-apipie-bindings \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman/Makefile b/sysutils/rubygem-hammer_cli_foreman/Makefile
index d484e24a2496..7a31ce254f7e 100644
--- a/sysutils/rubygem-hammer_cli_foreman/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-apipie-bindings>=0.0.16:devel/rubygem-apipie-bindings \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
index 57fc38a2c944..d4ecc305478e 100644
--- a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_forem
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
index 873eef35dc17..75e2d1b1f479 100644
--- a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS= rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_forem
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= "@sample etc/hammer/cli.modules.d/foreman_salt.yml.sample"
diff --git a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
index 5c9e7edc0be0..a67ef3bf99bf 100644
--- a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-hammer_cli>=0.0.6:sysutils/rubygem-hammer_cli \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= "@sample etc/hammer/cli.modules.d/foreman_ssh.yml.sample"
diff --git a/sysutils/rubygem-hiera-file/Makefile b/sysutils/rubygem-hiera-file/Makefile
index b3da3c9d8a29..4e7190ad04c6 100644
--- a/sysutils/rubygem-hiera-file/Makefile
+++ b/sysutils/rubygem-hiera-file/Makefile
@@ -13,8 +13,7 @@ COMMENT= Data backend for Hiera that returns whole files
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
RUN_DEPENDS= ${PKGNAMEPREFIX}hiera1>=0:sysutils/rubygem-hiera1
diff --git a/sysutils/rubygem-hiera/Makefile b/sysutils/rubygem-hiera/Makefile
index 04fb665e96be..785a87651041 100644
--- a/sysutils/rubygem-hiera/Makefile
+++ b/sysutils/rubygem-hiera/Makefile
@@ -18,8 +18,7 @@ CONFLICTS_INSTALL= rubygem-hiera1-*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
HIERA_DBDIR= /var/db/hiera
PLIST_FILES= bin/hiera
diff --git a/sysutils/rubygem-hiera1/Makefile b/sysutils/rubygem-hiera1/Makefile
index 04e90fee91ee..ef4239a8275f 100644
--- a/sysutils/rubygem-hiera1/Makefile
+++ b/sysutils/rubygem-hiera1/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL= rubygem-hiera-*
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
HIERA_DBDIR= /var/db/hiera
PLIST_FILES= bin/hiera
PLIST_DIRS= ${HIERA_DBDIR}
diff --git a/sysutils/rubygem-hieracles/Makefile b/sysutils/rubygem-hieracles/Makefile
index 2f8c6886340f..2fc7620fc054 100644
--- a/sysutils/rubygem-hieracles/Makefile
+++ b/sysutils/rubygem-hieracles/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= rubygem-deep_merge>=1.0.1:devel/rubygem-deep_merge \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/hc man/man1/hc.1.gz \
bin/ppdb man/man1/ppdb.1.gz
diff --git a/sysutils/rubygem-librarian-puppet/Makefile b/sysutils/rubygem-librarian-puppet/Makefile
index 14f7e43bf99f..fced93374594 100644
--- a/sysutils/rubygem-librarian-puppet/Makefile
+++ b/sysutils/rubygem-librarian-puppet/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= ${PKGNAMEPREFIX}librarianp>=0.6.3:devel/rubygem-librarianp \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/librarian-puppet
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-log4r/Makefile b/sysutils/rubygem-log4r/Makefile
index ec0ecf632fad..f891e0a9c497 100644
--- a/sysutils/rubygem-log4r/Makefile
+++ b/sysutils/rubygem-log4r/Makefile
@@ -15,7 +15,6 @@ PORTSCOUT= skipv:1.1.11
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-logify/Makefile b/sysutils/rubygem-logify/Makefile
index 84e442a6a9e2..435c53961550 100644
--- a/sysutils/rubygem-logify/Makefile
+++ b/sysutils/rubygem-logify/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/sysutils/rubygem-mogilefs-client/Makefile b/sysutils/rubygem-mogilefs-client/Makefile
index e417933f4d46..7638cd20b3a7 100644
--- a/sysutils/rubygem-mogilefs-client/Makefile
+++ b/sysutils/rubygem-mogilefs-client/Makefile
@@ -14,8 +14,7 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/mog
diff --git a/sysutils/rubygem-mothra/Makefile b/sysutils/rubygem-mothra/Makefile
index 0a8c6eecb2fd..21f6476139ee 100644
--- a/sysutils/rubygem-mothra/Makefile
+++ b/sysutils/rubygem-mothra/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-colorize>=0.7.3:devel/rubygem-colorize \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/mothra
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-murder/Makefile b/sysutils/rubygem-murder/Makefile
index 581100672109..a601da256547 100644
--- a/sysutils/rubygem-murder/Makefile
+++ b/sysutils/rubygem-murder/Makefile
@@ -11,11 +11,9 @@ COMMENT= Large scale deploys using BitTorrent
LICENSE= APACHE20
-USES= python
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist python
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-ohai/Makefile b/sysutils/rubygem-ohai/Makefile
index 32dd1192be4d..52f79febda85 100644
--- a/sysutils/rubygem-ohai/Makefile
+++ b/sysutils/rubygem-ohai/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= rubygem-ffi>=1.9.0:devel/rubygem-ffi \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ohai
diff --git a/sysutils/rubygem-parallel/Makefile b/sysutils/rubygem-parallel/Makefile
index 11ff266f37dd..cb8c05d3e9bc 100644
--- a/sysutils/rubygem-parallel/Makefile
+++ b/sysutils/rubygem-parallel/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/sysutils/rubygem-puppet_forge/Makefile b/sysutils/rubygem-puppet_forge/Makefile
index f0f17d0078a1..6026f0d56d04 100644
--- a/sysutils/rubygem-puppet_forge/Makefile
+++ b/sysutils/rubygem-puppet_forge/Makefile
@@ -18,7 +18,6 @@ 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
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-puppet_forge1/Makefile b/sysutils/rubygem-puppet_forge1/Makefile
index 999890bd76da..c4126713500a 100644
--- a/sysutils/rubygem-puppet_forge1/Makefile
+++ b/sysutils/rubygem-puppet_forge1/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-her>=0.6.8:databases/rubygem-her
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index 692ea6a7c86f..ab8e187e1e41 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS= rubygem-colored>=1.2:textproc/rubygem-colored \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/r10k
diff --git a/sysutils/rubygem-rubyipmi/Makefile b/sysutils/rubygem-rubyipmi/Makefile
index a1fbbd5495f7..232ce0f70e22 100644
--- a/sysutils/rubygem-rubyipmi/Makefile
+++ b/sysutils/rubygem-rubyipmi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/bmc-device:sysutils/freeipmi
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-shellany/Makefile b/sysutils/rubygem-shellany/Makefile
index 33dacd2c7707..49a9fbe5e8f3 100644
--- a/sysutils/rubygem-shellany/Makefile
+++ b/sysutils/rubygem-shellany/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/sysutils/rubygem-smart_proxy_chef/Makefile b/sysutils/rubygem-smart_proxy_chef/Makefile
index 42a94544e44c..5d457d080fe3 100644
--- a/sysutils/rubygem-smart_proxy_chef/Makefile
+++ b/sysutils/rubygem-smart_proxy_chef/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS= foreman-proxy>=1.8.0:net/foreman-proxy \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d
diff --git a/sysutils/rubygem-smart_proxy_dynflow/Makefile b/sysutils/rubygem-smart_proxy_dynflow/Makefile
index 995566245463..89e480609a85 100644
--- a/sysutils/rubygem-smart_proxy_dynflow/Makefile
+++ b/sysutils/rubygem-smart_proxy_dynflow/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= foreman-proxy>=1.9.0:net/foreman-proxy \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= "@sample etc/foreman-proxy/settings.d/dynflow.yml.sample" \
share/foreman-proxy/bundler.d/dynflow.rb
diff --git a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
index 310b48d13522..ebe18e75ff63 100644
--- a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
+++ b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= foreman-proxy>=1.9.0:net/foreman-proxy \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= "@sample etc/foreman-proxy/settings.d/remote_execution_ssh.yml.sample" \
share/foreman-proxy/bundler.d/remote_execution_ssh.rb
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 6d05b105f7e0..dcbdfe7e15d7 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -15,12 +15,10 @@ LICENSE= GPLv3
RUN_DEPENDS= foreman-proxy>=1.8.0:net/foreman-proxy \
${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt
-USES= python
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist python
post-patch:
@${REINPLACE_CMD} \
diff --git a/sysutils/rubygem-sys-admin/Makefile b/sysutils/rubygem-sys-admin/Makefile
index 38cc5f4d6902..7903ff5283d1 100644
--- a/sysutils/rubygem-sys-admin/Makefile
+++ b/sysutils/rubygem-sys-admin/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=1.1.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/sysutils/rubygem-sys-cpu/Makefile b/sysutils/rubygem-sys-cpu/Makefile
index a31e39344a04..8095b50e2411 100644
--- a/sysutils/rubygem-sys-cpu/Makefile
+++ b/sysutils/rubygem-sys-cpu/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=1.0.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/sysutils/rubygem-sys-filesystem/Makefile b/sysutils/rubygem-sys-filesystem/Makefile
index d75363981657..c209efdffce5 100644
--- a/sysutils/rubygem-sys-filesystem/Makefile
+++ b/sysutils/rubygem-sys-filesystem/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=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/sysutils/rubygem-sys-host/Makefile b/sysutils/rubygem-sys-host/Makefile
index bd8596f280a9..bc25aa4facb2 100644
--- a/sysutils/rubygem-sys-host/Makefile
+++ b/sysutils/rubygem-sys-host/Makefile
@@ -12,7 +12,6 @@ COMMENT= Provides hostname, IP address, and other information for a given host
LICENSE= ART20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-proctable/Makefile b/sysutils/rubygem-sys-proctable/Makefile
index a3b3e24759d4..28cdd08daa33 100644
--- a/sysutils/rubygem-sys-proctable/Makefile
+++ b/sysutils/rubygem-sys-proctable/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-ffi>=0:devel/rubygem-ffi
GEM_NAME= ${PORTNAME}-${DISTVERSIONFULL}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-uname/Makefile b/sysutils/rubygem-sys-uname/Makefile
index 3bde604e12c4..d7b4d4f83933 100644
--- a/sysutils/rubygem-sys-uname/Makefile
+++ b/sysutils/rubygem-sys-uname/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=1.0.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/sysutils/rubygem-sys-uptime/Makefile b/sysutils/rubygem-sys-uptime/Makefile
index d89bff73f25b..fc3369b9ffb7 100644
--- a/sysutils/rubygem-sys-uptime/Makefile
+++ b/sysutils/rubygem-sys-uptime/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-ffi>=1.0.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/sysutils/rubygem-teamocil/Makefile b/sysutils/rubygem-teamocil/Makefile
index 88bed66d639b..08f78217a3c3 100644
--- a/sysutils/rubygem-teamocil/Makefile
+++ b/sysutils/rubygem-teamocil/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/teamocil
diff --git a/sysutils/rubygem-winrm-fs/Makefile b/sysutils/rubygem-winrm-fs/Makefile
index ca80f0064c58..e440769e148a 100644
--- a/sysutils/rubygem-winrm-fs/Makefile
+++ b/sysutils/rubygem-winrm-fs/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-erubis>=2.7:www/rubygem-erubis \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rwinrmcp
diff --git a/sysutils/rubygem-winrm/Makefile b/sysutils/rubygem-winrm/Makefile
index 2fd721ac079c..c66e87745a74 100644
--- a/sysutils/rubygem-winrm/Makefile
+++ b/sysutils/rubygem-winrm/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS= rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rwinrm
diff --git a/sysutils/rubygem-yell/Makefile b/sysutils/rubygem-yell/Makefile
index eb2e0e6b91c0..3248bdc22961 100644
--- a/sysutils/rubygem-yell/Makefile
+++ b/sysutils/rubygem-yell/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/textproc/rubygem-actionpack-xml_parser/Makefile b/textproc/rubygem-actionpack-xml_parser/Makefile
index a4ebb1fc9b4c..63294c6386e8 100644
--- a/textproc/rubygem-actionpack-xml_parser/Makefile
+++ b/textproc/rubygem-actionpack-xml_parser/Makefile
@@ -16,7 +16,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/textproc/rubygem-albino/Makefile b/textproc/rubygem-albino/Makefile
index e1130ae7272b..463a4b679236 100644
--- a/textproc/rubygem-albino/Makefile
+++ b/textproc/rubygem-albino/Makefile
@@ -14,11 +14,9 @@ LICENSE= MIT
RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \
${PYTHON_PKGNAMEPREFIX}pygments>=0.8:textproc/py-pygments
-USES= python
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist python
.include <bsd.port.mk>
diff --git a/textproc/rubygem-amatch/Makefile b/textproc/rubygem-amatch/Makefile
index b15e61c53b24..2e7f145e3c7f 100644
--- a/textproc/rubygem-amatch/Makefile
+++ b/textproc/rubygem-amatch/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= rubygem-tins>=1.0:devel/rubygem-tins
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/agrep.rb
diff --git a/textproc/rubygem-asciidoctor/Makefile b/textproc/rubygem-asciidoctor/Makefile
index 1694adcf73e8..550f03ae700a 100644
--- a/textproc/rubygem-asciidoctor/Makefile
+++ b/textproc/rubygem-asciidoctor/Makefile
@@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.adoc
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES+= bin/asciidoctor bin/asciidoctor-safe
diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile
index b21934953e7e..be2de7f59481 100644
--- a/textproc/rubygem-autoprefixer-rails/Makefile
+++ b/textproc/rubygem-autoprefixer-rails/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-execjs>=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/textproc/rubygem-babosa/Makefile b/textproc/rubygem-babosa/Makefile
index 905baccea193..a85e56a855e9 100644
--- a/textproc/rubygem-babosa/Makefile
+++ b/textproc/rubygem-babosa/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index c56ef351df38..29a00b23703a 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -12,8 +12,7 @@ COMMENT= Gems for character encoding detection
LIB_DEPENDS= libicui18n.so:devel/icu
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
CONFIGURE_ARGS= --with-icu-include=${LOCALBASE}/include
.include <bsd.port.mk>
diff --git a/textproc/rubygem-coderay/Makefile b/textproc/rubygem-coderay/Makefile
index 65fc75b880c8..faf0b9e72de5 100644
--- a/textproc/rubygem-coderay/Makefile
+++ b/textproc/rubygem-coderay/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/coderay
diff --git a/textproc/rubygem-colorator/Makefile b/textproc/rubygem-colorator/Makefile
index 9059dabbfb5d..95fa4733207d 100644
--- a/textproc/rubygem-colorator/Makefile
+++ b/textproc/rubygem-colorator/Makefile
@@ -15,7 +15,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/textproc/rubygem-colored/Makefile b/textproc/rubygem-colored/Makefile
index 223cda3f8b41..6ca183d39ca4 100644
--- a/textproc/rubygem-colored/Makefile
+++ b/textproc/rubygem-colored/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/textproc/rubygem-compass-core/Makefile b/textproc/rubygem-compass-core/Makefile
index a6dd208519c0..b49ae11ded26 100644
--- a/textproc/rubygem-compass-core/Makefile
+++ b/textproc/rubygem-compass-core/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-multi_json>=1.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/textproc/rubygem-compass-import-once/Makefile b/textproc/rubygem-compass-import-once/Makefile
index 6ffdbc0dafe1..16ef3d0a1e14 100644
--- a/textproc/rubygem-compass-import-once/Makefile
+++ b/textproc/rubygem-compass-import-once/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/textproc/rubygem-compass-rails/Makefile b/textproc/rubygem-compass-rails/Makefile
index a61b29c3ce04..d63236c966e4 100644
--- a/textproc/rubygem-compass-rails/Makefile
+++ b/textproc/rubygem-compass-rails/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-compass>=1.0.0:textproc/rubygem-compass \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-compass/Makefile b/textproc/rubygem-compass/Makefile
index 8a5f4651c3f9..97df060294b7 100644
--- a/textproc/rubygem-compass/Makefile
+++ b/textproc/rubygem-compass/Makefile
@@ -21,8 +21,7 @@ RUN_DEPENDS= rubygem-chunky_png>=1.2:graphics/rubygem-chunky_png \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/compass
diff --git a/textproc/rubygem-creole/Makefile b/textproc/rubygem-creole/Makefile
index f525f821031d..da98fcebd114 100644
--- a/textproc/rubygem-creole/Makefile
+++ b/textproc/rubygem-creole/Makefile
@@ -13,7 +13,6 @@ LICENSE= RUBY
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-css_parser/Makefile b/textproc/rubygem-css_parser/Makefile
index b62b5190d5ec..07623f2b9387 100644
--- a/textproc/rubygem-css_parser/Makefile
+++ b/textproc/rubygem-css_parser/Makefile
@@ -15,7 +15,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/textproc/rubygem-cssmin/Makefile b/textproc/rubygem-cssmin/Makefile
index 4070a158d656..2956ce8111e6 100644
--- a/textproc/rubygem-cssmin/Makefile
+++ b/textproc/rubygem-cssmin/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-diff-lcs/Makefile b/textproc/rubygem-diff-lcs/Makefile
index 9cb5be5ee9c6..85947963e560 100644
--- a/textproc/rubygem-diff-lcs/Makefile
+++ b/textproc/rubygem-diff-lcs/Makefile
@@ -16,9 +16,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
ruby_OLD_CMD= ruby
SHEBANG_FILES= bin/htmldiff bin/ldiff
diff --git a/textproc/rubygem-diffy/Makefile b/textproc/rubygem-diffy/Makefile
index 44fb3e8734f2..683c6d0fd8ee 100644
--- a/textproc/rubygem-diffy/Makefile
+++ b/textproc/rubygem-diffy/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/textproc/rubygem-elasticsearch-api/Makefile b/textproc/rubygem-elasticsearch-api/Makefile
index b0097ffd8384..e0c15c387905 100644
--- a/textproc/rubygem-elasticsearch-api/Makefile
+++ b/textproc/rubygem-elasticsearch-api/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/textproc/rubygem-elasticsearch-transport/Makefile b/textproc/rubygem-elasticsearch-transport/Makefile
index a2bc8fdb4641..fa27998d626b 100644
--- a/textproc/rubygem-elasticsearch-transport/Makefile
+++ b/textproc/rubygem-elasticsearch-transport/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-faraday>=0: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/textproc/rubygem-elasticsearch/Makefile b/textproc/rubygem-elasticsearch/Makefile
index 17ae058590e1..0ea466cbe68f 100644
--- a/textproc/rubygem-elasticsearch/Makefile
+++ b/textproc/rubygem-elasticsearch/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-elasticsearch-api=${PORTVERSION}:textproc/rubygem-elasticse
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-emot/Makefile b/textproc/rubygem-emot/Makefile
index 97d3e6d23290..e981cf1f1d86 100644
--- a/textproc/rubygem-emot/Makefile
+++ b/textproc/rubygem-emot/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-thor>=0:devel/rubygem-thor
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/emot
diff --git a/textproc/rubygem-escape_utils-rails4/Makefile b/textproc/rubygem-escape_utils-rails4/Makefile
index 1a50df92e4ed..ecff283c1f93 100644
--- a/textproc/rubygem-escape_utils-rails4/Makefile
+++ b/textproc/rubygem-escape_utils-rails4/Makefile
@@ -14,7 +14,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-escape_utils/Makefile b/textproc/rubygem-escape_utils/Makefile
index 82f554ad21ff..780ffa0b4acd 100644
--- a/textproc/rubygem-escape_utils/Makefile
+++ b/textproc/rubygem-escape_utils/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-ezamar/Makefile b/textproc/rubygem-ezamar/Makefile
index fe8c3209546d..81196e094775 100644
--- a/textproc/rubygem-ezamar/Makefile
+++ b/textproc/rubygem-ezamar/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/textproc/rubygem-fast_xs/Makefile b/textproc/rubygem-fast_xs/Makefile
index f735852c1ae9..38e0fbbc48c8 100644
--- a/textproc/rubygem-fast_xs/Makefile
+++ b/textproc/rubygem-fast_xs/Makefile
@@ -14,7 +14,6 @@ COMMENT= Systems integration framework. Expander
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-fast_xs073/Makefile b/textproc/rubygem-fast_xs073/Makefile
index 5b6419b67997..b98888075b68 100644
--- a/textproc/rubygem-fast_xs073/Makefile
+++ b/textproc/rubygem-fast_xs073/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-hoe>=2.3.2:devel/rubygem-hoe
PORTSCOUT= limit:^0.7
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-ferret/Makefile b/textproc/rubygem-ferret/Makefile
index cb13135ed73a..be28d984d0e5 100644
--- a/textproc/rubygem-ferret/Makefile
+++ b/textproc/rubygem-ferret/Makefile
@@ -12,8 +12,7 @@ COMMENT= Ferret is a ruby port of Lucene
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/ferret-browser
diff --git a/textproc/rubygem-fog-xml/Makefile b/textproc/rubygem-fog-xml/Makefile
index a6298672fb7b..84d8eb46b587 100644
--- a/textproc/rubygem-fog-xml/Makefile
+++ b/textproc/rubygem-fog-xml/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/textproc/rubygem-gemoji/Makefile b/textproc/rubygem-gemoji/Makefile
index 543511989434..7d2a5e22041b 100644
--- a/textproc/rubygem-gemoji/Makefile
+++ b/textproc/rubygem-gemoji/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/textproc/rubygem-gherkin/Makefile b/textproc/rubygem-gherkin/Makefile
index 56169c0cb23d..f0f19c60c685 100644
--- a/textproc/rubygem-gherkin/Makefile
+++ b/textproc/rubygem-gherkin/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/textproc/rubygem-gherkin3/Makefile b/textproc/rubygem-gherkin3/Makefile
index 549b186c4a68..156669409362 100644
--- a/textproc/rubygem-gherkin3/Makefile
+++ b/textproc/rubygem-gherkin3/Makefile
@@ -17,7 +17,6 @@ EXPIRATION_DATE=2016-04-30
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-github-linguist/Makefile b/textproc/rubygem-github-linguist/Makefile
index 83ca241712d7..11ad847687a7 100644
--- a/textproc/rubygem-github-linguist/Makefile
+++ b/textproc/rubygem-github-linguist/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS= rubygem-charlock_holmes>=0.7.3:textproc/rubygem-charlock_holmes \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/git-linguist bin/linguist
diff --git a/textproc/rubygem-github-markdown/Makefile b/textproc/rubygem-github-markdown/Makefile
index bb9e2a635185..0631f0374312 100644
--- a/textproc/rubygem-github-markdown/Makefile
+++ b/textproc/rubygem-github-markdown/Makefile
@@ -11,7 +11,6 @@ COMMENT= Self-contained Markdown parser for GitHub
DEPRECATED= This gem is not maintained and not supported by upstream
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-github-markup/Makefile b/textproc/rubygem-github-markup/Makefile
index a07cd355b7ad..afbb343f1c3a 100644
--- a/textproc/rubygem-github-markup/Makefile
+++ b/textproc/rubygem-github-markup/Makefile
@@ -15,9 +15,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= script/bootstrap \
script/cibuild
diff --git a/textproc/rubygem-gitlab-grit/Makefile b/textproc/rubygem-gitlab-grit/Makefile
index fa78b03aee2d..9b6b91670a2d 100644
--- a/textproc/rubygem-gitlab-grit/Makefile
+++ b/textproc/rubygem-gitlab-grit/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-charlock_holmes>=0.6:textproc/rubygem-charlock_holmes \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-gitlab-linguist/Makefile b/textproc/rubygem-gitlab-linguist/Makefile
index 0bb1e963bd95..8dc3a0bbfb4f 100644
--- a/textproc/rubygem-gitlab-linguist/Makefile
+++ b/textproc/rubygem-gitlab-linguist/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-charlock_holmes>=0.6.6:textproc/rubygem-charlock_holmes \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/linguist
diff --git a/textproc/rubygem-heredoc_unindent/Makefile b/textproc/rubygem-heredoc_unindent/Makefile
index bd6bff0a3371..bd95a90304ac 100644
--- a/textproc/rubygem-heredoc_unindent/Makefile
+++ b/textproc/rubygem-heredoc_unindent/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/textproc/rubygem-hikidoc/Makefile b/textproc/rubygem-hikidoc/Makefile
index 624a4a1b6873..ede0f6896306 100644
--- a/textproc/rubygem-hikidoc/Makefile
+++ b/textproc/rubygem-hikidoc/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/hikidoc
diff --git a/textproc/rubygem-html-pipeline-gitlab/Makefile b/textproc/rubygem-html-pipeline-gitlab/Makefile
index 1a716b42faec..7db15df8de06 100644
--- a/textproc/rubygem-html-pipeline-gitlab/Makefile
+++ b/textproc/rubygem-html-pipeline-gitlab/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-actionpack4>=4: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/textproc/rubygem-html-pipeline/Makefile b/textproc/rubygem-html-pipeline/Makefile
index c534aa85f4f4..2e71ce2712fc 100644
--- a/textproc/rubygem-html-pipeline/Makefile
+++ b/textproc/rubygem-html-pipeline/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-activesupport4>=2:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-html-pipeline1/Makefile b/textproc/rubygem-html-pipeline1/Makefile
index f1fdcb0ee900..00f0f6f2079d 100644
--- a/textproc/rubygem-html-pipeline1/Makefile
+++ b/textproc/rubygem-html-pipeline1/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-activesupport4>=2:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-htmlentities/Makefile b/textproc/rubygem-htmlentities/Makefile
index bba065ef6918..9710201509a2 100644
--- a/textproc/rubygem-htmlentities/Makefile
+++ b/textproc/rubygem-htmlentities/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/textproc/rubygem-ini/Makefile b/textproc/rubygem-ini/Makefile
index 73464a9e2264..68fa9df7f5bc 100644
--- a/textproc/rubygem-ini/Makefile
+++ b/textproc/rubygem-ini/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/textproc/rubygem-itextomml/Makefile b/textproc/rubygem-itextomml/Makefile
index 3f488d10b694..756b21eb1c33 100644
--- a/textproc/rubygem-itextomml/Makefile
+++ b/textproc/rubygem-itextomml/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv2 LGPL20 MPL
LICENSE_COMB= dual
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-assets/Makefile b/textproc/rubygem-jekyll-assets/Makefile
index fdce167bf765..90b82ab92b41 100644
--- a/textproc/rubygem-jekyll-assets/Makefile
+++ b/textproc/rubygem-jekyll-assets/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-fastimage>=1.8:graphics/rubygem-fastimage \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-feed/Makefile b/textproc/rubygem-jekyll-feed/Makefile
index ad1f29044776..66858112a28e 100644
--- a/textproc/rubygem-jekyll-feed/Makefile
+++ b/textproc/rubygem-jekyll-feed/Makefile
@@ -13,7 +13,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/textproc/rubygem-jekyll-gist/Makefile b/textproc/rubygem-jekyll-gist/Makefile
index cee75bc2df12..1de1dbca031e 100644
--- a/textproc/rubygem-jekyll-gist/Makefile
+++ b/textproc/rubygem-jekyll-gist/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-octokit>=4.2:net/rubygem-octokit
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-mentions/Makefile b/textproc/rubygem-jekyll-mentions/Makefile
index 9aee63b364ee..d2ac54b2b30f 100644
--- a/textproc/rubygem-jekyll-mentions/Makefile
+++ b/textproc/rubygem-jekyll-mentions/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-html-pipeline>=2.3:textproc/rubygem-html-pipeline \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-paginate/Makefile b/textproc/rubygem-jekyll-paginate/Makefile
index a1b587a4ccd6..63532a3e41fb 100644
--- a/textproc/rubygem-jekyll-paginate/Makefile
+++ b/textproc/rubygem-jekyll-paginate/Makefile
@@ -16,9 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= script/bootstrap \
script/cibuild \
script/unbundle
diff --git a/textproc/rubygem-jekyll-redirect-from/Makefile b/textproc/rubygem-jekyll-redirect-from/Makefile
index f3e1eddee12a..a344d4f6db0b 100644
--- a/textproc/rubygem-jekyll-redirect-from/Makefile
+++ b/textproc/rubygem-jekyll-redirect-from/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-jekyll>=2.0:www/rubygem-jekyll
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jekyll-sass-converter/Makefile b/textproc/rubygem-jekyll-sass-converter/Makefile
index 7cc7e7fddc6b..44ddbe0dff07 100644
--- a/textproc/rubygem-jekyll-sass-converter/Makefile
+++ b/textproc/rubygem-jekyll-sass-converter/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-sass>=3.4: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/textproc/rubygem-jekyll-sitemap/Makefile b/textproc/rubygem-jekyll-sitemap/Makefile
index a5f33292f8ce..6bf4f6c6c307 100644
--- a/textproc/rubygem-jekyll-sitemap/Makefile
+++ b/textproc/rubygem-jekyll-sitemap/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jemoji/Makefile b/textproc/rubygem-jemoji/Makefile
index 08447db42867..8df3d6ebe740 100644
--- a/textproc/rubygem-jemoji/Makefile
+++ b/textproc/rubygem-jemoji/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gemoji>=2.0:textproc/rubygem-gemoji \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-jsmin/Makefile b/textproc/rubygem-jsmin/Makefile
index 4b5bb579c49e..8e2708ee0c03 100644
--- a/textproc/rubygem-jsmin/Makefile
+++ b/textproc/rubygem-jsmin/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/textproc/rubygem-kramdown/Makefile b/textproc/rubygem-kramdown/Makefile
index e8e01674c251..f0f7631be8b5 100644
--- a/textproc/rubygem-kramdown/Makefile
+++ b/textproc/rubygem-kramdown/Makefile
@@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
PLIST_FILES= bin/kramdown
diff --git a/textproc/rubygem-kwalify/Makefile b/textproc/rubygem-kwalify/Makefile
index 90c3e58da658..700f62c19772 100644
--- a/textproc/rubygem-kwalify/Makefile
+++ b/textproc/rubygem-kwalify/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/kwalify
diff --git a/textproc/rubygem-libxml-ruby/Makefile b/textproc/rubygem-libxml-ruby/Makefile
index 97cb67828cf8..d5b687479532 100644
--- a/textproc/rubygem-libxml-ruby/Makefile
+++ b/textproc/rubygem-libxml-ruby/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
USE_GNOME= libxml2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-linguistics/Makefile b/textproc/rubygem-linguistics/Makefile
index a796c3355874..9baca65f37e8 100644
--- a/textproc/rubygem-linguistics/Makefile
+++ b/textproc/rubygem-linguistics/Makefile
@@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-loggability>=0.11:textproc/rubygem-loggability
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= lib/linguistics.rb \
lib/linguistics/en/linkparser.rb
diff --git a/textproc/rubygem-liquid/Makefile b/textproc/rubygem-liquid/Makefile
index 26aa61114130..99d018f1a669 100644
--- a/textproc/rubygem-liquid/Makefile
+++ b/textproc/rubygem-liquid/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-liquid2/Makefile b/textproc/rubygem-liquid2/Makefile
index 408177e0fee3..23ace8510c2b 100644
--- a/textproc/rubygem-liquid2/Makefile
+++ b/textproc/rubygem-liquid2/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-loggability/Makefile b/textproc/rubygem-loggability/Makefile
index 2311fcb2fbd2..fb3a47930d3f 100644
--- a/textproc/rubygem-loggability/Makefile
+++ b/textproc/rubygem-loggability/Makefile
@@ -14,7 +14,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-loofah/Makefile b/textproc/rubygem-loofah/Makefile
index 5cd0483fc899..ec48389be706 100644
--- a/textproc/rubygem-loofah/Makefile
+++ b/textproc/rubygem-loofah/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.5.9: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/textproc/rubygem-ltsv/Makefile b/textproc/rubygem-ltsv/Makefile
index 8ec0b50b5205..9eedc0e47628 100644
--- a/textproc/rubygem-ltsv/Makefile
+++ b/textproc/rubygem-ltsv/Makefile
@@ -11,7 +11,6 @@ COMMENT= Parser / Dumper for LTSV
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-markaby/Makefile b/textproc/rubygem-markaby/Makefile
index a33a417f2eee..6b4fe6875b04 100644
--- a/textproc/rubygem-markaby/Makefile
+++ b/textproc/rubygem-markaby/Makefile
@@ -16,7 +16,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/textproc/rubygem-multi_xml/Makefile b/textproc/rubygem-multi_xml/Makefile
index 3568fd6ea052..7d05873a3fb4 100644
--- a/textproc/rubygem-multi_xml/Makefile
+++ b/textproc/rubygem-multi_xml/Makefile
@@ -16,8 +16,7 @@ NOKOGIRI_DESC= Nokogiri is a HTML, XML, SAX, and Reader parser
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
NOKOGIRI_RUN_DEPENDS= rubygem-nokogiri>=0:textproc/rubygem-nokogiri
diff --git a/textproc/rubygem-nokogiri-diff/Makefile b/textproc/rubygem-nokogiri-diff/Makefile
index 140c92f804c4..4e506e974a3a 100644
--- a/textproc/rubygem-nokogiri-diff/Makefile
+++ b/textproc/rubygem-nokogiri-diff/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-nokogiri>=1.5: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/textproc/rubygem-nokogiri/Makefile b/textproc/rubygem-nokogiri/Makefile
index 95d39a57cea8..e6d97b8b09b7 100644
--- a/textproc/rubygem-nokogiri/Makefile
+++ b/textproc/rubygem-nokogiri/Makefile
@@ -11,10 +11,8 @@ COMMENT= HTML, XML, SAX, and Reader parser
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pkgconfig
USE_GNOME= libxml2 libxslt
-USES= pkgconfig
CONFIGURE_ARGS= --use-system-libraries
PLIST_FILES= bin/nokogiri
diff --git a/textproc/rubygem-nokogiri14/Makefile b/textproc/rubygem-nokogiri14/Makefile
index f6d5b7857986..371bfc3940c5 100644
--- a/textproc/rubygem-nokogiri14/Makefile
+++ b/textproc/rubygem-nokogiri14/Makefile
@@ -12,10 +12,8 @@ COMMENT= HTML, XML, SAX, and Reader parser
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist pkgconfig
USE_GNOME= libxml2 libxslt
-USES= pkgconfig
CONFIGURE_ARGS= --use-system-libraries
PLIST_FILES= bin/nokogiri14
diff --git a/textproc/rubygem-nokogumbo/Makefile b/textproc/rubygem-nokogumbo/Makefile
index 25fc9d1836db..30574859a13a 100644
--- a/textproc/rubygem-nokogumbo/Makefile
+++ b/textproc/rubygem-nokogumbo/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= rubygem-nokogiri>=0:textproc/rubygem-nokogiri
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= pkgconfig
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/textproc/rubygem-octopress-escape-code/Makefile b/textproc/rubygem-octopress-escape-code/Makefile
index 6ec7b294141c..ea42b6b9c9d9 100644
--- a/textproc/rubygem-octopress-escape-code/Makefile
+++ b/textproc/rubygem-octopress-escape-code/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-jekyll>=3.0:www/rubygem-jekyll
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-opml/Makefile b/textproc/rubygem-opml/Makefile
index 6f99e7bde8fb..2aaa36bba24d 100644
--- a/textproc/rubygem-opml/Makefile
+++ b/textproc/rubygem-opml/Makefile
@@ -12,7 +12,6 @@ COMMENT= Simple wrapper for parsing OPML files
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-org-ruby/Makefile b/textproc/rubygem-org-ruby/Makefile
index a99380c86b28..e4c22bc9b6ad 100644
--- a/textproc/rubygem-org-ruby/Makefile
+++ b/textproc/rubygem-org-ruby/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rubypants>=0.2.0:textproc/rubygem-rubypants
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/org-ruby
diff --git a/textproc/rubygem-parslet/Makefile b/textproc/rubygem-parslet/Makefile
index b6437bb16a97..ef17c47be01e 100644
--- a/textproc/rubygem-parslet/Makefile
+++ b/textproc/rubygem-parslet/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-blankslate>=2:devel/rubygem-blankslate
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-phone/Makefile b/textproc/rubygem-phone/Makefile
index e3fe53e84e05..2789b8661864 100644
--- a/textproc/rubygem-phone/Makefile
+++ b/textproc/rubygem-phone/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/textproc/rubygem-rails-dom-testing/Makefile b/textproc/rubygem-rails-dom-testing/Makefile
index 1b83d4334f0f..6efdae85238d 100644
--- a/textproc/rubygem-rails-dom-testing/Makefile
+++ b/textproc/rubygem-rails-dom-testing/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4 \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rails-html-sanitizer/Makefile b/textproc/rubygem-rails-html-sanitizer/Makefile
index af680c703ffe..b93d5f3d716d 100644
--- a/textproc/rubygem-rails-html-sanitizer/Makefile
+++ b/textproc/rubygem-rails-html-sanitizer/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-loofah>=2.0:textproc/rubygem-loofah
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rak/Makefile b/textproc/rubygem-rak/Makefile
index 42fc1f2c4478..7cb9d2b4012e 100644
--- a/textproc/rubygem-rak/Makefile
+++ b/textproc/rubygem-rak/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/rak
diff --git a/textproc/rubygem-rchardet/Makefile b/textproc/rubygem-rchardet/Makefile
index 2fc0ebdc82c4..bde4a85399ae 100644
--- a/textproc/rubygem-rchardet/Makefile
+++ b/textproc/rubygem-rchardet/Makefile
@@ -13,7 +13,6 @@ LICENSE= LGPL21
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rdiscount/Makefile b/textproc/rubygem-rdiscount/Makefile
index 913a0f821583..adbcaeaca055 100644
--- a/textproc/rubygem-rdiscount/Makefile
+++ b/textproc/rubygem-rdiscount/Makefile
@@ -12,8 +12,7 @@ COMMENT= Fast Markdown converter for ruby based on discount
LICENSE= BSD3CLAUSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rdiscount
diff --git a/textproc/rubygem-rdtool/Makefile b/textproc/rubygem-rdtool/Makefile
index bc2492cdabd1..255ed7b23610 100644
--- a/textproc/rubygem-rdtool/Makefile
+++ b/textproc/rubygem-rdtool/Makefile
@@ -14,12 +14,10 @@ LICENSE_COMB= dual
NO_ARCH= yes
-USES= shebangfix
+USE_RUBY= yes
+USES= gem:autoplist shebangfix
SHEBANG_FILES= bin/rd2 bin/rdswap.rb
ruby_OLD_CMD= /usr/bin/ruby1.9.1
-USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
PLIST_FILES= bin/rd2 bin/rdswap.rb
diff --git a/textproc/rubygem-redcarpet/Makefile b/textproc/rubygem-redcarpet/Makefile
index f00a11d6ba13..f29847a301b7 100644
--- a/textproc/rubygem-redcarpet/Makefile
+++ b/textproc/rubygem-redcarpet/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/redcarpet
diff --git a/textproc/rubygem-reverse_markdown/Makefile b/textproc/rubygem-reverse_markdown/Makefile
index c84747dea5c9..f016474812bc 100644
--- a/textproc/rubygem-reverse_markdown/Makefile
+++ b/textproc/rubygem-reverse_markdown/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS= rubygem-nokogiri>=1.6.6.2:textproc/rubygem-nokogiri
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/reverse_markdown
.include <bsd.port.mk>
diff --git a/textproc/rubygem-ri_cal/Makefile b/textproc/rubygem-ri_cal/Makefile
index 4a08ec254145..18401dbe6ede 100644
--- a/textproc/rubygem-ri_cal/Makefile
+++ b/textproc/rubygem-ri_cal/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/ri_cal
diff --git a/textproc/rubygem-rich/Makefile b/textproc/rubygem-rich/Makefile
index 7f4b62003ab4..faebc96459fb 100644
--- a/textproc/rubygem-rich/Makefile
+++ b/textproc/rubygem-rich/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-jquery-rails>=0:www/rubygem-jquery-rails \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rmmseg-cpp/Makefile b/textproc/rubygem-rmmseg-cpp/Makefile
index a53c1cfab0c2..73b5f4f57dd4 100644
--- a/textproc/rubygem-rmmseg-cpp/Makefile
+++ b/textproc/rubygem-rmmseg-cpp/Makefile
@@ -13,9 +13,7 @@ COMMENT= High performance Chinese word segmentation utility
LICENSE= MIT
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= shebangfix
+USES= gem:autoplist shebangfix
SHEBANG_FILES= misc/convert.rb
PLIST_FILES= bin/rmmseg
diff --git a/textproc/rubygem-rouge/Makefile b/textproc/rubygem-rouge/Makefile
index 66d9921feb88..04a8b274029d 100644
--- a/textproc/rubygem-rouge/Makefile
+++ b/textproc/rubygem-rouge/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/rougify
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rttool/Makefile b/textproc/rubygem-rttool/Makefile
index 67d66bd664f3..99105ed4b9b7 100644
--- a/textproc/rubygem-rttool/Makefile
+++ b/textproc/rubygem-rttool/Makefile
@@ -14,8 +14,7 @@ LICENSE_COMB= dual
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rdrt2 bin/rt2
diff --git a/textproc/rubygem-ruby-augeas/Makefile b/textproc/rubygem-ruby-augeas/Makefile
index 7a190a92e87a..ae3a66f12174 100644
--- a/textproc/rubygem-ruby-augeas/Makefile
+++ b/textproc/rubygem-ruby-augeas/Makefile
@@ -17,8 +17,6 @@ LIB_DEPENDS= libaugeas.so:textproc/augeas
CONFIGURE_ARGS= --with-opt-include="${LOCALBASE}/include/libxml2"
USE_GNOME= libxml2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-USES= pkgconfig
+USES= gem:autoplist pkgconfig
.include <bsd.port.mk>
diff --git a/textproc/rubygem-ruby-xslt/Makefile b/textproc/rubygem-ruby-xslt/Makefile
index 0b385d100314..9f037fec2a12 100644
--- a/textproc/rubygem-ruby-xslt/Makefile
+++ b/textproc/rubygem-ruby-xslt/Makefile
@@ -13,7 +13,6 @@ LICENSE= GPLv2
USE_GNOME= libxslt
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-rubypants/Makefile b/textproc/rubygem-rubypants/Makefile
index 6bd0805a1dd1..739ec0229fcb 100644
--- a/textproc/rubygem-rubypants/Makefile
+++ b/textproc/rubygem-rubypants/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/textproc/rubygem-rugments/Makefile b/textproc/rubygem-rugments/Makefile
index de8519d61fab..43ae89fbd5ad 100644
--- a/textproc/rubygem-rugments/Makefile
+++ b/textproc/rubygem-rugments/Makefile
@@ -15,8 +15,7 @@ GEM_NAME= ${PORTNAME}-${DISTVERSION}
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/rugmentize
diff --git a/textproc/rubygem-sanitize/Makefile b/textproc/rubygem-sanitize/Makefile
index 0307059f2e47..ed7da57cefc8 100644
--- a/textproc/rubygem-sanitize/Makefile
+++ b/textproc/rubygem-sanitize/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-crass>=1.0.2:www/rubygem-crass \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-sass-rails/Makefile b/textproc/rubygem-sass-rails/Makefile
index f27d969dce8f..8857ff1715f5 100644
--- a/textproc/rubygem-sass-rails/Makefile
+++ b/textproc/rubygem-sass-rails/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS= rubygem-railties>=3.2.0:www/rubygem-railties \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PORTSCOUT= limit:^3\.
diff --git a/textproc/rubygem-sass-rails4/Makefile b/textproc/rubygem-sass-rails4/Makefile
index 0e86ed3db029..ef3aa80342a6 100644
--- a/textproc/rubygem-sass-rails4/Makefile
+++ b/textproc/rubygem-sass-rails4/Makefile
@@ -23,7 +23,6 @@ PORTSCOUT= limit:^4\.
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-sass-rails5/Makefile b/textproc/rubygem-sass-rails5/Makefile
index 3d35215d1a1f..3efef6b7ad26 100644
--- a/textproc/rubygem-sass-rails5/Makefile
+++ b/textproc/rubygem-sass-rails5/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS= rubygem-railties4>=4.0.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/textproc/rubygem-sass/Makefile b/textproc/rubygem-sass/Makefile
index bd386afc1dbe..376d5ce68cd6 100644
--- a/textproc/rubygem-sass/Makefile
+++ b/textproc/rubygem-sass/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/sass bin/sass-convert bin/scss
diff --git a/textproc/rubygem-sass32/Makefile b/textproc/rubygem-sass32/Makefile
index 21f421c2fd71..5984ddecbc73 100644
--- a/textproc/rubygem-sass32/Makefile
+++ b/textproc/rubygem-sass32/Makefile
@@ -17,7 +17,6 @@ PORTSCOUT= limit:^3\.2\.
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-sax-machine/Makefile b/textproc/rubygem-sax-machine/Makefile
index 5a8cf8bda9d4..6271508389de 100644
--- a/textproc/rubygem-sax-machine/Makefile
+++ b/textproc/rubygem-sax-machine/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/textproc/rubygem-scss_lint/Makefile b/textproc/rubygem-scss_lint/Makefile
index 6e7274f666a3..ef19e1426242 100644
--- a/textproc/rubygem-scss_lint/Makefile
+++ b/textproc/rubygem-scss_lint/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-rake>=0.9:devel/rubygem-rake \
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/scss-lint
diff --git a/textproc/rubygem-shell2html/Makefile b/textproc/rubygem-shell2html/Makefile
index 84729f525dba..36d6e18653b2 100644
--- a/textproc/rubygem-shell2html/Makefile
+++ b/textproc/rubygem-shell2html/Makefile
@@ -12,8 +12,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/shell2css bin/shell2html
.include <bsd.port.mk>
diff --git a/textproc/rubygem-simplecov-html/Makefile b/textproc/rubygem-simplecov-html/Makefile
index 9370b9ea2bed..89cb38b83286 100644
--- a/textproc/rubygem-simplecov-html/Makefile
+++ b/textproc/rubygem-simplecov-html/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/textproc/rubygem-spreadsheet/Makefile b/textproc/rubygem-spreadsheet/Makefile
index f1493ca1468a..dd28078213fa 100644
--- a/textproc/rubygem-spreadsheet/Makefile
+++ b/textproc/rubygem-spreadsheet/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= rubygem-ruby-ole>=1.0:devel/rubygem-ruby-ole
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
PLIST_FILES= bin/xlsopcodes
diff --git a/textproc/rubygem-stamp/Makefile b/textproc/rubygem-stamp/Makefile
index ab6ae80de4cc..594c78aff54b 100644
--- a/textproc/rubygem-stamp/Makefile
+++ b/textproc/rubygem-stamp/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/textproc/rubygem-string-scrub/Makefile b/textproc/rubygem-string-scrub/Makefile
index a493e26ef239..da63996be3c1 100644
--- a/textproc/rubygem-string-scrub/Makefile
+++ b/textproc/rubygem-string-scrub/Makefile
@@ -13,8 +13,7 @@ LICENSE= MIT
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.pre.mk>
diff --git a/textproc/rubygem-syntax/Makefile b/textproc/rubygem-syntax/Makefile
index e04c57322be9..16d877e4e0c4 100644
--- a/textproc/rubygem-syntax/Makefile
+++ b/textproc/rubygem-syntax/Makefile
@@ -13,7 +13,6 @@ LICENSE= BSD3CLAUSE
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-termcolor/Makefile b/textproc/rubygem-termcolor/Makefile
index 061c6da5c23b..4c7cc3e14271 100644
--- a/textproc/rubygem-termcolor/Makefile
+++ b/textproc/rubygem-termcolor/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-highline>=1.5.0:devel/rubygem-highline
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-terminal-table/Makefile b/textproc/rubygem-terminal-table/Makefile
index 31df82815412..5ed0ea7a202d 100644
--- a/textproc/rubygem-terminal-table/Makefile
+++ b/textproc/rubygem-terminal-table/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/textproc/rubygem-text/Makefile b/textproc/rubygem-text/Makefile
index a44eac300676..960b8a68d2b9 100644
--- a/textproc/rubygem-text/Makefile
+++ b/textproc/rubygem-text/Makefile
@@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-tidy/Makefile b/textproc/rubygem-tidy/Makefile
index 9e4acf05feed..4f3822da6a18 100644
--- a/textproc/rubygem-tidy/Makefile
+++ b/textproc/rubygem-tidy/Makefile
@@ -12,7 +12,6 @@ COMMENT= Ruby interface to HTML Tidy Library Project
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-twitter-text/Makefile b/textproc/rubygem-twitter-text/Makefile
index bdbc28e2152a..b856f7f9b0d2 100644
--- a/textproc/rubygem-twitter-text/Makefile
+++ b/textproc/rubygem-twitter-text/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-unf>=0.1.0: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/textproc/rubygem-unf/Makefile b/textproc/rubygem-unf/Makefile
index 060b930bf327..7058b4fd5dc3 100644
--- a/textproc/rubygem-unf/Makefile
+++ b/textproc/rubygem-unf/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-unf_ext>=0:textproc/rubygem-unf_ext
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-unf_ext/Makefile b/textproc/rubygem-unf_ext/Makefile
index 9295e06d1712..f9d33c10d1c8 100644
--- a/textproc/rubygem-unf_ext/Makefile
+++ b/textproc/rubygem-unf_ext/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-version_sorter/Makefile b/textproc/rubygem-version_sorter/Makefile
index 86141b5a84d9..53ccfc6239cf 100644
--- a/textproc/rubygem-version_sorter/Makefile
+++ b/textproc/rubygem-version_sorter/Makefile
@@ -13,7 +13,6 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-wikicloth/Makefile b/textproc/rubygem-wikicloth/Makefile
index 1bb059569760..3972cb4fda0f 100644
--- a/textproc/rubygem-wikicloth/Makefile
+++ b/textproc/rubygem-wikicloth/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS= rubygem-builder>=0: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/textproc/rubygem-xml-simple/Makefile b/textproc/rubygem-xml-simple/Makefile
index 4ca82d605409..05d9f8183a73 100644
--- a/textproc/rubygem-xml-simple/Makefile
+++ b/textproc/rubygem-xml-simple/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/textproc/rubygem-ya2yaml/Makefile b/textproc/rubygem-ya2yaml/Makefile
index 3dce49623fe6..6ecaab71e4fb 100644
--- a/textproc/rubygem-ya2yaml/Makefile
+++ b/textproc/rubygem-ya2yaml/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/textproc/rubygem-yard-chef/Makefile b/textproc/rubygem-yard-chef/Makefile
index c67389ae5041..800ac7b5ab59 100644
--- a/textproc/rubygem-yard-chef/Makefile
+++ b/textproc/rubygem-yard-chef/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-yard>=0.8:textproc/rubygem-yard
NO_ARCH= yes
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/textproc/rubygem-yard/Makefile b/textproc/rubygem-yard/Makefile
index 32a130b9aeb7..c70f6625712a 100644
--- a/textproc/rubygem-yard/Makefile
+++ b/textproc/rubygem-yard/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/yard \
bin/yardoc \
diff --git a/textproc/rubygem-zmq/Makefile b/textproc/rubygem-zmq/Makefile
index 6f5cb23390b9..fc20af324185 100644
--- a/textproc/rubygem-zmq/Makefile
+++ b/textproc/rubygem-zmq/Makefile
@@ -14,7 +14,6 @@ LICENSE= LGPL3
LIB_DEPENDS= libzmq.so:net/libzmq2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/www/rubygem-ace-rails-ap/Makefile b/www/rubygem-ace-rails-ap/Makefile
index 84e7f33b89e6..9a40267381c5 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 0b2d9d7c137b..7e32e5aa539f 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 7566bf734e4e..52311bcb2e70 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 d767ae0cc558..25cee76438a2 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 40a8bed4935d..9799b6673a8e 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 48d0fe693a2c..c836082f2e99 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 78d36fe7d003..1c2cf90e5ce7 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 9f0aa0f2d194..103cdfc39bb9 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 507660c22928..7a08b786f601 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 3009ded306af..429bea5c1d6f 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 f81b7873b7c5..0ab3afb460e1 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 9347d136d7c4..0561d1257e28 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 7feb331982f2..85fb4ac4efaf 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 2f729c6e739c..61c6763b6eea 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 851aa28a1c38..bb5739621019 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 215714476db1..7852f36a213b 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 08b532337aa0..51285abb8af0 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 df6326f01f78..344dde30ce99 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 e583528b3ec0..7d990644f7d3 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 dad642f4f8fb..f89f93583738 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 3e7640ee90d3..b18f90065dcf 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 ace9513e4d06..1812204df75b 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 f33f2179686b..a97c15fb557c 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 08c8bdfbc5c8..95ab18d32924 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 077ac2d74a0c..18050f9d74e4 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 c35fbf4fc711..3939389574e3 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 2407bbb36ce2..d1c1665739f3 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 948a46325517..931fb564d4c3 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 73ab26131546..4d55119016e7 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 5685406973ee..0031dda600df 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 5192e29b362d..e8e5ed48dca3 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 f1f9a775606a..6dc9af94d3c0 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 1d4dcaab4ab9..2a42278de7a1 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 195302874701..2c034e948040 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 9950396ebd70..b3455091965f 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 d116ba6f78a0..1e7e9efa82ed 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 58190bc12c01..265aa6f23067 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 6df82009a043..eaef6b4db182 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 85b7d691d326..62ea99496792 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 555d4083c853..25c180d9e265 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 f83fb3d865ec..ebef90dd934b 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 63e5968a98b0..43937cdfb727 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 1119a52f97a3..2965c590cfca 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 a6ffd1ad3ada..8c04a7cb446c 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 9021b51be947..21d1d936e688 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 2d0067e00854..a89559af6225 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 201e21b722c7..f98319bab59d 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 b9beee06efc7..77c266e28afb 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 f387663bd37d..bf108b8c412e 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 9a5c2aac5f41..40154e942b11 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 d0bf386628a0..afd58a28c18d 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 cf4b16d2ea78..ebfe3652fdfa 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 c0bf50e65ad7..3f83c82cd1e6 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 9235e06a4840..d68609788de9 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 4e38939e8638..0a8f4637b124 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 1cc2067ddf13..e30a41e8aedb 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 4938df06667e..18273e854718 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 bb4dfe608f75..1bb627a3ef29 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 62b563d0d7a6..30d666fbfddf 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 a674821cfddf..67a88b8ff503 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 31eecd2f0fbd..e176feb14708 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 05b405b580aa..623e6c39c50d 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 9bfc74abfb6a..60bcc809039c 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 ae4c388b114b..337cdd659eb6 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 7fe525f03241..b6b7d5b61d65 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 1b287d47b292..ab62c3a366f8 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 a6d69212aaa4..0afaf62f8e36 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 74360b90b904..ab3bac05b419 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 eb454ef7acd0..c56e5cc8c4c7 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 6aed86feecb5..8f4a06be1cff 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 8d31a1716a6c..fc5e4a421dd5 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 6cab0d77287b..870e856499f0 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 68906fd912de..4de4438f64fc 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 6f775bef9b93..aab78f6f1cf9 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 fefb4e4e51d4..f8a612abd4d4 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 2fb6e9efeb25..ec46ebd088a4 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 ce4fd8c91bf8..2750653f0fa8 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 cf3106947f4c..62c657f7c17e 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 695112f31f37..c7e1509c355d 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 a11a6fed0fb6..349c5a04567b 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 ed92cad8e9f0..f0f583331e7a 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 39b863526790..cc0ff4e1a0c8 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 7773b6a13834..67aa083ec2a3 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 f95b1b91ddb8..279dd7505136 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 b5ff975ce900..2378f215606a 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 3c99f1c055c2..d6f27218f8b2 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 eab732ae470a..104fd428faf3 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 b2b610002f99..38a476b89e65 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 9da6922647c5..5e62d8055ca0 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 db6b5723286a..5a0d17b02bea 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 b10154b98004..999285ecc5be 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 fc447212d7de..c775019e166c 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 4cba8ad195cc..cc8369abf57d 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 456331e9c017..9bd44443090b 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 76037baca04c..552bac3644ea 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 2b5bf3fdada8..c3f04a951744 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 def6227a8251..58e904d915d6 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 1548aef55cbc..4302bd77fcaf 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 6f2cd49e221c..ca40dd5d5290 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 5068e102d586..04bdf399be0e 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 7a73fc3cc360..ee1c09f45eed 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 9170ac522925..73e128dfc278 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 fe94e1893f85..4b2e6dea5670 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 2390b85b7f53..a5674d2fbbc3 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 51365c35b52b..a46a2fdd60c5 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 4c02b689bf9d..ea00199f9aae 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 7193a5e7e0b5..f1cdbaefe693 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 53b508476e9e..8e2493ee7107 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 bbb038708d7a..84db27ca23f3 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 bd73fce8f1b7..10ff3f8660f3 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 faad6efeaa28..761c5a611cb2 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 344f2df886a1..4ddbe246c52d 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 cfc9304be1c7..cda3a3e0a256 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 e45dee1094ed..86255f531da8 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 c91101a2eb8d..39d9818cb5d4 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 ebb9b4153a5d..7839ed116041 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 a9dfb643154a..dd18b86e6855 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 be6e87240dcc..c9f17ca56cbb 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 76bd9bdb14c0..2a33f763e787 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 03c8c649ae68..5e23206dc5fa 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 7b7a9120f783..2576755ad524 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 9690f172bb86..86623c55a5b3 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 648b05079276..e724630ee20a 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 f1ab14e39544..a4ee33cc1495 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 5dbd790e6408..75ca184010d4 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 d65332aee053..d10a3021b696 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 29f9e45df563..2b1c60911674 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 cc7a7f05944d..c852243f7564 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 75547ebe1508..292658cf614c 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 df03a28f2b78..011cd1f98847 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 876fcbbba165..8ddc80d82e4e 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 9b10be973f66..ac170ddcaf3f 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 d0fc53a95b61..e6eede70e870 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 486a905a9c4b..30a92ebf7550 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 9e91bedc6cc5..5d84dbbb4677 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 21894e4bb85e..0babc08fb617 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 ca27da4d4a7b..ee10a03124e7 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 5b9bd28b402e..5ebf1d0acbfe 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 699c5fcf549e..566d785604d8 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 58f48d468069..9cc9659a8b0d 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 dcce2dc0d2a0..eeb522e9348e 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 2560a97cc616..15a2f678b6e4 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 a94b0afc995a..06abbec16fc4 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 5cfbd7d81eb3..713130b57adb 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 ae119153fc8e..258910490ddc 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 d642e244cb0f..6efa4864772b 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 87b1b83999c0..3ae666ef919d 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 0021c01b6a5b..a3106ced40f9 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 ca01939a9f68..7356dd501c4b 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 4a871fa33186..1dbe3c02ec15 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 4db5195a63b0..4114590ad2fc 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 b478486e7fb7..a02ca1991961 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 90f5612e18e8..bcf64582a559 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 6f68675674fc..de8dd30de8c5 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 041d73b18aed..536d818371c1 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 9d2aafd7cd29..d7d774b6b295 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 6da6dcf1226c..56143876434a 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 a9f8bdc6bd2d..4b10e58ccc15 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 647766bbecbb..808f7954bc37 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 dd2a8d6937ce..6f1d462953a4 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 95fb4ef1eb5d..2a3046dad37c 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 2093010f77fa..1ef011eb58d5 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 a4202f3d7025..bf970efddac8 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 5cf98511c9f0..7b4b313fe3c0 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 ccedde424e9e..2758e0260e2f 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 1d3837a28b7e..7aa28409f444 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 669ccfba9a21..bc2c8317a496 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 821740cbce20..e98ae64d41c5 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 301591499a56..92de17e9cbcd 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 850fb4d22171..a9f7cfedb16a 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 f3d8fd49b4ca..fe22039d5a6c 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 e239957e73c8..5d71041add85 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 1d9be5082fd1..b7894048fbf5 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 9e88558a442a..de871531b3df 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 86298d5d1290..496ce04e4c99 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 06d23aa58849..6bf4b2876254 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 0124e60acaea..2bfda12ea195 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 2969e169153f..a9920b64f475 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 98124b829dd1..809ee0775b9c 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 408fbaba6a1e..f7df3d45e27d 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 79490a254a54..13d30328857a 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 db04ceddd351..e43602ff8cb8 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 4802469d6de8..ba849d79a4ae 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 b52bc6921c43..c8213ae2a546 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 f0394beb565f..194a39789752 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 bc9e59f193be..3034ccbc498d 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 beb2097d49a4..c8a6657e62b2 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 38aa28db6d88..0dbda090ff06 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 c8d4bcadab0e..0d108011ec9e 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 69f534978a4e..da25021b3770 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
diff --git a/x11-toolkits/rubygem-gdk3/Makefile b/x11-toolkits/rubygem-gdk3/Makefile
index f7b13fdee93a..447507765957 100644
--- a/x11-toolkits/rubygem-gdk3/Makefile
+++ b/x11-toolkits/rubygem-gdk3/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
NO_ARCH= yes
USE_GNOME= gtk30
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-gtk2/Makefile b/x11-toolkits/rubygem-gtk2/Makefile
index 79486e561621..2b73fef382dd 100644
--- a/x11-toolkits/rubygem-gtk2/Makefile
+++ b/x11-toolkits/rubygem-gtk2/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
USE_GNOME= gtk20
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-gtk3/Makefile b/x11-toolkits/rubygem-gtk3/Makefile
index 542818bddf60..57eda9aa9b4a 100644
--- a/x11-toolkits/rubygem-gtk3/Makefile
+++ b/x11-toolkits/rubygem-gtk3/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS= rubygem-atk>=${PORTVERSION}:accessibility/rubygem-atk \
USE_GNOME= gtk30
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-gtksourceview2/Makefile b/x11-toolkits/rubygem-gtksourceview2/Makefile
index fdf1434d82fd..a616930d9389 100644
--- a/x11-toolkits/rubygem-gtksourceview2/Makefile
+++ b/x11-toolkits/rubygem-gtksourceview2/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
USE_GNOME= gtksourceview2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-gtksourceview3/Makefile b/x11-toolkits/rubygem-gtksourceview3/Makefile
index 2dd315c9148a..0a351feabd8e 100644
--- a/x11-toolkits/rubygem-gtksourceview3/Makefile
+++ b/x11-toolkits/rubygem-gtksourceview3/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS= rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject
NO_ARCH= yes
USE_GNOME= gtksourceview3
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-pango/Makefile b/x11-toolkits/rubygem-pango/Makefile
index c13dc3471d28..ebd951e08cab 100644
--- a/x11-toolkits/rubygem-pango/Makefile
+++ b/x11-toolkits/rubygem-pango/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-cairo>=1.14.0:graphics/rubygem-cairo \
USE_GNOME= pango
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile
index 2fa29e1b99af..5dc91714e187 100644
--- a/x11-toolkits/rubygem-poppler/Makefile
+++ b/x11-toolkits/rubygem-poppler/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS= rubygem-cairo>=1.14.0:graphics/rubygem-cairo \
rubygem-gdk_pixbuf2>=${PORTVERSION}:graphics/rubygem-gdk_pixbuf2
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-vte/Makefile b/x11-toolkits/rubygem-vte/Makefile
index 59dd4fd43490..7ee87df29141 100644
--- a/x11-toolkits/rubygem-vte/Makefile
+++ b/x11-toolkits/rubygem-vte/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS= rubygem-gtk2>=${PORTVERSION}:x11-toolkits/rubygem-gtk2
USE_GNOME= vte
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>
diff --git a/x11-toolkits/rubygem-vte3/Makefile b/x11-toolkits/rubygem-vte3/Makefile
index 46f9d8e35068..8cfa8abf5299 100644
--- a/x11-toolkits/rubygem-vte3/Makefile
+++ b/x11-toolkits/rubygem-vte3/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS= rubygem-gobject-introspection>=${PORTVERSION}:devel/rubygem-gobject
NO_ARCH= yes
USE_GNOME= vte3
USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
+USES= gem:autoplist
.include <bsd.port.mk>