* 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, 25 insertions, 11 deletions

diff --git a/mail/rubygem-actionmailer/Makefile b/mail/rubygem-actionmailer/Makefile
index bebf1b49cb88..c0d79f465a3b 100644
--- a/mail/rubygem-actionmailer/Makefile
+++ b/mail/rubygem-actionmailer/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionmailer
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.5
 CATEGORIES=	mail rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,9 +13,22 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jw@innerewut.de
 COMMENT=	Easy email delivery and testing for Ruby
 
-BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack
+BUILD_DEPENDS=	${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack
 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/mail/rubygem-actionmailer/distinfo b/mail/rubygem-actionmailer/distinfo
index 90dab709b133..f8a9c488fad4 100644
--- a/mail/rubygem-actionmailer/distinfo
+++ b/mail/rubygem-actionmailer/distinfo
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionmailer-1.2.1.gem) = 890485893b19c2c2d250b058db2bc03d
-SHA256 (rubygem/actionmailer-1.2.1.gem) = 45d8043a69baf5c765184b56666599b1f5b4e13a2d327723fa081dde3cff7898
-SIZE (rubygem/actionmailer-1.2.1.gem) = 81920
+MD5 (rubygem/actionmailer-1.2.5.gem) = 095ce5045eebad4634987119e3f4a1ef
+SHA256 (rubygem/actionmailer-1.2.5.gem) = 24d5d7f0633525f5bcac946fd4c4c267bc7e9ba46d689bbcef35ec720d3ec64b
+SIZE (rubygem/actionmailer-1.2.5.gem) = 81920
diff --git a/mail/rubygem-actionmailer/pkg-descr b/mail/rubygem-actionmailer/pkg-descr
index 1134f258a917..69655f95c27b 100644
--- a/mail/rubygem-actionmailer/pkg-descr
+++ b/mail/rubygem-actionmailer/pkg-descr
@@ -7,7 +7,8 @@ Additionally, an Action Mailer class can be used to process incoming email,
 such as allowing a weblog to accept new posts from an email (which could even
 have been sent from a phone)
 
-WWW:	http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/actionmailer/
 
 - Jonathan Weiss
 jw@innerewut.de
diff --git a/mail/rubygem-actionmailer/pkg-plist b/mail/rubygem-actionmailer/pkg-plist
index 03cf818c2290..b95a74352c7c 100644
--- a/mail/rubygem-actionmailer/pkg-plist
+++ b/mail/rubygem-actionmailer/pkg-plist
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionmailer-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
 %%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.src/M000454.html
 %%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.src/M000455.html
@@ -484,6 +484,7 @@
 %%GEM_LIB_DIR%%/CHANGELOG
 %%GEM_LIB_DIR%%/MIT-LICENSE
 %%GEM_LIB_DIR%%/README
+%%GEM_LIB_DIR%%/Rakefile
 %%GEM_LIB_DIR%%/install.rb
 %%GEM_LIB_DIR%%/lib/action_mailer.rb
 %%GEM_LIB_DIR%%/lib/action_mailer/adv_attr_accessor.rb
@@ -519,7 +520,6 @@
 %%GEM_LIB_DIR%%/lib/action_mailer/vendor/tmail/tmail.rb
 %%GEM_LIB_DIR%%/lib/action_mailer/vendor/tmail/utils.rb
 %%GEM_LIB_DIR%%/lib/action_mailer/version.rb
-%%GEM_LIB_DIR%%/rakefile
 %%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_helper.rhtml
 %%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_helper_method.rhtml
 %%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_mail_helper.rhtml
@@ -551,7 +551,7 @@
 %%GEM_LIB_DIR%%/test/mail_service_test.rb
 %%GEM_LIB_DIR%%/test/quoting_test.rb
 %%GEM_LIB_DIR%%/test/tmail_test.rb
-%%SPEC_DIR%%/actionmailer-1.2.1.gemspec
+%%GEM_SPEC%%
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/test_mailer
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/templates
 @dirrm %%GEM_LIB_DIR%%/test/fixtures/path.with.dots
@@ -564,7 +564,7 @@
 @dirrm %%GEM_LIB_DIR%%/lib/action_mailer/vendor
 @dirrm %%GEM_LIB_DIR%%/lib/action_mailer
 @dirrm %%GEM_LIB_DIR%%/lib
-@dirrm %%GEMS_DIR%%/actionmailer-1.2.1
+@dirrm %%GEM_LIB_DIR%%
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor/tmail
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor/text
 @dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor
@@ -628,4 +628,4 @@
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionMailer
 @dirrm %%GEM_DOC_DIR%%/rdoc/classes
 @dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionmailer-1.2.1
+@dirrm %%GEM_DOC_DIR%%