Update ruby-actionmailer to 2.0.2.

There have been too many changes.  Please see CHANGES for the complete list:

http://dev.rubyonrails.org/browser/tags/rel_2-0-2/actionmailer/CHANGELOG

5 files changed, 54 insertions, 13 deletions

diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
index 863b5f4662f..2a9dc92a60c 100644
--- a/mail/ruby-actionmailer/Makefile
+++ b/mail/ruby-actionmailer/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2007/10/16 03:26:23 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2008/02/09 06:24:57 minskim Exp $
 
-DISTNAME=	actionmailer-1.3.5
+DISTNAME=	actionmailer-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
 CATEGORIES=	mail ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/26557/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/29354/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://rubyforge.org/projects/actionmailer/
 COMMENT=	Ruby framework for designing email-service layers
 
-DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=1.13.5:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-tmail>=0.10.8:../../mail/ruby-tmail
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.0.2:../../www/ruby-actionpack
+DEPENDS+=	${RUBY_PKGPREFIX}-tmail>=1.1.0:../../mail/ruby-tmail
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
@@ -20,7 +20,7 @@ USE_RUBY_INSTALL=	yes
 .include "../../lang/ruby/modules.mk"
 
 pre-install:
-	${RM} -rf ${WRKSRC}/lib/action_mailer/vendor/tmail
+	${RM} -rf ${WRKSRC}/lib/action_mailer/vendor/tmail-1.1.0
 	${RM} -f ${WRKSRC}/lib/action_mailer/vendor/tmail.rb
 
 post-install:
diff --git a/mail/ruby-actionmailer/PLIST b/mail/ruby-actionmailer/PLIST
index 22167ee9441..acdbf0bd79f 100644
--- a/mail/ruby-actionmailer/PLIST
+++ b/mail/ruby-actionmailer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/03/17 11:14:29 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/02/09 06:24:57 minskim Exp $
 ${RUBY_SITELIBDIR}/action_mailer.rb
 ${RUBY_SITELIBDIR}/action_mailer/adv_attr_accessor.rb
 ${RUBY_SITELIBDIR}/action_mailer/base.rb
@@ -7,12 +7,16 @@ ${RUBY_SITELIBDIR}/action_mailer/mail_helper.rb
 ${RUBY_SITELIBDIR}/action_mailer/part.rb
 ${RUBY_SITELIBDIR}/action_mailer/part_container.rb
 ${RUBY_SITELIBDIR}/action_mailer/quoting.rb
+${RUBY_SITELIBDIR}/action_mailer/test_case.rb
+${RUBY_SITELIBDIR}/action_mailer/test_helper.rb
 ${RUBY_SITELIBDIR}/action_mailer/utils.rb
-${RUBY_SITELIBDIR}/action_mailer/vendor/text/format.rb
+${RUBY_SITELIBDIR}/action_mailer/vendor.rb
+${RUBY_SITELIBDIR}/action_mailer/vendor/text-format-0.6.3/text/format.rb
 ${RUBY_SITELIBDIR}/action_mailer/version.rb
 ${RUBY_DOCDIR}/actionmailer/CHANGELOG
 ${RUBY_DOCDIR}/actionmailer/README
 @dirrm ${RUBY_DOCDIR}/actionmailer
-@dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor/text
+@dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor/text-format-0.6.3/text
+@dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor/text-format-0.6.3
 @dirrm ${RUBY_SITELIBDIR}/action_mailer/vendor
 @dirrm ${RUBY_SITELIBDIR}/action_mailer
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
index a523cb1bf07..84bd7ef40e1 100644
--- a/mail/ruby-actionmailer/distinfo
+++ b/mail/ruby-actionmailer/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/10/16 03:26:23 minskim Exp $
+$NetBSD: distinfo,v 1.11 2008/02/09 06:24:57 minskim Exp $
 
-SHA1 (actionmailer-1.3.5.tgz) = 2803796787b6752401cf85c12dc3a810c731ff4a
-RMD160 (actionmailer-1.3.5.tgz) = 1c1b417af80b3d429fdb84a4492ee123449bf530
-Size (actionmailer-1.3.5.tgz) = 80800 bytes
+SHA1 (actionmailer-2.0.2.tgz) = d3b150ba266b80e02d4d82a1b9601534031085bf
+RMD160 (actionmailer-2.0.2.tgz) = d7e763de8eaf4644b5afe5911cdd3d76a00ce7e6
+Size (actionmailer-2.0.2.tgz) = 113537 bytes
+SHA1 (patch-aa) = 46e7c61624eeb426d3cb72eb7c1651208c8c3efe
+SHA1 (patch-ab) = c30b7bd36a23e129ba48a6991386cbef17027df2
diff --git a/mail/ruby-actionmailer/patches/patch-aa b/mail/ruby-actionmailer/patches/patch-aa
new file mode 100644
index 00000000000..c7bf8d639ee
--- /dev/null
+++ b/mail/ruby-actionmailer/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.3 2008/02/09 06:24:57 minskim Exp $
+
+--- lib/action_mailer.rb.orig	2008-02-08 21:56:01.000000000 -0800
++++ lib/action_mailer.rb
+@@ -23,11 +23,7 @@
+ 
+ unless defined?(ActionController)
+   begin
+-    $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
+     require 'action_controller'
+-  rescue LoadError
+-    require 'rubygems'
+-    gem 'actionpack', '>= 1.12.5'
+   end
+ end
+ 
diff --git a/mail/ruby-actionmailer/patches/patch-ab b/mail/ruby-actionmailer/patches/patch-ab
new file mode 100644
index 00000000000..1c633dcc793
--- /dev/null
+++ b/mail/ruby-actionmailer/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2008/02/09 06:24:57 minskim Exp $
+
+--- lib/action_mailer/vendor.rb.orig	2008-02-08 21:56:50.000000000 -0800
++++ lib/action_mailer/vendor.rb
+@@ -1,14 +1,7 @@
+-# Prefer gems to the bundled libs.
+-require 'rubygems'
+-
+ begin
+-  gem 'tmail', '~> 1.1.0'
+-rescue Gem::LoadError
+   $:.unshift "#{File.dirname(__FILE__)}/vendor/tmail-1.1.0"
+ end
+ 
+ begin
+-  gem 'text-format', '>= 0.6.3'
+-rescue Gem::LoadError
+   $:.unshift "#{File.dirname(__FILE__)}/vendor/text-format-0.6.3"
+ end