Install as a gem using the pkgsrc rubygem.mk framework instead of

directly into site_ruby.

5 files changed, 148 insertions, 83 deletions

diff --git a/mail/ruby-actionmailer/Makefile b/mail/ruby-actionmailer/Makefile
index 2a9dc92a60c..5f4e655c483 100644
--- a/mail/ruby-actionmailer/Makefile
+++ b/mail/ruby-actionmailer/Makefile
@@ -1,31 +1,21 @@
-# $NetBSD: Makefile,v 1.10 2008/02/09 06:24:57 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2008/04/04 15:30:01 jlam Exp $
 
 DISTNAME=	actionmailer-2.0.2
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
-CATEGORIES=	mail ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/29354/
-EXTRACT_SUFX=	.tgz
+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.2:../../www/ruby-actionpack
-DEPENDS+=	${RUBY_PKGPREFIX}-tmail>=1.1.0:../../mail/ruby-tmail
+DEPENDS+=	${RUBY_PKGPREFIX}-actionpack>=2.0.2nb1:../../www/ruby-actionpack
 
-NO_BUILD=		yes
-NO_CONFIGURE=		yes
-USE_RUBY_INSTALL=	yes
-
-.include "../../lang/ruby/modules.mk"
-
-pre-install:
-	${RM} -rf ${WRKSRC}/lib/action_mailer/vendor/tmail-1.1.0
-	${RM} -f ${WRKSRC}/lib/action_mailer/vendor/tmail.rb
-
-post-install:
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/actionmailer
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${RUBY_DOCDIR}/actionmailer
-	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/actionmailer
+# 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
 
+.include "../../misc/rubygems/rubygem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ruby-actionmailer/PLIST b/mail/ruby-actionmailer/PLIST
index acdbf0bd79f..785650a39f8 100644
--- a/mail/ruby-actionmailer/PLIST
+++ b/mail/ruby-actionmailer/PLIST
@@ -1,22 +1,134 @@
-@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
-${RUBY_SITELIBDIR}/action_mailer/helpers.rb
-${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.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-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
+@comment $NetBSD: PLIST,v 1.8 2008/04/04 15:30:01 jlam Exp $
+${GEM_HOME}/cache/actionmailer-${PKGVERSION}.gem
+${GEM_LIBDIR}/CHANGELOG
+${GEM_LIBDIR}/MIT-LICENSE
+${GEM_LIBDIR}/README
+${GEM_LIBDIR}/Rakefile
+${GEM_LIBDIR}/install.rb
+${GEM_LIBDIR}/lib/action_mailer.rb
+${GEM_LIBDIR}/lib/action_mailer/adv_attr_accessor.rb
+${GEM_LIBDIR}/lib/action_mailer/base.rb
+${GEM_LIBDIR}/lib/action_mailer/helpers.rb
+${GEM_LIBDIR}/lib/action_mailer/mail_helper.rb
+${GEM_LIBDIR}/lib/action_mailer/part.rb
+${GEM_LIBDIR}/lib/action_mailer/part_container.rb
+${GEM_LIBDIR}/lib/action_mailer/quoting.rb
+${GEM_LIBDIR}/lib/action_mailer/test_case.rb
+${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/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
+${GEM_LIBDIR}/test/fixtures/raw_email13
+${GEM_LIBDIR}/test/fixtures/raw_email2
+${GEM_LIBDIR}/test/fixtures/raw_email3
+${GEM_LIBDIR}/test/fixtures/raw_email4
+${GEM_LIBDIR}/test/fixtures/raw_email5
+${GEM_LIBDIR}/test/fixtures/raw_email6
+${GEM_LIBDIR}/test/fixtures/raw_email7
+${GEM_LIBDIR}/test/fixtures/raw_email8
+${GEM_LIBDIR}/test/fixtures/raw_email9
+${GEM_LIBDIR}/test/fixtures/raw_email_quoted_with_0d0a
+${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
+${GEM_LIBDIR}/test/quoting_test.rb
+${GEM_LIBDIR}/test/test_helper_test.rb
+${GEM_LIBDIR}/test/tmail_test.rb
+${GEM_LIBDIR}/test/url_test.rb
+${GEM_HOME}/specifications/actionmailer-${PKGVERSION}.gemspec
+@dirrm ${GEM_LIBDIR}/test/fixtures/test_mailer
+@dirrm ${GEM_LIBDIR}/test/fixtures/templates
+@dirrm ${GEM_LIBDIR}/test/fixtures/second_mailer
+@dirrm ${GEM_LIBDIR}/test/fixtures/path.with.dots/funky_path_mailer
+@dirrm ${GEM_LIBDIR}/test/fixtures/path.with.dots
+@dirrm ${GEM_LIBDIR}/test/fixtures/helpers
+@dirrm ${GEM_LIBDIR}/test/fixtures/helper_mailer
+@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/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
+@dirrm ${GEM_LIBDIR}/lib/action_mailer
+@dirrm ${GEM_LIBDIR}/lib
+@dirrm ${GEM_LIBDIR}
diff --git a/mail/ruby-actionmailer/distinfo b/mail/ruby-actionmailer/distinfo
index 84bd7ef40e1..5d55316d638 100644
--- a/mail/ruby-actionmailer/distinfo
+++ b/mail/ruby-actionmailer/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.11 2008/02/09 06:24:57 minskim Exp $
+$NetBSD: distinfo,v 1.12 2008/04/04 15:30:01 jlam Exp $
 
-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
+SHA1 (actionmailer-2.0.2.gem) = 6ea83fb10f2d318627dc9de01e3772605bffbad4
+RMD160 (actionmailer-2.0.2.gem) = f6b247c87353639722da709dbf3ca50d9c86d18a
+Size (actionmailer-2.0.2.gem) = 116736 bytes
diff --git a/mail/ruby-actionmailer/patches/patch-aa b/mail/ruby-actionmailer/patches/patch-aa
deleted file mode 100644
index c7bf8d639ee..00000000000
--- a/mail/ruby-actionmailer/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 1c633dcc793..00000000000
--- a/mail/ruby-actionmailer/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$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