Index: head/sysutils/rubygem-r10k/Makefile
===================================================================
--- head/sysutils/rubygem-r10k/Makefile	(revision 400529)
+++ head/sysutils/rubygem-r10k/Makefile	(revision 400530)
@@ -1,40 +1,36 @@
 # $FreeBSD$
 
 PORTNAME=	r10k
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Tool for deploying Puppet environments and modules
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-colored>=1.2:${PORTSDIR}/textproc/rubygem-colored \
 		rubygem-cri>=2.6.1:${PORTSDIR}/devel/rubygem-cri \
 		rubygem-faraday>=0.9.0:${PORTSDIR}/www/rubygem-faraday \
 		rubygem-faraday_middleware>=0.9.0:${PORTSDIR}/www/rubygem-faraday_middleware \
 		rubygem-faraday_middleware-multi_json>=0.0.6:${PORTSDIR}/devel/rubygem-faraday_middleware-multi_json \
 		rubygem-log4r>=1.1.10:${PORTSDIR}/sysutils/rubygem-log4r \
 		rubygem-minitar>=0:${PORTSDIR}/archivers/rubygem-minitar \
 		rubygem-multi_json>=1.10:${PORTSDIR}/devel/rubygem-multi_json \
+		rubygem-puppet_forge>=2.1.1:${PORTSDIR}/sysutils/rubygem-puppet_forge \
 		rubygem-semantic_puppet>=0.1.0:${PORTSDIR}/devel/rubygem-semantic_puppet
 
 NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
 USES=		shebangfix
-SHEBANG_FILES=	integration/scripts/*.sh \
-		integration/test_run_scripts/*.sh \
-		integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh \
-		integration/test_run_scripts/command_line/all_tests-pe-centos6.sh \
-		integration/test_run_scripts/git_source/all_tests-pe-centos6.sh \
-		integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh \
-		integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh
+SHEBANG_FILES=	integration/*/*.sh \
+		integration/*/*/*.sh \
+		integration/*/*/*/*.sh
 
 PLIST_FILES=	bin/r10k
 
 .include <bsd.port.mk>
Index: head/sysutils/rubygem-r10k/distinfo
===================================================================
--- head/sysutils/rubygem-r10k/distinfo	(revision 400529)
+++ head/sysutils/rubygem-r10k/distinfo	(revision 400530)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/r10k-2.0.3.gem) = ef28c179d30c6908021320ae835cb4431ed939423369853b2d890de2ffea54f8
-SIZE (rubygem/r10k-2.0.3.gem) = 160256
+SHA256 (rubygem/r10k-2.1.0.gem) = 839f98887992c016d328aaf7fd4ec3a7871a6baa0c45d3168d4c31bb54f57c52
+SIZE (rubygem/r10k-2.1.0.gem) = 167936
Index: head/sysutils/rubygem-r10k/files/patch-gemspec
===================================================================
--- head/sysutils/rubygem-r10k/files/patch-gemspec	(revision 400529)
+++ head/sysutils/rubygem-r10k/files/patch-gemspec	(revision 400530)
@@ -1,15 +1,15 @@
 --- r10k.gemspec.orig	2015-06-10 21:34:18 UTC
 +++ r10k.gemspec
-@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
+@@ -23,9 +23,9 @@ Gem::Specification.new do |s|
      s.specification_version = 4
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
 -      s.add_runtime_dependency(%q<colored>, ["= 1.2"])
 -      s.add_runtime_dependency(%q<cri>, ["~> 2.6.1"])
 -      s.add_runtime_dependency(%q<log4r>, ["= 1.1.10"])
 +      s.add_runtime_dependency(%q<colored>, [">= 1.2"])
 +      s.add_runtime_dependency(%q<cri>, [">= 2.6.1"])
 +      s.add_runtime_dependency(%q<log4r>, [">= 1.1.10"])
        s.add_runtime_dependency(%q<multi_json>, ["~> 1.10"])
+       s.add_runtime_dependency(%q<puppet_forge>, ["~> 2.1.1"])
        s.add_runtime_dependency(%q<faraday>, ["~> 0.9.0"])
-       s.add_runtime_dependency(%q<faraday_middleware>, ["~> 0.9.0"])