Update ruby-actionmailer to 2.1.0.

Too many changes since 2.0.2.  See CHANGELOG for the complete list.

pkgsrc CHANGES:
This version does not depend on ruby-tmail any longer.  The dependency
should have been removed when it was switched to use rubygems.

3 files changed, 37 insertions, 63 deletions

diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
index 5f4e655c483..603b1632d8d 100644
--- a/mail/ruby-actionmailer/Makefile
+++ b/mail/ruby-actionmailer/Makefile
@@ -1,21 +1,14 @@
-# $NetBSD: Makefile,v 1.11 2008/04/04 15:30:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/20 04:33:02 minskim Exp $
 
-DISTNAME=	actionmailer-2.0.2
+DISTNAME=	actionmailer-2.1.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionmailer/
 COMMENT=	Ruby framework for designing email-service layers
 
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.0.2nb1:../../www/ruby-actionpack
-
-# This isn't strictly necessary as actionmailer bundles its own copy
-# of tmail, but we can make use of the bugfixes in a more recent gem
-# installation of tmail.
-#
-DEPENDS+=	${RUBY_PKGPREFIX}-tmail>=1.2.2:../../mail/ruby-tmail
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.1.0:../../www/ruby-actionpack
 
 .include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-actionmailer/PLIST b/mail/ruby-actionmailer/PLIST
index 785650a39f8..b9e28e77457 100644
--- a/mail/ruby-actionmailer/PLIST
+++ b/mail/ruby-actionmailer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2008/04/04 15:30:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/06/20 04:33:02 minskim Exp $
 ${GEM_HOME}/cache/actionmailer-${PKGVERSION}.gem
 ${GEM_LIBDIR}/CHANGELOG
 ${GEM_LIBDIR}/MIT-LICENSE
@@ -18,55 +18,44 @@ ${GEM_LIBDIR}/lib/action_mailer/test_helper.rb
 ${GEM_LIBDIR}/lib/action_mailer/utils.rb
 ${GEM_LIBDIR}/lib/action_mailer/vendor.rb
 ${GEM_LIBDIR}/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/Makefile
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/address.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/attachments.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/base64.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/compat.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/config.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/core_extensions.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/encode.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/facade.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/header.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/info.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/interface.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/loader.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/mail.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/mailbox.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/mbox.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/net.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/obsolete.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/parser.y
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/port.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/quoting.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/scanner_r.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/stringio.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/tmail.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/utils.rb
-${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail/version.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/address.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/attachments.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/base64.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/compat.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/config.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/core_extensions.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/encode.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/header.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/index.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/interface.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/loader.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/mail.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/mailbox.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/main.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/mbox.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/net.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/obsolete.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/parser.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/port.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/quoting.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/require_arch.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/scanner_r.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/stringio.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/utils.rb
+${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail/version.rb
 ${GEM_LIBDIR}/lib/action_mailer/version.rb
 ${GEM_LIBDIR}/lib/actionmailer.rb
 ${GEM_LIBDIR}/test/abstract_unit.rb
 ${GEM_LIBDIR}/test/delivery_method_test.rb
 ${GEM_LIBDIR}/test/fixtures/first_mailer/share.erb
-${GEM_LIBDIR}/test/fixtures/first_mailer/share.rhtml
 ${GEM_LIBDIR}/test/fixtures/helper_mailer/use_example_helper.erb
-${GEM_LIBDIR}/test/fixtures/helper_mailer/use_example_helper.rhtml
 ${GEM_LIBDIR}/test/fixtures/helper_mailer/use_helper.erb
-${GEM_LIBDIR}/test/fixtures/helper_mailer/use_helper.rhtml
 ${GEM_LIBDIR}/test/fixtures/helper_mailer/use_helper_method.erb
-${GEM_LIBDIR}/test/fixtures/helper_mailer/use_helper_method.rhtml
 ${GEM_LIBDIR}/test/fixtures/helper_mailer/use_mail_helper.erb
-${GEM_LIBDIR}/test/fixtures/helper_mailer/use_mail_helper.rhtml
 ${GEM_LIBDIR}/test/fixtures/helpers/example_helper.rb
 ${GEM_LIBDIR}/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
-${GEM_LIBDIR}/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml
-${GEM_LIBDIR}/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml
-${GEM_LIBDIR}/test/fixtures/raw_base64_decoded_string
-${GEM_LIBDIR}/test/fixtures/raw_base64_encoded_string
 ${GEM_LIBDIR}/test/fixtures/raw_email
 ${GEM_LIBDIR}/test/fixtures/raw_email10
 ${GEM_LIBDIR}/test/fixtures/raw_email12
@@ -84,28 +73,20 @@ ${GEM_LIBDIR}/test/fixtures/raw_email_with_invalid_characters_in_content_type
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_nested_attachment
 ${GEM_LIBDIR}/test/fixtures/raw_email_with_partially_quoted_subject
 ${GEM_LIBDIR}/test/fixtures/second_mailer/share.erb
-${GEM_LIBDIR}/test/fixtures/second_mailer/share.rhtml
 ${GEM_LIBDIR}/test/fixtures/templates/signed_up.erb
-${GEM_LIBDIR}/test/fixtures/templates/signed_up.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/_subtemplate.text.plain.erb
 ${GEM_LIBDIR}/test/fixtures/test_mailer/custom_templating_extension.text.html.haml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/custom_templating_extension.text.plain.haml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.ignored.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak
 ${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.html.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/included_subtemplate.text.plain.erb
 ${GEM_LIBDIR}/test/fixtures/test_mailer/rxml_template.builder
 ${GEM_LIBDIR}/test/fixtures/test_mailer/rxml_template.rxml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/signed_up.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/signed_up.rhtml
 ${GEM_LIBDIR}/test/fixtures/test_mailer/signed_up_with_url.erb
-${GEM_LIBDIR}/test/fixtures/test_mailer/signed_up_with_url.rhtml
 ${GEM_LIBDIR}/test/mail_helper_test.rb
 ${GEM_LIBDIR}/test/mail_render_test.rb
 ${GEM_LIBDIR}/test/mail_service_test.rb
@@ -124,8 +105,8 @@ ${GEM_HOME}/specifications/actionmailer-${PKGVERSION}.gemspec
 @dirrm ${GEM_LIBDIR}/test/fixtures/first_mailer
 @dirrm ${GEM_LIBDIR}/test/fixtures
 @dirrm ${GEM_LIBDIR}/test
-@dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0/tmail
-@dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.1.0
+@dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3/tmail
+@dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/tmail-1.2.3
 @dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/text-format-0.6.3/text
 @dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor/text-format-0.6.3
 @dirrm ${GEM_LIBDIR}/lib/action_mailer/vendor
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
index 5d55316d638..8fb7d2070aa 100644
--- a/mail/ruby-actionmailer/distinfo
+++ b/mail/ruby-actionmailer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2008/04/04 15:30:01 jlam Exp $
+$NetBSD: distinfo,v 1.13 2008/06/20 04:33:02 minskim Exp $
 
-SHA1 (actionmailer-2.0.2.gem) = 6ea83fb10f2d318627dc9de01e3772605bffbad4
-RMD160 (actionmailer-2.0.2.gem) = f6b247c87353639722da709dbf3ca50d9c86d18a
-Size (actionmailer-2.0.2.gem) = 116736 bytes
+SHA1 (actionmailer-2.1.0.gem) = 53d0a243ae820e18032598dc027937b33e8a08d1
+RMD160 (actionmailer-2.1.0.gem) = c586873ae84d36bf5bffadb2a9389cecf8b05ab3
+Size (actionmailer-2.1.0.gem) = 107520 bytes