* Update rails and its related ports to match rails 1.1.6:

	activesupport    = 1.3.1
	activerecord     = 1.14.4
	actionpack       = 1.12.5
	actionmailer     = 1.2.5
	actionwebservice = 1.1.6
	rails            = 1.1.6
    This update is needed to fix a serious bug in rails
* Add a x-generate-plist target to easy the creation of pkg-plist
* Add an "WWW" entry on pkg-descr that points to the correspoding
  project on rubyforge.

PR:		ports/101973
Submitted by:	Rui Lopes <rgl_AT_ruilopes dot com>
Approved by:	maintainer (Jonathan Weiss)
Security:	http://weblog.rubyonrails.org/2006/8/10/rails-1-1-6-backports-and-full-disclosure
Security:	http://www.vuxml.org/freebsd/90064567-28b1-11db-844d-000c6ec775d9.html

12 files changed, 90 insertions, 36 deletions

diff --git a/www/rubygem-actionpack/Makefile b/www/rubygem-actionpack/Makefile
index 9470c65ef9c..a3349e96ec6 100644
--- a/www/rubygem-actionpack/Makefile
+++ b/www/rubygem-actionpack/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionpack
-PORTVERSION=	1.12.1
+PORTVERSION=	1.12.5
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,6 +16,19 @@ COMMENT=	Action Controller and Action View of Rails MVC Framework
 BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/activesupport-1.3.1.gemspec:${PORTSDIR}/devel/rubygem-activesupport
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+	| ${SED} -E \
+		's,.*share/nls/.+$$,,g \
+		;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+		;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+		;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+		;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+		;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+		' | ${TR} -s '\n') > temp-pkg-plist
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/rubygem-actionpack/distinfo b/www/rubygem-actionpack/distinfo
index fb361f739ae..fd4d04e558e 100644
--- a/www/rubygem-actionpack/distinfo
+++ b/www/rubygem-actionpack/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionpack-1.12.1.gem) = 377632f15df44fe70b221d8b87db0e20
-SHA256 (rubygem/actionpack-1.12.1.gem) = 502b3d1767c282365d7211c453df3fec45aba0a69229a4250b9b4d814a11d0f7
-SIZE (rubygem/actionpack-1.12.1.gem) = 526336
+MD5 (rubygem/actionpack-1.12.5.gem) = d0bf5c15b7f530e0dbd28191bb4a54fc
+SHA256 (rubygem/actionpack-1.12.5.gem) = c6a95008d934b096e8d5ff730f85942c8d59fd94bea7f54e9ae74914fd9d5be1
+SIZE (rubygem/actionpack-1.12.5.gem) = 530432
diff --git a/www/rubygem-actionpack/pkg-descr b/www/rubygem-actionpack/pkg-descr
index 0fcd23367ed..0b180693466 100644
--- a/www/rubygem-actionpack/pkg-descr
+++ b/www/rubygem-actionpack/pkg-descr
@@ -9,7 +9,8 @@ much more separate.
 
 Each of these packages can be used independently outside of Rails.
 
-WWW:	http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/actionpack/
 
 - Jonathan Weiss
 jw@innerewut.de
diff --git a/www/rubygem-actionpack/pkg-plist b/www/rubygem-actionpack/pkg-plist
index 17e8d191e15..2d5ff096194 100644
--- a/www/rubygem-actionpack/pkg-plist
+++ b/www/rubygem-actionpack/pkg-plist
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionpack-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000119.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000120.html
@@ -31,8 +31,8 @@
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000148.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000149.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000150.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000151.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000154.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000155.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000156.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000157.html
@@ -117,9 +117,9 @@
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Integration/Session.src/M000043.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Integration/Session.src/M000044.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000151.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000152.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000153.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000154.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Layout/ClassMethods.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Layout/ClassMethods.src/M000061.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionController/Macros.html
@@ -466,6 +466,7 @@
 %%GEM_LIB_DIR%%/MIT-LICENSE
 %%GEM_LIB_DIR%%/README
 %%GEM_LIB_DIR%%/RUNNING_UNIT_TESTS
+%%GEM_LIB_DIR%%/Rakefile
 %%GEM_LIB_DIR%%/examples/.htaccess
 %%GEM_LIB_DIR%%/examples/address_book/index.rhtml
 %%GEM_LIB_DIR%%/examples/address_book/layout.rhtml
