- Update Rails to 3.1.1 and associated changes

With hat:	ruby@

21 files changed, 42 insertions, 38 deletions

diff --git a/devel/rubygem-activesupport/Makefile b/devel/rubygem-activesupport/Makefile
index 1fdcc8542ab2..fed512b3aa9a 100644
--- a/devel/rubygem-activesupport/Makefile
+++ b/devel/rubygem-activesupport/Makefile
@@ -5,13 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	activesupport
-PORTVERSION=	3.0.10
+PORTVERSION=	3.1.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Utility classes and extension that are required by Rails MVC Framework
 
+RUN_DEPENDS=	rubygem-multi_json>=1.0.0:${PORTSDIR}/devel/rubygem-multi_json
+
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
diff --git a/devel/rubygem-activesupport/distinfo b/devel/rubygem-activesupport/distinfo
index 9fff7770f1b0..ba65edbfcdd4 100644
--- a/devel/rubygem-activesupport/distinfo
+++ b/devel/rubygem-activesupport/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/activesupport-3.0.10.gem) = 11ae3ec8d14ceaea52d8d5d0325f46f697ca23c6ae9c1946601d3a1720d3cf8a
-SIZE (rubygem/activesupport-3.0.10.gem) = 304128
+SHA256 (rubygem/activesupport-3.1.1.gem) = c2255766aad9f8a392367702e6bc889f7784e9177a4b5956d4e73eab71042cb5
+SIZE (rubygem/activesupport-3.1.1.gem) = 307200
diff --git a/devel/rubygem-builder/Makefile b/devel/rubygem-builder/Makefile
index 692551b36588..c6aeb78be5a6 100644
--- a/devel/rubygem-builder/Makefile
+++ b/devel/rubygem-builder/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	builder
-PORTVERSION=	2.1.2
+PORTVERSION=	3.0.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-builder/distinfo b/devel/rubygem-builder/distinfo
index f6282efa1389..a5be23266933 100644
--- a/devel/rubygem-builder/distinfo
+++ b/devel/rubygem-builder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/builder-2.1.2.gem) = 0620b1c79431871b3323ff511da891db841419ff25d176e2c6b80e73b77ee542
-SIZE (rubygem/builder-2.1.2.gem) = 22528
+SHA256 (rubygem/builder-3.0.0.gem) = fbd3e15e5de02245f7d649b3415b2c2875cdc9a14dccde89aa30fc14a314618e
+SIZE (rubygem/builder-3.0.0.gem) = 609280
diff --git a/devel/rubygem-echoe/Makefile b/devel/rubygem-echoe/Makefile
index 4f7d821f5ddb..d38ed1128998 100644
--- a/devel/rubygem-echoe/Makefile
+++ b/devel/rubygem-echoe/Makefile
@@ -13,10 +13,10 @@ MASTER_SITES=	RG
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Rake tasks for docs, extension compiling, testing and deployment
 
-RUN_DEPENDS= rubygem-rubyforge>=0:${PORTSDIR}/devel/rubygem-rubyforge \
-	rubygem-gemcutter>=0:${PORTSDIR}/devel/rubygem-gemcutter \
-	rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
-	rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison
+RUN_DEPENDS=	rubygem-rubyforge>=0:${PORTSDIR}/devel/rubygem-rubyforge \
+		rubygem-gemcutter>=0:${PORTSDIR}/devel/rubygem-gemcutter \
+		rubygem-highline>=0:${PORTSDIR}/devel/rubygem-highline \
+		rubygem-allison>=0:${PORTSDIR}/devel/rubygem-allison
 
 USE_RUBY=		yes
 USE_RUBYGEMS=		yes
diff --git a/devel/rubygem-i18n/Makefile b/devel/rubygem-i18n/Makefile
index 4f63d5b545dd..e4d3cdb10969 100644
--- a/devel/rubygem-i18n/Makefile
+++ b/devel/rubygem-i18n/Makefile
@@ -4,9 +4,8 @@
 #
 # $FreeBSD$
 
-# XXX: activemodel from rails 3.0.6+ requires ~> 0.50
 PORTNAME=	i18n
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.0
 PORTEPOCH=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
