Index: devel/ruby-gems/Makefile
===================================================================
--- devel/ruby-gems/Makefile	(revision 400882)
+++ devel/ruby-gems/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gems
-PORTVERSION=	2.4.8
+PORTVERSION=	2.5.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -14,11 +14,13 @@
 
 LICENSE=	MIT RUBY
 LICENSE_COMB=	dual
+LICENSE_FILE_MIT=	${WRKSRC}/MIT.txt
+LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
 
+NO_ARCH=	yes
+NO_BUILD=	yes
 USE_RUBY=	yes
 RUBY_SETUP=	setup.rb
-
-NO_BUILD=	yes
 USES=		tar:tgz
 
 GEMS_BASE_DIR=		lib/ruby/gems
@@ -37,7 +39,7 @@
 SPEC_DIR=		${GEMS_VER_DIR}/specifications
 EXT_DIR=		${GEMS_VER_DIR}/extensions
 
-PLIST_SUB+=	DISTNAME="${DISTNAME}" \
+PLIST_SUB=	DISTNAME="${DISTNAME}" \
 		RUBY_VER_SHORT="${RUBY_VER_SHORT}" \
 		GEMS_DIR="${GEMS_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
@@ -47,17 +49,13 @@
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR}
 GEM_ENV=		GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
 
-.if !${PORT_OPTIONS:MDOCS}
-RUBY_SETUP_OPTIONS+=	--no-ri --no-rdoc
-.endif
+DOCS_VARS_OFF=		RUBY_SETUP_OPTIONS="--destdir=${STAGEDIR} --no-ri --no-rdoc"
+DOCS_VARS=		RUBY_SETUP_OPTIONS="--destdir=${STAGEDIR}"
 
 do-install:
-	cd ${WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
+	cd ${WRKSRC}/ && ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
 
 post-install:
 	@${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem
@@ -65,9 +63,7 @@
 #
 # Find all RDOC and RI files
 #
-.if ${PORT_OPTIONS:MDOCS}
-	@${FIND} -ds ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \
-	    ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-.endif
+post-install-DOCS-on:
+	cd ${STAGEDIR}${PREFIX}/ && ${FIND} -ds ${GEMS_DOC_DIR}/ ! -type d >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: devel/ruby-gems/distinfo
===================================================================
--- devel/ruby-gems/distinfo	(revision 400882)
+++ devel/ruby-gems/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (ruby/rubygems-2.4.8.tgz) = 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e
-SIZE (ruby/rubygems-2.4.8.tgz) = 447712
+SHA256 (ruby/rubygems-2.5.0.tgz) = a39e95acb86f52fdca38b1484b2eed61a7f76551119079d7a9f8c67c5be78831
+SIZE (ruby/rubygems-2.5.0.tgz) = 467978
Index: devel/ruby-gems/pkg-plist
===================================================================
--- devel/ruby-gems/pkg-plist	(revision 400882)
+++ devel/ruby-gems/pkg-plist	(working copy)
@@ -114,6 +114,16 @@
 %%RUBY_SITELIBDIR%%/rubygems/resolver/local_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_specification.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/errors.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/state.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/requirement_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/spec_specification.rb
@@ -154,8 +164,8 @@
 %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
 %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
 %%RUBY_SITELIBDIR%%/rubygems/util.rb
+%%RUBY_SITELIBDIR%%/rubygems/util/licenses.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/list.rb
-%%RUBY_SITELIBDIR%%/rubygems/util/stringio.rb
 %%RUBY_SITELIBDIR%%/rubygems/validator.rb
 %%RUBY_SITELIBDIR%%/rubygems/version.rb
 %%RUBY_SITELIBDIR%%/rubygems/version_option.rb