@@ -480,6 +481,7 @@
 %%GEM_LIB_DIR%%/examples/debate/new_topic.rhtml
 %%GEM_LIB_DIR%%/examples/debate/topic.rhtml
 %%GEM_LIB_DIR%%/examples/debate_controller.cgi
+%%GEM_LIB_DIR%%/filler.txt
 %%GEM_LIB_DIR%%/install.rb
 %%GEM_LIB_DIR%%/lib/action_controller.rb
 %%GEM_LIB_DIR%%/lib/action_controller/assertions.rb
@@ -571,7 +573,6 @@
 %%GEM_LIB_DIR%%/lib/action_view/helpers/url_helper.rb
 %%GEM_LIB_DIR%%/lib/action_view/partials.rb
 %%GEM_LIB_DIR%%/lib/action_view/template_error.rb
-%%GEM_LIB_DIR%%/rakefile
 %%GEM_LIB_DIR%%/test/abstract_unit.rb
 %%GEM_LIB_DIR%%/test/active_record_unit.rb
 %%GEM_LIB_DIR%%/test/activerecord/active_record_assertions_test.rb
@@ -588,6 +589,7 @@
 %%GEM_LIB_DIR%%/test/controller/cookie_test.rb
 %%GEM_LIB_DIR%%/test/controller/custom_handler_test.rb
 %%GEM_LIB_DIR%%/test/controller/fake_controllers.rb
+%%GEM_LIB_DIR%%/test/controller/filter_params_test.rb
 %%GEM_LIB_DIR%%/test/controller/filters_test.rb
 %%GEM_LIB_DIR%%/test/controller/flash_test.rb
 %%GEM_LIB_DIR%%/test/controller/fragment_store_setting_test.rb
@@ -608,12 +610,16 @@
 %%GEM_LIB_DIR%%/test/controller/verification_test.rb
 %%GEM_LIB_DIR%%/test/controller/webservice_test.rb
 %%GEM_LIB_DIR%%/test/fixtures/addresses/list.rhtml
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb
 %%GEM_LIB_DIR%%/test/fixtures/companies.yml
 %%GEM_LIB_DIR%%/test/fixtures/company.rb
 %%GEM_LIB_DIR%%/test/fixtures/db_definitions/sqlite.sql
 %%GEM_LIB_DIR%%/test/fixtures/developer.rb
 %%GEM_LIB_DIR%%/test/fixtures/developers.yml
 %%GEM_LIB_DIR%%/test/fixtures/developers_projects.yml
+%%GEM_LIB_DIR%%/test/fixtures/dont_load.rb
 %%GEM_LIB_DIR%%/test/fixtures/fun/games/hello_world.rhtml
 %%GEM_LIB_DIR%%/test/fixtures/helpers/abc_helper.rb
 %%GEM_LIB_DIR%%/test/fixtures/helpers/fun/games_helper.rb
@@ -679,7 +685,7 @@
 %%GEM_LIB_DIR%%/test/template/active_record_helper_test.rb
 %%GEM_LIB_DIR%%/test/template/asset_tag_helper_test.rb
 %%GEM_LIB_DIR%%/test/template/benchmark_helper_test.rb
-%%GEM_LIB_DIR%%/test/template/compiled_templates_tests.rb
+%%GEM_LIB_DIR%%/test/template/compiled_templates_test.rb
 %%GEM_LIB_DIR%%/test/template/date_helper_test.rb
 %%GEM_LIB_DIR%%/test/template/form_helper_test.rb
 %%GEM_LIB_DIR%%/test/template/form_options_helper_test.rb
@@ -693,7 +699,7 @@
 %%GEM_LIB_DIR%%/test/template/text_helper_test.rb
 %%GEM_LIB_DIR%%/test/template/url_helper_test.rb
 %%GEM_LIB_DIR%%/test/testing_sandbox.rb
-%%SPEC_DIR%%/actionpack-1.12.1.gemspec
+%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test/template
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/test/dot.directory
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/test
@@ -714,6 +720,12 @@
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/fun/games
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/fun
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/db_definitions
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/models
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/module_that_holds_controllers
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/addresses
 @dirrm %%GEM_LIB_DIR%%/test/fixtures
 @dirrm %%GEM_LIB_DIR%%/test/controller