diff --git a/devel/rubygem-i18n/distinfo b/devel/rubygem-i18n/distinfo
index bb790541a9e3..1e904bae8c1f 100644
--- a/devel/rubygem-i18n/distinfo
+++ b/devel/rubygem-i18n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/i18n-0.5.0.gem) = 340d9efd7082aa9cc711ac520601d44f1b7b2f92ac88c88d63cda2e6f621a481
-SIZE (rubygem/i18n-0.5.0.gem) = 60416
+SHA256 (rubygem/i18n-0.6.0.gem) = 400e7bf941f445176aac95ed22eea6fa4a74670543d1795e026473012b74f5dd
+SIZE (rubygem/i18n-0.6.0.gem) = 60928
diff --git a/devel/rubygem-json/Makefile b/devel/rubygem-json/Makefile
index 77f6f7735cfa..a28194630245 100644
--- a/devel/rubygem-json/Makefile
+++ b/devel/rubygem-json/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	json
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -17,7 +16,6 @@ COMMENT=	Parse JSON texts and generate them from ruby data structures
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
-PLIST_FILES=	bin/edit_json.rb bin/prettify_json.rb
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/rubygem-json/distinfo b/devel/rubygem-json/distinfo
index 29252fd85b64..0b537d74f388 100644
--- a/devel/rubygem-json/distinfo
+++ b/devel/rubygem-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/json-1.5.3.gem) = dd0a9449a21d85c20701adc14758b86d19760a2a2351a3f6029f5608dd99077a
-SIZE (rubygem/json-1.5.3.gem) = 675328
+SHA256 (rubygem/json-1.6.1.gem) = 84615d86cbf748fe60870e722e8450b871e6885f3294628eefb90b1d12c9b877
+SIZE (rubygem/json-1.6.1.gem) = 654336
diff --git a/devel/rubygem-json_pure/Makefile b/devel/rubygem-json_pure/Makefile
index cfc2edd8b302..46bd6d5ec801 100644
--- a/devel/rubygem-json_pure/Makefile
+++ b/devel/rubygem-json_pure/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	json_pure
-PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTVERSION=	1.6.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Parse JSON texts and generate them from ruby data structures in Ruby
 
+RUN_DEPENDS=	rubygem-spruz>=0.1.0:${PORTSDIR}/devel/rubygem-spruz
+
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
-PLIST_FILES=	bin/edit_json.rb bin/prettify_json.rb
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/rubygem-json_pure/distinfo b/devel/rubygem-json_pure/distinfo
index a9ac4552361a..fe84b10ebcab 100644
--- a/devel/rubygem-json_pure/distinfo
+++ b/devel/rubygem-json_pure/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/json_pure-1.5.3.gem) = a8be2a5177b7c06ca8812eec06a9816aae631442e52e516557ee3e8f882b52d4
-SIZE (rubygem/json_pure-1.5.3.gem) = 674816
+SHA256 (rubygem/json_pure-1.6.1.gem) = 0e9efe3fcc0f6449102a190763bea40ea002473bea4ba2afd77e89f27d769ad1
+SIZE (rubygem/json_pure-1.6.1.gem) = 654336
diff --git a/devel/rubygem-rake/Makefile b/devel/rubygem-rake/Makefile
index ee3cce1af834..d8ee82013c2d 100644
--- a/devel/rubygem-rake/Makefile
+++ b/devel/rubygem-rake/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rake
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.2.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-rake/distinfo b/devel/rubygem-rake/distinfo
index 9c08d17f02a2..8ddc016fd12d 100644
--- a/devel/rubygem-rake/distinfo
+++ b/devel/rubygem-rake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/rake-0.9.2.gem) = c55b525b421fd833a93171ad3d7f04528ca8e87d99ac273f8933038942a5888c
-SIZE (rubygem/rake-0.9.2.gem) = 113152
+SHA256 (rubygem/rake-0.9.2.2.gem) = d83ceb634b73530b3e56dbc3cf2c143cddb4317fd3142855f298adffcac5c4a6
+SIZE (rubygem/rake-0.9.2.2.gem) = 111616
diff --git a/devel/rubygem-rascut/Makefile b/devel/rubygem-rascut/Makefile
index 37af20a9983e..d2ac0d530dc5 100644
--- a/devel/rubygem-rascut/Makefile
+++ b/devel/rubygem-rascut/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Ruby ActionSCript UTility
 
 RUN_DEPENDS=	mongrel_rails:${PORTSDIR}/www/rubygem-mongrel \
-		edit_json.rb:${PORTSDIR}/devel/rubygem-json_pure \
+		rubygem-json_pure>=1.5.1:${PORTSDIR}/devel/rubygem-json_pure \
 		rackup:${PORTSDIR}/www/rubygem-rack \
 		fcsh:${PORTSDIR}/devel/flex-sdk
 
