* 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

4 files changed, 26 insertions, 12 deletions

diff --git a/www/rubygem-rails/Makefile b/www/rubygem-rails/Makefile
index c31f26689a8f..315b830eac89 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 1d8b1a047847..67ce1cca7fb0 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 c3b92c0c7c69..23000b3beb63 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 4ae8dfb77388..59fb572d5704 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%%