@@ -737,7 +749,7 @@
 @dirrm %%GEM_LIB_DIR%%/examples/debate
 @dirrm %%GEM_LIB_DIR%%/examples/address_book
 @dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEMS_DIR%%/actionpack-1.12.1
+@dirrm %%GEM_LIB_DIR%%
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_view/helpers
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_view
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_pack
@@ -832,4 +844,4 @@
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionController
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes
 @dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionpack-1.12.1
+@dirrm %%GEM_DOC_DIR%%
diff --git a/www/rubygem-actionwebservice/Makefile b/www/rubygem-actionwebservice/Makefile
index 223392b4e14..e99a24de805 100644
--- a/www/rubygem-actionwebservice/Makefile
+++ b/www/rubygem-actionwebservice/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionwebservice
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	aws
@@ -13,10 +13,23 @@ MASTER_SITE_SUBDIR=	aws
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Simple support for publishing Web Service APIs for Rails applications
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
-		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.2.gemspec:${PORTSDIR}/databases/rubygem-activerecord
+BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+	| ${SED} -E \
+		's,.*share/nls/.+$$,,g \
+		;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+		;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+		;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+		;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+		;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+		' | ${TR} -s '\n') > temp-pkg-plist
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/www/rubygem-actionwebservice/distinfo b/www/rubygem-actionwebservice/distinfo
index 88f10fee779..e52e5b208e9 100644
--- a/www/rubygem-actionwebservice/distinfo
+++ b/www/rubygem-actionwebservice/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionwebservice-1.1.2.gem) = bb61cdf8756eade9f75d2492c8fe75e9
-SHA256 (rubygem/actionwebservice-1.1.2.gem) = 7eb5304b613fe0c2a49ca37f8c05e3af6c5a3f1fbea70270e612b49573ec879e
-SIZE (rubygem/actionwebservice-1.1.2.gem) = 67072
+MD5 (rubygem/actionwebservice-1.1.6.gem) = 007eed546c522692fbe88d47bb0d7934
+SHA256 (rubygem/actionwebservice-1.1.6.gem) = e093589cc3bde3375c4feef4b82cdbde3ea6a2fbeb4103cbaded2dde5ec1f8a1
+SIZE (rubygem/actionwebservice-1.1.6.gem) = 67072
diff --git a/www/rubygem-actionwebservice/pkg-descr b/www/rubygem-actionwebservice/pkg-descr
index 3acd2d3aeca..9c7cae78deb 100644
--- a/www/rubygem-actionwebservice/pkg-descr
+++ b/www/rubygem-actionwebservice/pkg-descr
@@ -13,7 +13,8 @@ Features
 * Type signature hints to improve interoperability with static languages
 * Active Record model class support in signatures
 
-WWW:	http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/aws/
 
 - Jonathan Weiss
 jw@innerewut.de
diff --git a/www/rubygem-actionwebservice/pkg-plist b/www/rubygem-actionwebservice/pkg-plist
index ec09e50cc0b..0ad758ce014 100644
--- a/www/rubygem-actionwebservice/pkg-plist
+++ b/www/rubygem-actionwebservice/pkg-plist
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionwebservice-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
 %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000031.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000032.html
@@ -167,7 +167,7 @@
 %%GEM_LIB_DIR%%/test/scaffolded_controller_test.rb
 %%GEM_LIB_DIR%%/test/struct_test.rb
 %%GEM_LIB_DIR%%/test/test_invoke_test.rb
-%%SPEC_DIR%%/actionwebservice-1.1.2.gemspec
+%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/db_definitions
 @dirrm %%GEM_LIB_DIR%%/test/fixtures
 @dirrm %%GEM_LIB_DIR%%/test/apis
@@ -190,7 +190,7 @@
 @dirrm %%GEM_LIB_DIR%%/examples/googlesearch/autoloading
 @dirrm %%GEM_LIB_DIR%%/examples/googlesearch
 @dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEMS_DIR%%/actionwebservice-1.1.2