diff --git a/devel/rubygem-rdoc/Makefile b/devel/rubygem-rdoc/Makefile
index e68cef860fc6..5f8421784d00 100644
--- a/devel/rubygem-rdoc/Makefile
+++ b/devel/rubygem-rdoc/Makefile
@@ -6,13 +6,16 @@
 #
 
 PORTNAME=	rdoc
-PORTVERSION=	3.9.1
+PORTVERSION=	3.11
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	RDoc produces HTML and command-line documentation for Ruby projects
 
+BUILD_DEPENDS=	rubygem-json>=1.6.1:${PORTSDIR}/devel/rubygem-json
+RUN_DEPENDS=	rubygem-json>=1.6.1:${PORTSDIR}/devel/rubygem-json
+
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
 RUBYGEM_AUTOPLIST=	yes
diff --git a/devel/rubygem-rdoc/distinfo b/devel/rubygem-rdoc/distinfo
index 11fd052cfa37..19d859ffa7c7 100644
--- a/devel/rubygem-rdoc/distinfo
+++ b/devel/rubygem-rdoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/rdoc-3.9.1.gem) = b0a0c92f8c2ad3ebd7faa5a7a0a9a7988f8f6ee03e7cc797748536b0dcae7483
-SIZE (rubygem/rdoc-3.9.1.gem) = 252416
+SHA256 (rubygem/rdoc-3.11.gem) = 353b31c71315bb9ceb69185bc9a2d5aa83a5195dd717fbb865fd06b18b280873
+SIZE (rubygem/rdoc-3.11.gem) = 311808
diff --git a/devel/rubygem-rdoc/pkg-descr b/devel/rubygem-rdoc/pkg-descr
index 30315e561725..82582d41c457 100644
--- a/devel/rubygem-rdoc/pkg-descr
+++ b/devel/rubygem-rdoc/pkg-descr
@@ -1,3 +1,5 @@
-RDoc produces HTML and command-line documentation for Ruby projects. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying online documentation. See RDoc for a description of RDoc's markup and basic use.
+RDoc produces HTML and command-line documentation for Ruby projects. RDoc
+includes the +rdoc+ and +ri+ tools for generating and displaying online
+documentation. See RDoc for a description of RDoc's markup and basic use.
 
 WWW: http://docs.seattlerb.org/rdoc/
diff --git a/devel/rubygem-stringex/Makefile b/devel/rubygem-stringex/Makefile
index 9a8d42e6e0aa..eb5165f3e262 100644
--- a/devel/rubygem-stringex/Makefile
+++ b/devel/rubygem-stringex/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stringex
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.0
 PORTEPOCH=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
diff --git a/devel/rubygem-stringex/distinfo b/devel/rubygem-stringex/distinfo
index 9cd16bc372fc..9641aae85772 100644
--- a/devel/rubygem-stringex/distinfo
+++ b/devel/rubygem-stringex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/stringex-1.2.1.gem) = 70a1ece42ad40a0263e02c5ce4c14bce58f73f3d6256f816bd9b9d2dc0b4ce72
-SIZE (rubygem/stringex-1.2.1.gem) = 102912
+SHA256 (rubygem/stringex-1.3.0.gem) = 2d884c0f42f15584d3938b62d6af7b27d2892e8d2c70c976cde16a5f9798861e
+SIZE (rubygem/stringex-1.3.0.gem) = 103424
diff --git a/devel/rubygem-tzinfo/Makefile b/devel/rubygem-tzinfo/Makefile
index 2ddb68810da6..ed9573bf5a16 100644
--- a/devel/rubygem-tzinfo/Makefile
+++ b/devel/rubygem-tzinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tzinfo
-PORTVERSION=	0.3.28
+PORTVERSION=	0.3.30
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-tzinfo/distinfo b/devel/rubygem-tzinfo/distinfo
index 1d6671fe3575..aa7ef59fb875 100644
--- a/devel/rubygem-tzinfo/distinfo
+++ b/devel/rubygem-tzinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/tzinfo-0.3.28.gem) = 9e0be2c610006e2232b5e7590a72839a7662d758e080ffec5543d3b535e806f3
-SIZE (rubygem/tzinfo-0.3.28.gem) = 310272
+SHA256 (rubygem/tzinfo-0.3.30.gem) = 522d7bac90426926ae80639d512f2ed6f2152ee5b58719cf4eb0fcc9d762ff8f
+SIZE (rubygem/tzinfo-0.3.30.gem) = 301056