+@dirrm %%GEM_LIB_DIR%%
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol
@@ -228,4 +228,4 @@
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes
 @dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionwebservice-1.1.2
+@dirrm %%GEM_DOC_DIR%%
diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index c31f26689a8..315b830eac8 100644
--- a/www/rubygem-rails/Makefile
+++ b/www/rubygem-rails/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	rails
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,10 +15,10 @@ COMMENT=	MVC web application framework
 
 BUILD_DEPENDS=	rake:${PORTSDIR}/devel/rubygem-rake \
 		${LOCALBASE}/${SPEC_DIR}/activesupport-1.3.1.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
-		${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
-		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.1.2.gemspec:${PORTSDIR}/www/rubygem-actionwebservice \
-		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.2.1.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
-		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.2.gemspec:${PORTSDIR}/databases/rubygem-activerecord
+		${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
+		${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+		${LOCALBASE}/${SPEC_DIR}/actionmailer-1.2.5.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
+		${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.1.6.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	FCGI "FastCGI support" Off\
@@ -28,6 +28,19 @@ OPTIONSFILE=	${PORT_DBDIR}/rubygem-${PORTNAME}/options
 # to get RUBY_SITEARCHLIBDIR
 USE_RUBY=	yes
 
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+	| ${SED} -E \
+		's,.*share/nls/.+$$,,g \
+		;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+		;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+		;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+		;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+		;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+		;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+		' | ${TR} -s '\n') > temp-pkg-plist
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FCGI)
diff --git a/www/rubygem-rails/distinfo b/www/rubygem-rails/distinfo
index 1d8b1a04784..67ce1cca7fb 100644
--- a/www/rubygem-rails/distinfo
+++ b/www/rubygem-rails/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/rails-1.1.2.gem) = a90166212c33392f6aae98bd4be2e184
-SHA256 (rubygem/rails-1.1.2.gem) = 1ffd33463d5ed4aa4079f46816dd08af3028f361e623be57a6dec9784263f26f
-SIZE (rubygem/rails-1.1.2.gem) = 144896
+MD5 (rubygem/rails-1.1.6.gem) = dee64ab90efedbbe900944fac754d72d
+SHA256 (rubygem/rails-1.1.6.gem) = f78cc3dfe77ceaa3cdd808735dcb81c8d3bdbd8e4d6b72ecc3a1b7fc19f1bd49
+SIZE (rubygem/rails-1.1.6.gem) = 144896
diff --git a/www/rubygem-rails/pkg-descr b/www/rubygem-rails/pkg-descr
index c3b92c0c7c6..23000b3beb6 100644
--- a/www/rubygem-rails/pkg-descr
+++ b/www/rubygem-rails/pkg-descr
@@ -9,7 +9,8 @@ can use a single language from top to bottom. Everything from templates
 to control flow to business logic is written in Ruby - The language of
 love for industry heavy-weights.
 
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/rails/
 
 - Jonathan Weiss
 jw@innerewut.de
diff --git a/www/rubygem-rails/pkg-plist b/www/rubygem-rails/pkg-plist
index 4ae8dfb7738..59fb572d570 100644
--- a/www/rubygem-rails/pkg-plist
+++ b/www/rubygem-rails/pkg-plist
@@ -1,5 +1,5 @@
 bin/rails
-%%CACHE_DIR%%/rails-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
 %%GEM_LIB_DIR%%/CHANGELOG
 %%GEM_LIB_DIR%%/MIT-LICENSE
 %%GEM_LIB_DIR%%/README
@@ -169,7 +169,7 @@ bin/rails
 %%GEM_LIB_DIR%%/lib/tasks/tmp.rake
 %%GEM_LIB_DIR%%/lib/test_help.rb
 %%GEM_LIB_DIR%%/lib/webrick_server.rb
-%%SPEC_DIR%%/rails-1.1.2.gemspec
+%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/lib/tasks
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/scripts
 @dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates
@@ -217,4 +217,4 @@ bin/rails
 @dirrm %%GEM_LIB_DIR%%/bin/process
 @dirrm %%GEM_LIB_DIR%%/bin/performance
 @dirrm %%GEM_LIB_DIR%%/bin
-@dirrm %%GEMS_DIR%%/rails-1.1.2
+@dirrm %%GEM_LIB_DIR%%